Ensure callback provider is not null

manuel-alvarez-alvarez · manuel-alvarez-alvarez · commit 135e0f01a594 · 2025-06-19T14:14:05.000+02:00
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java b/dd-java-agent/instrumentation/play-2.4/src/main/java_play25/datadog/trace/instrumentation/play25/appsec/StatusHeaderSendJsonAdvice.java
@@ -38,6 +38,9 @@ static void after(
     }
 
     CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+    if (cbp == null) {
+      return;
+    }
     BiFunction<RequestContext, Object, Flow<Void>> callback =
         cbp.getCallback(EVENTS.responseBody());
     if (callback == null) {
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/StatusHeaderInstrumentation.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/appsec/StatusHeaderInstrumentation.java
@@ -75,6 +75,9 @@ static void after(
       }
 
       CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
+      if (cbp == null) {
+        return;
+      }
       BiFunction<RequestContext, Object, Flow<Void>> callback =
           cbp.getCallback(EVENTS.responseBody());
       if (callback == null) {

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ static void after(`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);`
	`41`	`+ if (cbp == null) {`
	`42`	`+ return;`
	`43`	`+ }`
`41`	`44`	`BiFunction<RequestContext, Object, Flow<Void>> callback =`
`42`	`45`	`cbp.getCallback(EVENTS.responseBody());`
`43`	`46`	`if (callback == null) {`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,9 @@ static void after(`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);`
	`78`	`+ if (cbp == null) {`
	`79`	`+ return;`
	`80`	`+ }`
`78`	`81`	`BiFunction<RequestContext, Object, Flow<Void>> callback =`
`79`	`82`	`cbp.getCallback(EVENTS.responseBody());`
`80`	`83`	`if (callback == null) {`