diff --git a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java b/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java index 2252b38acd37..ec90604981c2 100644 --- a/instrumentation/rmi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java +++ b/instrumentation/rmi/javaagent/src/main/java/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;