configuring more fake config tests

mhlidd · mhlidd · commit e7b23e9c8487 · 2026-04-02T13:03:03.000-04:00
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/AgentTestRunnerTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/AgentTestRunnerTest.groovy
@@ -1,5 +1,6 @@
 import com.google.common.reflect.ClassPath
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.agent.test.BootstrapClasspathSetupListener
 import datadog.trace.api.GlobalTracer
 import datadog.trace.api.Platform
@@ -26,6 +27,8 @@ class AgentTestRunnerTest extends InstrumentationSpecification {
   @Override
   void configurePreAgent() {
     super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
 
     injectSysConfig(TRACE_CLASSES_EXCLUDE, "config.exclude.packagename.*, config.exclude.SomeClass,config.exclude.SomeClass\$NestedClass")
   }
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/ConfigResetTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/ConfigResetTest.groovy
@@ -1,10 +1,18 @@
 import datadog.environment.EnvironmentVariables
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.api.Config
 import spock.lang.Shared
 
 class ConfigResetTest extends InstrumentationSpecification {
 
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   @Shared
   def sharedInstance = checkStaticAssertions()
 
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/InstrumentOldBytecode.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/InstrumentOldBytecode.groovy
@@ -1,7 +1,16 @@
 import com.ibm.as400.resource.ResourceLevel
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 
 class InstrumentOldBytecode extends InstrumentationSpecification {
+
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   def "can instrument old bytecode"() {
     expect:
     new ResourceLevel().toString() == "instrumented"
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/TooManyInvocationsErrorListenerTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/TooManyInvocationsErrorListenerTest.groovy
@@ -1,10 +1,18 @@
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.agent.test.TestClassShadowingExtension
 import org.spockframework.mock.*
 import org.spockframework.mock.runtime.MockInvocation
 
 class TooManyInvocationsErrorListenerTest extends InstrumentationSpecification {
 
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   @SuppressWarnings('GroovyAccessibility')
   void 'test that listener modifies failure'() {
     setup:
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/TraceCorrelationTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/TraceCorrelationTest.groovy
@@ -1,11 +1,19 @@
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.api.CorrelationIdentifier
 
 import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_128_BIT_TRACEID_LOGGING_ENABLED
 import static datadog.trace.api.config.TracerConfig.TRACE_128_BIT_TRACEID_GENERATION_ENABLED
 
 class TraceCorrelationTest extends InstrumentationSpecification {
 
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   def "access trace correlation only under trace"() {
     when:
     def span = TEST_TRACER.startSpan("test", "myspan")
@@ -28,6 +36,8 @@ class Trace128bitCorrelationTest extends TraceCorrelationTest {
   @Override
   void configurePreAgent() {
     super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
     injectSysConfig(TRACE_128_BIT_TRACEID_GENERATION_ENABLED, "true")
     injectSysConfig(TRACE_128_BIT_TRACEID_LOGGING_ENABLED, "true")
   }
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/context/FieldInjectionForkedTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/context/FieldInjectionForkedTest.groovy
@@ -2,6 +2,7 @@ package context
 
 import datadog.trace.agent.test.AbortTransformationException
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.agent.test.utils.ClasspathUtils
 import datadog.trace.api.InstrumenterConfig
 import datadog.trace.test.util.GCUtils
@@ -32,6 +33,13 @@ import static context.FieldInjectionTestInstrumentation.ValidSerializableKeyClas
 
 class FieldInjectionForkedTest extends InstrumentationSpecification {
 
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   @Override
   void onDiscovery(String typeName, ClassLoader classLoader, JavaModule module, boolean loaded) {
     if (typeName?.endsWith("UntransformableKeyClass")) {
@@ -219,6 +227,8 @@ class FieldInjectionForkedTest extends InstrumentationSpecification {
 class FieldInjectionDisabledForkedTest extends InstrumentationSpecification {
   void configurePreAgent() {
     super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
 
     injectSysConfig("dd.trace.runtime.context.field.injection", "false")
   }
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy
@@ -1,6 +1,7 @@
 package excludefilter
 
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.bootstrap.FieldBackedContextStores
 import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter
 
@@ -18,6 +19,13 @@ import static excludefilter.ExcludeFilterTestInstrumentation.RunnableExcludedExe
 
 class ExcludeFilterForkedTest extends InstrumentationSpecification {
 
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   def "test ExcludeFilter #runnable.class.name"() {
     expect:
     ExcludeFilter.exclude(RUNNABLE, runnable) == excluded
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/locator/ClassInjectingForkedTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/locator/ClassInjectingForkedTest.groovy
@@ -1,6 +1,7 @@
 package locator
 
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import net.bytebuddy.agent.builder.AgentBuilder
 import net.bytebuddy.description.type.TypeDescription
 import net.bytebuddy.dynamic.DynamicType
@@ -16,6 +17,8 @@ class ClassInjectingForkedTest extends InstrumentationSpecification {
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
 
     // Since this method is not at all configurePreAgent, but more like
     // configurePreAgentAndOhByTheWayBeforeEveryTest we need to not install
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/locator/ClassInjectingLoadClassDisabledForkedTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/locator/ClassInjectingLoadClassDisabledForkedTest.groovy
@@ -1,6 +1,7 @@
 package locator
 
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import net.bytebuddy.agent.builder.AgentBuilder
 import net.bytebuddy.description.type.TypeDescription
 import net.bytebuddy.dynamic.DynamicType
@@ -19,6 +20,8 @@ class ClassInjectingLoadClassDisabledForkedTest extends InstrumentationSpecifica
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
 
     injectSysConfig("dd.resolver.use.loadclass", "false")
 
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/server/HttpProxyTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/server/HttpProxyTest.groovy
@@ -1,6 +1,7 @@
 package server
 
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.agent.test.server.http.HttpProxy
 import datadog.trace.agent.test.utils.OkHttpUtils
 import okhttp3.MediaType
@@ -21,6 +22,13 @@ import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 })
 class HttpProxyTest extends InstrumentationSpecification {
 
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   @AutoCleanup
   @Shared
   def proxy = new HttpProxy()
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/server/HttpServerTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/server/HttpServerTest.groovy
@@ -6,6 +6,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
 
 import datadog.communication.util.IOUtils
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.agent.test.utils.OkHttpUtils
 import okhttp3.MultipartBody
 import okhttp3.Request
@@ -14,6 +15,14 @@ import spock.lang.Shared
 /* Don't actually need AgentTestRunner, but it messes up the classloader for AgentTestRunnerTest if this runs first. */
 
 class HttpServerTest extends InstrumentationSpecification {
+
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   @Shared
   def client = OkHttpUtils.client()
 
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/synthetic/SyntheticForkedTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/synthetic/SyntheticForkedTest.groovy
@@ -1,9 +1,17 @@
 package synthetic
 
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 
 abstract class SyntheticForkedTestBase extends InstrumentationSpecification {
 
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   def "test Synthetic methods"() {
     expect:
     SyntheticTestInstrumentation.Compute.result(i) == computed(i)
@@ -25,6 +33,8 @@ class SyntheticForkedTest extends SyntheticForkedTestBase {
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
 
     System.setProperty("synthetic.test.enabled", "true")
   }
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/utils/PortUtilsTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/utils/PortUtilsTest.groovy
@@ -1,11 +1,20 @@
 package utils
 
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.agent.test.utils.PortUtils
 
 import java.util.concurrent.TimeUnit
 
 class PortUtilsTest extends InstrumentationSpecification {
+
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   def "expect waitForPortToOpen succeed"() {
     given:
     int port = PortUtils.randomOpenPort()
diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/utils/ThreadUtilsTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/utils/ThreadUtilsTest.groovy
@@ -1,6 +1,7 @@
 package utils
 
 import datadog.trace.agent.test.InstrumentationSpecification
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.test.util.ThreadUtils
 import org.spockframework.runtime.ConditionNotSatisfiedError
 import spock.lang.FailsWith
@@ -11,6 +12,13 @@ import java.util.concurrent.atomic.AtomicInteger
 
 class ThreadUtilsTest extends InstrumentationSpecification {
 
+  @Override
+  protected void configurePreAgent() {
+    super.configurePreAgent()
+    // Opt out of strict config validation - test module loads test instrumentations with fake names
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   @Shared
   def counter = new AtomicInteger()
 
diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json
@@ -6705,6 +6705,22 @@
         "aliases": ["DD_INTEGRATION_JAVA_HTTP_CLIENT_ENABLED", "DD_TRACE_INTEGRATION_JAVA_HTTP_CLIENT_ENABLED"]
       }
     ],
+    "DD_TRACE_FFM_NATIVE_TRACING_ENABLED": [
+      {
+        "version": "A",
+        "type": "boolean",
+        "default": "true",
+        "aliases": ["DD_TRACE_INTEGRATION_FFM_NATIVE_TRACING_ENABLED", "DD_INTEGRATION_FFM_NATIVE_TRACING_ENABLED"]
+      }
+    ],
+    "DD_TRACE_JAVA_LANG_22_ENABLED": [
+      {
+        "version": "A",
+        "type": "boolean",
+        "default": "true",
+        "aliases": ["DD_TRACE_INTEGRATION_JAVA_LANG_22_ENABLED", "DD_INTEGRATION_JAVA_LANG_22_ENABLED"]
+      }
+    ],
     "DD_TRACE_JAVA_LANG_APPSEC_ENABLED": [
       {
         "version": "A",
diff --git a/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java b/utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java
@@ -316,9 +316,12 @@ private String getDatadogProperty(String sysProp) {
    * <p>Checks system properties and environment variables.
    */
   private static String getProperty(String sysProp) {
-    String value = SystemProperties.get(sysProp);
-    if (null == value) {
-      value = ConfigHelper.env(toEnvVar(sysProp));
+    // Always validate through ConfigHelper so STRICT_TEST mode can detect unsupported configs
+    String value = ConfigHelper.env(toEnvVar(sysProp));
+    // System property takes precedence over environment variable
+    String sysPropValue = SystemProperties.get(sysProp);
+    if (sysPropValue != null) {
+      value = sysPropValue;
     }
     return value;
   }
