Skip to content

Pre-construct TagMap.Entry objects in InternalTagsAdder #11555

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

Open
dougqh wants to merge 7 commits into
base: master
Choose a base branch
from
+17 −9
Open

Pre-construct TagMap.Entry objects in InternalTagsAdder #11555

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
934fd5d
Pre-construct TagMap.Entry objects in InternalTagsAdder
dougqh Jun 3, 2026
f5f5cc9
Fix empty-DD_SERVICE version drop; migrate test to JUnit 5
dougqh Jun 4, 2026
c773ba7
Trim verbose generated comments in InternalTagsAdder per review feedback
dougqh Jun 9, 2026
01773bf
Resolve merge conflict: keep @TableTest structure from master, add re…
dougqh Jun 9, 2026
b9feabc
Fix empty-ddService: exit early + drop redundant Entry.create guard
dougqh Jun 9, 2026
7456d26
Merge branch 'master' into dougqh/preconstruct-internal-tags
dougqh Jun 9, 2026
dc188a0
Accept review feedback: @NonNull ddService, drop empty guard and regr…
dougqh Jun 10, 2026
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
26 changes: 17 additions & 9 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 @@ -7,32 +7,40 @@
import datadog.trace.bootstrap.instrumentation.api.AppendableSpanLinks;
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
import datadog.trace.core.DDSpanContext;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

public final class InternalTagsAdder extends TagsPostProcessor {
private final UTF8BytesString ddService;
private final UTF8BytesString version;

public InternalTagsAdder(@Nullable final String ddService, @Nullable final String version) {
this.ddService = ddService != null ? UTF8BytesString.create(ddService) : null;
this.version = version != null && !version.isEmpty() ? UTF8BytesString.create(version) : null;
// Prebuilt once to avoid per-span Entry allocation.
private final TagMap.Entry baseServiceEntry;
@Nullable private final TagMap.Entry versionEntry;

public InternalTagsAdder(@Nonnull final String ddService, @Nullable final String version) {
this.ddService = UTF8BytesString.create(ddService);
this.baseServiceEntry = TagMap.Entry.create(DDTags.BASE_SERVICE, this.ddService);
this.versionEntry =
version != null && !version.isEmpty()
? TagMap.Entry.create(VERSION, UTF8BytesString.create(version))
: null;
}

@Override
public void processTags(
TagMap unsafeTags, DDSpanContext spanContext, AppendableSpanLinks spanLinks) {
if (spanContext == null || ddService == null) {
if (spanContext == null) {
return;
}

if (!ddService.toString().equalsIgnoreCase(spanContext.getServiceName())) {
// service name != DD_SERVICE
unsafeTags.set(DDTags.BASE_SERVICE, ddService);
// 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
if (version != null && !unsafeTags.containsKey(VERSION)) {
unsafeTags.set(VERSION, version);
if (versionEntry != null && !unsafeTags.containsKey(VERSION)) {
unsafeTags.set(versionEntry);
}
}
}
Expand Down
Loading