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
index 332b6a67f871..a7a4c7f680f8 100644
--- 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
index fd028894c92f..d4ddba4fb5e2 100644
--- 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
index 81506ec514d8..256f5527abb9 100644
--- 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,6 +5,7 @@
 
 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;
@@ -12,6 +13,7 @@
 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
index 4b91c4e5f5da..ada84555373a 100644
--- 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
index 8793787e71b6..649e8df960e5 100644
--- 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,6 +5,7 @@
 
 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;
@@ -12,6 +13,7 @@
 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
index 311de19e02c5..65506e58dede 100644
--- 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
index aed58d617504..53c3a80b8f82 100644
--- 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,6 +5,7 @@
 
 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;
@@ -12,6 +13,7 @@
 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
index 18e2d27be404..5a99a9c1b60f 100644
--- 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
index dd613e266cb5..b952f068fc4e 100644
--- 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
index 49e8dbd8eed1..92bd112db90c 100644
--- 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
index 0c03f9956b48..3e392a8e4ef4 100644
--- 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
index 468343ef6a1b..90f156dde253 100644
--- 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
index fc0d9573a9cf..7385e5677dfe 100644
--- 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
index a70e8fffbd08..752ac424f66d 100644
--- 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
index 5861e77b22de..66bd612eb1f9 100644
--- 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
index 5bde283fe943..a108043df81d 100644
--- 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
index fe3925e57cc0..82bf9687e884 100644
--- 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
index 3b99eedb53c4..d0e3cd0fb473 100644
--- 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
index 9a44be9ad885..65b1a125dbb9 100644
--- 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
index 3662f4ec8485..103a2ce08f2e 100644
--- 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
index 63fb66886b28..3c5074403927 100644
--- 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
index 6744382b7c25..11637af5e7ff 100644
--- 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"))