make apache httpclient instrumentations indy-ready

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentation.java

@@ -18,6 +18,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;
@@ -47,32 +48,46 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class ExecuteMethodAdvice {
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.Argument(1) HttpMethod httpMethod,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      Context parentContext = currentContext();
-      if (!instrumenter().shouldStart(parentContext, httpMethod)) {
-        return;
+    public static class AdviceScope {
+      private final Context context;
+      private final Scope scope;
+      private final HttpMethod httpMethod;
+
+      private AdviceScope(Context context, Scope scope, HttpMethod httpMethod) {
+        this.context = context;
+        this.scope = scope;
+        this.httpMethod = httpMethod;
+      }
+
+      @Nullable
+      public static AdviceScope start(HttpMethod httpMethod) {
+        Context parentContext = currentContext();
+        if (!instrumenter().shouldStart(parentContext, httpMethod)) {
+          return null;
+        }
+        Context context = instrumenter().start(parentContext, httpMethod);
+        return new AdviceScope(context, context.makeCurrent(), httpMethod);
+      }
+
+      public void end(Throwable throwable) {
+        scope.close();
+        instrumenter().end(context, httpMethod, httpMethod, throwable);
       }
+    }
 
-      context = instrumenter().start(parentContext, httpMethod);
-      scope = context.makeCurrent();
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope methodEnter(@Advice.Argument(1) HttpMethod httpMethod) {
+      return AdviceScope.start(httpMethod);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void methodExit(
-        @Advice.Argument(1) HttpMethod httpMethod,
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
 
-      scope.close();
-      instrumenter().end(context, httpMethod, httpMethod, throwable);
+      if (adviceScope != null) {
+        adviceScope.end(throwable);
+      }
     }
   }
 }

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v2_0/ApacheHttpClientInstrumentationModule.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 ApacheHttpClientInstrumentationModule extends InstrumentationModule {
+public class ApacheHttpClientInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public ApacheHttpClientInstrumentationModule() {
     super("apache-httpclient", "apache-httpclient-2.0");
@@ -23,4 +25,9 @@ public ApacheHttpClientInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new ApacheHttpClientInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentation.java

@@ -20,11 +20,15 @@
 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.asm.Advice.AssignReturned;
+import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.HttpUriRequest;
 
@@ -123,171 +127,145 @@ public void transform(TypeTransformer transformer) {
         this.getClass().getName() + "$RequestWithHandlerAdvice");
   }
 
-  @SuppressWarnings("unused")
-  public static class UriRequestAdvice {
+  public static class AdviceScope {
+    private final ApacheHttpClientRequest otelRequest;
+    private final Context parentContext;
+    private final Context context;
+    private final Scope scope;
+
+    private AdviceScope(
+        ApacheHttpClientRequest otelRequest, Context parentContext, Context context, Scope scope) {
+      this.otelRequest = otelRequest;
+      this.parentContext = parentContext;
+      this.context = context;
+      this.scope = scope;
+    }
 
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.Argument(0) HttpUriRequest request,
-        @Advice.Local("otelRequest") ApacheHttpClientRequest otelRequest,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
+    @Nullable
+    public static AdviceScope start(ApacheHttpClientRequest otelRequest) {
       Context parentContext = currentContext();
+      if (!instrumenter().shouldStart(parentContext, otelRequest)) {
+        return null;
+      }
+      Context context = instrumenter().start(parentContext, otelRequest);
+      return new AdviceScope(otelRequest, parentContext, context, context.makeCurrent());
+    }
 
-      otelRequest = new ApacheHttpClientRequest(request);
+    public <T> ResponseHandler<T> wrapHandler(ResponseHandler<T> handler) {
+      return new WrappingStatusSettingResponseHandler<>(
+          context, parentContext, otelRequest, handler);
+    }
 
-      if (!instrumenter().shouldStart(parentContext, otelRequest)) {
-        return;
+    public void end(@Nullable Object result, @Nullable Throwable throwable) {
+      scope.close();
+      if (throwable != null) {
+        instrumenter().end(context, otelRequest, null, throwable);
+      } else if (result instanceof HttpResponse) {
+        instrumenter().end(context, otelRequest, (HttpResponse) result, null);
       }
+      // ended in WrappingStatusSettingResponseHandler
+    }
+  }
+
+  @SuppressWarnings("unused")
+  public static class UriRequestAdvice {
 
-      context = instrumenter().start(parentContext, otelRequest);
-      scope = context.makeCurrent();
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static AdviceScope methodEnter(@Advice.Argument(0) HttpUriRequest request) {
+      return AdviceScope.start(new ApacheHttpClientRequest(request));
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void methodExit(
         @Advice.Argument(0) HttpUriRequest request,
-        @Advice.Return Object result,
-        @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") ApacheHttpClientRequest otelRequest,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.Return @Nullable Object result,
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable AdviceScope adviceScope) {
 
-      scope.close();
-      ApacheHttpClientHelper.doMethodExit(context, otelRequest, result, throwable);
+      if (adviceScope != null) {
+        adviceScope.end(result, throwable);
+      }
     }
   }
 
   @SuppressWarnings("unused")
   public static class UriRequestWithHandlerAdvice {
 
+    @AssignReturned.ToArguments(@ToArgument(value = 1, index = 1))
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
+    public static Object[] methodEnter(
         @Advice.Argument(0) HttpUriRequest request,
-        @Advice.Argument(value = 1, readOnly = false) ResponseHandler<?> handler,
-        @Advice.Local("otelRequest") ApacheHttpClientRequest otelRequest,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      Context parentContext = currentContext();
-
-      otelRequest = new ApacheHttpClientRequest(request);
-
-      if (!instrumenter().shouldStart(parentContext, otelRequest)) {
-        return;
-      }
-
-      context = instrumenter().start(parentContext, otelRequest);
-      scope = context.makeCurrent();
+        @Advice.Argument(1) ResponseHandler<?> handler) {
 
+      AdviceScope adviceScope = AdviceScope.start(new ApacheHttpClientRequest(request));
       // Wrap the handler so we capture the status code
-      if (handler != null) {
-        handler =
-            new WrappingStatusSettingResponseHandler<>(
-                context, parentContext, otelRequest, handler);
-      }
+      return new Object[] {
+        adviceScope, adviceScope == null ? handler : adviceScope.wrapHandler(handler)
+      };
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void methodExit(
-        @Advice.Argument(0) HttpUriRequest request,
         @Advice.Return Object result,
         @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") ApacheHttpClientRequest otelRequest,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.Enter Object[] enterResult) {
 
-      scope.close();
-      ApacheHttpClientHelper.doMethodExit(context, otelRequest, result, throwable);
+      AdviceScope adviceScope = (AdviceScope) enterResult[0];
+      if (adviceScope != null) {
+        adviceScope.end(result, throwable);
+      }
     }
   }
 
   @SuppressWarnings("unused")
   public static class RequestAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
-        @Advice.Argument(0) HttpHost host,
-        @Advice.Argument(1) HttpRequest request,
-        @Advice.Local("otelRequest") ApacheHttpClientRequest otelRequest,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      Context parentContext = currentContext();
-
-      otelRequest = new ApacheHttpClientRequest(host, request);
-
-      if (!instrumenter().shouldStart(parentContext, otelRequest)) {
-        return;
-      }
-
-      context = instrumenter().start(parentContext, otelRequest);
-      scope = context.makeCurrent();
+    public static AdviceScope methodEnter(
+        @Advice.Argument(0) HttpHost host, @Advice.Argument(1) HttpRequest request) {
+      return AdviceScope.start(new ApacheHttpClientRequest(host, request));
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void methodExit(
         @Advice.Return Object result,
         @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") ApacheHttpClientRequest otelRequest,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.Enter AdviceScope adviceScope) {
 
-      scope.close();
-      ApacheHttpClientHelper.doMethodExit(context, otelRequest, result, throwable);
+      if (adviceScope != null) {
+        adviceScope.end(result, throwable);
+      }
     }
   }
 
   @SuppressWarnings("unused")
   public static class RequestWithHandlerAdvice {
 
+    @AssignReturned.ToArguments(@ToArgument(value = 2, index = 1))
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void methodEnter(
+    public static Object[] methodEnter(
         @Advice.Argument(0) HttpHost host,
         @Advice.Argument(1) HttpRequest request,
-        @Advice.Argument(value = 2, readOnly = false) ResponseHandler<?> handler,
-        @Advice.Local("otelRequest") ApacheHttpClientRequest otelRequest,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      Context parentContext = currentContext();
-
-      otelRequest = new ApacheHttpClientRequest(host, request);
-
-      if (!instrumenter().shouldStart(parentContext, otelRequest)) {
-        return;
-      }
-
-      context = instrumenter().start(parentContext, otelRequest);
-      scope = context.makeCurrent();
-
-      // Wrap the handler so we capture the status code
-      if (handler != null) {
-        handler =
-            new WrappingStatusSettingResponseHandler<>(
-                context, parentContext, otelRequest, handler);
-      }
+        @Advice.Argument(2) ResponseHandler<?> handler) {
+
+      AdviceScope adviceScope = AdviceScope.start(new ApacheHttpClientRequest(host, request));
+      return new Object[] {
+        adviceScope,
+        // Wrap the handler so we capture the status code
+        adviceScope == null ? handler : adviceScope.wrapHandler(handler)
+      };
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void methodExit(
         @Advice.Return Object result,
         @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") ApacheHttpClientRequest otelRequest,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-      if (scope == null) {
-        return;
-      }
+        @Advice.Enter Object[] enterResult) {
 
-      scope.close();
-      ApacheHttpClientHelper.doMethodExit(context, otelRequest, result, throwable);
+      AdviceScope adviceScope = (AdviceScope) enterResult[0];
+      if (adviceScope != null) {
+        adviceScope.end(result, throwable);
+      }
     }
   }
 }