Fix CI failings

Author: steverao

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

@@ -8,8 +8,6 @@ muzzle {
     module.set("async-http-client")
     versions.set("[1.8.0,1.9.0)")
     assertInverse.set(true)
-    extraDependency("org.glassfish.grizzly:grizzly-http:2.3")
-    extraDependency("commons-httpclient:commons-httpclient:3.1")
   }
 }
 
@@ -20,14 +18,18 @@ dependencies {
   annotationProcessor("com.google.auto.value:auto-value")
 
   testInstrumentation(project(":instrumentation:netty:netty-3.8:javaagent"))
+  testInstrumentation(project(":instrumentation:async-http-client:async-http-client-1.9:javaagent"))
+  testInstrumentation(project(":instrumentation:async-http-client:async-http-client-2.0:javaagent"))
+  
+  // For testLatestDeps, use the latest 1.8.x version to maintain API compatibility
+  latestDepTestLibrary("com.ning:async-http-client:1.8.+")
 }
 
 tasks {
   withType<Test>().configureEach {
     // required on jdk17
     jvmArgs("--add-exports=java.base/sun.security.util=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-    jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
 
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     systemProperty("async.https.skip", "true")

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

@@ -5,13 +5,15 @@
 
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_8;
 
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Arrays.asList;
 
 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;
+import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
 public class AsyncHttpClientInstrumentationModule extends InstrumentationModule
@@ -20,6 +22,12 @@ public AsyncHttpClientInstrumentationModule() {
     super("async-http-client", "async-http-client-1.8");
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // TimeoutsHolder class was added in 1.8.0, not present in 1.7.x
+    return hasClassesNamed("com.ning.http.client.providers.netty.timeout.TimeoutsHolder");
+  }
+
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new AsyncHttpProviderInstrumentation(), new ResponseInstrumentation());

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

@@ -18,6 +18,7 @@ dependencies {
   annotationProcessor("com.google.auto.value:auto-value")
 
   testInstrumentation(project(":instrumentation:netty:netty-3.8:javaagent"))
+  testInstrumentation(project(":instrumentation:async-http-client:async-http-client-1.8:javaagent"))
   testInstrumentation(project(":instrumentation:async-http-client:async-http-client-2.0:javaagent"))
 }
 

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

@@ -5,13 +5,15 @@
 
 package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Arrays.asList;
 
 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;
+import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
 public class AsyncHttpClientInstrumentationModule extends InstrumentationModule
@@ -20,6 +22,12 @@ public AsyncHttpClientInstrumentationModule() {
     super("async-http-client", "async-http-client-1.9");
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // Uri class was added in 1.9.0, not present in 1.8.x
+    return hasClassesNamed("com.ning.http.client.uri.Uri");
+  }
+
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new RequestInstrumentation(), new ResponseInstrumentation());

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

@@ -16,6 +16,7 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
+  testInstrumentation(project(":instrumentation:async-http-client:async-http-client-1.8:javaagent"))
   testInstrumentation(project(":instrumentation:async-http-client:async-http-client-1.9:javaagent"))
 }