Fix play-mvc\methods NullPointerException (#12121)

open-telemetry · Aug 28, 2024 · 3bcbacc · 3bcbacc
1 parent cdd8bba
commit 3bcbacc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/...c/main/java/io/opentelemetry/javaagent/instrumentation/methods/MethodInstrumentation.java b/...c/main/java/io/opentelemetry/javaagent/instrumentation/methods/MethodInstrumentation.java
@@ -79,6 +79,9 @@ public static void stopSpan(
         @Advice.Local("otelScope") Scope scope,
         @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Object returnValue,
         @Advice.Thrown Throwable throwable) {
+      if (scope == null) {
+        return;
+      }
       scope.close();
 
       returnValue =

diff --git a/...main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/ActionInstrumentation.java b/...main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/ActionInstrumentation.java
@@ -71,6 +71,9 @@ public static void stopTraceOnResponse(
         @Advice.Return(readOnly = false) Future<Result> responseFuture,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
+      if (scope == null) {
+        return;
+      }
       scope.close();
 
       updateSpan(context, req);

diff --git a/...main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/ActionInstrumentation.java b/...main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/ActionInstrumentation.java
@@ -71,6 +71,9 @@ public static void stopTraceOnResponse(
         @Advice.Return(readOnly = false) Future<Result> responseFuture,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
+      if (scope == null) {
+        return;
+      }
       scope.close();
 
       updateSpan(context, req);