Code review sweep (run 25018389247) (open-telemetry#18346)

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

Author: otelbot[bot]

instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceAsyncCommandInstrumentation.java

@@ -17,6 +17,7 @@
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -52,15 +53,18 @@ public static void saveContext(@Advice.This AsyncCommand<?, ?, ?> asyncCommand)
   public static class RestoreContextAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+    @Nullable
     public static Scope onEnter(@Advice.This AsyncCommand<?, ?, ?> asyncCommand) {
 
       Context context = CONTEXT.get(asyncCommand);
-      return context.makeCurrent();
+      return context == null ? null : context.makeCurrent();
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
-    public static void onExit(@Advice.Enter Scope scope) {
-      scope.close();
+    public static void onExit(@Advice.Enter @Nullable Scope scope) {
+      if (scope != null) {
+        scope.close();
+      }
     }
   }
 }

instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/rx/LettuceFluxTerminationRunnable.java

@@ -25,15 +25,15 @@ public class LettuceFluxTerminationRunnable implements Consumer<Signal<?>>, Runn
       DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "lettuce")
           .getBoolean("experimental_span_attributes/development", false);
 
+  private final FluxOnSubscribeConsumer onSubscribeConsumer;
   private Context context;
   private int numResults;
-  private final FluxOnSubscribeConsumer onSubscribeConsumer;
 
   public LettuceFluxTerminationRunnable(RedisCommand<?, ?, ?> command, boolean expectsResponse) {
     onSubscribeConsumer = new FluxOnSubscribeConsumer(this, command, expectsResponse);
   }
 
-  public FluxOnSubscribeConsumer getOnSubscribeConsumer() {
+  public Consumer<Subscription> getOnSubscribeConsumer() {
     return onSubscribeConsumer;
   }
 

instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/rx/LettuceMonoDualConsumer.java

@@ -16,9 +16,9 @@
 
 public class LettuceMonoDualConsumer<R, T> implements Consumer<R>, BiConsumer<T, Throwable> {
 
-  private Context context;
   private final RedisCommand<?, ?, ?> command;
   private final boolean finishSpanOnClose;
+  private Context context;
 
   public LettuceMonoDualConsumer(RedisCommand<?, ?, ?> command, boolean finishSpanOnClose) {
     this.command = command;

instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/ClientResourcesInstrumentation.java

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
+import static io.opentelemetry.javaagent.instrumentation.lettuce.v5_1.TracingHolder.tracing;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.isStatic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -41,7 +42,7 @@ public static class BuilderAdvice {
     @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
     public static void onExit(@Advice.Return ClientResources.Builder builder) {
       if (CompatibilityChecker.isCompatible()) {
-        builder.tracing(TracingHolder.tracing());
+        builder.tracing(tracing());
       }
     }
   }

instrumentation/lettuce/lettuce-5.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/CompatibilityChecker.java

@@ -15,7 +15,7 @@ private static boolean computeCompatibility() {
     try {
       Tracing.getContext();
       return true;
-    } catch (Throwable t) {
+    } catch (Throwable ignored) {
       return false;
     }
   }

instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java

@@ -24,6 +24,7 @@
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.REDIS;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
 import io.opentelemetry.api.trace.SpanKind;
 import java.lang.reflect.Method;
@@ -70,7 +71,9 @@ void testAuthCommand() throws ReflectiveOperationException {
       authMethod = commandsClass.getMethod("auth", CharSequence.class);
     }
 
-    String result = (String) authMethod.invoke(redisClient.connect().sync(), "password");
+    StatefulRedisConnection<String, String> testConnection = redisClient.connect();
+    cleanup.deferCleanup(testConnection);
+    String result = (String) authMethod.invoke(testConnection.sync(), "password");
 
     assertThat(result).isEqualTo("OK");
 

instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/LibertyInstrumentationModule.java

@@ -19,7 +19,7 @@
  *   <li>On entry to WebApp.handleRequest remember request. {@link
  *       LibertyWebAppInstrumentation.HandleRequestAdvice}
  *   <li>On call to WebApp.isForbidden (called from WebApp.handleRequest) start span based on
- *       remembered request. We don't start span immediately at the start or handleRequest because
+ *       remembered request. We don't start span immediately at the start of handleRequest because
  *       HttpServletRequest isn't usable yet. {@link LibertyWebAppInstrumentation.IsForbiddenAdvice}
  *   <li>On exit from WebApp.handleRequest close the span. {@link
  *       LibertyWebAppInstrumentation.HandleRequestAdvice}

instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/v20_0/ThreadLocalContext.java

@@ -45,10 +45,6 @@ public void setScope(Scope scope) {
     this.scope = scope;
   }
 
-  public HttpServletRequest getRequest() {
-    return requestContext.request();
-  }
-
   public ServletRequestContext<HttpServletRequest> getRequestContext() {
     return requestContext;
   }

instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherSingletons.java

@@ -21,7 +21,7 @@ class LibertyDispatcherSingletons {
             new LibertyDispatcherRequestGetter());
   }
 
-  public static Instrumenter<LibertyRequest, LibertyResponse> instrumenter() {
+  static Instrumenter<LibertyRequest, LibertyResponse> instrumenter() {
     return instrumenter;
   }
 

instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyRequest.java

@@ -21,7 +21,7 @@ final class LibertyRequest {
   @Nullable private final String clientSocketAddress;
   private final int clientSocketPort;
 
-  public LibertyRequest(
+  LibertyRequest(
       HttpRequestMessage httpRequestMessage,
       @Nullable InetAddress serverInetAddress,
       int serverSocketPort,
@@ -36,33 +36,33 @@ public LibertyRequest(
     this.clientSocketPort = clientSocketPort;
   }
 
-  public String getMethod() {
+  String getMethod() {
     return httpRequestMessage.getMethod();
   }
 
-  public String getScheme() {
+  String getScheme() {
     return httpRequestMessage.getScheme();
   }
 
-  public String getRequestUri() {
+  String getRequestUri() {
     return httpRequestMessage.getRequestURI();
   }
 
-  public String getQueryString() {
+  String getQueryString() {
     return httpRequestMessage.getQueryString();
   }
 
-  public List<String> getAllHeaderNames() {
+  List<String> getAllHeaderNames() {
     return httpRequestMessage.getAllHeaderNames();
   }
 
   @Nullable
-  public String getHeaderValue(String name) {
+  String getHeaderValue(String name) {
     HeaderField hf = httpRequestMessage.getHeader(name);
     return hf != null ? hf.asString() : null;
   }
 
-  public List<String> getHeaderValues(String name) {
+  List<String> getHeaderValues(String name) {
     List<HeaderField> headers = httpRequestMessage.getHeaders(name);
     if (headers.isEmpty()) {
       return emptyList();
@@ -74,25 +74,25 @@ public List<String> getHeaderValues(String name) {
     return stringHeaders;
   }
 
-  public String getProtocol() {
+  String getProtocol() {
     return httpRequestMessage.getVersion();
   }
 
   @Nullable
-  public String getServerSocketAddress() {
+  String getServerSocketAddress() {
     return serverSocketAddress;
   }
 
-  public int getServerSocketPort() {
+  int getServerSocketPort() {
     return serverSocketPort;
   }
 
   @Nullable
-  public String getClientSocketAddress() {
+  String getClientSocketAddress() {
     return clientSocketAddress;
   }
 
-  public int getClientSocketPort() {
+  int getClientSocketPort() {
     return clientSocketPort;
   }
 }