Merge remote-tracking branch 'upstream/main' into semconv-static-import

Author: trask

.github/scripts/markdown-link-check-config.json

@@ -12,15 +12,14 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Install markdown-link-check
-        # https://github.com/tcort/markdown-link-check/issues/297
-        run: npm install -g [email protected]
-
-      - name: Run markdown-link-check
-        run: |
-          find . -type f \
-                 -name '*.md' \
-                 -not -path './CHANGELOG.md' \
-                 -not -path './licenses/*' \
-                 -not -path '*/build/*' \
-               | xargs .github/scripts/markdown-link-check-with-retry.sh
+      - uses: lycheeverse/lychee-action@v2
+        with:
+          # remove version after next release of lychee-action
+          lycheeVersion: latest
+          # excluding links to pull requests and issues is done for performance
+          args: >
+            --include-fragments
+            --exclude "^https://github.com/open-telemetry/opentelemetry-java-instrumentation/(issue|pull)/\\d+$"
+            --exclude "^http://code.google.com/p/concurrentlinkedhashmap$"
+            --max-retries 6
+            .

.github/scripts/markdown-link-check-with-retry.sh

@@ -761,7 +761,7 @@ too disruptive to adopt right away.
   or `-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true`.
 - ⚠️⚠️ Stable HTTP semantic conventions are now emitted ⚠️⚠️
   - TOO MANY CHANGES TO LIST HERE, be sure to review the full
-    [list of changes](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/http/migration-guide.md#summary-of-changes).
+    [list of changes](https://github.com/open-telemetry/semantic-conventions/blob/main/docs/non-normative/http-migration.md#summary-of-changes).
 - Stable JVM semantic conventions are now emitted.
   - Memory metrics
     - `process.runtime.jvm.memory.usage` renamed to `jvm.memory.used`

.github/workflows/reusable-markdown-link-check.yml

@@ -46,7 +46,7 @@ val asmVersion = "9.7.1"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"
 val slf4jVersion = "2.0.16"
-val semConvVersion = "1.28.0-alpha"
+val semConvVersion = "1.29.0-alpha"
 
 val CORE_DEPENDENCIES = listOf(
   "io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}",
@@ -116,7 +116,7 @@ val DEPENDENCIES = listOf(
   "org.objenesis:objenesis:3.4",
   "javax.validation:validation-api:2.0.1.Final",
   "org.snakeyaml:snakeyaml-engine:2.8",
-  "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.9"
+  "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.10"
 )
 
 javaPlatform {

CHANGELOG.md

@@ -5,11 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.couchbase.v3_1;
 
-import static org.awaitility.Awaitility.await;
-
 import com.couchbase.client.core.env.TimeoutConfig;
 import com.couchbase.client.core.error.DocumentNotFoundException;
-import com.couchbase.client.core.error.UnambiguousTimeoutException;
 import com.couchbase.client.java.Bucket;
 import com.couchbase.client.java.Cluster;
 import com.couchbase.client.java.ClusterOptions;
@@ -44,20 +41,8 @@ class CouchbaseClient31Test {
 
   @BeforeAll
   static void setup() {
-    // wait and retry in the hope that it will help against test flakiness
-    await()
-        .atMost(Duration.ofMinutes(5))
-        .ignoreException(UnambiguousTimeoutException.class)
-        .until(
-            () -> {
-              startCouchbase();
-              return true;
-            });
-  }
-
-  private static void startCouchbase() {
     couchbase =
-        new CouchbaseContainer("couchbase/server:7.6.0")
+        new CouchbaseContainer("couchbase/server:6.5.1")
             .withExposedPorts(8091)
             .withEnabledServices(CouchbaseService.KV)
             .withBucket(new BucketDefinition("test"))

dependencyManagement/build.gradle.kts

@@ -11,6 +11,7 @@
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,4 +79,16 @@ protected static StatefulRedisConnection<String, String> newContainerConnection(
 
     return statefulConnection;
   }
+
+  static void shutdown(RedisClient redisClient) {
+    // using shutdownAsync instead of redisClient.shutdown() because there is a bug in the redis
+    // client that can cause the shutdown to hang
+    try {
+      redisClient.shutdownAsync(0, 15, TimeUnit.SECONDS).get(15, TimeUnit.SECONDS);
+    } catch (InterruptedException exception) {
+      Thread.currentThread().interrupt();
+    } catch (Exception exception) {
+      // ignore
+    }
+  }
 }

instrumentation/couchbase/couchbase-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1/CouchbaseClient31Test.java

@@ -93,7 +93,7 @@ static void setUp() throws UnknownHostException {
   @AfterAll
   static void cleanUp() {
     connection.close();
-    redisClient.shutdown();
+    shutdown(redisClient);
     redisServer.stop();
   }
 

instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/AbstractLettuceClientTest.java

@@ -63,7 +63,7 @@ static void setUp() throws UnknownHostException {
   @AfterAll
   static void cleanUp() {
     connection.close();
-    redisClient.shutdown();
+    shutdown(redisClient);
     redisServer.stop();
   }
 

instrumentation/lettuce/lettuce-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncClientTest.java

@@ -74,7 +74,7 @@ static void setUp() throws UnknownHostException {
   @AfterAll
   static void cleanUp() {
     connection.close();
-    redisClient.shutdown();
+    shutdown(redisClient);
     redisServer.stop();
   }