[mq] [skip ddci] working branch - merge 49c0d54 on top of master at f4491d3

{"baseBranch":"master","baseCommit":"f4491d333713faf327192376b11b15db20ff6ab5","createdAt":"2026-04-09T21:38:06.148253Z","headSha":"49c0d54d85b4f69086f1a1fc654c9ff986bb3059","id":"781cfc2d-683f-45a5-a4ea-1a8eadbb1d59","priority":"200","pullRequestNumber":"11032","queuedAt":"2026-04-09T21:38:06.146852Z","status":"STATUS_QUEUED"}

Author: gh-worker-dd-mergequeue-cf854d[bot]

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy

@@ -5,11 +5,16 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext
 import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities
 import datadog.trace.bootstrap.instrumentation.api.Tags
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.test.util.DDSpecification
 import spock.lang.Shared
 
 class BaseDecoratorTest extends DDSpecification {
 
+  def setupSpec() {
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   @Shared
   def decorator = newDecorator()
 

dd-java-agent/agent-installer/src/test/groovy/datadog/trace/agent/test/DefaultInstrumenterForkedTest.groovy

@@ -2,6 +2,7 @@ package datadog.trace.agent.test
 
 import datadog.environment.EnvironmentVariables
 import datadog.trace.agent.tooling.InstrumenterModule
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.agent.tooling.bytebuddy.matcher.DDElementMatchers
 import datadog.trace.agent.tooling.bytebuddy.outline.TypePoolFacade
 import datadog.trace.test.util.DDSpecification
@@ -12,6 +13,10 @@ class DefaultInstrumenterForkedTest extends DDSpecification {
     DDElementMatchers.registerAsSupplier()
   }
 
+  def setupSpec() {
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   def "default enabled"() {
     setup:
     def target = new TestDefaultInstrumenter("test")

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/InstrumenterIndexTest.groovy

@@ -1,10 +1,15 @@
 package datadog.trace.agent.tooling
 
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.test.util.DDSpecification
 import spock.lang.Shared
 
 class InstrumenterIndexTest extends DDSpecification {
 
+  def setupSpec() {
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   @Shared
   def unknownInstrumentation = new InstrumenterModule('unknown') {}
 

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/csi/BaseCallSiteTest.groovy

@@ -4,6 +4,7 @@ import datadog.trace.agent.tooling.bytebuddy.csi.Advices
 import datadog.trace.agent.tooling.bytebuddy.csi.CallSiteInstrumentation
 import datadog.trace.agent.tooling.bytebuddy.csi.CallSiteSupplier
 import datadog.trace.agent.tooling.bytebuddy.csi.CallSiteTransformer
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.test.util.DDSpecification
 import groovy.transform.CompileDynamic
 import net.bytebuddy.agent.builder.AgentBuilder
@@ -31,6 +32,10 @@ import static net.bytebuddy.matcher.ElementMatchers.named
 @CompileDynamic
 class BaseCallSiteTest extends DDSpecification {
 
+  def setupSpec() {
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   protected CallSites mockCallSites(final byte type = BEFORE, final CallSiteAdvice advice, final Pointcut target, final String... helpers) {
     return Stub(CallSites) {
       accept(_ as CallSites.Container) >> {

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPluginTest.groovy

@@ -2,6 +2,7 @@ package datadog.trace.agent.tooling.muzzle
 
 import datadog.trace.agent.tooling.Instrumenter
 import datadog.trace.agent.tooling.InstrumenterModule
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.test.util.DDSpecification
 import net.bytebuddy.matcher.ElementMatcher
 
@@ -20,6 +21,10 @@ import static datadog.trace.agent.tooling.muzzle.TestInstrumentationClasses.Vali
 
 class MuzzleVersionScanPluginTest extends DDSpecification {
 
+  def setupSpec() {
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+  }
+
   def "test assertInstrumentationMuzzled advice"() {
     setup:
     def instrumentationLoader = new ServiceEnabledClassLoader(InstrumenterModule,

dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy

@@ -10,6 +10,7 @@ import static datadog.trace.api.config.TraceInstrumentationConfig.CODE_ORIGIN_FO
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious
 import static datadog.trace.util.AgentThreadFactory.AgentThread.TASK_SCHEDULER
 
+
 import ch.qos.logback.classic.Level
 import ch.qos.logback.classic.util.ContextInitializer
 import com.datadog.debugger.agent.ClassesToRetransformFinder

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")
   }

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()
 

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"

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: