Enable process tags collection by default (#9510)

Author: raphaelgavache

dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java

@@ -9,7 +9,6 @@
 
 import com.datadog.debugger.probe.LogProbe;
 import com.datadog.debugger.sink.Snapshot;
-import datadog.environment.JavaVirtualMachine;
 import datadog.trace.agent.test.utils.PortUtils;
 import datadog.trace.bootstrap.debugger.MethodLocation;
 import datadog.trace.bootstrap.debugger.ProbeId;
@@ -214,10 +213,7 @@ private void doTestTracer(LogProbe logProbe, boolean enableProcessTags) throws E
     setCurrentConfiguration(createConfig(logProbe));
     String httpPort = String.valueOf(PortUtils.randomOpenPort());
     ProcessBuilder processBuilder = createProcessBuilder(logFilePath, "--server.port=" + httpPort);
-    if (enableProcessTags) {
-      processBuilder.environment().put("DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED", "true");
-    } else if (JavaVirtualMachine.isJavaVersion(21)) {
-      // disable explicitly since enable by default on 21
+    if (!enableProcessTags) {
       processBuilder.environment().put("DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED", "false");
     }
     targetProcess = processBuilder.start();

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

@@ -1527,8 +1527,7 @@ 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, JavaVirtualMachine.isJavaVersion(21));
+        configProvider.getBoolean(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, true);
 
     peerServiceMapping = configProvider.getMergedMap(TRACE_PEER_SERVICE_MAPPING);
 

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

@@ -1,6 +1,5 @@
 package datadog.trace.api
 
-import datadog.environment.JavaVirtualMachine
 import datadog.trace.api.env.CapturedEnvironment
 import datadog.trace.test.util.DDSpecification
 
@@ -89,20 +88,19 @@ class ProcessTagsForkedTest extends DDSpecification {
     null     | "server1"  | "^((?!cluster.name|server.name|server.type).)*\$"
   }
 
-  def 'should not calculate process tags by default except for java 21'() {
-    final boolean shouldBeEnabled = JavaVirtualMachine.isJavaVersion(21)
+  def 'calculate process tags by default'() {
     when:
     ProcessTags.reset()
     def processTags = ProcessTags.tagsForSerialization
     then:
-    assert ProcessTags.enabled == shouldBeEnabled
-    assert (processTags != null) == shouldBeEnabled
+    assert ProcessTags.enabled
+    assert (processTags != null)
     when:
     ProcessTags.addTag("test", "value")
     then:
-    assert (ProcessTags.tagsForSerialization != null) == shouldBeEnabled
-    assert (ProcessTags.tagsAsStringList != null) == shouldBeEnabled
-    assert (ProcessTags.tagsAsUTF8ByteStringList != null) == shouldBeEnabled
+    assert (ProcessTags.tagsForSerialization != null)
+    assert (ProcessTags.tagsAsStringList != null)
+    assert (ProcessTags.tagsAsUTF8ByteStringList != null)
   }
 
   def 'should lazily recalculate when a tag is added'() {

remote-config/remote-config-core/src/test/groovy/datadog/remoteconfig/PollerRequestFactoryTest.groovy

@@ -1,7 +1,6 @@
 package datadog.remoteconfig
 
 import com.squareup.moshi.Moshi
-import datadog.environment.JavaVirtualMachine
 import datadog.remoteconfig.tuf.RemoteConfigRequest
 import datadog.trace.api.ProcessTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
@@ -59,10 +58,7 @@ class PollerRequestFactoryTest extends DDSpecification {
 
   void 'remote config provides process tags when enabled  = #enabled'() {
     setup:
-    // to be changed when activated by default
-    if (enabled) {
-      injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
-    } else if (JavaVirtualMachine.isJavaVersion(21)) {
+    if (!enabled) {
       injectSysConfig(EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false")
     }
     ProcessTags.reset()