From 6b7e1c0553e42adf7fb35342a25d964a09602637 Mon Sep 17 00:00:00 2001 From: Piedeloup Nicolas Date: Tue, 30 Apr 2024 10:49:39 +0200 Subject: [PATCH] [Core] Protect Traces against null metadatas or tags --- .../core/analytics/trace/TraceSpanBuilder.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/vertigo-core/src/main/java/io/vertigo/core/analytics/trace/TraceSpanBuilder.java b/vertigo-core/src/main/java/io/vertigo/core/analytics/trace/TraceSpanBuilder.java index 3030efa79..e62dd081a 100644 --- a/vertigo-core/src/main/java/io/vertigo/core/analytics/trace/TraceSpanBuilder.java +++ b/vertigo-core/src/main/java/io/vertigo/core/analytics/trace/TraceSpanBuilder.java @@ -127,7 +127,11 @@ public TraceSpanBuilder withMetadata(final String name, final String value) { .isNotNull(name, "metadata name is required") .isNotNull(value, "metadata value is required"); //--------------------------------------------------------------------- - metadatas.put(name, value); + if (value.isBlank()) { + metadatas.remove(name); + } else { + metadatas.put(name, value); + } return this; } @@ -142,7 +146,11 @@ public TraceSpanBuilder withTag(final String name, final String value) { .isNotNull(name, "tag name is required") .isNotNull(value, "tag value is required"); //--- - tags.put(name, value); + if (value.isBlank()) { + tags.remove(name); + } else { + tags.put(name, value); + } return this; }