restore original tracer during LambdaAppSecHandler test cleanup (#11172)

claponcet · devflow.devflow-routing-intake · web-flow · commit 995f760c78a8 · 2026-04-22T09:57:02.000Z
restore original tracer during LambdaAppSecHandler test cleanup

Merge branch 'master' into clara.poncet/fix-lambda-handler-test-npe

Co-authored-by: devflow.devflow-routing-intake &lt;devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io&gt;
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaAppSecHandlerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaAppSecHandlerTest.groovy
@@ -28,8 +28,12 @@ class LambdaAppSecHandlerTest extends DDCoreSpecification {
   @Shared
   def originalAppSecActive
 
+  @Shared
+  AgentTracer.TracerAPI originalTracer
+
   def setupSpec() {
     originalAppSecActive = ActiveSubsystems.APPSEC_ACTIVE
+    originalTracer = AgentTracer.get()
   }
 
   def cleanupSpec() {
@@ -1438,7 +1442,6 @@ class LambdaAppSecHandlerTest extends DDCoreSpecification {
   }
 
   def cleanup() {
-    // Reset tracer after each test
-    AgentTracer.forceRegister(null)
+    AgentTracer.forceRegister(originalTracer)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,12 @@ class LambdaAppSecHandlerTest extends DDCoreSpecification {`
`28`	`28`	`@Shared`
`29`	`29`	`def originalAppSecActive`
`30`	`30`
	`31`	`+ @Shared`
	`32`	`+ AgentTracer.TracerAPI originalTracer`
	`33`	`+`
`31`	`34`	`def setupSpec() {`
`32`	`35`	`originalAppSecActive = ActiveSubsystems.APPSEC_ACTIVE`
	`36`	`+ originalTracer = AgentTracer.get()`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`def cleanupSpec() {`
`@@ -1438,7 +1442,6 @@ class LambdaAppSecHandlerTest extends DDCoreSpecification {`
`1438`	`1442`	`}`
`1439`	`1443`
`1440`	`1444`	`def cleanup() {`
`1441`		`- // Reset tracer after each test`
`1442`		`- AgentTracer.forceRegister(null)`
	`1445`	`+ AgentTracer.forceRegister(originalTracer)`
`1443`	`1446`	`}`
`1444`	`1447`	`}`