From beee258aade2ce2e6f00a43d729c32e30de10c9a Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 15 Jul 2026 14:24:17 +0200 Subject: [PATCH] InternalTagAdder: defensively guard against null prebuilt tagmap entry (cherry picked from commit 041bd688fae2c7a1e4e33f9890fc695257129608) --- .../datadog/trace/core/tagprocessor/InternalTagsAdder.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java index 34588dc9da4..3e6b8b13192 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java @@ -34,8 +34,10 @@ public void processTags( } if (!ddService.toString().equalsIgnoreCase(spanContext.getServiceName())) { - // service name != DD_SERVICE - unsafeTags.set(baseServiceEntry); + if (baseServiceEntry != null) { + // service name != DD_SERVICE + unsafeTags.set(baseServiceEntry); + } } else { // as per config consistency, the version tag is added across tracers only if // the service name is DD_SERVICE and version tag is not manually set