rmi

Author: SylvainJuge

instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/SpringRmiInstrumentationModule.java

@@ -10,12 +10,14 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import io.opentelemetry.javaagent.instrumentation.spring.rmi.v4_0.client.ClientInstrumentation;
 import io.opentelemetry.javaagent.instrumentation.spring.rmi.v4_0.server.ServerInstrumentation;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class SpringRmiInstrumentationModule extends InstrumentationModule {
+public class SpringRmiInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public SpringRmiInstrumentationModule() {
     super("spring-rmi", "spring-rmi-4.0");
@@ -25,4 +27,9 @@ public SpringRmiInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new ClientInstrumentation(), new ServerInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/client/ClientInstrumentation.java

@@ -17,6 +17,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.lang.reflect.Method;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -42,35 +43,42 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class InvokeMethodAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) MethodInvocation methodInv,
-        @Advice.Local("method") Method method,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
+    public static class AdviceScope {
+      public Method method;
+      public Context context;
+      public Scope scope;
+
+      public AdviceScope(Method method, Context context, Scope scope) {
+        this.method = method;
+        this.context = context;
+        this.scope = scope;
+      }
 
-      method = methodInv.getMethod();
+      public void exit(@Nullable Throwable throwable) {
+        scope.close();
+        clientInstrumenter().end(context, method, null, throwable);
+      }
+    }
+
+    @Nullable
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope onEnter(@Advice.Argument(0) MethodInvocation methodInv) {
+      Method method = methodInv.getMethod();
       Context parentContext = Java8BytecodeBridge.currentContext();
       if (!clientInstrumenter().shouldStart(parentContext, method)) {
-        return;
+        return null;
       }
-
-      context = clientInstrumenter().start(parentContext, method);
-      scope = context.makeCurrent();
+      Context context = clientInstrumenter().start(parentContext, method);
+      return new AdviceScope(method, context, context.makeCurrent());
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Advice.Local("method") Method method,
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-
-      if (scope == null) {
-        return;
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.exit(throwable);
       }
-      scope.close();
-      clientInstrumenter().end(context, method, null, throwable);
     }
   }
 }

instrumentation/spring/spring-rmi-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/rmi/v4_0/server/ServerInstrumentation.java

@@ -41,49 +41,50 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class InvokeMethodAdvice {
 
+    public static class AdviceLocals {
+      public CallDepth callDepth;
+      public ClassAndMethod request;
+      public Context context;
+      public Scope scope;
+    }
+
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This RmiBasedExporter thisObject,
-        @Advice.Argument(0) RemoteInvocation remoteInv,
-        @Advice.Local("otelCallDepth") CallDepth callDepth,
-        @Advice.Local("otelRequest") ClassAndMethod request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
+    public static AdviceLocals onEnter(
+        @Advice.This RmiBasedExporter thisObject, @Advice.Argument(0) RemoteInvocation remoteInv) {
 
-      callDepth = CallDepth.forClass(RmiBasedExporter.class);
-      if (callDepth.getAndIncrement() > 0) {
-        return;
+      AdviceLocals locals = new AdviceLocals();
+
+      locals.callDepth = CallDepth.forClass(RmiBasedExporter.class);
+      if (locals.callDepth.getAndIncrement() > 0) {
+        return locals;
       }
 
       Context parentContext = THREAD_LOCAL_CONTEXT.getAndResetContext();
       Class<?> serverClass = thisObject.getService().getClass();
       String methodName = remoteInv.getMethodName();
-      request = ClassAndMethod.create(serverClass, methodName);
+      locals.request = ClassAndMethod.create(serverClass, methodName);
 
-      if (!serverInstrumenter().shouldStart(parentContext, request)) {
-        return;
+      if (!serverInstrumenter().shouldStart(parentContext, locals.request)) {
+        return locals;
       }
 
-      context = serverInstrumenter().start(parentContext, request);
-      scope = context.makeCurrent();
+      locals.context = serverInstrumenter().start(parentContext, locals.request);
+      locals.scope = locals.context.makeCurrent();
+      return locals;
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelCallDepth") CallDepth callDepth,
-        @Advice.Local("otelRequest") ClassAndMethod request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
+        @Advice.Thrown Throwable throwable, @Advice.Enter AdviceLocals locals) {
 
-      if (callDepth.decrementAndGet() > 0) {
+      if (locals.callDepth.decrementAndGet() > 0) {
         return;
       }
-      if (scope == null) {
+      if (locals.scope == null) {
         return;
       }
-      scope.close();
-      serverInstrumenter().end(context, request, null, throwable);
+      locals.scope.close();
+      serverInstrumenter().end(locals.context, locals.request, null, throwable);
     }
   }
 }