Skip to content

Extracting into span kind & language into static TagMap.Entry objects #10495

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 2 commits into
base: master
Choose a base branch
from
+8 −2
Open

Extracting into span kind & language into static TagMap.Entry objects #10495

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16fd947
Extracting into span kind & language into static TagMap.Entry objects…
dougqh Feb 2, 2026
e5e17bc
Merge branch 'master' into dougqh/server-decorator-entry-reuse
dougqh Feb 6, 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
10 changes: 8 additions & 2 deletions ...trap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/ServerDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
package datadog.trace.bootstrap.instrumentation.decorator;

import datadog.trace.api.DDTags;
import datadog.trace.api.TagMap;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.Tags;

public abstract class ServerDecorator extends BaseDecorator {
private static final TagMap.Entry SPAN_KIND_ENTRY =
TagMap.Entry.create(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
private static final TagMap.Entry LANG_ENTRY =
TagMap.Entry.create(DDTags.LANGUAGE_TAG_KEY, DDTags.LANGUAGE_TAG_VALUE);

@Override
public AgentSpan afterStart(final AgentSpan span) {
span.setTag(Tags.SPAN_KIND, Tags.SPAN_KIND_SERVER);
span.setTag(DDTags.LANGUAGE_TAG_KEY, DDTags.LANGUAGE_TAG_VALUE);
span.setTag(SPAN_KIND_ENTRY);
span.setTag(LANG_ENTRY);
Comment on lines +16 to +17
Copy link
Contributor

@bric3 bric3 Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue: There are some tests failing e.g. in HttpServerDecoratorTest, but not only. This might be related to checked interactions using the usual key, value API.

Copy link
Contributor Author

@dougqh dougqh Feb 6, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it looks we have some overly strict mocking tests. I'll sort that out.


return super.afterStart(span);
}
}