diff --git a/.mailmap b/.mailmap index 8cb4e2f619..7776e85d57 100644 --- a/.mailmap +++ b/.mailmap @@ -652,7 +652,7 @@ John OLoughlin <john.oloughlin@intel.com> John Ousterhout <ouster@cs.stanford.edu> John W. Linville <linville@tuxdriver.com> Jonas Pfefferle <jpf@zurich.ibm.com> <pepperjo@japf.ch> -Jonathan Erb <jonathan.erb@banduracyber.com> +(??)Jonathan Erb <jonathan.erb@threatblockr.com> <jonathan.erb@banduracyber.com> Jonathan Tsai <jonathan1.tsai@intel.com> Jon DeVree <nuxi@vault24.org> Jon Loeliger <jdl@netgate.com> diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c index 075672d91d..36cdec26ef 100644 --- a/lib/telemetry/telemetry.c +++ b/lib/telemetry/telemetry.c @@ -160,7 +160,11 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len) d->type != RTE_TEL_ARRAY_INT && d->type != RTE_TEL_ARRAY_STRING) return snprintf(out_buf, buf_len, "null"); - used = rte_tel_json_empty_array(out_buf, buf_len, 0); + if (d->type == RTE_TEL_DICT) + used = rte_tel_json_empty_obj(out_buf, buf_len, 0); + else + used = rte_tel_json_empty_array(out_buf, buf_len, 0); + if (d->type == RTE_TEL_ARRAY_U64) for (i = 0; i < d->data_len; i++) used = rte_tel_json_add_array_u64(out_buf,