Code review sweep (run 25135365127) (#18421)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>

Author: otelbot[bot]

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

@@ -29,13 +29,9 @@ public List<TypeInstrumentation> typeInstrumentations() {
 
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
-    return hasClassesNamed(
-            // added in 4.0
-            "com.datastax.oss.driver.api.core.CqlSession")
-        .and(
-            not(
-                hasClassesNamed(
-                    // added in 4.4
-                    "com.datastax.dse.driver.api.core.cql.reactive.ReactiveSession")));
+    // added in 4.0
+    return hasClassesNamed("com.datastax.oss.driver.api.core.CqlSession")
+        // added in 4.4
+        .and(not(hasClassesNamed("com.datastax.dse.driver.api.core.cql.reactive.ReactiveSession")));
   }
 }

instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts

@@ -6,7 +6,7 @@ muzzle {
   pass {
     group.set("com.datastax.oss")
     module.set("java-driver-core")
-    versions.set("[4.4,]")
+    versions.set("[4.4,)")
     assertInverse.set(true)
   }
   pass {

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

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.cassandra.v4_4;
 
+import static io.opentelemetry.javaagent.instrumentation.cassandra.v4_4.CassandraSingletons.telemetry;
+
 import com.datastax.oss.driver.api.core.CqlSession;
 import java.util.function.Function;
 
@@ -19,6 +21,6 @@ public Object apply(Object session) {
     if (session.getClass().getName().endsWith("cassandra4.TracingCqlSession")) {
       return session;
     }
-    return CassandraSingletons.telemetry().wrap((CqlSession) session);
+    return telemetry().wrap((CqlSession) session);
   }
 }

instrumentation/clickhouse/clickhouse-client-v1-0.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv1/v0_5/ClickHouseClientV1Instrumentation.java

@@ -22,6 +22,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest;
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseScope;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -48,8 +49,9 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class ExecuteAndWaitAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+    @Nullable
     public static ClickHouseScope onEnter(
-        @Advice.Argument(0) ClickHouseRequest<?> clickHouseRequest) {
+        @Advice.Argument(0) @Nullable ClickHouseRequest<?> clickHouseRequest) {
 
       CallDepth callDepth = CallDepth.forClass(ClickHouseClient.class);
       if (callDepth.getAndIncrement() > 0 || clickHouseRequest == null) {
@@ -71,7 +73,8 @@ public static ClickHouseScope onEnter(
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void onExit(
-        @Advice.Thrown Throwable throwable, @Advice.Enter ClickHouseScope scope) {
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable ClickHouseScope scope) {
 
       CallDepth callDepth = CallDepth.forClass(ClickHouseClient.class);
       if (callDepth.decrementAndGet() > 0 || scope == null) {

instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Instrumentation.java

@@ -21,6 +21,7 @@
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest;
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseScope;
 import java.util.Map;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -45,8 +46,9 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class QueryAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+    @Nullable
     public static ClickHouseScope onEnter(
-        @Advice.This Client client, @Advice.Argument(0) String sqlQuery) {
+        @Advice.This Client client, @Advice.Argument(0) @Nullable String sqlQuery) {
       CallDepth callDepth = CallDepth.forClass(Client.class);
       if (callDepth.getAndIncrement() > 0 || sqlQuery == null) {
         return null;
@@ -72,7 +74,8 @@ public static ClickHouseScope onEnter(
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void onExit(
-        @Advice.Thrown Throwable throwable, @Advice.Enter ClickHouseScope scope) {
+        @Advice.Thrown @Nullable Throwable throwable,
+        @Advice.Enter @Nullable ClickHouseScope scope) {
       CallDepth callDepth = CallDepth.forClass(Client.class);
       if (callDepth.decrementAndGet() > 0 || scope == null) {
         return;

instrumentation/clickhouse/clickhouse-client-v2-0.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/clickhouse/clientv2/v0_8/ClickHouseClientV2Singletons.java

@@ -13,6 +13,7 @@
 import io.opentelemetry.instrumentation.api.util.VirtualField;
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseDbRequest;
 import io.opentelemetry.javaagent.instrumentation.clickhouse.common.ClickHouseInstrumenterFactory;
+import javax.annotation.Nullable;
 
 public class ClickHouseClientV2Singletons {
 
@@ -37,11 +38,12 @@ public static Instrumenter<ClickHouseDbRequest, Void> instrumenter() {
     return instrumenter;
   }
 
+  @Nullable
   public static AddressAndPort getAddressAndPort(Client client) {
     return ADDRESS_AND_PORT.get(client);
   }
 
-  public static AddressAndPort setAddressAndPort(Client client, String endpoint) {
+  public static AddressAndPort setAddressAndPort(Client client, @Nullable String endpoint) {
     AddressAndPort addressAndPort = new AddressAndPort();
 
     if (endpoint != null) {