Code review sweep (run 24951606276) (#18311)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Author: otelbot[bot]

.github/agents/knowledge/gradle-conventions.md

@@ -264,5 +264,8 @@ When already present, verify:
 - `collectMetadata` is in `withType<Test>().configureEach` (or `tasks.test` if the module
   does not explicitly register additional `Test` tasks — `latestDepTest` does not count) —
   never on individual tasks.
-- `metadataConfig` is on each non-default task, not on the default `test` task.
+- `metadataConfig` is on each non-default task. It may also appear on the default `test`
+  task when that task itself runs with non-default `jvmArgs` (e.g., an experimental flag
+  enabled module-wide via `withType<Test>().configureEach { jvmArgs(...) }`); in that case
+  the `metadataConfig` value should describe those non-default jvmArgs.
 - The `metadataConfig` value matches at least one of the jvmArgs configured in the task

instrumentation/couchbase/couchbase-3.1.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_1_6/CouchbaseClient316Test.java

@@ -14,11 +14,11 @@
 import com.couchbase.client.java.ClusterOptions;
 import com.couchbase.client.java.Collection;
 import com.couchbase.client.java.env.ClusterEnvironment;
+import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import java.time.Duration;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -36,6 +36,9 @@ class CouchbaseClient316Test {
   @RegisterExtension
   private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
+  @RegisterExtension
+  private static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+
   private static final Logger logger = LoggerFactory.getLogger("couchbase-container");
 
   private static CouchbaseContainer couchbase;
@@ -53,6 +56,7 @@ static void setup() {
             .withStartupAttempts(5)
             .withStartupTimeout(Duration.ofMinutes(2));
     couchbase.start();
+    cleanup.deferAfterAll(couchbase::stop);
 
     ClusterEnvironment environment =
         ClusterEnvironment.builder()
@@ -64,6 +68,7 @@ static void setup() {
             couchbase.getConnectionString(),
             ClusterOptions.clusterOptions(couchbase.getUsername(), couchbase.getPassword())
                 .environment(environment));
+    cleanup.deferAfterAll(cluster::disconnect);
 
     Bucket bucket = cluster.bucket("test");
     collection = bucket.defaultCollection();
@@ -72,12 +77,6 @@ static void setup() {
     bucket.waitUntilReady(Duration.ofMinutes(1));
   }
 
-  @AfterAll
-  static void cleanup() {
-    cluster.disconnect();
-    couchbase.stop();
-  }
-
   @Test
   void testEmitsSpans() {
     try {

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

@@ -62,6 +62,7 @@ static void setup() {
         ClusterEnvironment.builder()
             .timeoutConfig(TimeoutConfig.kvTimeout(Duration.ofSeconds(30)))
             .build();
+    cleanup.deferAfterAll(environment::shutdown);
 
     cluster =
         Cluster.connect(
@@ -81,7 +82,7 @@ static void setup() {
   void testEmitsSpans() {
     try {
       collection.get("id");
-    } catch (DocumentNotFoundException e) {
+    } catch (DocumentNotFoundException ignored) {
       // Expected
     }
 

instrumentation/couchbase/couchbase-3.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_2/CouchbaseClient32Test.java

@@ -11,11 +11,11 @@
 import com.couchbase.client.java.Bucket;
 import com.couchbase.client.java.Cluster;
 import com.couchbase.client.java.Collection;
+import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import java.time.Duration;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -32,6 +32,9 @@ class CouchbaseClient32Test {
   @RegisterExtension
   private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
+  @RegisterExtension
+  private static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+
   private static final Logger logger = LoggerFactory.getLogger("couchbase-container");
 
   private static CouchbaseContainer couchbase;
@@ -48,26 +51,22 @@ static void setup() {
             .withLogConsumer(new Slf4jLogConsumer(logger))
             .withStartupTimeout(Duration.ofMinutes(2));
     couchbase.start();
+    cleanup.deferAfterAll(couchbase::stop);
 
     cluster =
         Cluster.connect(
             couchbase.getConnectionString(), couchbase.getUsername(), couchbase.getPassword());
+    cleanup.deferAfterAll(cluster::disconnect);
     Bucket bucket = cluster.bucket("test");
     collection = bucket.defaultCollection();
     bucket.waitUntilReady(Duration.ofSeconds(30));
   }
 
-  @AfterAll
-  static void cleanup() {
-    cluster.disconnect();
-    couchbase.stop();
-  }
-
   @Test
   void testEmitsSpans() {
     try {
       collection.get("id");
-    } catch (DocumentNotFoundException e) {
+    } catch (DocumentNotFoundException ignored) {
       // Expected
     }
 

instrumentation/couchbase/couchbase-3.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v3_4/CouchbaseInstrumentationModule.java

@@ -22,8 +22,8 @@ public CouchbaseInstrumentationModule() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    // added in 3.4.0 (via com.couchbase.client:core-io 2.4.0)
     return hasClassesNamed(
-        // added in 3.4.0 (via com.couchbase.client:core-io 2.4.0)
         "com.couchbase.client.core.transaction.components.CoreTransactionRequest");
   }
 

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

@@ -16,7 +16,7 @@
 import java.lang.invoke.MethodType;
 import javax.annotation.Nullable;
 
-public class CouchbaseQuerySanitizer {
+class CouchbaseQuerySanitizer {
 
   private static final SqlQueryAnalyzer analyzer =
       SqlQueryAnalyzer.create(
@@ -79,11 +79,11 @@ public class CouchbaseQuerySanitizer {
     ANALYTICS_GET_STATEMENT = analyticsGetStatement;
   }
 
-  public static SqlQuery analyze(Object query) {
+  static SqlQuery analyze(Object query) {
     return analyzeInternal(query, false);
   }
 
-  public static SqlQuery analyzeWithSummary(Object query) {
+  static SqlQuery analyzeWithSummary(Object query) {
     return analyzeInternal(query, true);
   }
 

instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java

@@ -67,8 +67,7 @@ void setUpSpring() {
                             + "    emit(meta.id, null);"
                             + " }"
                             + "}"))));
-    CouchbaseConfig.environment = environment;
-    CouchbaseConfig.bucketSettings = bucketCouchbase;
+    CouchbaseConfig.configure(environment, bucketCouchbase);
 
     // Close all buckets and disconnect
     couchbaseCluster.disconnect();

instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/CouchbaseConfig.java

@@ -22,8 +22,13 @@
 class CouchbaseConfig extends AbstractCouchbaseConfiguration {
 
   // These need to be set before this class can be used by Spring
-  static CouchbaseEnvironment environment;
-  static BucketSettings bucketSettings;
+  private static CouchbaseEnvironment environment;
+  private static BucketSettings bucketSettings;
+
+  static void configure(CouchbaseEnvironment environment, BucketSettings bucketSettings) {
+    CouchbaseConfig.environment = environment;
+    CouchbaseConfig.bucketSettings = bucketSettings;
+  }
 
   @Override
   protected CouchbaseEnvironment getEnvironment() {
@@ -37,11 +42,11 @@ protected List<String> getBootstrapHosts() {
 
   @Override
   protected String getBucketName() {
-    return bucketSettings.name();
+    return requireNonNull(bucketSettings).name();
   }
 
   @Override
   protected String getBucketPassword() {
-    return bucketSettings.password();
+    return requireNonNull(bucketSettings).password();
   }
 }

instrumentation/dropwizard/dropwizard-metrics-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardmetrics/v4_0/DropwizardSingletons.java

@@ -9,11 +9,11 @@
 
 public class DropwizardSingletons {
 
-  private static final DropwizardMetricsAdapter METRICS =
+  private static final DropwizardMetricsAdapter metricsAdapter =
       new DropwizardMetricsAdapter(GlobalOpenTelemetry.get());
 
   public static DropwizardMetricsAdapter metrics() {
-    return METRICS;
+    return metricsAdapter;
   }
 
   private DropwizardSingletons() {}