Code review sweep (run 25258026678) (#18517)

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

Author: otelbot[bot]

instrumentation/vertx/vertx-kafka-client-3.6/vertx-kafka-client-5-testing/build.gradle.kts

@@ -47,11 +47,26 @@ tasks {
   }
 
   test {
-    jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true")
     jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
+    systemProperty(
+      "metadataConfig",
+      "otel.instrumentation.messaging.experimental.receive-telemetry.enabled=true",
+    )
+  }
+
+  val testExperimental by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
+    jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true")
+    systemProperty(
+      "metadataConfig",
+      "otel.instrumentation.messaging.experimental.receive-telemetry.enabled=true,otel.instrumentation.kafka.experimental-span-attributes=true",
+    )
   }
 
   check {
-    dependsOn(testing.suites)
+    dependsOn(testing.suites, testExperimental)
   }
 }

instrumentation/vertx/vertx-redis-client-4.0/metadata.yaml

@@ -13,6 +13,7 @@ configurations:
     type: boolean
     default: true
   - name: otel.instrumentation.common.peer-service-mapping
+    declarative_name: java.common.peer_service_mapping
     description: Used to specify a mapping from host names or IP addresses to peer services.
     type: map
     default: ""

instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/VertxReactivePropagationTest.java

@@ -166,7 +166,7 @@ void highConcurrency() {
           () -> {
             try {
               latch.await();
-            } catch (InterruptedException e) {
+            } catch (InterruptedException ignored) {
               Thread.currentThread().interrupt();
             }
             testing.runWithSpan(

instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version41Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/VertxReactivePropagationTest.java

@@ -166,7 +166,7 @@ void highConcurrency() {
           () -> {
             try {
               latch.await();
-            } catch (InterruptedException e) {
+            } catch (InterruptedException ignored) {
               Thread.currentThread().interrupt();
             }
             testing.runWithSpan(

instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version5Test/java/io/opentelemetry/javaagent/instrumentation/vertx/rx/v3_5/server/VertxReactivePropagationTest.java

@@ -166,7 +166,7 @@ void highConcurrency() {
           () -> {
             try {
               latch.await();
-            } catch (InterruptedException e) {
+            } catch (InterruptedException ignored) {
               Thread.currentThread().interrupt();
             }
             testing.runWithSpan(

instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/sqlclient/v4_0/VertxSqlClientSingletons.java

@@ -20,16 +20,16 @@ public class VertxSqlClientSingletons {
   private static final Instrumenter<VertxSqlClientRequest, Void> instrumenter =
       VertxSqlInstrumenterFactory.createInstrumenter(INSTRUMENTATION_NAME);
 
-  public static Instrumenter<VertxSqlClientRequest, Void> instrumenter() {
-    return instrumenter;
-  }
-
   private static final VirtualField<SqlClientBase<?>, SqlConnectOptions> connectOptionsField =
       VirtualField.find(SqlClientBase.class, SqlConnectOptions.class);
 
   private static final VirtualField<SqlConnectOptions, String> connectOptionsDbSystem =
       VirtualField.find(SqlConnectOptions.class, String.class);
 
+  public static Instrumenter<VertxSqlClientRequest, Void> instrumenter() {
+    return instrumenter;
+  }
+
   public static void storeConnectOptionsDbSystem(
       SqlConnectOptions connectOptions, String dbSystem) {
     connectOptionsDbSystem.set(connectOptions, dbSystem);

instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/sqlclient/v5_0/PoolInstrumentation.java

@@ -27,6 +27,7 @@
 import io.vertx.sqlclient.Pool;
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.description.type.TypeDescription;
@@ -76,17 +77,19 @@ public static CallDepth onEnter(@Advice.Argument(1) SqlConnectOptions sqlConnect
       return callDepth;
     }
 
-    @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
+    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void onExit(
-        @Advice.Return Pool pool,
+        @Advice.Return @Nullable Pool pool,
         @Advice.Argument(1) SqlConnectOptions sqlConnectOptions,
         @Advice.Enter CallDepth callDepth) {
       if (callDepth.decrementAndGet() > 0) {
         return;
       }
 
-      setPoolConnectOptions(pool, sqlConnectOptions);
-      resolveAndStoreDbSystem(pool, sqlConnectOptions);
+      if (pool != null) {
+        setPoolConnectOptions(pool, sqlConnectOptions);
+        resolveAndStoreDbSystem(pool, sqlConnectOptions);
+      }
       setSqlConnectOptions(null);
     }
   }

instrumentation/vertx/vertx-sql-client/vertx-sql-client-common-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/sqlclient/common/v4_0/VertxSqlClientUtil.java

@@ -99,9 +99,9 @@ public static Scope endQuerySpan(
   }
 
   private static class RequestData {
-    final VertxSqlClientRequest request;
-    final Context context;
-    final Context parentContext;
+    private final VertxSqlClientRequest request;
+    private final Context context;
+    private final Context parentContext;
 
     RequestData(VertxSqlClientRequest request, Context context, Context parentContext) {
       this.request = request;

instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts

@@ -14,7 +14,7 @@ muzzle {
 dependencies {
   compileOnly("io.vertx:vertx-web:3.0.0")
 
-  // We need both version as different versions of Vert.x use different versions of Netty
+  // We need both versions as different versions of Vert.x use different versions of Netty
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
   testInstrumentation(project(":instrumentation:jdbc:javaagent"))

instrumentation/vertx/vertx-web-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/web/v3_0/RoutingContextHandlerWrapper.java

@@ -38,7 +38,7 @@ public void handle(RoutingContext context) {
     }
     HttpServerRoute.update(otelContext, HttpServerRouteSource.NESTED_CONTROLLER, route);
 
-    try (Scope ignore = RouteHolder.init(otelContext, route).makeCurrent()) {
+    try (Scope ignored = RouteHolder.init(otelContext, route).makeCurrent()) {
       handler.handle(context);
     } catch (Throwable t) {
       Span serverSpan = LocalRootSpan.fromContextOrNull(otelContext);