vertx-rx-java-3.5

Author: SylvainJuge

instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/AsyncResultSingleInstrumentation.java

@@ -18,6 +18,8 @@
 import io.vertx.core.Handler;
 import java.util.function.Consumer;
 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;
 
@@ -50,22 +52,22 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class ConstructorWithHandlerAdvice {
 
+    @AssignReturned.ToArguments(@ToArgument(0))
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrapHandler(
-        @Advice.Argument(value = 0, readOnly = false) Handler<Handler<AsyncResult<?>>> handler) {
-      handler =
-          AsyncResultHandlerWrapper.wrapIfNeeded(handler, Java8BytecodeBridge.currentContext());
+    public static Handler<Handler<AsyncResult<?>>> wrapHandler(
+        @Advice.Argument(0) Handler<Handler<AsyncResult<?>>> handler) {
+      return AsyncResultHandlerWrapper.wrapIfNeeded(handler, Java8BytecodeBridge.currentContext());
     }
   }
 
   @SuppressWarnings("unused")
   public static class ConstructorWithConsumerAdvice {
 
+    @AssignReturned.ToArguments(@ToArgument(0))
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void wrapHandler(
-        @Advice.Argument(value = 0, readOnly = false) Consumer<Handler<AsyncResult<?>>> handler) {
-      handler =
-          AsyncResultConsumerWrapper.wrapIfNeeded(handler, Java8BytecodeBridge.currentContext());
+    public static Consumer<Handler<AsyncResult<?>>> wrapHandler(
+        @Advice.Argument(0) Consumer<Handler<AsyncResult<?>>> handler) {
+      return AsyncResultConsumerWrapper.wrapIfNeeded(handler, Java8BytecodeBridge.currentContext());
     }
   }
 }

instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/reactive/VertxRxInstrumentationModule.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 VertxRxInstrumentationModule extends InstrumentationModule {
+public class VertxRxInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public VertxRxInstrumentationModule() {
     super("vertx-rx-java", "vertx-rx-java-3.5", "vertx");
@@ -23,4 +25,9 @@ public VertxRxInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new AsyncResultSingleInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }