From aebefb1b4d7ff8f245f60d145c7b9ed2485e55ae Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Thu, 4 Jun 2026 17:17:41 -0600 Subject: [PATCH] sync fixes from Fluent Bit bundled ctraces Signed-off-by: Eduardo Silva --- CMakeLists.txt | 2 +- include/ctraces/ctr_encode_opentelemetry.h | 6 +++--- src/ctr_id.c | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 226e70d..bb2c54f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ endif() # CTraces Version set(CTR_VERSION_MAJOR 0) set(CTR_VERSION_MINOR 7) -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 diff --git a/include/ctraces/ctr_encode_opentelemetry.h b/include/ctraces/ctr_encode_opentelemetry.h index ed60936..b460761 100644 --- a/include/ctraces/ctr_encode_opentelemetry.h +++ b/include/ctraces/ctr_encode_opentelemetry.h @@ -17,12 +17,12 @@ * limitations under the License. */ -#ifndef CMT_ENCODE_OPENTELEMETRY_H -#define CMT_ENCODE_OPENTELEMETRY_H +#ifndef CTR_ENCODE_OPENTELEMETRY_H +#define CTR_ENCODE_OPENTELEMETRY_H #include cfl_sds_t ctr_encode_opentelemetry_create(struct ctrace *ctr); void ctr_encode_opentelemetry_destroy(cfl_sds_t text); -#endif \ No newline at end of file +#endif diff --git a/src/ctr_id.c b/src/ctr_id.c index 0c2299f..3be5eb0 100644 --- a/src/ctr_id.c +++ b/src/ctr_id.c @@ -148,6 +148,7 @@ cfl_sds_t ctr_id_to_lower_base16(struct ctrace_id *cid) } out[i * 2] = 0; + cfl_sds_set_len(out, len * 2); return out; }