make async-http-client indy ready

Author: SylvainJuge

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientInstrumentationModule.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 AsyncHttpClientInstrumentationModule extends InstrumentationModule {
+public class AsyncHttpClientInstrumentationModule extends InstrumentationModule implements
+    ExperimentalInstrumentationModule {
   public AsyncHttpClientInstrumentationModule() {
     super("async-http-client", "async-http-client-1.9");
   }
@@ -22,4 +24,9 @@ public AsyncHttpClientInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new RequestInstrumentation(), new ResponseInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/RequestInstrumentation.java

@@ -21,6 +21,7 @@
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
+import javax.annotation.Nullable;
 
 public class RequestInstrumentation implements TypeInstrumentation {
 
@@ -42,24 +43,22 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class ExecuteAdvice {
 
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) Request request,
-        @Advice.Argument(1) AsyncHandler<?> handler,
-        @Advice.Local("otelScope") Scope scope) {
+    public static Scope onEnter(@Advice.Argument(0) Request request, @Advice.Argument(1) AsyncHandler<?> handler) {
       Context parentContext = currentContext();
       if (!instrumenter().shouldStart(parentContext, request)) {
-        return;
+        return null;
       }
 
       Context context = instrumenter().start(parentContext, request);
       VirtualField.find(AsyncHandler.class, AsyncHandlerData.class)
           .set(handler, AsyncHandlerData.create(parentContext, context, request));
-      scope = context.makeCurrent();
+      return context.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(@Advice.Local("otelScope") Scope scope) {
+    public static void onExit(@Advice.Enter @Nullable Scope scope) {
       if (scope != null) {
         scope.close();
       }

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientInstrumentation.java

@@ -22,6 +22,7 @@
 import net.bytebuddy.matcher.ElementMatcher;
 import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.Request;
+import javax.annotation.Nullable;
 
 public class AsyncHttpClientInstrumentation implements TypeInstrumentation {
 
@@ -43,15 +44,14 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class ExecuteRequestAdvice {
 
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) Request request,
-        @Advice.Argument(1) AsyncHandler<?> handler,
-        @Advice.Local("otelScope") Scope scope) {
+    public static Scope onEnter(@Advice.Argument(0) Request request, @Advice.Argument(1) AsyncHandler<?> handler) {
+
       Context parentContext = currentContext();
       RequestContext requestContext = new RequestContext(parentContext, request);
       if (!instrumenter().shouldStart(parentContext, requestContext)) {
-        return;
+        return null;
       }
 
       Context context = instrumenter().start(parentContext, requestContext);
@@ -71,11 +71,11 @@ public static void onEnter(
       // module introduced)
 
       VirtualField.find(AsyncHandler.class, RequestContext.class).set(handler, requestContext);
-      scope = context.makeCurrent();
+      return context.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void onExit(@Advice.Local("otelScope") Scope scope) {
+    public static void onExit(@Advice.Enter @Nullable Scope scope) {
       if (scope != null) {
         scope.close();
       }

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientInstrumentationModule.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 AsyncHttpClientInstrumentationModule extends InstrumentationModule {
+public class AsyncHttpClientInstrumentationModule extends InstrumentationModule implements
+    ExperimentalInstrumentationModule {
   public AsyncHttpClientInstrumentationModule() {
     super("async-http-client", "async-http-client-2.0");
   }
@@ -26,4 +28,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
         new NettyRequestSenderInstrumentation(),
         new NettyResponseFutureInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/NettyResponseFutureInstrumentation.java

@@ -14,6 +14,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.util.concurrent.CompletableFuture;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -34,9 +35,10 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class WrapFutureAdvice {
 
+    @AssignReturned.ToReturned
     @Advice.OnMethodExit(suppress = Throwable.class)
-    public static void onExit(@Advice.Return(readOnly = false) CompletableFuture<?> result) {
-      result = CompletableFutureWrapper.wrap(result, Java8BytecodeBridge.currentContext());
+    public static CompletableFuture<?> onExit(@Advice.Return CompletableFuture<?> result) {
+      return CompletableFutureWrapper.wrap(result, Java8BytecodeBridge.currentContext());
     }
   }
 }