From 7c6707d0a75c25cf6ae69a18a1412b654f8dc6eb Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Fri, 12 Apr 2024 15:39:32 -0600 Subject: [PATCH 1/4] decode: opentelemetry: adjust function prototypes Signed-off-by: Eduardo Silva --- src/ctr_decode_opentelemetry.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ctr_decode_opentelemetry.c b/src/ctr_decode_opentelemetry.c index ba9f2eb..768f86f 100644 --- a/src/ctr_decode_opentelemetry.c +++ b/src/ctr_decode_opentelemetry.c @@ -278,13 +278,12 @@ static int convert_bytes_value(struct opentelemetry_decode_value *ctr_val, break; case CTR_OPENTELEMETRY_TYPE_ARRAY: - result = cfl_array_append_bytes(ctr_val->cfl_arr, buf, len); + result = cfl_array_append_bytes(ctr_val->cfl_arr, buf, len, CFL_FALSE); break; case CTR_OPENTELEMETRY_TYPE_KVLIST: - result = cfl_kvlist_insert_bytes(ctr_val->cfl_kvlist, key, buf, len); + result = cfl_kvlist_insert_bytes(ctr_val->cfl_kvlist, key, buf, len, CFL_FALSE); break; - } if (result == -2) { From 3109d8b3c8a68003f8505d639633372b3227ae77 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Thu, 18 Apr 2024 12:42:32 -0600 Subject: [PATCH 2/4] lib: cfl: upgrade to v0.5.0 Signed-off-by: Eduardo Silva --- lib/cfl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cfl b/lib/cfl index 8c55a4c..5d771a8 160000 --- a/lib/cfl +++ b/lib/cfl @@ -1 +1 @@ -Subproject commit 8c55a4cdb83b848e6dd5e3435077285540e1c9de +Subproject commit 5d771a8706079f79cd4398760141b580c6458619 From 26a47f3a6c1faf4e03d6268ae968e469af3df9a6 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Thu, 18 Apr 2024 12:46:19 -0600 Subject: [PATCH 3/4] tests: adjust to new CFL API changes Signed-off-by: Eduardo Silva --- tests/decoding.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/decoding.c b/tests/decoding.c index 81076d0..e798f15 100644 --- a/tests/decoding.c +++ b/tests/decoding.c @@ -81,7 +81,7 @@ static int generate_dummy_array_attribute_set(struct cfl_array **out_array, size } cfl_array_append_string(array, "string value"); - cfl_array_append_bytes(array, "\xFF\xEE\xFF\xEE\xCA\xFE", 6); + cfl_array_append_bytes(array, "\xFF\xEE\xFF\xEE\xCA\xFE", 6, CFL_FALSE); cfl_array_append_bool(array, CTR_TRUE); cfl_array_append_int64(array, 303456); cfl_array_append_double(array, 1.23456); @@ -164,7 +164,7 @@ static int generate_dummy_kvlist_attribute_set(struct cfl_kvlist **out_kvlist, s return -3; } - result = cfl_kvlist_insert_bytes(kvlist, "bytes value", "\xFE\xEE\xFF\xEE\xCA\xFE", 6); + result = cfl_kvlist_insert_bytes(kvlist, "bytes value", "\xFE\xEE\xFF\xEE\xCA\xFE", 6, CFL_FALSE); if (result != 0) { return -3; From 0819c291981e4f643772665376722ec6c06492c5 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Thu, 18 Apr 2024 12:48:12 -0600 Subject: [PATCH 4/4] lib: fluent-otel-proto: update with git master Signed-off-by: Eduardo Silva --- lib/fluent-otel-proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fluent-otel-proto b/lib/fluent-otel-proto index 5eceb5b..99373d4 160000 --- a/lib/fluent-otel-proto +++ b/lib/fluent-otel-proto @@ -1 +1 @@ -Subproject commit 5eceb5b71d54860c619a149b4e82eb2d03b873d5 +Subproject commit 99373d42f9b028604ae774a51697596d18398977