Skip to content

Improved OpenTelemetry OTLP error handling #8962

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

Merged
edsiper merged 3 commits into from
Jun 25, 2024
Merged

Improved OpenTelemetry OTLP error handling #8962

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cee976
Add logging in cases of opentelemetry metric+trace decode fail
nuclearpidgeon May 22, 2024
2d2e931
Return error val in case of opentelemetry metric payload decode failure
nuclearpidgeon May 22, 2024
dbd4997
Update opentelemetry HTTP server to return deserialisation error mess…
nuclearpidgeon May 22, 2024
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
14 changes: 13 additions & 1 deletion plugins/in_opentelemetry/opentelemetry_prot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2205,6 +2205,10 @@ static int process_payload_metrics_ng(struct flb_opentelemetry *ctx,

cmt_decode_opentelemetry_destroy(&decoded_contexts);
}
else {
flb_plg_warn(ctx->ins, "non-success cmetrics opentelemetry decode result %d", result);
return -1;
}

return 0;
}
Expand Down Expand Up @@ -2242,6 +2246,9 @@ static int process_payload_traces_proto_ng(struct flb_opentelemetry *ctx,
result = flb_input_trace_append(ctx->ins, NULL, 0, decoded_context);
ctr_decode_opentelemetry_destroy(decoded_context);
}
else {
flb_plg_warn(ctx->ins, "non-success ctraces opentelemetry decode result %d", result);
}

return result;
}
Expand Down Expand Up @@ -2454,7 +2461,12 @@ int opentelemetry_prot_handle_ng(struct flb_http_request *request,
send_export_service_response_ng(response, result, payload_type);
}
else {
send_response_ng(response, context->successful_response_code, NULL);
if (result == 0) {
send_response_ng(response, context->successful_response_code, NULL);
}
else {
send_response_ng(response, 400, "invalid request: deserialisation error\n");
}
}

return result;
Expand Down