fix tests and experimental features

amarziali · amarziali · commit fcbe97771764 · 2025-04-15T17:07:24.000+02:00
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
@@ -242,7 +242,7 @@ public final class ConfigDefaults {
 
   static final Set<String> DEFAULT_TRACE_EXPERIMENTAL_FEATURES_ENABLED =
       new HashSet<>(
-          asList("DD_TAGS", "DD_LOGS_INJECTION", "EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED"));
+          asList("DD_TAGS", "DD_LOGS_INJECTION", "DD_EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED"));
 
   static final boolean DEFAULT_TRACE_128_BIT_TRACEID_GENERATION_ENABLED = true;
   static final boolean DEFAULT_TRACE_128_BIT_TRACEID_LOGGING_ENABLED = true;
diff --git a/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy
@@ -1938,7 +1938,7 @@ class ConfigTest extends DDSpecification {
     def config = new Config()
 
     then:
-    config.experimentalFeaturesEnabled == ["DD_TAGS", "DD_LOGS_INJECTION"].toSet()
+    config.experimentalFeaturesEnabled == ["DD_TAGS", "DD_LOGS_INJECTION", "DD_EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED"].toSet()
   }
 
   def "detect if agent is configured using default values"() {
diff --git a/utils/test-utils/src/main/groovy/datadog/trace/test/util/DDSpecification.groovy b/utils/test-utils/src/main/groovy/datadog/trace/test/util/DDSpecification.groovy
@@ -90,7 +90,7 @@ abstract class DDSpecification extends Specification {
 
   void setupSpec() {
     assert !configModificationFailed: "Config class modification failed.  Ensure all test classes extend DDSpecification"
-    // //     assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
+    assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
     assert systemPropertiesExceptAllowed().findAll { it.key.toString().startsWith("dd.") }.isEmpty()
 
     if (getDDThreads().isEmpty()) {
@@ -106,7 +106,7 @@ abstract class DDSpecification extends Specification {
   void cleanupSpec() {
     restoreProperties()
 
-    // //     assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
+    assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
     assert systemPropertiesExceptAllowed().findAll { it.key.toString().startsWith("dd.") }.isEmpty()
 
     if (isConfigInstanceModifiable) {
@@ -129,7 +129,7 @@ abstract class DDSpecification extends Specification {
   void setup() {
     restoreProperties()
 
-    // //     assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
+    assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
     assert systemPropertiesExceptAllowed().findAll { it.key.toString().startsWith("dd.") }.isEmpty()
 
     if (isConfigInstanceModifiable) {
@@ -140,7 +140,7 @@ abstract class DDSpecification extends Specification {
   void cleanup() {
     restoreProperties()
 
-    // //     assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
+    assert System.getenv().findAll { it.key.startsWith("DD_") }.isEmpty()
     assert systemPropertiesExceptAllowed().findAll { it.key.toString().startsWith("dd.") }.isEmpty()
 
     if (isConfigInstanceModifiable) {

Original file line number	Diff line number	Diff line change
`@@ -1938,7 +1938,7 @@ class ConfigTest extends DDSpecification {`
`1938`	`1938`	`def config = new Config()`
`1939`	`1939`
`1940`	`1940`	`then:`
`1941`		`- config.experimentalFeaturesEnabled == ["DD_TAGS", "DD_LOGS_INJECTION"].toSet()`
	`1941`	`+ config.experimentalFeaturesEnabled == ["DD_TAGS", "DD_LOGS_INJECTION", "DD_EXPERIMENTAL_COLLECT_PROCESS_TAGS_ENABLED"].toSet()`
`1942`	`1942`	`}`
`1943`	`1943`
`1944`	`1944`	`def "detect if agent is configured using default values"() {`