Code review sweep (run 25076807872) (#18386)

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

Author: otelbot[bot]

instrumentation/rxjava/rxjava-common-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/common/v3_0/TracingCompletableObserver.java

@@ -28,7 +28,7 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 
-public class TracingCompletableObserver implements CompletableObserver, Disposable {
+public final class TracingCompletableObserver implements CompletableObserver, Disposable {
 
   private final CompletableObserver actual;
   private final Context context;

instrumentation/rxjava/rxjava-common-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/common/v3_0/TracingMaybeObserver.java

@@ -28,7 +28,7 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 
-public class TracingMaybeObserver<T> implements MaybeObserver<T>, Disposable {
+public final class TracingMaybeObserver<T> implements MaybeObserver<T>, Disposable {
 
   private final MaybeObserver<T> actual;
   private final Context context;

instrumentation/rxjava/rxjava-common-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/common/v3_0/TracingSingleObserver.java

@@ -28,7 +28,7 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 
-public class TracingSingleObserver<T> implements SingleObserver<T>, Disposable {
+public final class TracingSingleObserver<T> implements SingleObserver<T>, Disposable {
 
   private final SingleObserver<T> actual;
   private final Context context;

instrumentation/rxjava/rxjava-common-3.0/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/common/v3_0/ExperimentalTestHelper.java

@@ -6,11 +6,11 @@
 package io.opentelemetry.instrumentation.rxjava.common.v3_0;
 
 class ExperimentalTestHelper {
-  private static final boolean isEnabled =
+  private static final boolean EXPERIMENTAL_ATTRIBUTES =
       Boolean.getBoolean("otel.instrumentation.rxjava.experimental-span-attributes");
 
   static Boolean experimentalCanceled(boolean value) {
-    if (isEnabled) {
+    if (EXPERIMENTAL_ATTRIBUTES) {
       return value;
     }
     return null;

instrumentation/rxjava/rxjava-common-3.0/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/common/v3_0/RxJava3ConcurrencyTestHelper.java

@@ -23,10 +23,10 @@
  * scheduler threads handling various stages of the chain will have to alternate between contexts
  * from different traces.
  */
-public class RxJava3ConcurrencyTestHelper {
+class RxJava3ConcurrencyTestHelper {
   private RxJava3ConcurrencyTestHelper() {}
 
-  public static void launchAndWait(
+  static void launchAndWait(
       Scheduler scheduler, int iterations, long timeoutMillis, InstrumentationExtension runner) {
     CountDownLatch latch = new CountDownLatch(iterations);
 

instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2Accessor.java

@@ -11,6 +11,7 @@
 import io.opentelemetry.instrumentation.servlet.internal.ServletAsyncListener;
 import io.opentelemetry.javaagent.bootstrap.http.HttpServerResponseMutator;
 import java.util.List;
+import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -21,16 +22,19 @@ class Servlet2Accessor extends JavaxServletAccessor<HttpServletResponse>
   private Servlet2Accessor() {}
 
   @Override
+  @Nullable
   public Integer getRequestRemotePort(HttpServletRequest httpServletRequest) {
     return null;
   }
 
   @Override
+  @Nullable
   public String getRequestLocalAddr(HttpServletRequest request) {
     return null;
   }
 
   @Override
+  @Nullable
   public Integer getRequestLocalPort(HttpServletRequest request) {
     return null;
   }
@@ -39,7 +43,7 @@ public Integer getRequestLocalPort(HttpServletRequest request) {
   public void addRequestAsyncListener(
       HttpServletRequest httpServletRequest,
       ServletAsyncListener<HttpServletResponse> listener,
-      Object response) {
+      @Nullable Object response) {
     throw new UnsupportedOperationException();
   }
 

instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/HttpServletResponseTest.java

@@ -96,7 +96,7 @@ void testSendWithParent() {
   }
 
   @Test
-  void testSendWithException() throws ServletException, IOException {
+  void testSendWithException() throws Exception {
     RuntimeException ex = new RuntimeException("some error");
     TestResponse response =
         new TestResponse() {

instrumentation/servlet/servlet-3.0/javaagent-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/HttpServletResponseTest.java

@@ -97,7 +97,7 @@ void testSendWithParent() throws IOException {
   }
 
   @Test
-  void testSendWithException() throws ServletException, IOException {
+  void testSendWithException() throws Exception {
     TestResponse response =
         new TestResponse() {
           @Override

instrumentation/servlet/servlet-3.0/javaagent-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyDispatchTest.java

@@ -12,6 +12,6 @@
 
 class JettyDispatchTest extends BaseJettyDispatchTest {
   @RegisterExtension
-  protected static final InstrumentationExtension testing =
+  private static final InstrumentationExtension testing =
       HttpServerInstrumentationExtension.forAgent();
 }

instrumentation/servlet/servlet-3.0/javaagent-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3Test.java

@@ -12,6 +12,6 @@
 
 class JettyServlet3Test extends BaseJettyServlet3Test {
   @RegisterExtension
-  protected static final InstrumentationExtension testing =
+  private static final InstrumentationExtension testing =
       HttpServerInstrumentationExtension.forAgent();
 }