Skip to content

Guard InternalTagAdder against null prebuilt tagmap entry #11962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amarziali merged 1 commit into from
Jul 15, 2026
+4 −2
Merged

Guard InternalTagAdder against null prebuilt tagmap entry #11962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions dd-trace-core/src/main/java/datadog/trace/core/tagprocessor/InternalTagsAdder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading