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

in_opentelemetry: fix handling of status code in JSON traces #10091

Merged
merged 2 commits into from
Mar 18, 2025
Merged

in_opentelemetry: fix handling of status code in JSON traces #10091

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
a325f96
lib: ctraces: upgrade to v0.6.1
edsiper Mar 17, 2025
0c791cb
in_opentelemetry: traces: fix handling of JSON status code
edsiper Mar 17, 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
2 changes: 1 addition & 1 deletion lib/ctraces/.github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
submodules: true

- name: Build on ${{ matrix.os }} with ${{ matrix.compiler }}
uses: uraimo/run-on-arch-action@v2.8.1
uses: uraimo/run-on-arch-action@v3.0.0
with:
arch: aarch64
distro: ubuntu_latest
Expand Down
2 changes: 1 addition & 1 deletion lib/ctraces/.github/workflows/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
submodules: true

- uses: uraimo/run-on-arch-action@v2.8.1
- uses: uraimo/run-on-arch-action@v3.0.0
name: Build the ${{matrix.format}} packages
with:
arch: aarch64
Expand Down
2 changes: 1 addition & 1 deletion lib/ctraces/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ endif()
# CTraces Version
set(CTR_VERSION_MAJOR 0)
set(CTR_VERSION_MINOR 6)
set(CTR_VERSION_PATCH 0)
set(CTR_VERSION_PATCH 1)
set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}")

# Define __FILENAME__ consistently across Operating Systems
Expand Down
7 changes: 7 additions & 0 deletions lib/ctraces/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Global Owners
# -------------
* @edsiper @leonardo-albertovich

# CI
# -------------------------
/.github/ @niedbalski @patrick-stephens @celalettin1286
2 changes: 1 addition & 1 deletion lib/ctraces/include/ctraces/ctr_span.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/* Status code */
#define CTRACE_SPAN_STATUS_CODE_UNSET 0
#define CTRACE_SPAN_STATUS_CODE_OK 1
#define CTRACE_SPAN_STAUTS_CODE_ERROR 2
#define CTRACE_SPAN_STATUS_CODE_ERROR 2

struct ctrace_span_status {
int code;
Expand Down
25 changes: 23 additions & 2 deletions plugins/in_opentelemetry/opentelemetry_traces.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@ static int process_span_status(struct flb_opentelemetry *ctx,
{
int ret;
int code = 0;
cfl_sds_t tmp = NULL;
char *message = NULL;

if (status->type != MSGPACK_OBJECT_MAP) {
Expand All @@ -559,8 +560,28 @@ static int process_span_status(struct flb_opentelemetry *ctx,

/* code */
ret = find_map_entry_by_key(&status->via.map, "code", 0, FLB_TRUE);
if (ret >= 0 && status->via.map.ptr[ret].val.type == MSGPACK_OBJECT_POSITIVE_INTEGER) {
code = status->via.map.ptr[ret].val.via.u64;
if (ret >= 0 && status->via.map.ptr[ret].val.type == MSGPACK_OBJECT_STR) {
tmp = cfl_sds_create_len(status->via.map.ptr[ret].val.via.str.ptr,
status->via.map.ptr[ret].val.via.str.size);
if (!tmp) {
return -1;
}

if (strcasecmp(tmp, "UNSET") == 0) {
code = CTRACE_SPAN_STATUS_CODE_UNSET;
}
else if (strcasecmp(tmp, "OK") == 0) {
code = CTRACE_SPAN_STATUS_CODE_OK;
}
else if (strcasecmp(tmp, "ERROR") == 0) {
code = CTRACE_SPAN_STATUS_CODE_ERROR;
}
else {
flb_plg_error(ctx->ins, "status code value is invalid: %s", tmp);
cfl_sds_destroy(tmp);
return -1;
}
cfl_sds_destroy(tmp);
}
else {
flb_plg_error(ctx->ins, "status code is missing");
Expand Down
Loading