Develop/rmi instrumentation (open-telemetry#4764)

* Remove new top level client span check from UnicastRefInstrumentation.java * Instrument Remote instead of RemoteServer
RashmiRam · May 23, 2022 · 5be10bd · 5be10bd
1 parent 69f3356
commit 5be10bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/...java/io/opentelemetry/javaagent/instrumentation/rmi/client/UnicastRefInstrumentation.java b/...java/io/opentelemetry/javaagent/instrumentation/rmi/client/UnicastRefInstrumentation.java
@@ -48,11 +48,6 @@ public static void onEnter(
 
       Context parentContext = Java8BytecodeBridge.currentContext();
 
-      // TODO replace with client span check - this is a bit different condition though, can we
-      // remove it?
-      if (!Java8BytecodeBridge.spanFromContext(parentContext).getSpanContext().isValid()) {
-        return;
-      }
       if (!instrumenter().shouldStart(parentContext, method)) {
         return;
       }

diff --git a/...va/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java b/...va/io/opentelemetry/javaagent/instrumentation/rmi/server/RemoteServerInstrumentation.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.rmi.server;
 
 import static io.opentelemetry.javaagent.bootstrap.rmi.ThreadLocalContext.THREAD_LOCAL_CONTEXT;
-import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
 import static io.opentelemetry.javaagent.instrumentation.rmi.server.RmiServerSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
@@ -20,15 +20,15 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.api.CallDepth;
-import java.rmi.server.RemoteServer;
+import java.rmi.Remote;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
 public class RemoteServerInstrumentation implements TypeInstrumentation {
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
-    return extendsClass(named("java.rmi.server.RemoteServer"));
+    return implementsInterface(named("java.rmi.Remote"));
   }
 
   @Override
@@ -50,7 +50,7 @@ public static void onEnter(
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
 
-      callDepth = CallDepth.forClass(RemoteServer.class);
+      callDepth = CallDepth.forClass(Remote.class);
       if (callDepth.getAndIncrement() > 0) {
         return;
       }