feat: introduce common helper interface

Author: steverao

instrumentation/async-http-client/async-http-client-1-common/javaagent/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+  id("otel.javaagent-instrumentation")
+}
+
+dependencies {
+  compileOnly("com.ning:async-http-client:1.8.3")
+
+  compileOnly("com.google.auto.value:auto-value-annotations")
+  annotationProcessor("com.google.auto.value:auto-value")
+}

instrumentation/async-http-client/async-http-client-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_8/AsyncHandlerData.java renamed to instrumentation/async-http-client/async-http-client-1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/common/AsyncHandlerData.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_8;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.common;
 
 import com.google.auto.value.AutoValue;
 import com.ning.http.client.Request;

instrumentation/async-http-client/async-http-client-1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/common/AsyncHttpClientHelper.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.common;
+
+import com.ning.http.client.Request;
+import javax.annotation.Nullable;
+
+/**
+ * Helper interface to abstract away differences between AsyncHttpClient versions.
+ * This allows sharing common instrumentation code while handling version-specific API differences.
+ */
+public interface AsyncHttpClientHelper {
+
+  /**
+   * Get the full URL from the request.
+   * 
+   * @param request the HTTP request
+   * @return the full URL as a string, or null if it cannot be determined
+   */
+  @Nullable
+  String getUrlFull(Request request);
+
+  /**
+   * Get the server address (host) from the request.
+   * 
+   * @param request the HTTP request
+   * @return the server address
+   */
+  String getServerAddress(Request request);
+
+  /**
+   * Get the server port from the request.
+   * 
+   * @param request the HTTP request
+   * @return the server port
+   */
+  Integer getServerPort(Request request);
+
+  /**
+   * Set a header on the request.
+   * 
+   * @param request the HTTP request
+   * @param key the header name
+   * @param value the header value
+   */
+  void setHeader(Request request, String key, String value);
+}

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/AsyncHttpClientHttpAttributesGetter.java renamed to instrumentation/async-http-client/async-http-client-1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/common/AsyncHttpClientHttpAttributesGetter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.common;
 
 import static java.util.Collections.emptyList;
 
@@ -13,17 +13,23 @@
 import java.util.List;
 import javax.annotation.Nullable;
 
-final class AsyncHttpClientHttpAttributesGetter
+public final class AsyncHttpClientHttpAttributesGetter
     implements HttpClientAttributesGetter<Request, Response> {
 
+  private final AsyncHttpClientHelper helper;
+
+  public AsyncHttpClientHttpAttributesGetter(AsyncHttpClientHelper helper) {
+    this.helper = helper;
+  }
+
   @Override
   public String getHttpRequestMethod(Request request) {
     return request.getMethod();
   }
 
   @Override
   public String getUrlFull(Request request) {
-    return request.getUri().toUrl();
+    return helper.getUrlFull(request);
   }
 
   @Override
@@ -44,11 +50,11 @@ public List<String> getHttpResponseHeader(Request request, Response response, St
 
   @Override
   public String getServerAddress(Request request) {
-    return request.getUri().getHost();
+    return helper.getServerAddress(request);
   }
 
   @Override
   public Integer getServerPort(Request request) {
-    return request.getUri().getPort();
+    return helper.getServerPort(request);
   }
 }

instrumentation/async-http-client/async-http-client-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_8/HttpHeaderSetter.java renamed to instrumentation/async-http-client/async-http-client-1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/common/HttpHeaderSetter.java

@@ -3,16 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_8;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.common;
 
 import com.ning.http.client.Request;
 import io.opentelemetry.context.propagation.TextMapSetter;
 
-enum HttpHeaderSetter implements TextMapSetter<Request> {
-  INSTANCE;
+public final class HttpHeaderSetter implements TextMapSetter<Request> {
+
+  private final AsyncHttpClientHelper helper;
+
+  public HttpHeaderSetter(AsyncHttpClientHelper helper) {
+    this.helper = helper;
+  }
 
   @Override
   public void set(Request carrier, String key, String value) {
-    carrier.getHeaders().replace(key, value);
+    helper.setHeader(carrier, key, value);
   }
 }

instrumentation/async-http-client/async-http-client-1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/common/InstrumenterContextKey.java

@@ -0,0 +1,16 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.common;
+
+import io.opentelemetry.context.ContextKey;
+import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+
+public final class InstrumenterContextKey {
+  public static final ContextKey<Instrumenter<?, ?>> KEY = 
+      ContextKey.named("async-http-client-instrumenter");
+
+  private InstrumenterContextKey() {}
+}

instrumentation/async-http-client/async-http-client-1.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_9/ResponseInstrumentation.java renamed to instrumentation/async-http-client/async-http-client-1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/common/ResponseInstrumentation.java

@@ -3,19 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.common;
 
 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.Request;
 import com.ning.http.client.Response;
 import io.opentelemetry.context.Scope;
+import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+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;
@@ -53,12 +55,21 @@ public static class OnCompletedAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Response response) {
 
-      AsyncHandlerData data = ASYNC_HANDLER_DATA.get(handler);
+      VirtualField<AsyncHandler<?>, AsyncHandlerData> asyncHandlerDataField = 
+          VirtualField.find(AsyncHandler.class, AsyncHandlerData.class);
+      AsyncHandlerData data = asyncHandlerDataField.get(handler);
       if (data == null) {
         return null;
       }
-      ASYNC_HANDLER_DATA.set(handler, null);
-      instrumenter().end(data.getContext(), data.getRequest(), response, null);
+      asyncHandlerDataField.set(handler, null);
+      
+      // Get instrumenter from the data context - we'll store it there
+      @SuppressWarnings("unchecked")
+      Instrumenter<Request, Response> instrumenter = 
+          (Instrumenter<Request, Response>) data.getContext().get(InstrumenterContextKey.KEY);
+      if (instrumenter != null) {
+        instrumenter.end(data.getContext(), data.getRequest(), response, null);
+      }
       return data.getParentContext().makeCurrent();
     }
 
@@ -77,12 +88,21 @@ public static class OnThrowableAdvice {
     public static Scope onEnter(
         @Advice.This AsyncCompletionHandler<?> handler, @Advice.Argument(0) Throwable throwable) {
 
-      AsyncHandlerData data = ASYNC_HANDLER_DATA.get(handler);
+      VirtualField<AsyncHandler<?>, AsyncHandlerData> asyncHandlerDataField = 
+          VirtualField.find(AsyncHandler.class, AsyncHandlerData.class);
+      AsyncHandlerData data = asyncHandlerDataField.get(handler);
       if (data == null) {
         return null;
       }
-      ASYNC_HANDLER_DATA.set(handler, null);
-      instrumenter().end(data.getContext(), data.getRequest(), null, throwable);
+      asyncHandlerDataField.set(handler, null);
+      
+      // Get instrumenter from the data context - we'll store it there
+      @SuppressWarnings("unchecked")
+      Instrumenter<Request, Response> instrumenter = 
+          (Instrumenter<Request, Response>) data.getContext().get(InstrumenterContextKey.KEY);
+      if (instrumenter != null) {
+        instrumenter.end(data.getContext(), data.getRequest(), null, throwable);
+      }
       return data.getParentContext().makeCurrent();
     }
 

instrumentation/async-http-client/async-http-client-1.8/javaagent/build.gradle.kts

@@ -12,6 +12,8 @@ muzzle {
 }
 
 dependencies {
+  implementation(project(":instrumentation:async-http-client:async-http-client-1-common:javaagent"))
+  
   library("com.ning:async-http-client:1.8.3")
 
   compileOnly("com.google.auto.value:auto-value-annotations")

instrumentation/async-http-client/async-http-client-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v1_8/AsyncHttpClient18Helper.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_8;
+
+import com.ning.http.client.Request;
+import io.opentelemetry.javaagent.instrumentation.asynchttpclient.common.AsyncHttpClientHelper;
+import java.net.MalformedURLException;
+import javax.annotation.Nullable;
+
+final class AsyncHttpClient18Helper implements AsyncHttpClientHelper {
+
+  static final AsyncHttpClient18Helper INSTANCE = new AsyncHttpClient18Helper();
+
+  private AsyncHttpClient18Helper() {}
+
+  @Override
+  @Nullable
+  public String getUrlFull(Request request) {
+    try {
+      return request.getURI().toURL().toString();
+    } catch (MalformedURLException e) {
+      return null;
+    }
+  }
+
+  @Override
+  public String getServerAddress(Request request) {
+    return request.getOriginalURI().getHost();
+  }
+
+  @Override
+  public Integer getServerPort(Request request) {
+    return request.getOriginalURI().getPort();
+  }
+
+  @Override
+  public void setHeader(Request request, String key, String value) {
+    request.getHeaders().replace(key, value);
+  }
+}