Skip to content

Enable process level tags for java 21 applications #9458

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 2 commits into from
Sep 3, 2025
Merged

Enable process level tags for java 21 applications #9458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0384afd
Enable process level tags for java 21 applications
amarziali Sep 3, 2025
f5b5f3a
Adapt tests
amarziali Sep 3, 2025
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
3 changes: 2 additions & 1 deletion internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,7 +1508,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
removeIntegrationServiceNamesEnabled =
configProvider.getBoolean(TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED, false);
experimentalPropagateProcessTagsEnabled =
configProvider.getBoolean(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, false);
configProvider.getBoolean(
EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, JavaVirtualMachine.isJavaVersion(21));

peerServiceMapping = configProvider.getMergedMap(TRACE_PEER_SERVICE_MAPPING);

Expand Down
14 changes: 8 additions & 6 deletions internal-api/src/test/groovy/datadog/trace/api/ProcessTagsForkedTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package datadog.trace.api

import datadog.environment.JavaVirtualMachine
import datadog.trace.api.env.CapturedEnvironment
import datadog.trace.test.util.DDSpecification

Expand Down Expand Up @@ -88,19 +89,20 @@ class ProcessTagsForkedTest extends DDSpecification {
null | "server1" | "^((?!cluster.name|server.name|server.type).)*\$"
}

def 'should not calculate process tags by default'() {
def 'should not calculate process tags by default except for java 21'() {
final boolean shouldBeEnabled = JavaVirtualMachine.isJavaVersion(21)
when:
ProcessTags.reset()
def processTags = ProcessTags.tagsForSerialization
then:
assert !ProcessTags.enabled
assert processTags == null
assert ProcessTags.enabled == shouldBeEnabled
assert (processTags != null) == shouldBeEnabled
when:
ProcessTags.addTag("test", "value")
then:
assert ProcessTags.tagsForSerialization == null
assert ProcessTags.tagsAsStringList == null
assert ProcessTags.tagsAsUTF8ByteStringList == null
assert (ProcessTags.tagsForSerialization != null) == shouldBeEnabled
assert (ProcessTags.tagsAsStringList != null) == shouldBeEnabled
assert (ProcessTags.tagsAsUTF8ByteStringList != null) == shouldBeEnabled
}

def 'should lazily recalculate when a tag is added'() {
Expand Down
Loading