Merge branch 'main' into copilot/fix-79effdad-6d82-4980-ad08-443e4438f725

jaydeluca · web-flow · commit 0e2e6ddeb292 · 2025-10-22T05:44:43.000-04:00
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -46,56 +46,58 @@
     {
       groupName: 'quarkus packages',
       matchPackageNames: [
-        'io.quarkus{/,}**',
+        'io.quarkus:**',
       ],
     },
     {
       groupName: 'gradle develocity packages',
       matchPackageNames: [
-        'com.gradle.develocity{/,}**',
+        'com.gradle.develocity:**',
       ],
     },
     {
       groupName: 'armeria packages',
       matchPackageNames: [
-        'com.linecorp.armeria:{/,}**',
+        'com.linecorp.armeria:**',
       ],
     },
     {
       groupName: 'spotless packages',
       matchPackageNames: [
-        'com.diffplug.spotless{/,}**',
+        'com.diffplug.spotless',
+        'com.diffplug.spotless:**',
       ],
     },
     {
       groupName: 'byte buddy packages',
       matchPackageNames: [
-        'net.bytebuddy:{/,}**',
+        'net.bytebuddy:**',
       ],
     },
     {
       groupName: 'gradle shadow packages',
       matchPackageNames: [
-        'com.gradleup.shadow{/,}**',
+        'com.gradleup.shadow:**',
       ],
     },
     {
       groupName: 'guava packages',
       matchPackageNames: [
-        'com.google.guava{/,}**',
+        'com.google.guava:**',
       ],
     },
     {
       groupName: 'jackson packages',
       matchPackageNames: [
-        'com.fasterxml.jackson{/,}**',
+        'com.fasterxml.jackson:**',
+        'com.fasterxml.jackson.core:**',
       ],
     },
     {
       // prevent update to 2.4-groovy-4.0-SNAPSHOT
       allowedVersions: '!/\\-SNAPSHOT$/',
       matchPackageNames: [
-        'org.spockframework:{/,}**',
+        'org.spockframework:**',
       ],
     },
     {
@@ -109,7 +111,7 @@
       // OpenTelemetry SDK updates are handled by auto-update-otel-sdk.yml
       enabled: false,
       matchPackageNames: [
-        'io.opentelemetry:{/,}**',
+        'io.opentelemetry:**',
       ],
     },
     {
@@ -140,7 +142,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.mockito:{/,}**',
+        'org.mockito:**',
       ],
     },
     {
@@ -212,7 +214,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'ch.qos.logback:{/,}**',
+        'ch.qos.logback:**',
       ],
     },
     {
@@ -225,7 +227,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.slf4j:{/,}**',
+        'org.slf4j:**',
       ],
     },
     {
@@ -239,8 +241,8 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'com.google.inject:{/,}**',
-        'com.google.inject.extensions:{/,}**',
+        'com.google.inject:**',
+        'com.google.inject.extensions:**',
       ],
     },
     {
@@ -316,7 +318,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'ch.qos.logback:{/,}**',
+        'ch.qos.logback:**',
       ],
     },
     {
@@ -329,7 +331,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.springframework.boot:spring-boot-dependencies{/,}**',
+        'org.springframework.boot:spring-boot-dependencies:**',
       ],
     },
     {
@@ -342,7 +344,7 @@
       ],
       enabled: false,
       matchPackageNames: [
-        'org.eclipse.jetty:{/,}**',
+        'org.eclipse.jetty:**',
       ],
     },
   ],
diff --git a/.github/repository-settings.md b/.github/repository-settings.md
@@ -10,10 +10,6 @@ private admin repo.
 
 - `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
 - `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
-- `DEVELOCITY_ACCESS_KEY` - owned by [@trask](https://github.com/trask)
-  - Generated at https://develocity.opentelemetry.io > My settings > Access keys
-  - Format of env var is `develocity.opentelemetry.io=<access key>`,
-    see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)
 - `GRADLE_PUBLISH_KEY`
 - `GRADLE_PUBLISH_SECRET`
 - `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password
@@ -25,6 +21,7 @@ private admin repo.
 
 ### Organization secrets
 
+- `DEVELOCITY_ACCESS_KEY`
 - `FOSSA_API_KEY`
 - `OTELBOT_PRIVATE_KEY`
 - `OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY`
diff --git a/.github/workflows/auto-spotless.yml b/.github/workflows/auto-spotless.yml
@@ -14,6 +14,7 @@ permissions:
 
 jobs:
   check:
+    if: ${{ github.event.pull_request.draft == false }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
 
   testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
 
-  // TODO testInstrumentation(project(":instrumentation:couchbase:couchbase-2.6:javaagent"))
+  testInstrumentation(project(":instrumentation:couchbase:couchbase-2.6:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1.6:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.2:javaagent"))
diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;
 
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 
@@ -13,6 +14,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 CouchbaseInstrumentationModule extends InstrumentationModule
@@ -46,4 +48,10 @@ public List<String> injectedClassNames() {
   public boolean isIndyReady() {
     return true;
   }
+
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // removed in 3.x
+    return hasClassesNamed("com.couchbase.client.java.CouchbaseAsyncBucket");
+  }
 }
diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseInstrumentationModule.java
@@ -5,13 +5,15 @@
 
 package io.opentelemetry.javaagent.instrumentation.couchbase.v2_6;
 
+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 CouchbaseInstrumentationModule extends InstrumentationModule
@@ -21,6 +23,12 @@ public CouchbaseInstrumentationModule() {
     super("couchbase", "couchbase-2.6");
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // introduced in java-client 2.6, removed in 3.x
+    return hasClassesNamed("com.couchbase.client.java.auth.CertAuthenticator");
+  }
+
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new CouchbaseCoreInstrumentation(), new CouchbaseNetworkInstrumentation());
diff --git a/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-2.6:javaagent"))
-  // TODO testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1:javaagent"))
+  testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.2:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.4:javaagent"))
   testImplementation("org.testcontainers:testcontainers-couchbase")
diff --git a/instrumentation/couchbase/couchbase-3.1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1_6/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-3.1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1_6/CouchbaseInstrumentationModule.java
@@ -25,11 +25,9 @@ public CouchbaseInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // New class introduced in 3.1, the minimum version we support.
-    // NB: Couchbase does not provide any API guarantees on their core IO artifact so reconsider
-    // instrumenting it instead of each individual JVM artifact if this becomes unmaintainable.
-    return hasClassesNamed("com.couchbase.client.core.cnc.TracingIdentifiers")
-        // added in 3.2
+    // introduced in java-client 3.1.6 (core-io 2.1.6)
+    return hasClassesNamed("com.couchbase.client.core.endpoint.EventingEndpoint")
+        // introduced in java-client 3.2.0 (core-io 2.2.0)
         .and(not(hasClassesNamed("com.couchbase.client.core.cnc.RequestSpan$StatusCode")));
   }
 
diff --git a/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts
@@ -36,7 +36,7 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-2.6:javaagent"))
-  // TODO testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1.6:javaagent"))
+  testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1.6:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.2:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.4:javaagent"))
   testImplementation("org.testcontainers:testcontainers-couchbase")
diff --git a/instrumentation/couchbase/couchbase-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseInstrumentationModule.java
@@ -25,12 +25,10 @@ public CouchbaseInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // New class introduced in 3.1, the minimum version we support.
-    // NB: Couchbase does not provide any API guarantees on their core IO artifact so reconsider
-    // instrumenting it instead of each individual JVM artifact if this becomes unmaintainable.
+    // introduced in java-client 3.1.0 (core-io 2.1.0)
     return hasClassesNamed("com.couchbase.client.core.cnc.TracingIdentifiers")
-        // added in 3.2
-        .and(not(hasClassesNamed("com.couchbase.client.core.cnc.RequestSpan$StatusCode")));
+        // introduced in java-client 3.1.6 (core-io 2.1.6)
+        .and(not(hasClassesNamed("com.couchbase.client.core.endpoint.EventingEndpoint")));
   }
 
   @Override
diff --git a/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-2.6:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1:javaagent"))
-  // TODO testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1.6:javaagent"))
+  testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1.6:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.4:javaagent"))
 
   latestDepTestLibrary("com.couchbase.client:java-client:3.3.+") // see couchbase-3.4 module
diff --git a/instrumentation/couchbase/couchbase-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_2/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_2/CouchbaseInstrumentationModule.java
@@ -25,9 +25,9 @@ public CouchbaseInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // New class introduced in 3.2.
-    // CoreTransactionRequest was introduced in 3.4.0.
+    // introduced in java-client 3.2.0 (core-io 2.2.0)
     return hasClassesNamed("com.couchbase.client.core.cnc.RequestSpan$StatusCode")
+        // introduced in java-client 3.4.0 (core-io 2.4.0)
         .and(
             not(
                 hasClassesNamed(
diff --git a/instrumentation/couchbase/couchbase-3.4/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-3.4/javaagent/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-2.6:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1:javaagent"))
-  // TODO testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1.6:javaagent"))
+  testInstrumentation(project(":instrumentation:couchbase:couchbase-3.1.6:javaagent"))
   testInstrumentation(project(":instrumentation:couchbase:couchbase-3.2:javaagent"))
 }
 
diff --git a/instrumentation/couchbase/couchbase-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_4/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_4/CouchbaseInstrumentationModule.java
@@ -24,7 +24,7 @@ public CouchbaseInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // CoreTransactionRequest was introduced in 3.4.0 with integrated transactions support.
+    // introduced in java-client 3.4.0 (core-io 2.4.0)
     return hasClassesNamed(
         "com.couchbase.client.core.transaction.components.CoreTransactionRequest");
   }
diff --git a/instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletInstrumentationModule.java b/instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/RestletInstrumentationModule.java
@@ -8,11 +8,13 @@
 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.Arrays;
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class RestletInstrumentationModule extends InstrumentationModule {
+public class RestletInstrumentationModule extends InstrumentationModule
+    implements ExperimentalInstrumentationModule {
 
   public RestletInstrumentationModule() {
     super("restlet", "restlet-1.1");
@@ -22,4 +24,9 @@ public RestletInstrumentationModule() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return Arrays.asList(new ServerInstrumentation(), new RouteInstrumentation());
   }
+
+  @Override
+  public boolean isIndyReady() {
+    return true;
+  }
 }
diff --git a/instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/ServerInstrumentation.java b/instrumentation/restlet/restlet-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_1/ServerInstrumentation.java
diff --git a/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RestletInstrumentationModule.java b/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RestletInstrumentationModule.java
diff --git a/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/ServerInstrumentation.java b/instrumentation/restlet/restlet-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/ServerInstrumentation.java
