[Core] Protect Traces against null metadatas or tags

vertigo-io · Apr 30, 2024 · 6b7e1c0 · 6b7e1c0
1 parent 25d812e
commit 6b7e1c0
Showing 1 changed file with 10 additions and 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
@@ -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;
 	}