fix

Author: trask

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java

@@ -52,9 +52,9 @@ public boolean isIndyReady() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // core-io 1.0.0 (java-client 2.0.0) includes CouchbaseAsyncBucket; 1.6.0 (java-client 2.6.0)
-    // adds CertAuthenticator, so exclude the newer line handled by couchbase-2.6.
+    // core-io 1.x (java-client 2.x) exposes CouchbaseAsyncBucket, removed in the 3.x line.
     return hasClassesNamed("com.couchbase.client.java.CouchbaseAsyncBucket")
-        .and(not(hasClassesNamed("com.couchbase.client.java.auth.CertAuthenticator")));
+        // core-io 2.1.0 (java-client 3.1.0) introduces TracingIdentifiers; let 3.x modules handle those.
+        .and(not(hasClassesNamed("com.couchbase.client.core.cnc.TracingIdentifiers")));
   }
 }

instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java

@@ -7,11 +7,13 @@
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Arrays.asList;
+import static net.bytebuddy.matcher.ElementMatchers.not;
 
 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.lang.reflect.Method;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
@@ -25,10 +27,11 @@ public CouchbaseInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // core-io 1.0.0 (java-client 2.0.0) exposes CouchbaseAsyncBucket and 1.6.0 (java-client 2.6.0)
-    // adds CertAuthenticator, capturing the updated authentication stack.
-    return hasClassesNamed("com.couchbase.client.java.CouchbaseAsyncBucket")
-        .and(hasClassesNamed("com.couchbase.client.java.auth.CertAuthenticator"));
+    // core-io 1.6.0 (java-client 2.6.0) introduces BucketClosedException, the lower bound here.
+    return hasClassesNamed("com.couchbase.client.core.BucketClosedException")
+    .and(classLoaderHasOperationId())
+        // core-io 2.1.0 (java-client 3.1.0) adds TracingIdentifiers, handled by the 3.x modules.
+        .and(not(hasClassesNamed("com.couchbase.client.core.cnc.TracingIdentifiers")));
   }
 
   @Override
@@ -45,4 +48,26 @@ public String getModuleGroup() {
   public boolean isIndyReady() {
     return true;
   }
+
+  private static ElementMatcher.Junction<ClassLoader> classLoaderHasOperationId() {
+    return new ElementMatcher.Junction.AbstractBase<ClassLoader>() {
+      @Override
+      public boolean matches(ClassLoader classLoader) {
+        try {
+          Class<?> requestClass =
+              classLoader.loadClass("com.couchbase.client.core.message.CouchbaseRequest");
+          for (Method method : requestClass.getMethods()) {
+            if (method.getName().equals("operationId")
+                && method.getParameterCount() == 0
+                && method.getReturnType() == String.class) {
+              return true;
+            }
+          }
+        } catch (Throwable ignored) {
+          // fall through and signal that the method is not available
+        }
+        return false;
+      }
+    };
+  }
 }

instrumentation/couchbase/couchbase-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseInstrumentationModule.java

@@ -31,7 +31,14 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // instrumenting it instead of each individual JVM artifact if this becomes unmaintainable.
     return hasClassesNamed("com.couchbase.client.core.cnc.TracingIdentifiers")
         // core-io 2.1.6 (java-client 3.1.6) adds AbstractManagerSupport, so exclude it here.
-        .and(not(hasClassesNamed("com.couchbase.client.core.manager.AbstractManagerSupport")));
+        .and(not(hasClassesNamed("com.couchbase.client.core.manager.AbstractManagerSupport")))
+        // core-io 2.2.0 (java-client 3.2.0) adds RequestSpan$StatusCode, which the 3.2 module owns.
+        .and(not(hasClassesNamed("com.couchbase.client.core.cnc.RequestSpan$StatusCode")))
+        // core-io 2.4.0 (java-client 3.4.0) adds CoreTransactionRequest, which the 3.4 module owns.
+        .and(
+            not(
+                hasClassesNamed(
+                    "com.couchbase.client.core.transaction.components.CoreTransactionRequest")));
   }
 
   @Override