Skip to content

Commit 0384afd

Browse files
committed
Enable process level tags for java 21 applications
1 parent 030f9bb commit 0384afd

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

internal-api/src/main/java/datadog/trace/api/Config.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
15081508
removeIntegrationServiceNamesEnabled =
15091509
configProvider.getBoolean(TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED, false);
15101510
experimentalPropagateProcessTagsEnabled =
1511-
configProvider.getBoolean(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, false);
1511+
configProvider.getBoolean(
1512+
EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, JavaVirtualMachine.isJavaVersion(21));
15121513

15131514
peerServiceMapping = configProvider.getMergedMap(TRACE_PEER_SERVICE_MAPPING);
15141515

internal-api/src/test/groovy/datadog/trace/api/ProcessTagsForkedTest.groovy

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package datadog.trace.api
22

3+
import datadog.environment.JavaVirtualMachine
34
import datadog.trace.api.env.CapturedEnvironment
45
import datadog.trace.test.util.DDSpecification
56

@@ -88,19 +89,20 @@ class ProcessTagsForkedTest extends DDSpecification {
8889
null | "server1" | "^((?!cluster.name|server.name|server.type).)*\$"
8990
}
9091
91-
def 'should not calculate process tags by default'() {
92+
def 'should not calculate process tags by default except for java 21'() {
93+
final boolean shouldBeEnabled = JavaVirtualMachine.isJavaVersion(21)
9294
when:
9395
ProcessTags.reset()
9496
def processTags = ProcessTags.tagsForSerialization
9597
then:
96-
assert !ProcessTags.enabled
97-
assert processTags == null
98+
assert ProcessTags.enabled == shouldBeEnabled
99+
assert (processTags != null) == shouldBeEnabled
98100
when:
99101
ProcessTags.addTag("test", "value")
100102
then:
101-
assert ProcessTags.tagsForSerialization == null
102-
assert ProcessTags.tagsAsStringList == null
103-
assert ProcessTags.tagsAsUTF8ByteStringList == null
103+
assert (ProcessTags.tagsForSerialization != null) == shouldBeEnabled
104+
assert (ProcessTags.tagsAsStringList != null) == shouldBeEnabled
105+
assert (ProcessTags.tagsAsUTF8ByteStringList != null) == shouldBeEnabled
104106
}
105107
106108
def 'should lazily recalculate when a tag is added'() {

0 commit comments

Comments
 (0)