Skip to contentSkip to conversation

telemetry: fix adding dicts in container arrays

PATCH Superseded Robin Jarry 5 participants 9 messages Jan 7 – Feb 17

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 telemetry: fix adding dicts in container arrays

Currently, adding TEL_DICT containers in TEL_ARRAY_CONTAINER containers is not supported by rte_tel_data_add_array_container. It wrongfully returns -EINVAL where it should allow it.

This is supported by the JSON formatter.

Allow the same value types than rte_tel_data_add_dict_container().

Fixes c933bb5177ca ("telemetry: support array values in data object")
---
 lib/telemetry/telemetry_data.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
lib/telemetry/telemetry_data.c +3 -3
index 0354a0654804..0a006559ab42 100644
@@ -96,10 +96,10 @@ int
 rte_tel_data_add_array_container(struct rte_tel_data *d,
 		struct rte_tel_data *val, int keep)
 {
-	if (d->type != TEL_ARRAY_CONTAINER ||
-			(val->type != TEL_ARRAY_UINT
+	if (d->type != TEL_ARRAY_CONTAINER || (val->type != TEL_ARRAY_UINT
 			&& val->type != TEL_ARRAY_INT
-			&& val->type != TEL_ARRAY_STRING))
+			&& val->type != TEL_ARRAY_STRING
+			&& val->type != TEL_DICT))
 		return -EINVAL;
 	if (d->data_len >= RTE_TEL_MAX_ARRAY_ENTRIES)
 		return -ENOSPC;
Signature · 1 line
2.52.0
#1 lore raw
Quoted 24 lines · Robin Jarry

Currently, adding TEL_DICT containers in TEL_ARRAY_CONTAINER containers is not supported by rte_tel_data_add_array_container. It wrongfully returns -EINVAL where it should allow it.

This is supported by the JSON formatter.

Allow the same value types than rte_tel_data_add_dict_container().

Fixes c933bb5177ca ("telemetry: support array values in data object")
---
 lib/telemetry/telemetry_data.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
lib/telemetry/telemetry_data.c +0 -0
index 0354a0654804..0a006559ab42 100644
@@ -96,10 +96,10 @@ int
 rte_tel_data_add_array_container(struct rte_tel_data *d,
 		struct rte_tel_data *val, int keep)
 {

lib/telemetry/telemetry_data.c int · line 105

Quoted 10 lines
lib/telemetry/telemetry_data.c +3 -3
-	if (d->type != TEL_ARRAY_CONTAINER ||
-			(val->type != TEL_ARRAY_UINT
+	if (d->type != TEL_ARRAY_CONTAINER || (val->type != TEL_ARRAY_UINT
 			&& val->type != TEL_ARRAY_INT
-			&& val->type != TEL_ARRAY_STRING))
+			&& val->type != TEL_ARRAY_STRING
+			&& val->type != TEL_DICT))
 		return -EINVAL;
 	if (d->data_len >= RTE_TEL_MAX_ARRAY_ENTRIES)
 		return -ENOSPC;

No objection to this, but previous implementation limited the options to what was needed and tested by telemetry rather than trying to cover every eventuality. If we now support dicts in arrays, please add some unit testing around it to verify we haven't any issues with it.

Thanks,
/Bruce

#2 lore raw

PATCH v2 1/1 telemetry: fix adding dicts in container arrays

In reply to Robin Jarry

Currently, adding TEL_DICT containers in TEL_ARRAY_CONTAINER containers is not supported by rte_tel_data_add_array_container. It wrongfully returns -EINVAL where it should allow it.

This is supported by the JSON formatter.

Allow the same value types than rte_tel_data_add_dict_container().

Add test case to verify it works as expected.

Fixes c933bb5177ca ("telemetry: support array values in data object")

---

Notes:
v2: added test case

 app/test/test_telemetry_data.c | 21 +++++++++++++++++++++
 lib/telemetry/telemetry_data.c |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)
app/test/test_telemetry_data.c +21 -0
index 59898ff5e983..e904b5a7f210 100644
@@ -405,6 +405,26 @@ test_array_with_array_uint_hex_values_nopadding(void)
 	return CHECK_OUTPUT("[[\"0x888\"],[\"0x8888\"]]");
 }
 
+static int
+test_array_with_dict_values(void)
+{
+	rte_tel_data_start_array(&response_data, RTE_TEL_CONTAINER);
+
+	struct rte_tel_data *d1 = rte_tel_data_alloc();
+	rte_tel_data_start_dict(d1);
+	rte_tel_data_add_dict_string(d1, "name", "foo");
+	rte_tel_data_add_dict_uint(d1, "size", 42);
+	rte_tel_data_add_array_container(&response_data, d1, 0);
+
+	struct rte_tel_data *d2 = rte_tel_data_alloc();
+	rte_tel_data_start_dict(d2);
+	rte_tel_data_add_dict_string(d2, "name", "bar");
+	rte_tel_data_add_dict_uint(d2, "size", 666);
+	rte_tel_data_add_array_container(&response_data, d2, 0);
+
+	return CHECK_OUTPUT("[{\"name\":\"foo\",\"size\":42},{\"name\":\"bar\",\"size\":666}]");
+}
+
 static int
 test_case_array_u64(void)
 {
@@ -597,6 +617,7 @@ telemetry_data_autotest(void)
 			test_array_with_array_string_values,
 			test_array_with_array_uint_hex_values_padding,
 			test_array_with_array_uint_hex_values_nopadding,
+			test_array_with_dict_values,
 			test_string_char_escaping,
 			test_array_char_escaping,
 			test_dict_char_escaping,
lib/telemetry/telemetry_data.c +3 -3
index 0354a0654804..0a006559ab42 100644
@@ -96,10 +96,10 @@ int
 rte_tel_data_add_array_container(struct rte_tel_data *d,
 		struct rte_tel_data *val, int keep)
 {
-	if (d->type != TEL_ARRAY_CONTAINER ||
-			(val->type != TEL_ARRAY_UINT
+	if (d->type != TEL_ARRAY_CONTAINER || (val->type != TEL_ARRAY_UINT
 			&& val->type != TEL_ARRAY_INT
-			&& val->type != TEL_ARRAY_STRING))
+			&& val->type != TEL_ARRAY_STRING
+			&& val->type != TEL_DICT))
 		return -EINVAL;
 	if (d->data_len >= RTE_TEL_MAX_ARRAY_ENTRIES)
 		return -ENOSPC;
Signature · 1 line
2.52.0
Acked-by on v2 1/1
#3 lore raw
Quoted 14 lines · Robin Jarry

Currently, adding TEL_DICT containers in TEL_ARRAY_CONTAINER containers is not supported by rte_tel_data_add_array_container. It wrongfully returns -EINVAL where it should allow it.

This is supported by the JSON formatter.

Allow the same value types than rte_tel_data_add_dict_container().

Add test case to verify it works as expected.

Fixes c933bb5177ca ("telemetry: support array values in data object")
Quoted 9 lines

---

Notes:
v2: added test case

 app/test/test_telemetry_data.c | 21 +++++++++++++++++++++
 lib/telemetry/telemetry_data.c |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)
Acked-by Chengwen Feng Applied
#4 lore raw

08/01/2026 12:06, Bruce Richardson:

Quoted 9 lines · Robin Jarry
Quoted 8 lines

Currently, adding TEL_DICT containers in TEL_ARRAY_CONTAINER containers is not supported by rte_tel_data_add_array_container. It wrongfully returns -EINVAL where it should allow it.

This is supported by the JSON formatter.

Allow the same value types than rte_tel_data_add_dict_container().

Quoted 7 lines
Quoted 6 lines

Add test case to verify it works as expected.

Fixes c933bb5177ca ("telemetry: support array values in data object")

Applied, thanks.

#5 lore raw
In reply to Robin Jarry
Quoted 4 lines · Robin Jarry

Currently, adding TEL_DICT containers in TEL_ARRAY_CONTAINER containers is not supported by rte_tel_data_add_array_container. It wrongfully returns -EINVAL where it should allow it.

Quoted 9 lines

This is supported by the JSON formatter.

Allow the same value types than rte_tel_data_add_dict_container().

Add test case to verify it works as expected.

Fixes c933bb5177ca ("telemetry: support array values in data object")

Not sure this is really a fix since it's adding a new capability, but I'll leave that to the stable tree maintainers to decide if they want to backport or not.

#6 lore raw
In reply to Robin Jarry

Hey Robin, my name is Mathew Labrecque and I work over at the UNH InterOperability Laboratory on the Open-Source Team.

I wanted to email you regarding the ARM cross-compile tests that failed on the patch. While it says the tests were run on Ubuntu 20.04, these tests were actually performed on Ubuntu 24.04. This was due to an internal error where we hadn't properly updated the labels for the tests.

Cheers,
Matthew

Quoted 87 lines · Robin Jarry

Currently, adding TEL_DICT containers in TEL_ARRAY_CONTAINER containers is not supported by rte_tel_data_add_array_container. It wrongfully returns -EINVAL where it should allow it.

This is supported by the JSON formatter.

Allow the same value types than rte_tel_data_add_dict_container().

Add test case to verify it works as expected.

Fixes c933bb5177ca ("telemetry: support array values in data object")

---

Notes:
v2: added test case

 app/test/test_telemetry_data.c | 21 +++++++++++++++++++++
 lib/telemetry/telemetry_data.c |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)
app/test/test_telemetry_data.c +20 -0
index 59898ff5e983..e904b5a7f210 100644
@@ -405,6 +405,26 @@ test_array_with_array_uint_hex_values_nopadding(void)
        return CHECK_OUTPUT("[[\"0x888\"],[\"0x8888\"]]");
 }
 
+static int
+test_array_with_dict_values(void)
+{
+       rte_tel_data_start_array(&response_data, RTE_TEL_CONTAINER);
+
+       struct rte_tel_data *d1 = rte_tel_data_alloc();
+       rte_tel_data_start_dict(d1);
+       rte_tel_data_add_dict_string(d1, "name", "foo");
+       rte_tel_data_add_dict_uint(d1, "size", 42);
+       rte_tel_data_add_array_container(&response_data, d1, 0);
+
+       struct rte_tel_data *d2 = rte_tel_data_alloc();
+       rte_tel_data_start_dict(d2);
+       rte_tel_data_add_dict_string(d2, "name", "bar");
+       rte_tel_data_add_dict_uint(d2, "size", 666);
+       rte_tel_data_add_array_container(&response_data, d2, 0);
+
+       return
 CHECK_OUTPUT("[{\"name\":\"foo\",\"size\":42},{\"name\":\"bar\",\"size\":666}]");
+}
+
 static int
 test_case_array_u64(void)

{

app/test/test_telemetry_data.c +1 -0
@@ -597,6 +617,7 @@ telemetry_data_autotest(void)
                        test_array_with_array_string_values,
                        test_array_with_array_uint_hex_values_padding,
                        test_array_with_array_uint_hex_values_nopadding,
+                       test_array_with_dict_values,
                        test_string_char_escaping,
                        test_array_char_escaping,
                        test_dict_char_escaping,
lib/telemetry/telemetry_data.c +3 -4
index 0354a0654804..0a006559ab42 100644
@@ -96,10 +96,10 @@ int
 rte_tel_data_add_array_container(struct rte_tel_data *d,
                struct rte_tel_data *val, int keep)
 {
-       if (d->type != TEL_ARRAY_CONTAINER ||
-                       (val->type != TEL_ARRAY_UINT
+       if (d->type != TEL_ARRAY_CONTAINER || (val->type != TEL_ARRAY_UINT
                        && val->type != TEL_ARRAY_INT
-                       && val->type != TEL_ARRAY_STRING))
+                       && val->type != TEL_ARRAY_STRING
+                       && val->type != TEL_DICT))
                return -EINVAL;
        if (d->data_len >= RTE_TEL_MAX_ARRAY_ENTRIES)
                return -ENOSPC;
--

2.52.0

Signature · 8 lines
Matthew Labrecque
Technical Intern, Open Source Team

UNH Interoperability Labs

21 Madbury Rd, Suite 100, Durham, NH 03824

www.iol.unh.edu
#7 lore raw

Matthew Labrecque, Jan 12, 2026 at 16:56:

Quoted 7 lines

Hey Robin, my name is Mathew Labrecque and I work over at the UNH InterOperability Laboratory on the Open-Source Team.

I wanted to email you regarding the ARM cross-compile tests that failed on the patch. While it says the tests were run on Ubuntu 20.04, these tests were actually performed on Ubuntu 24.04. This was due to an internal error where we hadn't properly updated the labels for the tests.

Hi Matthew,

OK, thanks for the heads up. I don't think this error is relevant anyway.

Acked-by on v2 1/1
#8 lore raw
In reply to Robin Jarry
Quoted 14 lines · Robin Jarry

Currently, adding TEL_DICT containers in TEL_ARRAY_CONTAINER containers is not supported by rte_tel_data_add_array_container. It wrongfully returns -EINVAL where it should allow it.

This is supported by the JSON formatter.

Allow the same value types than rte_tel_data_add_dict_container().

Add test case to verify it works as expected.

Fixes c933bb5177ca ("telemetry: support array values in data object")