WIP.

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle

@@ -10,27 +10,6 @@ apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 
-test {
-  environment([
-    "_HANDLER": "Handler",
-    "TEST_ENV_PROPAGATE_VARS": "_HANDLER"
-  ])
-}
-
-forkedTest {
-  environment([
-    "_HANDLER": "Handler",
-    "TEST_ENV_PROPAGATE_VARS": "_HANDLER"
-  ])
-}
-
-latestDepTest {
-  environment([
-    "_HANDLER": "Handler",
-    "TEST_ENV_PROPAGATE_VARS": "_HANDLER"
-  ])
-}
-
 dependencies {
   compileOnly group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.2.1'
   testImplementation group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.2.1'

dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/groovy/LambdaHandlerInstrumentationTest.groovy

@@ -5,6 +5,12 @@ import com.amazonaws.services.lambda.runtime.Context
 abstract class LambdaHandlerInstrumentationTest extends VersionedNamingTestBase {
   def requestId = "test-request-id"
 
+  // Must set this env var before the Datadog integration is initialized.
+  // If present at load time, the integration auto-enables.
+  static {
+    environmentVariables.set("_HANDLER", "Handler")
+  }
+
   @Override
   String service() {
     null

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

@@ -173,12 +173,8 @@ class ConfigTest extends DDSpecification {
   private static final DD_LLMOBS_ML_APP_ENV = "DD_LLMOBS_ML_APP"
   private static final DD_LLMOBS_AGENTLESS_ENABLED_ENV = "DD_LLMOBS_AGENTLESS_ENABLED"
 
-  def setupSpec() {
-    ControllableCapturedEnvironment.useFixedEnv([:])
-  }
-
   def setup() {
-    ControllableCapturedEnvironment.useFixedEnv([:])
+    FixedCapturedEnvironment.useFixedEnv([:])
   }
 
   def "specify overrides via properties"() {
@@ -797,9 +793,6 @@ class ConfigTest extends DDSpecification {
   }
 
   def "override null properties"() {
-    setup:
-    FixedCapturedEnvironment.useFixedEnv([:])
-
     when:
     def config = Config.get(null)
 

utils/test-utils/src/main/groovy/datadog/trace/test/util/DDSpecification.groovy

@@ -35,7 +35,7 @@ abstract class DDSpecification extends Specification {
   static configModificationFailed = false
 
   @Shared
-  protected ControllableEnvironmentVariables environmentVariables = ControllableEnvironmentVariables.setup()
+  protected static ControllableEnvironmentVariables environmentVariables = ControllableEnvironmentVariables.setup()
 
   // Intentionally saving and restoring System properties.
   private static Properties originalSystemProperties