opentelemetry: logs: fix packaging length for trace_id and span_id#10767
Merged
opentelemetry: logs: fix packaging length for trace_id and span_id#10767
Conversation
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>
WalkthroughGates emission of trace_id/span_id to exact hex string lengths (32/16), converts to 16/8-byte binary respectively, and ignores invalid/non-string IDs without error. Updates tests to assert binary sizes via record accessors. Test list updated; note duplicate test definition/registration added. Changes
Sequence Diagram(s)sequenceDiagram
autonumber
participant Client as HTTP/JSON Client
participant Ingest as HTTP Input
participant Parser as OTLP JSON Parser
participant IDProc as ID Validator/Converter
participant Builder as Record Builder
participant Export as gRPC OTLP Exporter
Client->>Ingest: Send JSON (trace_id, span_id as hex strings)
Ingest->>Parser: Pass JSON payload
Parser->>IDProc: Provide trace_id/span_id values
alt Valid strings with exact lengths (32/16)
IDProc->>IDProc: Hex→binary (16/8 bytes)
IDProc->>Builder: Set binary IDs (16/8 bytes)
else Missing/invalid/non-string/length mismatch
IDProc->>Builder: Skip IDs (no error)
end
Builder->>Export: Emit record with IDs (if present)
Export-->>Client: Forward via gRPC
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Assessment against linked issues
Assessment against linked issues: Out-of-scope changes
Suggested labels
Suggested reviewers
Poem
Tip 🔌 Remote MCP (Model Context Protocol) integration is now available!Pro plan users can now connect to remote MCP servers from the Integrations page. Connect with popular remote MCPs such as Notion and Linear to add more context to your reviews and chats. ✨ Finishing Touches
🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. CodeRabbit Commands (Invoked using PR/Issue comments)Type Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
src/opentelemetry/flb_opentelemetry_logs.c (1)
213-221: Wrong return code on span_id hex validation failure.On invalid span_id hex characters you set error_status = FLB_OTEL_LOGS_ERR_INVALID_SPAN_ID, but return -FLB_OTEL_LOGS_ERR_UNEXPECTED_TIMESTAMP_TYPE. This mismatch confuses callers and error reporting.
Apply this diff:
- if (error_status) { - *error_status = FLB_OTEL_LOGS_ERR_INVALID_SPAN_ID; - } - return -FLB_OTEL_LOGS_ERR_UNEXPECTED_TIMESTAMP_TYPE; + if (error_status) { + *error_status = FLB_OTEL_LOGS_ERR_INVALID_SPAN_ID; + } + return -FLB_OTEL_LOGS_ERR_INVALID_SPAN_ID;
🧹 Nitpick comments (5)
tests/internal/opentelemetry.c (2)
765-767: Assert encoder error_status to catch silent validation failures.We should verify error_status stays 0 after flb_opentelemetry_logs_json_to_msgpack to avoid passing when internal validation fails.
Apply this diff:
ret = flb_opentelemetry_logs_json_to_msgpack(&enc, input_json, strlen(input_json), NULL, &error_status); TEST_CHECK(ret == 0); +TEST_CHECK(error_status == 0);
757-757: Remove unused variable.Variable ‘len’ is declared but never used.
Apply this diff:
- size_t len;src/opentelemetry/flb_opentelemetry_logs.c (3)
296-301: Correct trace_id packing: now 16 bytes (not 32).This addresses the core bug where traceId was doubled in size. One small nit: check the conversion return for completeness, even though we validate the hex beforehand.
Apply this diff:
- flb_otel_utils_hex_to_id(trace_id->via.str.ptr, trace_id->via.str.size, tmp_id, 16); - flb_log_event_encoder_append_metadata_values(encoder, - FLB_LOG_EVENT_STRING_VALUE("trace_id", 8), - FLB_LOG_EVENT_BINARY_VALUE(tmp_id, 16)); + if (flb_otel_utils_hex_to_id(trace_id->via.str.ptr, trace_id->via.str.size, tmp_id, 16) == 0) { + flb_log_event_encoder_append_metadata_values(encoder, + FLB_LOG_EVENT_STRING_VALUE("trace_id", 8), + FLB_LOG_EVENT_BINARY_VALUE(tmp_id, 16)); + }
303-308: Correct span_id packing: now 8 bytes (not 16).Same nit as above: check the converter’s return for completeness.
Apply this diff:
- flb_otel_utils_hex_to_id(span_id->via.str.ptr, span_id->via.str.size, tmp_id, 8); - flb_log_event_encoder_append_metadata_values(encoder, - FLB_LOG_EVENT_STRING_VALUE("span_id", 7), - FLB_LOG_EVENT_BINARY_VALUE(tmp_id, 8)); + if (flb_otel_utils_hex_to_id(span_id->via.str.ptr, span_id->via.str.size, tmp_id, 8) == 0) { + flb_log_event_encoder_append_metadata_values(encoder, + FLB_LOG_EVENT_STRING_VALUE("span_id", 7), + FLB_LOG_EVENT_BINARY_VALUE(tmp_id, 8)); + }
181-189: ctype usage: cast inputs to unsigned char for defined behavior.isxdigit() requires an unsigned char value (or EOF). To avoid UB on non-ASCII inputs, cast arguments.
Apply this diff:
- for (i = 0; i < 32; i++) { - if (!isxdigit(trace_id->via.str.ptr[i])) { + for (i = 0; i < 32; i++) { + if (!isxdigit((unsigned char) trace_id->via.str.ptr[i])) { ... } } @@ - for (i = 0; i < 16; i++) { - if (!isxdigit(span_id->via.str.ptr[i])) { + for (i = 0; i < 16; i++) { + if (!isxdigit((unsigned char) span_id->via.str.ptr[i])) { ... } }Also applies to: 213-221
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
💡 Knowledge Base configuration:
- MCP integration is disabled by default for public repositories
- Jira integration is disabled by default for public repositories
- Linear integration is disabled by default for public repositories
You can enable these sources in your CodeRabbit configuration.
📒 Files selected for processing (2)
src/opentelemetry/flb_opentelemetry_logs.c(1 hunks)tests/internal/opentelemetry.c(2 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (1)
tests/internal/opentelemetry.c (5)
src/flb_log_event_encoder.c (2)
flb_log_event_encoder_init(42-74)flb_log_event_encoder_destroy(99-116)src/opentelemetry/flb_opentelemetry_logs.c (1)
flb_opentelemetry_logs_json_to_msgpack(794-871)src/flb_record_accessor.c (3)
flb_ra_create(271-358)flb_ra_get_value_object(803-814)flb_ra_destroy(232-248)src/flb_log_event_decoder.c (5)
flb_log_event_decoder_init(99-116)flb_log_event_decoder_read_groups(85-97)flb_log_event_decoder_next(310-406)flb_log_event_decoder_get_record_type(408-428)flb_log_event_decoder_destroy(147-179)src/flb_ra_key.c (1)
flb_ra_key_value_destroy(842-851)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (28)
- GitHub Check: pr-windows-build / call-build-windows-package (Windows 64bit, x64, x64-windows-static, 3.31.6)
- GitHub Check: pr-windows-build / call-build-windows-package (Windows 64bit (Arm64), amd64_arm64, -DCMAKE_SYSTEM_NAME=Windows -DCMA...
- GitHub Check: pr-windows-build / call-build-windows-package (Windows 32bit, x86, x86-windows-static, 3.31.6)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_SANITIZE_THREAD=On, 3.31.6, clang, clang++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_SIMD=On, 3.31.6, gcc, g++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_SANITIZE_THREAD=On, 3.31.6, gcc, g++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_SIMD=Off, 3.31.6, clang, clang++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_SIMD=On, 3.31.6, clang, clang++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_JEMALLOC=On, 3.31.6, clang, clang++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_SIMD=Off, 3.31.6, gcc, g++)
- GitHub Check: run-ubuntu-unit-tests (-DSANITIZE_UNDEFINED=On, 3.31.6, gcc, g++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_SANITIZE_MEMORY=On, 3.31.6, gcc, g++)
- GitHub Check: run-ubuntu-unit-tests (-DSANITIZE_ADDRESS=On, 3.31.6, clang, clang++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_SANITIZE_MEMORY=On, 3.31.6, clang, clang++)
- GitHub Check: run-ubuntu-unit-tests (-DSANITIZE_UNDEFINED=On, 3.31.6, clang, clang++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_COVERAGE=On, 3.31.6, gcc, g++)
- GitHub Check: run-ubuntu-unit-tests (-DSANITIZE_ADDRESS=On, 3.31.6, gcc, g++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_SMALL=On, 3.31.6, clang, clang++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_SMALL=On, 3.31.6, gcc, g++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_JEMALLOC=Off, 3.31.6, clang, clang++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_JEMALLOC=On, 3.31.6, gcc, g++)
- GitHub Check: run-ubuntu-unit-tests (-DFLB_JEMALLOC=Off, 3.31.6, gcc, g++)
- GitHub Check: PR - fuzzing test
- GitHub Check: pr-compile-system-libs (-DFLB_PREFER_SYSTEM_LIBS=On, 3.31.6, clang, clang++, ubuntu-24.04, clang-14)
- GitHub Check: pr-compile-system-libs (-DFLB_PREFER_SYSTEM_LIBS=On, 3.31.6, gcc, g++, ubuntu-22.04, clang-12)
- GitHub Check: pr-compile-system-libs (-DFLB_PREFER_SYSTEM_LIBS=On, 3.31.6, gcc, g++, ubuntu-24.04, clang-14)
- GitHub Check: pr-compile-system-libs (-DFLB_PREFER_SYSTEM_LIBS=On, 3.31.6, clang, clang++, ubuntu-22.04, clang-12)
- GitHub Check: pr-compile-centos-7
🔇 Additional comments (2)
tests/internal/opentelemetry.c (2)
25-26: Record accessor headers are correctly added.Needed for flb_ra_create()/flb_ra_get_value_object() usage in the new test. No issues.
836-836: Test is properly registered.Name is descriptive and specific to the regression being fixed. Good.
Comment on lines
+740
to
+827
| void test_trace_span_binary_sizes() | ||
| { | ||
| int ret; | ||
| struct flb_log_event_encoder enc; | ||
| struct flb_log_event_decoder dec; | ||
| struct flb_log_event event; | ||
| int32_t record_type; | ||
| char *input_json; | ||
| int error_status = 0; | ||
| int found_trace_id = 0; | ||
| int found_span_id = 0; | ||
| size_t trace_id_size = 0; | ||
| size_t span_id_size = 0; | ||
| struct flb_record_accessor *ra_trace_id; | ||
| struct flb_record_accessor *ra_span_id; | ||
| struct flb_ra_value *val_trace_id; | ||
| struct flb_ra_value *val_span_id; | ||
| size_t len; | ||
|
|
||
| /* Test input with trace_id and span_id */ | ||
| input_json = "{\"resourceLogs\":[{\"scopeLogs\":[{\"logRecords\":[{\"timeUnixNano\":\"1640995200000000000\",\"traceId\":\"5B8EFFF798038103D269B633813FC60C\",\"spanId\":\"EEE19B7EC3C1B174\",\"body\":{\"stringValue\":\"test\"}}]}]}]}"; | ||
|
|
||
| ret = flb_log_event_encoder_init(&enc, FLB_LOG_EVENT_FORMAT_FLUENT_BIT_V2); | ||
| TEST_CHECK(ret == FLB_EVENT_ENCODER_SUCCESS); | ||
|
|
||
| ret = flb_opentelemetry_logs_json_to_msgpack(&enc, input_json, strlen(input_json), NULL, &error_status); | ||
| TEST_CHECK(ret == 0); | ||
|
|
||
| /* Create record accessors for trace_id and span_id */ | ||
| ra_trace_id = flb_ra_create("$otlp['trace_id']", FLB_FALSE); | ||
| TEST_CHECK(ra_trace_id != NULL); | ||
|
|
||
| ra_span_id = flb_ra_create("$otlp['span_id']", FLB_FALSE); | ||
| TEST_CHECK(ra_span_id != NULL); | ||
|
|
||
| /* Decode the output to check binary sizes */ | ||
| ret = flb_log_event_decoder_init(&dec, enc.output_buffer, enc.output_length); | ||
| TEST_CHECK(ret == FLB_EVENT_DECODER_SUCCESS); | ||
|
|
||
| flb_log_event_decoder_read_groups(&dec, FLB_TRUE); | ||
|
|
||
| while ((ret = flb_log_event_decoder_next(&dec, &event)) == FLB_EVENT_DECODER_SUCCESS) { | ||
| ret = flb_log_event_decoder_get_record_type(&event, &record_type); | ||
| TEST_CHECK(ret == 0); | ||
|
|
||
| if (record_type == FLB_LOG_EVENT_NORMAL) { | ||
| /* Use record accessor to get trace_id */ | ||
| val_trace_id = flb_ra_get_value_object(ra_trace_id, *event.metadata); | ||
| if (val_trace_id != NULL) { | ||
| found_trace_id = 1; | ||
| if (val_trace_id->type == FLB_RA_BINARY) { | ||
| trace_id_size = flb_sds_len(val_trace_id->val.binary); | ||
| printf("Found trace_id with binary size: %zu\n", trace_id_size); | ||
| /* trace_id should be 16 bytes (32 hex chars = 16 bytes) */ | ||
| TEST_CHECK_(trace_id_size == 16, "trace_id binary size should be 16, got %zu", trace_id_size); | ||
| } | ||
| else if (val_trace_id->type == FLB_RA_STRING) { | ||
| printf("Found trace_id as string: %s\n", val_trace_id->val.string); | ||
| } | ||
| flb_ra_key_value_destroy(val_trace_id); | ||
| } | ||
|
|
||
| /* Use record accessor to get span_id */ | ||
| val_span_id = flb_ra_get_value_object(ra_span_id, *event.metadata); | ||
| if (val_span_id != NULL) { | ||
| found_span_id = 1; | ||
| if (val_span_id->type == FLB_RA_BINARY) { | ||
| span_id_size = flb_sds_len(val_span_id->val.binary); | ||
| printf("Found span_id with binary size: %zu\n", span_id_size); | ||
| /* span_id should be 8 bytes (16 hex chars = 8 bytes) */ | ||
| TEST_CHECK_(span_id_size == 8, "span_id binary size should be 8, got %zu", span_id_size); | ||
| } | ||
| else if (val_span_id->type == FLB_RA_STRING) { | ||
| printf("Found span_id as string: %s\n", val_span_id->val.string); | ||
| } | ||
| flb_ra_key_value_destroy(val_span_id); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| flb_log_event_decoder_destroy(&dec); | ||
| flb_log_event_encoder_destroy(&enc); | ||
| flb_ra_destroy(ra_trace_id); | ||
| flb_ra_destroy(ra_span_id); | ||
|
|
||
| TEST_CHECK(found_trace_id == 1); | ||
| TEST_CHECK(found_span_id == 1); | ||
| } |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Strengthen the test: enforce binary type and verify the exact bytes, not only the lengths.
Today the test passes if IDs show up as strings. Given the PR fixes packaging to 16/8-byte binaries, assert type == FLB_RA_BINARY and bytes match the hex source. Also prefer const for the JSON literal.
Apply this diff:
void test_trace_span_binary_sizes()
{
int ret;
struct flb_log_event_encoder enc;
struct flb_log_event_decoder dec;
struct flb_log_event event;
int32_t record_type;
- char *input_json;
+ const char *input_json;
int error_status = 0;
int found_trace_id = 0;
int found_span_id = 0;
size_t trace_id_size = 0;
size_t span_id_size = 0;
struct flb_record_accessor *ra_trace_id;
struct flb_record_accessor *ra_span_id;
struct flb_ra_value *val_trace_id;
struct flb_ra_value *val_span_id;
- size_t len;
+ unsigned char expected_trace_id[16];
+ unsigned char expected_span_id[8];
+ const char *trace_hex = "5B8EFFF798038103D269B633813FC60C";
+ const char *span_hex = "EEE19B7EC3C1B174";
/* Test input with trace_id and span_id */
input_json = "{\"resourceLogs\":[{\"scopeLogs\":[{\"logRecords\":[{\"timeUnixNano\":\"1640995200000000000\",\"traceId\":\"5B8EFFF798038103D269B633813FC60C\",\"spanId\":\"EEE19B7EC3C1B174\",\"body\":{\"stringValue\":\"test\"}}]}]}]}";
ret = flb_log_event_encoder_init(&enc, FLB_LOG_EVENT_FORMAT_FLUENT_BIT_V2);
TEST_CHECK(ret == FLB_EVENT_ENCODER_SUCCESS);
ret = flb_opentelemetry_logs_json_to_msgpack(&enc, input_json, strlen(input_json), NULL, &error_status);
TEST_CHECK(ret == 0);
+ TEST_CHECK(error_status == 0);
+
+ /* Prepare expected binary bytes from hex */
+ ret = flb_otel_utils_hex_to_id(trace_hex, 32, expected_trace_id, sizeof(expected_trace_id));
+ TEST_CHECK(ret == 0);
+ ret = flb_otel_utils_hex_to_id(span_hex, 16, expected_span_id, sizeof(expected_span_id));
+ TEST_CHECK(ret == 0);
/* Create record accessors for trace_id and span_id */
ra_trace_id = flb_ra_create("$otlp['trace_id']", FLB_FALSE);
TEST_CHECK(ra_trace_id != NULL);
ra_span_id = flb_ra_create("$otlp['span_id']", FLB_FALSE);
TEST_CHECK(ra_span_id != NULL);
@@
/* Use record accessor to get trace_id */
val_trace_id = flb_ra_get_value_object(ra_trace_id, *event.metadata);
if (val_trace_id != NULL) {
found_trace_id = 1;
- if (val_trace_id->type == FLB_RA_BINARY) {
+ TEST_CHECK_(val_trace_id->type == FLB_RA_BINARY, "trace_id must be emitted as binary");
+ if (val_trace_id->type == FLB_RA_BINARY) {
trace_id_size = flb_sds_len(val_trace_id->val.binary);
printf("Found trace_id with binary size: %zu\n", trace_id_size);
/* trace_id should be 16 bytes (32 hex chars = 16 bytes) */
TEST_CHECK_(trace_id_size == 16, "trace_id binary size should be 16, got %zu", trace_id_size);
+ TEST_CHECK_(memcmp(expected_trace_id, val_trace_id->val.binary, 16) == 0,
+ "trace_id binary content mismatch");
}
- else if (val_trace_id->type == FLB_RA_STRING) {
- printf("Found trace_id as string: %s\n", val_trace_id->val.string);
- }
flb_ra_key_value_destroy(val_trace_id);
}
/* Use record accessor to get span_id */
val_span_id = flb_ra_get_value_object(ra_span_id, *event.metadata);
if (val_span_id != NULL) {
found_span_id = 1;
- if (val_span_id->type == FLB_RA_BINARY) {
+ TEST_CHECK_(val_span_id->type == FLB_RA_BINARY, "span_id must be emitted as binary");
+ if (val_span_id->type == FLB_RA_BINARY) {
span_id_size = flb_sds_len(val_span_id->val.binary);
printf("Found span_id with binary size: %zu\n", span_id_size);
/* span_id should be 8 bytes (16 hex chars = 8 bytes) */
TEST_CHECK_(span_id_size == 8, "span_id binary size should be 8, got %zu", span_id_size);
+ TEST_CHECK_(memcmp(expected_span_id, val_span_id->val.binary, 8) == 0,
+ "span_id binary content mismatch");
}
- else if (val_span_id->type == FLB_RA_STRING) {
- printf("Found span_id as string: %s\n", val_span_id->val.string);
- }
flb_ra_key_value_destroy(val_span_id);
}
}
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| void test_trace_span_binary_sizes() | |
| { | |
| int ret; | |
| struct flb_log_event_encoder enc; | |
| struct flb_log_event_decoder dec; | |
| struct flb_log_event event; | |
| int32_t record_type; | |
| char *input_json; | |
| int error_status = 0; | |
| int found_trace_id = 0; | |
| int found_span_id = 0; | |
| size_t trace_id_size = 0; | |
| size_t span_id_size = 0; | |
| struct flb_record_accessor *ra_trace_id; | |
| struct flb_record_accessor *ra_span_id; | |
| struct flb_ra_value *val_trace_id; | |
| struct flb_ra_value *val_span_id; | |
| size_t len; | |
| /* Test input with trace_id and span_id */ | |
| input_json = "{\"resourceLogs\":[{\"scopeLogs\":[{\"logRecords\":[{\"timeUnixNano\":\"1640995200000000000\",\"traceId\":\"5B8EFFF798038103D269B633813FC60C\",\"spanId\":\"EEE19B7EC3C1B174\",\"body\":{\"stringValue\":\"test\"}}]}]}]}"; | |
| ret = flb_log_event_encoder_init(&enc, FLB_LOG_EVENT_FORMAT_FLUENT_BIT_V2); | |
| TEST_CHECK(ret == FLB_EVENT_ENCODER_SUCCESS); | |
| ret = flb_opentelemetry_logs_json_to_msgpack(&enc, input_json, strlen(input_json), NULL, &error_status); | |
| TEST_CHECK(ret == 0); | |
| /* Create record accessors for trace_id and span_id */ | |
| ra_trace_id = flb_ra_create("$otlp['trace_id']", FLB_FALSE); | |
| TEST_CHECK(ra_trace_id != NULL); | |
| ra_span_id = flb_ra_create("$otlp['span_id']", FLB_FALSE); | |
| TEST_CHECK(ra_span_id != NULL); | |
| /* Decode the output to check binary sizes */ | |
| ret = flb_log_event_decoder_init(&dec, enc.output_buffer, enc.output_length); | |
| TEST_CHECK(ret == FLB_EVENT_DECODER_SUCCESS); | |
| flb_log_event_decoder_read_groups(&dec, FLB_TRUE); | |
| while ((ret = flb_log_event_decoder_next(&dec, &event)) == FLB_EVENT_DECODER_SUCCESS) { | |
| ret = flb_log_event_decoder_get_record_type(&event, &record_type); | |
| TEST_CHECK(ret == 0); | |
| if (record_type == FLB_LOG_EVENT_NORMAL) { | |
| /* Use record accessor to get trace_id */ | |
| val_trace_id = flb_ra_get_value_object(ra_trace_id, *event.metadata); | |
| if (val_trace_id != NULL) { | |
| found_trace_id = 1; | |
| if (val_trace_id->type == FLB_RA_BINARY) { | |
| trace_id_size = flb_sds_len(val_trace_id->val.binary); | |
| printf("Found trace_id with binary size: %zu\n", trace_id_size); | |
| /* trace_id should be 16 bytes (32 hex chars = 16 bytes) */ | |
| TEST_CHECK_(trace_id_size == 16, "trace_id binary size should be 16, got %zu", trace_id_size); | |
| } | |
| else if (val_trace_id->type == FLB_RA_STRING) { | |
| printf("Found trace_id as string: %s\n", val_trace_id->val.string); | |
| } | |
| flb_ra_key_value_destroy(val_trace_id); | |
| } | |
| /* Use record accessor to get span_id */ | |
| val_span_id = flb_ra_get_value_object(ra_span_id, *event.metadata); | |
| if (val_span_id != NULL) { | |
| found_span_id = 1; | |
| if (val_span_id->type == FLB_RA_BINARY) { | |
| span_id_size = flb_sds_len(val_span_id->val.binary); | |
| printf("Found span_id with binary size: %zu\n", span_id_size); | |
| /* span_id should be 8 bytes (16 hex chars = 8 bytes) */ | |
| TEST_CHECK_(span_id_size == 8, "span_id binary size should be 8, got %zu", span_id_size); | |
| } | |
| else if (val_span_id->type == FLB_RA_STRING) { | |
| printf("Found span_id as string: %s\n", val_span_id->val.string); | |
| } | |
| flb_ra_key_value_destroy(val_span_id); | |
| } | |
| } | |
| } | |
| flb_log_event_decoder_destroy(&dec); | |
| flb_log_event_encoder_destroy(&enc); | |
| flb_ra_destroy(ra_trace_id); | |
| flb_ra_destroy(ra_span_id); | |
| TEST_CHECK(found_trace_id == 1); | |
| TEST_CHECK(found_span_id == 1); | |
| } | |
| void test_trace_span_binary_sizes() | |
| { | |
| int ret; | |
| struct flb_log_event_encoder enc; | |
| struct flb_log_event_decoder dec; | |
| struct flb_log_event event; | |
| int32_t record_type; | |
| const char *input_json; | |
| int error_status = 0; | |
| int found_trace_id = 0; | |
| int found_span_id = 0; | |
| size_t trace_id_size = 0; | |
| size_t span_id_size = 0; | |
| struct flb_record_accessor *ra_trace_id; | |
| struct flb_record_accessor *ra_span_id; | |
| struct flb_ra_value *val_trace_id; | |
| struct flb_ra_value *val_span_id; | |
| unsigned char expected_trace_id[16]; | |
| unsigned char expected_span_id[8]; | |
| const char *trace_hex = "5B8EFFF798038103D269B633813FC60C"; | |
| const char *span_hex = "EEE19B7EC3C1B174"; | |
| /* Test input with trace_id and span_id */ | |
| input_json = "{\"resourceLogs\":[{\"scopeLogs\":[{\"logRecords\":[{\"timeUnixNano\":\"1640995200000000000\",\"traceId\":\"5B8EFFF798038103D269B633813FC60C\",\"spanId\":\"EEE19B7EC3C1B174\",\"body\":{\"stringValue\":\"test\"}}]}]}]}"; | |
| ret = flb_log_event_encoder_init(&enc, FLB_LOG_EVENT_FORMAT_FLUENT_BIT_V2); | |
| TEST_CHECK(ret == FLB_EVENT_ENCODER_SUCCESS); | |
| ret = flb_opentelemetry_logs_json_to_msgpack(&enc, input_json, strlen(input_json), NULL, &error_status); | |
| TEST_CHECK(ret == 0); | |
| TEST_CHECK(error_status == 0); | |
| /* Prepare expected binary bytes from hex */ | |
| ret = flb_otel_utils_hex_to_id(trace_hex, 32, expected_trace_id, sizeof(expected_trace_id)); | |
| TEST_CHECK(ret == 0); | |
| ret = flb_otel_utils_hex_to_id(span_hex, 16, expected_span_id, sizeof(expected_span_id)); | |
| TEST_CHECK(ret == 0); | |
| /* Create record accessors for trace_id and span_id */ | |
| ra_trace_id = flb_ra_create("$otlp['trace_id']", FLB_FALSE); | |
| TEST_CHECK(ra_trace_id != NULL); | |
| ra_span_id = flb_ra_create("$otlp['span_id']", FLB_FALSE); | |
| TEST_CHECK(ra_span_id != NULL); | |
| /* Decode the output to check binary sizes */ | |
| ret = flb_log_event_decoder_init(&dec, enc.output_buffer, enc.output_length); | |
| TEST_CHECK(ret == FLB_EVENT_DECODER_SUCCESS); | |
| flb_log_event_decoder_read_groups(&dec, FLB_TRUE); | |
| while ((ret = flb_log_event_decoder_next(&dec, &event)) == FLB_EVENT_DECODER_SUCCESS) { | |
| ret = flb_log_event_decoder_get_record_type(&event, &record_type); | |
| TEST_CHECK(ret == 0); | |
| if (record_type == FLB_LOG_EVENT_NORMAL) { | |
| /* Use record accessor to get trace_id */ | |
| val_trace_id = flb_ra_get_value_object(ra_trace_id, *event.metadata); | |
| if (val_trace_id != NULL) { | |
| found_trace_id = 1; | |
| TEST_CHECK_(val_trace_id->type == FLB_RA_BINARY, "trace_id must be emitted as binary"); | |
| if (val_trace_id->type == FLB_RA_BINARY) { | |
| trace_id_size = flb_sds_len(val_trace_id->val.binary); | |
| printf("Found trace_id with binary size: %zu\n", trace_id_size); | |
| /* trace_id should be 16 bytes (32 hex chars = 16 bytes) */ | |
| TEST_CHECK_(trace_id_size == 16, "trace_id binary size should be 16, got %zu", trace_id_size); | |
| TEST_CHECK_(memcmp(expected_trace_id, val_trace_id->val.binary, 16) == 0, | |
| "trace_id binary content mismatch"); | |
| } | |
| flb_ra_key_value_destroy(val_trace_id); | |
| } | |
| /* Use record accessor to get span_id */ | |
| val_span_id = flb_ra_get_value_object(ra_span_id, *event.metadata); | |
| if (val_span_id != NULL) { | |
| found_span_id = 1; | |
| TEST_CHECK_(val_span_id->type == FLB_RA_BINARY, "span_id must be emitted as binary"); | |
| if (val_span_id->type == FLB_RA_BINARY) { | |
| span_id_size = flb_sds_len(val_span_id->val.binary); | |
| printf("Found span_id with binary size: %zu\n", span_id_size); | |
| /* span_id should be 8 bytes (16 hex chars = 8 bytes) */ | |
| TEST_CHECK_(span_id_size == 8, "span_id binary size should be 8, got %zu", span_id_size); | |
| TEST_CHECK_(memcmp(expected_span_id, val_span_id->val.binary, 8) == 0, | |
| "span_id binary content mismatch"); | |
| } | |
| flb_ra_key_value_destroy(val_span_id); | |
| } | |
| } | |
| } | |
| flb_log_event_decoder_destroy(&dec); | |
| flb_log_event_encoder_destroy(&enc); | |
| flb_ra_destroy(ra_trace_id); | |
| flb_ra_destroy(ra_span_id); | |
| TEST_CHECK(found_trace_id == 1); | |
| TEST_CHECK(found_span_id == 1); | |
| } |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #10750
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.
Summary by CodeRabbit
Bug Fixes
Performance/Improvements
Tests