Fix NPE in rmi server instrumentation (#5042)

open-telemetry · Jan 7, 2022 · d5bd3cb · d5bd3cb
1 parent 478800e
commit d5bd3cb
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...va/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java b/...va/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java
@@ -57,6 +57,9 @@ public static void onEnter(
 
       // TODO review and unify with all other SERVER instrumentation
       Context parentContext = THREAD_LOCAL_CONTEXT.getAndResetContext();
+      if (parentContext == null) {
+        return;
+      }
       request = ClassAndMethod.create(declaringClass, methodName);
       if (!instrumenter().shouldStart(parentContext, request)) {
         return;