Add all otel api bridging instrumentations to testing agent (#13423)

laurit · web-flow · commit 13233958eca7 · 2025-02-28T19:10:26.000+02:00
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/build.gradle.kts
@@ -50,4 +50,7 @@ configurations.configureEach {
       force("io.opentelemetry:opentelemetry-api:1.4.0")
     }
   }
+  if (name == "testRuntimeClasspath") {
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/build.gradle.kts
@@ -14,4 +14,7 @@ configurations.configureEach {
       force("io.opentelemetry:opentelemetry-api:1.10.0")
     }
   }
+  if (name == "testRuntimeClasspath") {
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/OpenTelemetryApiInstrumentationModule.java
@@ -5,13 +5,15 @@
 
 package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10;
 
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Collections.singletonList;
 
 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 OpenTelemetryApiInstrumentationModule extends InstrumentationModule
@@ -26,6 +28,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new OpenTelemetryInstrumentation());
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    return hasClassesNamed("application.io.opentelemetry.api.metrics.LongGaugeBuilder");
+  }
+
   @Override
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/build.gradle.kts
@@ -15,4 +15,7 @@ configurations.configureEach {
       force("io.opentelemetry:opentelemetry-api:1.15.0")
     }
   }
+  if (name == "testRuntimeClasspath") {
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/OpenTelemetryApiInstrumentationModule.java
@@ -5,13 +5,15 @@
 
 package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_15;
 
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Collections.singletonList;
 
 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 OpenTelemetryApiInstrumentationModule extends InstrumentationModule
@@ -25,6 +27,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new OpenTelemetryInstrumentation());
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    return hasClassesNamed("application.io.opentelemetry.api.metrics.BatchCallback");
+  }
+
   @Override
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/build.gradle.kts
@@ -18,4 +18,7 @@ configurations.configureEach {
       force("io.opentelemetry:opentelemetry-sdk-testing:1.27.0")
     }
   }
+  if (name == "testRuntimeClasspath") {
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.27/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_27/OpenTelemetryApiInstrumentationModule.java
@@ -5,13 +5,15 @@
 
 package io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_27;
 
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Collections.singletonList;
 
 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 OpenTelemetryApiInstrumentationModule extends InstrumentationModule
@@ -25,6 +27,11 @@ public List<TypeInstrumentation> typeInstrumentations() {
     return singletonList(new OpenTelemetryInstrumentation());
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    return hasClassesNamed("application.io.opentelemetry.api.logs.LoggerBuilder");
+  }
+
   @Override
   public String getModuleGroup() {
     return "opentelemetry-api-bridge";
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.31/javaagent/build.gradle.kts
@@ -7,10 +7,8 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
 
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
 
   testImplementation("io.opentelemetry:opentelemetry-extension-incubator:1.31.0-alpha")
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/build.gradle.kts
@@ -7,10 +7,8 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
 
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
 }
 
@@ -21,9 +19,9 @@ configurations.configureEach {
     resolutionStrategy {
       force("io.opentelemetry:opentelemetry-api:1.32.0")
     }
-    if (name.equals("testRuntimeClasspath")) {
-      exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
-    }
+  }
+  if (name == "testRuntimeClasspath") {
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
   }
 }
 
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.32/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_32/OpenTelemetryApiInstrumentationModule.java
@@ -27,9 +27,11 @@ public OpenTelemetryApiInstrumentationModule() {
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // skip instrumentation when opentelemetry-extension-incubator is present, instrumentation is
     // handled by OpenTelemetryApiIncubatorInstrumentationModule
-    return not(
-        hasClassesNamed(
-            "application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder"));
+    return hasClassesNamed("application.io.opentelemetry.api.logs.LoggerBuilder")
+        .and(
+            not(
+                hasClassesNamed(
+                    "application.io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder")));
   }
 
   @Override
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.37/javaagent/build.gradle.kts
@@ -7,12 +7,8 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
 
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
 }
 
 configurations.configureEach {
@@ -27,9 +23,9 @@ configurations.configureEach {
         force("io.opentelemetry:opentelemetry-extension-incubator:1.32.0-alpha")
       }
     }
-    if (name.equals("testRuntimeClasspath")) {
-      exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
-    }
+  }
+  if (name == "testRuntimeClasspath") {
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
   }
 }
 
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/build.gradle.kts
@@ -10,7 +10,6 @@ dependencies {
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
@@ -22,9 +21,9 @@ configurations.configureEach {
       force("io.opentelemetry:opentelemetry-api:1.38.0")
       force("io.opentelemetry:opentelemetry-api-incubator:1.38.0-alpha")
     }
-    if (name.equals("testRuntimeClasspath")) {
-      exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
-    }
+  }
+  if (name == "testRuntimeClasspath") {
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
   }
 }
 
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/OpenTelemetryApiInstrumentationModule.java
@@ -27,9 +27,11 @@ public OpenTelemetryApiInstrumentationModule() {
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // skip instrumentation when opentelemetry-api-incubator is present, instrumentation is
     // handled by OpenTelemetryApiIncubatorInstrumentationModule
-    return not(
-        hasClassesNamed(
-            "application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder"));
+    return hasClassesNamed("application.io.opentelemetry.api.metrics.LongGauge")
+        .and(
+            not(
+                hasClassesNamed(
+                    "application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder")));
   }
 
   @Override
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.38/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_38/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java
@@ -27,6 +27,7 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // skip instrumentation when opentelemetry-api-incubator is not present, instrumentation
     // is handled by OpenTelemetryApiInstrumentationModule
     return hasClassesNamed(
+        "application.io.opentelemetry.api.metrics.LongGauge",
         "application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder");
   }
 
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.4/javaagent/build.gradle.kts
@@ -13,4 +13,7 @@ configurations.configureEach {
       force("io.opentelemetry:opentelemetry-api:1.4.0")
     }
   }
+  if (name == "testRuntimeClasspath") {
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
+  }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.40/javaagent/build.gradle.kts
@@ -7,12 +7,9 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
 
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))
 
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/build.gradle.kts
@@ -7,14 +7,7 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
 
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.40:javaagent"))
 }
 
@@ -24,9 +17,9 @@ configurations.configureEach {
       force("io.opentelemetry:opentelemetry-api:1.42.0")
       force("io.opentelemetry:opentelemetry-api-incubator:1.42.0-alpha")
     }
-    if (name.equals("testRuntimeClasspath")) {
-      exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
-    }
+  }
+  if (name == "testRuntimeClasspath") {
+    exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")
   }
 }
 
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/OpenTelemetryApiInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/OpenTelemetryApiInstrumentationModule.java
@@ -25,7 +25,9 @@ public OpenTelemetryApiInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return not(hasClassesNamed("application.io.opentelemetry.api.incubator.logs.ExtendedLogger"));
+    return hasClassesNamed("application.io.opentelemetry.api.common.Value")
+        .and(
+            not(hasClassesNamed("application.io.opentelemetry.api.incubator.logs.ExtendedLogger")));
   }
 
   @Override
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.42/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_42/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java
@@ -27,6 +27,7 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // EventLogger was removed in 1.47, including it here prevents the instrumentation from applying
     // to 1.47
     return hasClassesNamed(
+        "application.io.opentelemetry.api.common.Value",
         "application.io.opentelemetry.api.incubator.logs.ExtendedLogger",
         "application.io.opentelemetry.api.incubator.events.EventLogger");
   }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/build.gradle.kts b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/build.gradle.kts
@@ -7,14 +7,7 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
 
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
-  implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.40:javaagent"))
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.42:javaagent"))
 
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.47/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_47/incubator/OpenTelemetryApiIncubatorInstrumentationModule.java
@@ -24,7 +24,9 @@ public OpenTelemetryApiIncubatorInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassesNamed("application.io.opentelemetry.api.incubator.logs.ExtendedLogger");
+    return hasClassesNamed(
+        "application.io.opentelemetry.api.common.Value",
+        "application.io.opentelemetry.api.incubator.logs.ExtendedLogger");
   }
 
   @Override
diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts
@@ -76,6 +76,16 @@ dependencies {
   baseJavaagentLibs(project(":muzzle"))
   baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
   baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.40:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.42:javaagent"))
+  baseJavaagentLibs(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.47:javaagent"))
   baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-api:javaagent"))
   baseJavaagentLibs(project(":instrumentation:opentelemetry-instrumentation-annotations-1.16:javaagent"))
   baseJavaagentLibs(project(":instrumentation:executors:javaagent"))

Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,7 @@ configurations.configureEach {`
`50`	`50`	`force("io.opentelemetry:opentelemetry-api:1.4.0")`
`51`	`51`	`}`
`52`	`52`	`}`
	`53`	`+ if (name == "testRuntimeClasspath") {`
	`54`	`+ exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
	`55`	`+ }`
`53`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,7 @@ configurations.configureEach {`
`14`	`14`	`force("io.opentelemetry:opentelemetry-api:1.10.0")`
`15`	`15`	`}`
`16`	`16`	`}`
	`17`	`+ if (name == "testRuntimeClasspath") {`
	`18`	`+ exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
	`19`	`+ }`
`17`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,7 @@ configurations.configureEach {`
`15`	`15`	`force("io.opentelemetry:opentelemetry-api:1.15.0")`
`16`	`16`	`}`
`17`	`17`	`}`
	`18`	`+ if (name == "testRuntimeClasspath") {`
	`19`	`+ exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
	`20`	`+ }`
`18`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,7 @@ configurations.configureEach {`
`18`	`18`	`force("io.opentelemetry:opentelemetry-sdk-testing:1.27.0")`
`19`	`19`	`}`
`20`	`20`	`}`
	`21`	`+ if (name == "testRuntimeClasspath") {`
	`22`	`+ exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
	`23`	`+ }`
`21`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,8 @@ dependencies {`
`7`	`7`	`compileOnly("io.opentelemetry:opentelemetry-api-incubator")`
`8`	`8`
`9`	`9`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))`
`10`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))`
`11`	`10`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))`
`12`	`11`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))`
`13`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))`
`14`	`12`
`15`	`13`	`testImplementation("io.opentelemetry:opentelemetry-extension-incubator:1.31.0-alpha")`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,8 @@ dependencies {`
`7`	`7`	`compileOnly("io.opentelemetry:opentelemetry-api-incubator")`
`8`	`8`
`9`	`9`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))`
`10`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))`
`11`	`10`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))`
`12`	`11`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))`
`13`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))`
`14`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))`
`15`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))`
`16`	`12`	`}`
`17`	`13`
`18`	`14`	`configurations.configureEach {`
`@@ -27,9 +23,9 @@ configurations.configureEach {`
`27`	`23`	`force("io.opentelemetry:opentelemetry-extension-incubator:1.32.0-alpha")`
`28`	`24`	`}`
`29`	`25`	`}`
`30`		`- if (name.equals("testRuntimeClasspath")) {`
`31`		`- exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
`32`		`- }`
	`26`	`+ }`
	`27`	`+ if (name == "testRuntimeClasspath") {`
	`28`	`+ exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
`33`	`29`	`}`
`34`	`30`	`}`
`35`	`31`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ dependencies {`
`10`	`10`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))`
`11`	`11`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))`
`12`	`12`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))`
`13`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))`
`14`	`13`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))`
`15`	`14`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))`
`16`	`15`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))`
`@@ -22,9 +21,9 @@ configurations.configureEach {`
`22`	`21`	`force("io.opentelemetry:opentelemetry-api:1.38.0")`
`23`	`22`	`force("io.opentelemetry:opentelemetry-api-incubator:1.38.0-alpha")`
`24`	`23`	`}`
`25`		`- if (name.equals("testRuntimeClasspath")) {`
`26`		`- exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
`27`		`- }`
	`24`	`+ }`
	`25`	`+ if (name == "testRuntimeClasspath") {`
	`26`	`+ exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {`
`27`	`27`	`// skip instrumentation when opentelemetry-api-incubator is not present, instrumentation`
`28`	`28`	`// is handled by OpenTelemetryApiInstrumentationModule`
`29`	`29`	`return hasClassesNamed(`
	`30`	`+ "application.io.opentelemetry.api.metrics.LongGauge",`
`30`	`31`	`"application.io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder");`
`31`	`32`	`}`
`32`	`33`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,7 @@ configurations.configureEach {`
`13`	`13`	`force("io.opentelemetry:opentelemetry-api:1.4.0")`
`14`	`14`	`}`
`15`	`15`	`}`
	`16`	`+ if (name == "testRuntimeClasspath") {`
	`17`	`+ exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
	`18`	`+ }`
`16`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,7 @@ dependencies {`
`7`	`7`	`compileOnly("io.opentelemetry:opentelemetry-api-incubator")`
`8`	`8`
`9`	`9`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))`
`10`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent"))`
`11`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.10:javaagent"))`
`12`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.15:javaagent"))`
`13`	`10`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.27:javaagent"))`
`14`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.31:javaagent"))`
`15`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.32:javaagent"))`
`16`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.37:javaagent"))`
`17`		`- implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.38:javaagent"))`
`18`	`11`	`implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.40:javaagent"))`
`19`	`12`	`}`
`20`	`13`
`@@ -24,9 +17,9 @@ configurations.configureEach {`
`24`	`17`	`force("io.opentelemetry:opentelemetry-api:1.42.0")`
`25`	`18`	`force("io.opentelemetry:opentelemetry-api-incubator:1.42.0-alpha")`
`26`	`19`	`}`
`27`		`- if (name.equals("testRuntimeClasspath")) {`
`28`		`- exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
`29`		`- }`
	`20`	`+ }`
	`21`	`+ if (name == "testRuntimeClasspath") {`
	`22`	`+ exclude(group = "io.opentelemetry", module = "opentelemetry-api-incubator")`
`30`	`23`	`}`
`31`	`24`	`}`
`32`	`25`