Change Metrics Output for sls flusher #908
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
EvanLjp
changed the title
… into add-metric-store-output
messixukejia
requested changes
Jul 9, 2023
yyuuttaaoo
reviewed
Jul 10, 2023
messixukejia
reviewed
Aug 8, 2023
core/sender/Sender.cpp
Outdated
| @@ -167,6 +172,77 @@ static const char* GetOperationString(OperationOnFail op) { | |||
| } | |||
| } | |||
|
|
|||
| void MetricsSendClosure::OnFail(sdk::Response* response, const string& errorCode, const string& errorMessage) { | |||
| static std::string sMetricstoreVersionTooLowFlag = "get WriteClient error: no basic auth or parse error"; | |||
| LOG_INFO(sLogger, ("send failed, error code", errorCode)("error msg", errorMessage)("retry times", mDataPtr->mSendRetryTimes)); | |||
| @@ -19,10 +19,12 @@ | |||
| #include <string> | |||
| #include <deque> | |||
| #include <stdio.h> | |||
| #include "Config.h" | |||
core/sender/Sender.cpp
Outdated
| dataPtr->mLogData, | ||
| dataPtr->mRawSize, | ||
| sendClosure); | ||
| }else if (hashKey.empty()) { |
core/sender/Sender.cpp
Outdated
| @@ -167,6 +172,77 @@ static const char* GetOperationString(OperationOnFail op) { | |||
| } | |||
| } | |||
|
|
|||
| void MetricsSendClosure::OnFail(sdk::Response* response, const string& errorCode, const string& errorMessage) { | |||
There was a problem hiding this comment.
SendClosure::OnFail 这两个函数还是重复度极高，能合成一个吗
yyuuttaaoo
reviewed
Aug 8, 2023
| else if (telemetryTypeStr == "metrics") | ||
| telemetryType = sls_logs::SLS_TELEMETRY_TYPE_METRICS; | ||
| else { | ||
| LOG_ERROR(sLogger, ("not supported log type, use default log telemetry type", telemetryType)); |
core/sdk/CurlAsynInstance.cpp
Outdated
| return; | ||
| } | ||
| auto errCode = LOGE_REQUEST_ERROR; | ||
| if (request->mCallBack->mHTTPMessage.statusCode ==401) { |
There was a problem hiding this comment.
401也是LOGE_INTERNAL_SERVER_ERROR？
core/sender/Sender.cpp
Outdated
| @@ -2125,7 +2215,15 @@ void Sender::SendToNetAsync(LoggroupTimeValue* dataPtr) { | |||
| } | |||
| } else if (dataPtr->mDataType == LOGGROUP_COMPRESSED) { | |||
| const auto& hashKey = exactlyOnceCpt ? exactlyOnceCpt->data.hash_key() : dataPtr->mShardHashKey; | |||
| if (hashKey.empty()) { | |||
| if (sendToMetricStore){ | |||
… into add-metric-store-output
henryzhx8
approved these changes
Aug 9, 2023
yyuuttaaoo
requested changes
Sep 19, 2023
yyuuttaaoo
approved these changes
Sep 25, 2023
| @@ -351,6 +372,9 @@ void SendClosure::OnFail(sdk::Response* response, const string& errorCode, const | |||
|
|
|||
| // Log warning if retry for too long or will discard data | |||
| switch (operation) { | |||
| case METRICSTORE_CHANGE_LOGSTORE: | |||
There was a problem hiding this comment.
后端不具备时，所有请求会发送两次。等后端发差不多了，再带入logtail版本吧。 @yyuuttaaoo
messixukejia
approved these changes
Sep 25, 2023
EvanLjp
force-pushed
the
add-metric-store-output
branch
from
0e23e32
to
471657d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#904