Code review sweep (run 24941097472) (open-telemetry#18294)

otelbot[bot] · web-flow · commit 950dce4d3bdb · 2026-04-25T16:20:33.000-07:00
Co-authored-by: otelbot &lt;197425009+otelbot@users.noreply.github.com&gt;
diff --git a/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejAsyncServletInstrumentation.java b/instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejAsyncServletInstrumentation.java
@@ -94,7 +94,7 @@ public static AdviceScope methodEnter(@Advice.Argument(0) HttpRequest request) {
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static Promise<HttpResponse> methodExit(
         @Advice.Return Promise<HttpResponse> responsePromise,
-        @Advice.Thrown Throwable throwable,
+        @Advice.Thrown @Nullable Throwable throwable,
         @Advice.Enter @Nullable AdviceScope adviceScope) {
 
       if (adviceScope == null) {
diff --git a/instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/v2_3/AkkaActorCellInstrumentation.java b/instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/v2_3/AkkaActorCellInstrumentation.java
@@ -14,6 +14,7 @@
 import io.opentelemetry.javaagent.bootstrap.executors.TaskAdviceHelper;
 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;
@@ -45,7 +46,7 @@ public static Scope enter(@Advice.Argument(0) Envelope envelope) {
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
-    public static void exit(@Advice.Enter Scope scope) {
+    public static void exit(@Advice.Enter @Nullable Scope scope) {
       if (scope != null) {
         scope.close();
       }
@@ -62,7 +63,7 @@ public static Scope enter(@Advice.Argument(0) SystemMessage systemMessage) {
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
-    public static void exit(@Advice.Enter Scope scope) {
+    public static void exit(@Advice.Enter @Nullable Scope scope) {
       if (scope != null) {
         scope.close();
       }
diff --git a/instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/v2_3/AkkaDefaultSystemMessageQueueInstrumentation.java b/instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/v2_3/AkkaDefaultSystemMessageQueueInstrumentation.java
@@ -17,6 +17,7 @@
 import io.opentelemetry.javaagent.bootstrap.executors.PropagatedContext;
 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;
@@ -44,6 +45,7 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class DispatchSystemAdvice {
 
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
     public static PropagatedContext enter(@Advice.Argument(1) SystemMessage systemMessage) {
       Context context = Java8BytecodeBridge.currentContext();
@@ -57,8 +59,8 @@ public static PropagatedContext enter(@Advice.Argument(1) SystemMessage systemMe
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void exit(
         @Advice.Argument(1) SystemMessage systemMessage,
-        @Advice.Enter PropagatedContext propagatedContext,
-        @Advice.Thrown Throwable throwable) {
+        @Advice.Enter @Nullable PropagatedContext propagatedContext,
+        @Advice.Thrown @Nullable Throwable throwable) {
       ExecutorAdviceHelper.cleanUpAfterSubmit(
           propagatedContext,
           throwable,
diff --git a/instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/v2_3/AkkaDispatcherInstrumentation.java b/instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/v2_3/AkkaDispatcherInstrumentation.java
@@ -15,6 +15,7 @@
 import io.opentelemetry.javaagent.bootstrap.executors.PropagatedContext;
 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;
@@ -38,6 +39,7 @@ public void transform(TypeTransformer transformer) {
   @SuppressWarnings("unused")
   public static class DispatchEnvelopeAdvice {
 
+    @Nullable
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
     public static PropagatedContext enterDispatch(@Advice.Argument(1) Envelope envelope) {
       Context context = Java8BytecodeBridge.currentContext();
@@ -51,8 +53,8 @@ public static PropagatedContext enterDispatch(@Advice.Argument(1) Envelope envel
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void exitDispatch(
         @Advice.Argument(1) Envelope envelope,
-        @Advice.Enter PropagatedContext propagatedContext,
-        @Advice.Thrown Throwable throwable) {
+        @Advice.Enter @Nullable PropagatedContext propagatedContext,
+        @Advice.Thrown @Nullable Throwable throwable) {
       ExecutorAdviceHelper.cleanUpAfterSubmit(
           propagatedContext, throwable, VirtualFields.ENVELOPE_PROPAGATED_CONTEXT, envelope);
     }
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java
@@ -12,24 +12,24 @@
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
 import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
 
-public class AkkaHttpClientSingletons {
+class AkkaHttpClientSingletons {
 
-  private static final HttpHeaderSetter SETTER;
+  private static final HttpHeaderSetter headerSetter;
   private static final Instrumenter<HttpRequest, HttpResponse> instrumenter;
 
   static {
-    SETTER = new HttpHeaderSetter(GlobalOpenTelemetry.getPropagators());
+    headerSetter = new HttpHeaderSetter(GlobalOpenTelemetry.getPropagators());
     instrumenter =
         JavaagentHttpClientInstrumenters.create(
             AkkaHttpUtil.instrumentationName(), new AkkaHttpClientAttributesGetter());
   }
 
-  public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {
+  static Instrumenter<HttpRequest, HttpResponse> instrumenter() {
     return instrumenter;
   }
 
-  public static HttpHeaderSetter setter() {
-    return SETTER;
+  static HttpHeaderSetter setter() {
+    return headerSetter;
   }
 
   private AkkaHttpClientSingletons() {}
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientUtil.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientUtil.java
@@ -43,7 +43,7 @@ public static ActorSystem getActorSystem(HttpExt httpExt) {
 
     try {
       return (ActorSystem) actorSystemAccessor.invoke(httpExt);
-    } catch (Throwable e) {
+    } catch (Throwable t) {
       return null;
     }
   }
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/FutureWrapper.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/FutureWrapper.java
@@ -13,10 +13,9 @@
 import scala.runtime.AbstractFunction1;
 import scala.util.Try;
 
-public class FutureWrapper {
+class FutureWrapper {
 
-  public static <T> Future<T> wrap(
-      Future<T> future, ExecutionContext executionContext, Context context) {
+  static <T> Future<T> wrap(Future<T> future, ExecutionContext executionContext, Context context) {
     Promise.DefaultPromise<T> promise = new Promise.DefaultPromise<>();
     future.onComplete(
         new AbstractFunction1<Try<T>, Object>() {
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpHeaderSetter.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpHeaderSetter.java
@@ -12,11 +12,11 @@
 import io.opentelemetry.context.propagation.TextMapSetter;
 import javax.annotation.Nullable;
 
-public class HttpHeaderSetter implements TextMapSetter<HttpHeaderSetter.AkkaHttpHeaders> {
+class HttpHeaderSetter implements TextMapSetter<HttpHeaderSetter.AkkaHttpHeaders> {
 
   private final ContextPropagators contextPropagators;
 
-  public HttpHeaderSetter(ContextPropagators contextPropagators) {
+  HttpHeaderSetter(ContextPropagators contextPropagators) {
     this.contextPropagators = contextPropagators;
   }
 
@@ -31,7 +31,7 @@ public void set(@Nullable AkkaHttpHeaders carrier, String key, String value) {
         (HttpRequest) request.removeHeader(key).addHeader(RawHeader.create(key, value)));
   }
 
-  public HttpRequest inject(HttpRequest original) {
+  HttpRequest inject(HttpRequest original) {
     AkkaHttpHeaders carrier = new AkkaHttpHeaders(original);
     contextPropagators.getTextMapPropagator().inject(Context.current(), carrier, this);
     return carrier.getRequest();
@@ -44,11 +44,11 @@ public AkkaHttpHeaders(HttpRequest request) {
       this.request = request;
     }
 
-    public HttpRequest getRequest() {
+    HttpRequest getRequest() {
       return request;
     }
 
-    public void setRequest(HttpRequest request) {
+    void setRequest(HttpRequest request) {
       this.request = request;
     }
   }
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/OnCompleteHandler.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/OnCompleteHandler.java
@@ -14,11 +14,11 @@
 import scala.runtime.AbstractFunction1;
 import scala.util.Try;
 
-public class OnCompleteHandler extends AbstractFunction1<Try<HttpResponse>, Void> {
+class OnCompleteHandler extends AbstractFunction1<Try<HttpResponse>, Void> {
   private final Context context;
   private final HttpRequest request;
 
-  public OnCompleteHandler(Context context, HttpRequest request) {
+  OnCompleteHandler(Context context, HttpRequest request) {
     this.context = context;
     this.request = request;
   }
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java b/instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/server/AkkaHttpServerSingletons.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;
 import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
 
-public class AkkaHttpServerSingletons {
+class AkkaHttpServerSingletons {
 
   private static final Instrumenter<HttpRequest, HttpResponse> instrumenter;
 
@@ -23,11 +23,11 @@ public class AkkaHttpServerSingletons {
             new AkkaHttpServerHeaders());
   }
 
-  public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {
+  static Instrumenter<HttpRequest, HttpResponse> instrumenter() {
     return instrumenter;
   }
 
-  public static HttpResponse errorResponse() {
+  static HttpResponse errorResponse() {
     return (HttpResponse) HttpResponse.create().withStatus(500);
   }
 
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerRouteTest.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerRouteTest.scala
@@ -41,8 +41,8 @@ class AkkaHttpServerRouteTest {
   private def buildAddress(port: Int): URI = try
     new URI("http://localhost:" + port + "/")
   catch {
-    case exception: URISyntaxException =>
-      throw new IllegalStateException(exception)
+    case e: URISyntaxException =>
+      throw new IllegalStateException(e)
   }
 
   @Test def testSimple(): Unit = {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`import io.opentelemetry.javaagent.bootstrap.executors.TaskAdviceHelper;`
`15`	`15`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;`
`16`	`16`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;`
	`17`	`+import javax.annotation.Nullable;`
`17`	`18`	`import net.bytebuddy.asm.Advice;`
`18`	`19`	`import net.bytebuddy.description.type.TypeDescription;`
`19`	`20`	`import net.bytebuddy.matcher.ElementMatcher;`
`@@ -45,7 +46,7 @@ public static Scope enter(@Advice.Argument(0) Envelope envelope) {`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)`
`48`		`- public static void exit(@Advice.Enter Scope scope) {`
	`49`	`+ public static void exit(@Advice.Enter @Nullable Scope scope) {`
`49`	`50`	`if (scope != null) {`
`50`	`51`	`scope.close();`
`51`	`52`	`}`
`@@ -62,7 +63,7 @@ public static Scope enter(@Advice.Argument(0) SystemMessage systemMessage) {`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)`
`65`		`- public static void exit(@Advice.Enter Scope scope) {`
	`66`	`+ public static void exit(@Advice.Enter @Nullable Scope scope) {`
`66`	`67`	`if (scope != null) {`
`67`	`68`	`scope.close();`
`68`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static ActorSystem getActorSystem(HttpExt httpExt) {`
`43`	`43`
`44`	`44`	`try {`
`45`	`45`	`return (ActorSystem) actorSystemAccessor.invoke(httpExt);`
`46`		`- } catch (Throwable e) {`
	`46`	`+ } catch (Throwable t) {`
`47`	`47`	`return null;`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@`
`12`	`12`	`import io.opentelemetry.context.propagation.TextMapSetter;`
`13`	`13`	`import javax.annotation.Nullable;`
`14`	`14`
`15`		`-public class HttpHeaderSetter implements TextMapSetter<HttpHeaderSetter.AkkaHttpHeaders> {`
	`15`	`+class HttpHeaderSetter implements TextMapSetter<HttpHeaderSetter.AkkaHttpHeaders> {`
`16`	`16`
`17`	`17`	`private final ContextPropagators contextPropagators;`
`18`	`18`
`19`		`- public HttpHeaderSetter(ContextPropagators contextPropagators) {`
	`19`	`+ HttpHeaderSetter(ContextPropagators contextPropagators) {`
`20`	`20`	`this.contextPropagators = contextPropagators;`
`21`	`21`	`}`
`22`	`22`
`@@ -31,7 +31,7 @@ public void set(@Nullable AkkaHttpHeaders carrier, String key, String value) {`
`31`	`31`	`(HttpRequest) request.removeHeader(key).addHeader(RawHeader.create(key, value)));`
`32`	`32`	`}`
`33`	`33`
`34`		`- public HttpRequest inject(HttpRequest original) {`
	`34`	`+ HttpRequest inject(HttpRequest original) {`
`35`	`35`	`AkkaHttpHeaders carrier = new AkkaHttpHeaders(original);`
`36`	`36`	`contextPropagators.getTextMapPropagator().inject(Context.current(), carrier, this);`
`37`	`37`	`return carrier.getRequest();`
`@@ -44,11 +44,11 @@ public AkkaHttpHeaders(HttpRequest request) {`
`44`	`44`	`this.request = request;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public HttpRequest getRequest() {`
	`47`	`+ HttpRequest getRequest() {`
`48`	`48`	`return request;`
`49`	`49`	`}`
`50`	`50`
`51`		`- public void setRequest(HttpRequest request) {`
	`51`	`+ void setRequest(HttpRequest request) {`
`52`	`52`	`this.request = request;`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpServerInstrumenters;`
`12`	`12`	`import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;`
`13`	`13`
`14`		`-public class AkkaHttpServerSingletons {`
	`14`	`+class AkkaHttpServerSingletons {`
`15`	`15`
`16`	`16`	`private static final Instrumenter<HttpRequest, HttpResponse> instrumenter;`
`17`	`17`
`@@ -23,11 +23,11 @@ public class AkkaHttpServerSingletons {`
`23`	`23`	`new AkkaHttpServerHeaders());`
`24`	`24`	`}`
`25`	`25`
`26`		`- public static Instrumenter<HttpRequest, HttpResponse> instrumenter() {`
	`26`	`+ static Instrumenter<HttpRequest, HttpResponse> instrumenter() {`
`27`	`27`	`return instrumenter;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public static HttpResponse errorResponse() {`
	`30`	`+ static HttpResponse errorResponse() {`
`31`	`31`	`return (HttpResponse) HttpResponse.create().withStatus(500);`
`32`	`32`	`}`
`33`	`33`