Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use logs pb instead of metrics pb when meet metric EVENT_GROUP_LIST #2033

Closed
wants to merge 2 commits into from
Closed

fix: use logs pb instead of metrics pb when meet metric EVENT_GROUP_LIST #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ed60fc
fix the error of metric pb_list
catdogpandas Jan 13, 2025
0f74ed2
fix: metric pb_list
catdogpandas Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/plugin/flusher/sls/DiskBufferWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,8 @@ SLSResponse DiskBufferWriter::SendBufferFileData(const sls_logs::LogtailBufferMe
} else {
dataType = RawDataType::EVENT_GROUP;
}
if (bufferMeta.has_telemetrytype() && bufferMeta.telemetrytype() == sls_logs::SLS_TELEMETRY_TYPE_METRICS) {
if (bufferMeta.has_telemetrytype() && bufferMeta.telemetrytype() == sls_logs::SLS_TELEMETRY_TYPE_METRICS
&& dataType == RawDataType::EVENT_GROUP) {
return PostMetricStoreLogs(accessKeyId,
accessKeySecret,
type,
Expand Down
22 changes: 13 additions & 9 deletions core/plugin/flusher/sls/FlusherSLS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,15 +656,19 @@ bool FlusherSLS::BuildRequest(SenderQueueItem* item, unique_ptr<HttpSinkRequest>
data->mCurrentHost = host;
#endif

switch (mTelemetryType) {
case sls_logs::SLS_TELEMETRY_TYPE_LOGS:
req = CreatePostLogStoreLogsRequest(accessKeyId, accessKeySecret, type, data);
break;
case sls_logs::SLS_TELEMETRY_TYPE_METRICS:
req = CreatePostMetricStoreLogsRequest(accessKeyId, accessKeySecret, type, data);
break;
default:
break;
if (data->mType == RawDataType::EVENT_GROUP) {
switch (mTelemetryType) {
case sls_logs::SLS_TELEMETRY_TYPE_LOGS:
req = CreatePostLogStoreLogsRequest(accessKeyId, accessKeySecret, type, data);
break;
case sls_logs::SLS_TELEMETRY_TYPE_METRICS:
req = CreatePostMetricStoreLogsRequest(accessKeyId, accessKeySecret, type, data);
break;
default:
break;
}
} else {
req = CreatePostLogStoreLogsRequest(accessKeyId, accessKeySecret, type, data);
}
return true;
}
Expand Down
Loading