Code review sweep (run 25096588108) (#18404)

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

Author: otelbot[bot]

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

@@ -8,6 +8,7 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.vertx.core.Handler;
+import javax.annotation.Nullable;
 
 public class HandlerWrapper<T> implements Handler<T> {
   private final Handler<T> delegate;
@@ -18,7 +19,8 @@ private HandlerWrapper(Handler<T> delegate, Context context) {
     this.context = context;
   }
 
-  public static <T> Handler<T> wrap(Handler<T> handler) {
+  @Nullable
+  public static <T> Handler<T> wrap(@Nullable Handler<T> handler) {
     Context current = Context.current();
     if (handler != null && !(handler instanceof HandlerWrapper) && current != Context.root()) {
       handler = new HandlerWrapper<>(handler, current);

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

@@ -14,6 +14,7 @@
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.vertx.core.Promise;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -36,12 +37,13 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class CompleteAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+    @Nullable
     public static Scope onEnter(@Advice.FieldValue("handler") Promise<?> promise) {
       return endQuerySpan(instrumenter(), promise, null);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
-    public static void onExit(@Advice.Enter Scope scope) {
+    public static void onExit(@Advice.Enter @Nullable Scope scope) {
       if (scope != null) {
         scope.close();
       }
@@ -51,13 +53,14 @@ public static void onExit(@Advice.Enter Scope scope) {
   @SuppressWarnings("unused")
   public static class FailAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+    @Nullable
     public static Scope onEnter(
         @Advice.Argument(0) Throwable throwable, @Advice.FieldValue("handler") Promise<?> promise) {
       return endQuerySpan(instrumenter(), promise, throwable);
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
-    public static void onExit(@Advice.Enter Scope scope) {
+    public static void onExit(@Advice.Enter @Nullable Scope scope) {
       if (scope != null) {
         scope.close();
       }

instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/sqlclient/v4_0/VertxJdbcClientTest.java

@@ -20,14 +20,14 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.vertx.core.Vertx;
 import io.vertx.jdbcclient.JDBCConnectOptions;
 import io.vertx.jdbcclient.JDBCPool;
 import io.vertx.sqlclient.Pool;
 import io.vertx.sqlclient.PoolOptions;
-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;
@@ -44,17 +44,22 @@ class VertxJdbcClientTest {
   @RegisterExtension
   private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
+  @RegisterExtension
+  private static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+
   private static Vertx vertx;
   private static Pool pool;
 
   @BeforeAll
   static void setUp() throws Exception {
     vertx = Vertx.vertx();
+    cleanup.deferAfterAll(vertx::close);
     pool =
         JDBCPool.pool(
             vertx,
             new JDBCConnectOptions().setJdbcUrl("jdbc:hsqldb:mem:" + DB),
             new PoolOptions().setMaxSize(4));
+    cleanup.deferAfterAll(pool::close);
     pool.query("create table test(id int primary key, name varchar(255))")
         .execute()
         .compose(r -> pool.query("insert into test values (1, 'Hello'), (2, 'World')").execute())
@@ -63,12 +68,6 @@ static void setUp() throws Exception {
         .get(30, SECONDS);
   }
 
-  @AfterAll
-  static void cleanUp() {
-    pool.close();
-    vertx.close();
-  }
-
   @Test
   void testSimpleSelect() throws Exception {
     testing

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

@@ -35,7 +35,8 @@ public static class CompleteAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
     @Nullable
     public static Scope onEnter(
-        @Advice.Argument(1) Throwable throwable, @Advice.FieldValue("handler") Promise<?> promise) {
+        @Advice.Argument(1) @Nullable Throwable throwable,
+        @Advice.FieldValue("handler") Promise<?> promise) {
       return endQuerySpan(instrumenter(), promise, throwable);
     }
 

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

@@ -25,10 +25,6 @@ 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<Pool, String> poolDbSystem =
       VirtualField.find(Pool.class, String.class);
 
@@ -43,6 +39,10 @@ public static Instrumenter<VertxSqlClientRequest, Void> instrumenter() {
   private static final VirtualField<CommandBase, Context> commandContextField =
       VirtualField.find(CommandBase.class, Context.class);
 
+  public static Instrumenter<VertxSqlClientRequest, Void> instrumenter() {
+    return instrumenter;
+  }
+
   // CommandBase is a generic type used as VirtualField key
   @SuppressWarnings("rawtypes")
   @Nullable

instrumentation/vertx/vertx-sql-client/vertx-sql-client-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/sql/VertxSqlClientAttributesGetter.java

@@ -125,13 +125,13 @@ private static Function<Throwable, String> responseStatusExtractor(
         if (exClass.isInstance(error)) {
           try {
             return String.valueOf(method.invoke(error)); // can be String or int
-          } catch (IllegalAccessException | InvocationTargetException e) {
+          } catch (IllegalAccessException | InvocationTargetException ignored) {
             return null;
           }
         }
         return null;
       };
-    } catch (ClassNotFoundException | NoSuchMethodException e) {
+    } catch (ClassNotFoundException | NoSuchMethodException ignored) {
       return (error) -> null;
     }
   }

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

@@ -10,16 +10,16 @@
 import javax.annotation.Nullable;
 
 public class RoutingContextUtil {
-  private static final VirtualField<RoutingContext, String> routeField =
+  private static final VirtualField<RoutingContext, String> ROUTE_FIELD =
       VirtualField.find(RoutingContext.class, String.class);
 
   static void setRoute(RoutingContext routingContext, @Nullable String route) {
-    routeField.set(routingContext, route);
+    ROUTE_FIELD.set(routingContext, route);
   }
 
   @Nullable
   public static String getRoute(RoutingContext routingContext) {
-    return routeField.get(routingContext);
+    return ROUTE_FIELD.get(routingContext);
   }
 
   private RoutingContextUtil() {}

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

@@ -9,6 +9,4 @@ dependencies {
 
   compileOnly("io.vertx:vertx-codegen:3.0.0")
   compileOnly("io.vertx:vertx-docgen:3.0.0")
-
-  implementation("io.opentelemetry:opentelemetry-api")
 }

instrumentation/vibur-dbcp-11.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/viburdbcp/v11_0/ViburSingletons.java

@@ -10,11 +10,10 @@
 
 public class ViburSingletons {
 
-  private static final ViburTelemetry viburTelemetry =
-      ViburTelemetry.create(GlobalOpenTelemetry.get());
+  private static final ViburTelemetry telemetry = ViburTelemetry.create(GlobalOpenTelemetry.get());
 
   public static ViburTelemetry telemetry() {
-    return viburTelemetry;
+    return telemetry;
   }
 
   private ViburSingletons() {}