vertx-web-3.0

Author: SylvainJuge

instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/RouteInstrumentation.java

@@ -16,6 +16,8 @@
 import io.vertx.core.Handler;
 import io.vertx.ext.web.RoutingContext;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
+import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -40,10 +42,11 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class HandlerAdvice {
 
+    @AssignReturned.ToArguments(@ToArgument(0))
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrapHandler(
-        @Advice.Argument(value = 0, readOnly = false) Handler<RoutingContext> handler) {
-      handler = new RoutingContextHandlerWrapper(handler);
+    public static Handler<RoutingContext> wrapHandler(
+        @Advice.Argument(0) Handler<RoutingContext> handler) {
+      return new RoutingContextHandlerWrapper(handler);
     }
   }
 }

instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/VertxWebInstrumentationModule.java

@@ -10,10 +10,12 @@
 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;
 
 @AutoService(InstrumentationModule.class)
-public class VertxWebInstrumentationModule extends InstrumentationModule {
+public class VertxWebInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public VertxWebInstrumentationModule() {
     super("vertx-web", "vertx-web-3.0", "vertx");
@@ -23,4 +25,9 @@ public VertxWebInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new RouteInstrumentation(), new RoutingContextInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }