Indy-ready - vaadin

instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/ClientCallableRpcInstrumentation.java

@@ -11,9 +11,9 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -41,36 +41,52 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class InvokeMethodAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(1) Class<?> componentClass,
-        @Advice.Argument(2) String methodName,
-        @Advice.Local("otelRequest") VaadinClientCallableRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
+    public static class AdviceScope {
+      private final VaadinClientCallableRequest request;
+      private final Context context;
+      private final Scope scope;
+
+      private AdviceScope(VaadinClientCallableRequest request, Context context, Scope scope) {
+        this.request = request;
+        this.context = context;
+        this.scope = scope;
+      }
+
+      @Nullable
+      public static AdviceScope start(Class<?> componentClass, String methodName) {
+        Context parentContext = Context.current();
+        VaadinClientCallableRequest request =
+            VaadinClientCallableRequest.create(componentClass, methodName);
+        if (!clientCallableInstrumenter().shouldStart(parentContext, request)) {
+          return null;
+        }
+
+        Context context = clientCallableInstrumenter().start(parentContext, request);
+        Scope scope = context.makeCurrent();
+        return new AdviceScope(request, context, scope);
+      }
+
+      public void end(@Nullable Throwable throwable) {
+        scope.close();
 
-      Context parentContext = Java8BytecodeBridge.currentContext();
-      request = VaadinClientCallableRequest.create(componentClass, methodName);
-      if (!clientCallableInstrumenter().shouldStart(parentContext, request)) {
-        return;
+        clientCallableInstrumenter().end(context, request, null, throwable);
       }
+    }
 
-      context = clientCallableInstrumenter().start(parentContext, request);
-      scope = context.makeCurrent();
+    @Nullable
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope onEnter(
+        @Advice.Argument(1) Class<?> componentClass, @Advice.Argument(2) String methodName) {
+      return AdviceScope.start(componentClass, methodName);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") VaadinClientCallableRequest request,
-        @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.end(throwable);
       }
-      scope.close();
-
-      clientCallableInstrumenter().end(context, request, null, throwable);
     }
   }
 }

instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/RequestHandlerInstrumentation.java

@@ -16,6 +16,7 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -45,35 +46,51 @@ public void transform(TypeTransformer transformer) {
 
   @SuppressWarnings("unused")
   public static class HandleRequestAdvice {
+    public static class AdviceScope {
+      private final VaadinHandlerRequest request;
+      private final Context context;
+      private final Scope scope;
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This RequestHandler requestHandler,
-        @Advice.Origin("#m") String methodName,
-        @Advice.Local("otelRequest") VaadinHandlerRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
+      private AdviceScope(VaadinHandlerRequest request, Context context, Scope scope) {
+        this.request = request;
+        this.context = context;
+        this.scope = scope;
+      }
+
+      @Nullable
+      public static AdviceScope start(Class<?> handlerClass, String methodName) {
+        VaadinHandlerRequest request = VaadinHandlerRequest.create(handlerClass, methodName);
+        Context context = helper().startRequestHandlerSpan(request);
+        if (context == null) {
+          return null;
+        }
+        Scope scope = context.makeCurrent();
+        return new AdviceScope(request, context, scope);
+      }
+
+      public void end(@Nullable Throwable throwable, boolean handled) {
+        scope.close();
 
-      request = VaadinHandlerRequest.create(requestHandler.getClass(), methodName);
-      context = helper().startRequestHandlerSpan(request);
-      if (context != null) {
-        scope = context.makeCurrent();
+        helper().endRequestHandlerSpan(context, request, throwable, handled);
       }
     }
 
+    @Nullable
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope onEnter(
+        @Advice.This RequestHandler requestHandler, @Advice.Origin("#m") String methodName) {
+
+      return AdviceScope.start(requestHandler.getClass(), methodName);
+    }
+
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit(
         @Advice.Thrown Throwable throwable,
         @Advice.Return boolean handled,
-        @Advice.Local("otelRequest") VaadinHandlerRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
+      if (adviceScope != null) {
+        adviceScope.end(throwable, handled);
       }
-      scope.close();
-
-      helper().endRequestHandlerSpan(context, request, throwable, handled);
     }
   }
 }

instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/RpcInvocationHandlerInstrumentation.java

@@ -15,9 +15,9 @@
 import elemental.json.JsonObject;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -48,37 +48,54 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class HandleAdvice {
 
+    public static class AdviceScope {
+      private final VaadinRpcRequest request;
+      private final Context context;
+      private final Scope scope;
+
+      private AdviceScope(VaadinRpcRequest request, Context context, Scope scope) {
+        this.request = request;
+        this.context = context;
+        this.scope = scope;
+      }
+
+      @Nullable
+      public static AdviceScope start(
+          RpcInvocationHandler handler, String methodName, JsonObject jsonObject) {
+        Context parentContext = Context.current();
+        VaadinRpcRequest request = VaadinRpcRequest.create(handler, methodName, jsonObject);
+        if (!rpcInstrumenter().shouldStart(parentContext, request)) {
+          return null;
+        }
+
+        Context context = rpcInstrumenter().start(parentContext, request);
+        Scope scope = context.makeCurrent();
+        return new AdviceScope(request, context, scope);
+      }
+
+      public void end(@Nullable Throwable throwable) {
+        scope.close();
+
+        rpcInstrumenter().end(context, request, null, throwable);
+      }
+    }
+
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
+    public static AdviceScope onEnter(
         @Advice.This RpcInvocationHandler rpcInvocationHandler,
         @Advice.Origin("#m") String methodName,
-        @Advice.Argument(1) JsonObject jsonObject,
-        @Advice.Local("otelRequest") VaadinRpcRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-
-      Context parentContext = Java8BytecodeBridge.currentContext();
-      request = VaadinRpcRequest.create(rpcInvocationHandler, methodName, jsonObject);
-      if (!rpcInstrumenter().shouldStart(parentContext, request)) {
-        return;
-      }
-
-      context = rpcInstrumenter().start(parentContext, request);
-      scope = context.makeCurrent();
+        @Advice.Argument(1) JsonObject jsonObject) {
+      return AdviceScope.start(rpcInvocationHandler, methodName, jsonObject);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") VaadinRpcRequest request,
-        @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.end(throwable);
       }
-      scope.close();
-
-      rpcInstrumenter().end(context, request, null, throwable);
     }
   }
 }

instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinInstrumentationModule.java

@@ -11,11 +11,13 @@
 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 java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class VaadinInstrumentationModule extends InstrumentationModule {
+public class VaadinInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public VaadinInstrumentationModule() {
     super("vaadin", "vaadin-14.2");
@@ -38,4 +40,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new RpcInvocationHandlerInstrumentation(),
         new ClientCallableRpcInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/vaadin-14.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/VaadinServiceInstrumentation.java

@@ -14,6 +14,7 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -38,33 +39,50 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class HandleRequestAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.This VaadinService vaadinService,
-        @Advice.Origin("#m") String methodName,
-        @Advice.Local("otelRequest") VaadinServiceRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
+    public static class AdviceScope {
+      private final VaadinServiceRequest request;
+      private final Context context;
+      private final Scope scope;
+
+      private AdviceScope(VaadinServiceRequest request, Context context, Scope scope) {
+        this.request = request;
+        this.context = context;
+        this.scope = scope;
+      }
+
+      @Nullable
+      public static AdviceScope start(Class<?> serviceClass, String methodName) {
+        VaadinServiceRequest request = VaadinServiceRequest.create(serviceClass, methodName);
+        Context context = helper().startVaadinServiceSpan(request);
+        if (context == null) {
+          return null;
+        }
+        Scope scope = context.makeCurrent();
+        return new AdviceScope(request, context, scope);
+      }
+
+      public void end(@Nullable Throwable throwable) {
+        scope.close();
 
-      request = VaadinServiceRequest.create(vaadinService.getClass(), methodName);
-      context = helper().startVaadinServiceSpan(request);
-      if (context != null) {
-        scope = context.makeCurrent();
+        helper().endVaadinServiceSpan(context, request, throwable);
       }
     }
 
+    @Nullable
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope onEnter(
+        @Advice.This VaadinService vaadinService, @Advice.Origin("#m") String methodName) {
+
+      return AdviceScope.start(vaadinService.getClass(), methodName);
+    }
+
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void onExit(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") VaadinServiceRequest request,
-        @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.end(throwable);
       }
-      scope.close();
-
-      helper().endVaadinServiceSpan(context, request, throwable);
     }
   }
 }