Code review sweep (run 24949954141) (#18310)

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

Author: otelbot[bot]

instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraRequest.java

@@ -9,16 +9,15 @@
 import com.google.auto.value.AutoValue;
 
 @AutoValue
-public abstract class CassandraRequest {
+abstract class CassandraRequest {
 
-  public static CassandraRequest create(
-      Session session, String queryText, boolean parameterizedQuery) {
+  static CassandraRequest create(Session session, String queryText, boolean parameterizedQuery) {
     return new AutoValue_CassandraRequest(session, queryText, parameterizedQuery);
   }
 
-  public abstract Session getSession();
+  abstract Session getSession();
 
-  public abstract String getQueryText();
+  abstract String getQueryText();
 
-  public abstract boolean isParameterizedQuery();
+  abstract boolean isParameterizedQuery();
 }

instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java

@@ -17,7 +17,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 
 @SuppressWarnings("deprecation") // using deprecated semconv
-public class CassandraSingletons {
+class CassandraSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-4.0";
 
   // using ExecutionInfo because we can get that from ResultSet, AsyncResultSet and DriverException
@@ -42,7 +42,7 @@ public class CassandraSingletons {
             .buildInstrumenter(SpanKindExtractor.alwaysClient());
   }
 
-  public static Instrumenter<CassandraRequest, ExecutionInfo> instrumenter() {
+  static Instrumenter<CassandraRequest, ExecutionInfo> instrumenter() {
     return instrumenter;
   }
 

instrumentation/cassandra/cassandra-4.0/metadata.yaml

@@ -8,6 +8,7 @@ semantic_conventions:
 library_link: https://github.com/apache/cassandra-java-driver
 configurations:
   - name: otel.instrumentation.common.db.query-sanitization.enabled
+    declarative_name: java.common.db.query_sanitization.enabled
     description: Enables query sanitization for database queries.
     type: boolean
     default: true

instrumentation/cassandra/cassandra-4.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_4/SessionBuilderInstrumentation.java

@@ -39,7 +39,7 @@ public static class BuildAdvice {
     /**
      * Strategy: each time we build a connection to a Cassandra cluster, the
      * com.datastax.oss.driver.api.core.session.SessionBuilder.buildAsync() method is called. The
-     * opentracing contribution is a simple wrapper, so we just have to wrap the new session.
+     * OpenTelemetry instrumentation is a simple wrapper, so we just have to wrap the new session.
      *
      * @param stage The fresh CompletionStage to patch. This stage produces session which is
      *     replaced with new session

instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraAttributesExtractor.java

@@ -186,7 +186,7 @@ private static Field getProxyAddressField() {
       Field field = SniEndPoint.class.getDeclaredField("proxyAddress");
       field.setAccessible(true);
       return field;
-    } catch (Exception e) {
+    } catch (Exception ignored) {
       return null;
     }
   }

instrumentation/cassandra/cassandra-common-4.0/testing/src/main/java/io/opentelemetry/cassandra/common/v4_0/AbstractCassandraTest.java

@@ -158,7 +158,7 @@ void syncTest(Parameter parameter) {
 
   @ParameterizedTest(name = "{index}: {0}")
   @MethodSource("provideAsyncParameters")
-  void asyncTest(Parameter parameter) throws Exception {
+  void asyncTest(Parameter parameter) {
     CqlSession session = getSession(parameter.keyspace);
     cleanup.deferCleanup(session);
 
@@ -170,7 +170,7 @@ void asyncTest(Parameter parameter) throws Exception {
                     .executeAsync(parameter.queryText)
                     .toCompletableFuture()
                     .whenComplete((result, throwable) -> testing().runWithSpan("child", () -> {}))
-                    .get());
+                    .join());
 
     testing()
         .waitAndAssertTraces(

instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1Test.java

@@ -290,15 +290,15 @@ void testExecuteAndWaitThrowsException() {
   }
 
   @Test
-  void testAsyncExecuteQuery() throws Exception {
+  void testAsyncExecuteQuery() {
     CompletableFuture<ClickHouseResponse> response =
         client
             .read(server)
             .format(ClickHouseFormat.RowBinaryWithNamesAndTypes)
             .query("select * from " + tableName)
             .execute();
 
-    ClickHouseResponse result = response.get();
+    ClickHouseResponse result = response.join();
     assertThat(result).isNotNull();
     result.close();
 
@@ -326,13 +326,13 @@ void testAsyncExecuteQuery() throws Exception {
   }
 
   @Test
-  void testSendQuery() throws Exception {
+  void testSendQuery() {
     testing.runWithSpan(
         "parent",
         () -> {
           CompletableFuture<List<ClickHouseResponseSummary>> future =
               ClickHouseClient.send(server, "select * from " + tableName + " limit 1");
-          List<ClickHouseResponseSummary> results = future.get();
+          List<ClickHouseResponseSummary> results = future.join();
           assertThat(results).hasSize(1);
         });
 
@@ -364,7 +364,7 @@ void testSendQuery() throws Exception {
   }
 
   @Test
-  void testSendMultipleQueries() throws Exception {
+  void testSendMultipleQueries() {
     testing.runWithSpan(
         "parent",
         () -> {
@@ -373,7 +373,7 @@ void testSendMultipleQueries() throws Exception {
                   server,
                   "insert into " + tableName + " values('1')('2')('3')",
                   "select * from " + tableName + " limit 1");
-          List<ClickHouseResponseSummary> results = future.get();
+          List<ClickHouseResponseSummary> results = future.join();
           assertThat(results).hasSize(2);
         });
 
@@ -508,7 +508,7 @@ void testParameterizedQueryInput() throws ClickHouseException {
   // that this syntax error isn't detected when running with the agent as it is also ignored when
   // running without the agent.
   @Test
-  void testPlaceholderQueryInput() throws Exception {
+  void testPlaceholderQueryInput() {
     ClickHouseRequest<?> request =
         client.read(server).format(ClickHouseFormat.RowBinaryWithNamesAndTypes);
     testing.runWithSpan(
@@ -520,7 +520,7 @@ void testPlaceholderQueryInput() throws Exception {
                   .query("select * from " + tableName + " where s={s:String}")
                   .settings(ImmutableMap.of("param_s", "" + Instant.now().getEpochSecond()))
                   .execute()
-                  .get();
+                  .join();
           response.close();
         });
 

instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Test.java

@@ -40,8 +40,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-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;
@@ -53,22 +51,23 @@ class ClickHouseClientV2Test {
   @RegisterExtension
   private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
-  @RegisterExtension final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+  @RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
 
   private static final GenericContainer<?> clickhouseServer =
       new GenericContainer<>("clickhouse/clickhouse-server:24.4.2").withExposedPorts(8123);
 
   private static final String databaseName = "default";
   private static final String tableName = "test_table";
+  private static final String username = "default";
+  private static final String password = "";
   private static int port;
   private static String host;
   private static Client client;
-  private static final String username = "default";
-  private static final String password = "";
 
   @BeforeAll
   static void setup() throws Exception {
     clickhouseServer.start();
+    cleanup.deferAfterAll(clickhouseServer::stop);
     port = clickhouseServer.getMappedPort(8123);
     host = clickhouseServer.getHost();
 
@@ -80,26 +79,19 @@ static void setup() throws Exception {
             .setPassword(password)
             .setOption("compress", "false")
             .build();
+    cleanup.deferAfterAll(client);
 
     QueryResponse response =
         client
             .query("create table if not exists " + tableName + "(value String) engine=Memory")
-            .get();
+            .join();
     response.close();
 
     // wait for CREATE operation and clear
     testing.waitForTraces(1);
     testing.clearData();
   }
 
-  @AfterAll
-  static void cleanup() {
-    if (client != null) {
-      client.close();
-    }
-    clickhouseServer.stop();
-  }
-
   @Test
   void testConnectionStringWithoutDatabaseSpecifiedStillGeneratesSpans() throws Exception {
     Client client =
@@ -111,7 +103,7 @@ void testConnectionStringWithoutDatabaseSpecifiedStillGeneratesSpans() throws Ex
             .build();
     cleanup.deferCleanup(client);
 
-    QueryResponse response = client.query("select * from " + tableName).get();
+    QueryResponse response = client.query("select * from " + tableName).join();
     response.close();
 
     testing.waitAndAssertTraces(
@@ -153,10 +145,10 @@ void testQueryWithStringQuery() throws Exception {
         "parent",
         () -> {
           QueryResponse response =
-              client.query("insert into " + tableName + " values('1')('2')('3')").get();
+              client.query("insert into " + tableName + " values('1')('2')('3')").join();
           response.close();
 
-          response = client.query("select * from " + tableName).get();
+          response = client.query("select * from " + tableName).join();
           response.close();
         });
 
@@ -214,7 +206,7 @@ void testQueryWithStringQueryAndId() throws Exception {
           QuerySettings querySettings = new QuerySettings();
           querySettings.setQueryId("test_query_id");
 
-          QueryResponse response = client.query("select * from " + tableName, querySettings).get();
+          QueryResponse response = client.query("select * from " + tableName, querySettings).join();
           response.close();
         });
 
@@ -285,9 +277,8 @@ void testSendQuery() throws Exception {
     testing.runWithSpan(
         "parent",
         () -> {
-          CompletableFuture<CommandResponse> future =
-              client.execute("select * from " + tableName + " limit 1");
-          CommandResponse results = future.get();
+          CommandResponse results =
+              client.execute("select * from " + tableName + " limit 1").join();
           assertThat(results.getReadRows()).isEqualTo(0);
         });
 
@@ -360,10 +351,10 @@ void testSendQueryRecords() throws Exception {
         "parent",
         () -> {
           Records records =
-              client.queryRecords("insert into " + tableName + " values('test_value')").get();
+              client.queryRecords("insert into " + tableName + " values('test_value')").join();
           records.close();
 
-          records = client.queryRecords("select * from " + tableName + " limit 1").get();
+          records = client.queryRecords("select * from " + tableName + " limit 1").join();
           records.close();
           assertThat(records.getReadRows()).isEqualTo(1);
         });
@@ -430,7 +421,7 @@ void testPlaceholderQuery() throws Exception {
                       "select * from " + tableName + " where value={param_s: String}",
                       queryParams,
                       null)
-                  .get();
+                  .join();
           response.close();
         });
 

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

@@ -46,7 +46,7 @@ public List<String> injectedClassNames() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    // removed in 3.0.0
+    // added in 2.0.0, removed in 3.0.0
     return hasClassesNamed("com.couchbase.client.java.CouchbaseAsyncBucket");
   }
 }

instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseUtil.java

@@ -5,39 +5,16 @@
 
 package io.opentelemetry.javaagent.instrumentation.couchbase.v2_0;
 
-import static java.util.Collections.emptyList;
 import static java.util.concurrent.TimeUnit.DAYS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.couchbase.client.core.metrics.DefaultLatencyMetricsCollectorConfig;
 import com.couchbase.client.core.metrics.DefaultMetricsCollectorConfig;
 import com.couchbase.client.java.cluster.BucketSettings;
 import com.couchbase.client.java.env.DefaultCouchbaseEnvironment;
-import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
-import java.util.List;
 
 public class CouchbaseUtil {
 
-  public static List<AttributeAssertion> couchbaseAttributes() {
-    return couchbaseKvAttributes();
-  }
-
-  public static List<AttributeAssertion> couchbaseKvAttributes() {
-    return emptyList();
-  }
-
-  public static List<AttributeAssertion> couchbaseQueryAttributes() {
-    return emptyList();
-  }
-
-  public static List<AttributeAssertion> couchbaseClusterManagerAttributes() {
-    return emptyList();
-  }
-
-  public static List<AttributeAssertion> couchbaseN1qlAttributes() {
-    return emptyList();
-  }
-
   public static DefaultCouchbaseEnvironment.Builder envBuilder(
       BucketSettings bucketSettings, int carrierDirectPort, int httpDirectPort) {
     // Couchbase seems to be really slow to start sometimes