migrate more http clients to indy-ready

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/AsyncHttpClientSingletons.java

@@ -5,22 +5,28 @@
 
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
+import com.ning.http.client.AsyncHandler;
 import com.ning.http.client.Request;
 import com.ning.http.client.Response;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
 
 public final class AsyncHttpClientSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.async-http-client-1.9";
 
   private static final Instrumenter<Request, Response> INSTRUMENTER;
 
+  public static final VirtualField<AsyncHandler<?>, AsyncHandlerData> ASYNC_HANDLER_DATA;
+
   static {
     INSTRUMENTER =
         JavaagentHttpClientInstrumenters.create(
             INSTRUMENTATION_NAME,
             new AsyncHttpClientHttpAttributesGetter(),
             HttpHeaderSetter.INSTANCE);
+
+    ASYNC_HANDLER_DATA = VirtualField.find(AsyncHandler.class, AsyncHandlerData.class);
   }
 
   public static Instrumenter<Request, Response> instrumenter() {

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

@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.ASYNC_HANDLER_DATA;
 import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -15,9 +16,9 @@
 import com.ning.http.client.Request;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 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;
@@ -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();
+      ASYNC_HANDLER_DATA.set(handler, AsyncHandlerData.create(parentContext, context, request));
+      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-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/ResponseInstrumentation.java

@@ -6,17 +6,16 @@
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.ASYNC_HANDLER_DATA;
 import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperClass;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import com.ning.http.client.AsyncCompletionHandler;
-import com.ning.http.client.AsyncHandler;
 import com.ning.http.client.Response;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
@@ -54,13 +53,11 @@ public static class OnCompletedAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Response response) {
 
-      VirtualField<AsyncHandler<?>, AsyncHandlerData> virtualField =
-          VirtualField.find(AsyncHandler.class, AsyncHandlerData.class);
-      AsyncHandlerData data = virtualField.get(handler);
+      AsyncHandlerData data = ASYNC_HANDLER_DATA.get(handler);
       if (data == null) {
         return null;
       }
-      virtualField.set(handler, null);
+      ASYNC_HANDLER_DATA.set(handler, null);
       instrumenter().end(data.getContext(), data.getRequest(), response, null);
       return data.getParentContext().makeCurrent();
     }
@@ -80,13 +77,11 @@ public static class OnThrowableAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Throwable throwable) {
 
-      VirtualField<AsyncHandler<?>, AsyncHandlerData> virtualField =
-          VirtualField.find(AsyncHandler.class, AsyncHandlerData.class);
-      AsyncHandlerData data = virtualField.get(handler);
+      AsyncHandlerData data = ASYNC_HANDLER_DATA.get(handler);
       if (data == null) {
         return null;
       }
-      virtualField.set(handler, null);
+      ASYNC_HANDLER_DATA.set(handler, null);
       instrumenter().end(data.getContext(), data.getRequest(), null, throwable);
       return data.getParentContext().makeCurrent();
     }

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

@@ -6,21 +6,20 @@
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.ASYNC_HANDLER_REQUEST_CONTEXT;
 import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperClass;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import org.asynchttpclient.AsyncCompletionHandler;
-import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.Response;
 
 public class AsyncCompletionHandlerInstrumentation implements TypeInstrumentation {
@@ -54,13 +53,11 @@ public static class OnCompletedAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Response response) {
 
-      VirtualField<AsyncHandler<?>, RequestContext> virtualField =
-          VirtualField.find(AsyncHandler.class, RequestContext.class);
-      RequestContext requestContext = virtualField.get(handler);
+      RequestContext requestContext = ASYNC_HANDLER_REQUEST_CONTEXT.get(handler);
       if (requestContext == null) {
         return null;
       }
-      virtualField.set(handler, null);
+      ASYNC_HANDLER_REQUEST_CONTEXT.set(handler, null);
       instrumenter().end(requestContext.getContext(), requestContext, response, null);
       return requestContext.getParentContext().makeCurrent();
     }
@@ -80,13 +77,11 @@ public static class OnThrowableAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Throwable throwable) {
 
-      VirtualField<AsyncHandler<?>, RequestContext> virtualField =
-          VirtualField.find(AsyncHandler.class, RequestContext.class);
-      RequestContext requestContext = virtualField.get(handler);
+      RequestContext requestContext = ASYNC_HANDLER_REQUEST_CONTEXT.get(handler);
       if (requestContext == null) {
         return null;
       }
-      virtualField.set(handler, null);
+      ASYNC_HANDLER_REQUEST_CONTEXT.set(handler, null);
       instrumenter().end(requestContext.getContext(), requestContext, null, throwable);
       return requestContext.getParentContext().makeCurrent();
     }

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

@@ -7,16 +7,17 @@
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.ASYNC_HANDLER_REQUEST_CONTEXT;
 import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 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;
@@ -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);
@@ -70,12 +70,12 @@ public static void onEnter(
       // 2.1, so the instrumentation module will need to be essentially duplicated (or a common
       // module introduced)
 
-      VirtualField.find(AsyncHandler.class, RequestContext.class).set(handler, requestContext);
-      scope = context.makeCurrent();
+      ASYNC_HANDLER_REQUEST_CONTEXT.set(handler, requestContext);
+      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/AsyncHttpClientSingletons.java

@@ -5,21 +5,30 @@
 
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 
+import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
+import org.asynchttpclient.AsyncHandler;
+import org.asynchttpclient.Request;
 import org.asynchttpclient.Response;
 
 public final class AsyncHttpClientSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.async-http-client-2.0";
 
   private static final Instrumenter<RequestContext, Response> INSTRUMENTER;
+  public static final VirtualField<AsyncHandler<?>, RequestContext> ASYNC_HANDLER_REQUEST_CONTEXT;
+  public static final VirtualField<Request, Context> REQUEST_CONTEXT;
 
   static {
     INSTRUMENTER =
         JavaagentHttpClientInstrumenters.create(
             INSTRUMENTATION_NAME,
             new AsyncHttpClientHttpAttributesGetter(),
             HttpHeaderSetter.INSTANCE);
+
+    ASYNC_HANDLER_REQUEST_CONTEXT = VirtualField.find(AsyncHandler.class, RequestContext.class);
+    REQUEST_CONTEXT = VirtualField.find(Request.class, Context.class);
   }
 
   public static Instrumenter<RequestContext, Response> instrumenter() {

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

@@ -5,21 +5,21 @@
 
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0;
 
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.ASYNC_HANDLER_REQUEST_CONTEXT;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v2_0.AsyncHttpClientSingletons.REQUEST_CONTEXT;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
-import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.Request;
 import org.asynchttpclient.netty.NettyResponseFuture;
 
@@ -59,8 +59,7 @@ public static class AttachContextAdvice {
 
     @Advice.OnMethodEnter
     public static void attachContext(@Advice.Argument(0) Request request) {
-      VirtualField.find(Request.class, Context.class)
-          .set(request, Java8BytecodeBridge.currentContext());
+      REQUEST_CONTEXT.set(request, Java8BytecodeBridge.currentContext());
     }
   }
 
@@ -70,7 +69,7 @@ public static class MountContextAdvice {
     @Advice.OnMethodEnter
     public static Scope mountContext(@Advice.Argument(0) NettyResponseFuture<?> responseFuture) {
       Request request = responseFuture.getCurrentRequest();
-      Context context = VirtualField.find(Request.class, Context.class).get(request);
+      Context context = REQUEST_CONTEXT.get(request);
       return context == null ? null : context.makeCurrent();
     }
 
@@ -88,8 +87,7 @@ public static class RememberNettyRequestAdvice {
     @Advice.OnMethodExit
     public static void rememberNettyRequest(@Advice.Return NettyResponseFuture<?> responseFuture) {
       RequestContext requestContext =
-          VirtualField.find(AsyncHandler.class, RequestContext.class)
-              .get(responseFuture.getAsyncHandler());
+          ASYNC_HANDLER_REQUEST_CONTEXT.get(responseFuture.getAsyncHandler());
       if (requestContext != null) {
         requestContext.setNettyRequest(responseFuture.getNettyRequest());
       }

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());
     }
   }
 }