fix(deps): update errorproneversion to v2.33.0 (minor) (#12371)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <[email protected]>

dependencyManagement/build.gradle.kts

@@ -40,7 +40,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
-val errorProneVersion = "2.32.0"
+val errorProneVersion = "2.33.0"
 val byteBuddyVersion = "1.15.3"
 val asmVersion = "9.7"
 val jmhVersion = "1.37"

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java

@@ -24,7 +24,7 @@ public CouchbaseInstrumentationModule() {
 
   @Override
   public boolean isHelperClass(String className) {
-    return className.equals("rx.__OpenTelemetryTracingUtil");
+    return className.equals("rx.OpenTelemetryTracingUtil");
   }
 
   @Override
@@ -39,6 +39,6 @@ public String getModuleGroup() {
 
   @Override
   public List<String> injectedClassNames() {
-    return singletonList("rx.__OpenTelemetryTracingUtil");
+    return singletonList("rx.OpenTelemetryTracingUtil");
   }
 }

instrumentation/graphql-java/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetry.java

@@ -9,7 +9,7 @@
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.graphql.internal.OpenTelemetryInstrumentationHelper;
 
-@SuppressWarnings("AbbreviationAsWordInName")
+@SuppressWarnings({"AbbreviationAsWordInName", "MemberName"})
 public final class GraphQLTelemetry {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.graphql-java-12.0";
 

instrumentation/graphql-java/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetryBuilder.java

@@ -9,7 +9,7 @@
 import io.opentelemetry.api.OpenTelemetry;
 
 /** A builder of {@link GraphQLTelemetry}. */
-@SuppressWarnings("AbbreviationAsWordInName")
+@SuppressWarnings({"AbbreviationAsWordInName", "MemberName"})
 public final class GraphQLTelemetryBuilder {
 
   private final OpenTelemetry openTelemetry;

instrumentation/graphql-java/graphql-java-20.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v20_0/GraphQLTelemetry.java

@@ -11,7 +11,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.graphql.internal.OpenTelemetryInstrumentationHelper;
 
-@SuppressWarnings("AbbreviationAsWordInName")
+@SuppressWarnings({"AbbreviationAsWordInName", "MemberName"})
 public final class GraphQLTelemetry {
 
   /** Returns a new {@link GraphQLTelemetry} configured with the given {@link OpenTelemetry}. */

instrumentation/graphql-java/graphql-java-20.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v20_0/GraphQLTelemetryBuilder.java

@@ -9,7 +9,7 @@
 import io.opentelemetry.api.OpenTelemetry;
 
 /** A builder of {@link GraphQLTelemetry}. */
-@SuppressWarnings("AbbreviationAsWordInName")
+@SuppressWarnings({"AbbreviationAsWordInName", "MemberName"})
 public final class GraphQLTelemetryBuilder {
 
   private final OpenTelemetry openTelemetry;

instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java

@@ -23,7 +23,7 @@ public HystrixInstrumentationModule() {
 
   @Override
   public boolean isHelperClass(String className) {
-    return className.equals("rx.__OpenTelemetryTracingUtil");
+    return className.equals("rx.OpenTelemetryTracingUtil");
   }
 
   @Override
@@ -33,6 +33,6 @@ public List<TypeInstrumentation> typeInstrumentations() {
 
   @Override
   public List<String> injectedClassNames() {
-    return singletonList("rx.__OpenTelemetryTracingUtil");
+    return singletonList("rx.OpenTelemetryTracingUtil");
   }
 }

instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerMdcTest.java

@@ -97,6 +97,7 @@ void idsGeneratedWhenSpanProvided() throws InvocationTargetException, IllegalAcc
     try {
       getMdcCopy = logRecords.get(0).getClass().getMethod("getMdcCopy");
     } catch (NoSuchMethodException ignored) {
+      // ignored
     }
 
     assertThat(logRecords.get(0).getMessage()).isEqualTo("log message 1");

instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java

@@ -82,6 +82,7 @@ public void cleanup() throws IOException, TimeoutException {
         conn.close();
       }
     } catch (ShutdownSignalException ignored) {
+      // ignored
     }
   }
 

instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java

@@ -78,7 +78,7 @@ static void cleanupAll() {
   }
 
   @BeforeEach
-  void setup() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+  void setup() throws InvocationTargetException, IllegalAccessException {
     String newAddress = address;
     if (useRedisProtocol()) {
       // Newer versions of redisson require scheme, older versions forbid it
@@ -95,6 +95,7 @@ void setup() throws NoSuchMethodException, InvocationTargetException, IllegalAcc
           .getMethod("setPingConnectionInterval", int.class)
           .invoke(singleServerConfig, 0);
     } catch (NoSuchMethodException ignored) {
+      // ignored
     }
     redisson = Redisson.create(config);
     testing.clearData();

instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java

@@ -99,6 +99,7 @@ void setup() throws InvocationTargetException, IllegalAccessException {
           .getMethod("setPingConnectionInterval", int.class)
           .invoke(singleServerConfig, 0);
     } catch (NoSuchMethodException ignored) {
+      // ignored
     }
     redisson = Redisson.create(config);
     testing.clearData();

instrumentation/rxjava/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v1_0/TracedOnSubscribe.java

@@ -9,8 +9,8 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import rx.Observable;
+import rx.OpenTelemetryTracingUtil;
 import rx.Subscriber;
-import rx.__OpenTelemetryTracingUtil;
 
 public final class TracedOnSubscribe<T, REQUEST> implements Observable.OnSubscribe<T> {
   private final Observable.OnSubscribe<T> delegate;
@@ -20,7 +20,7 @@ public final class TracedOnSubscribe<T, REQUEST> implements Observable.OnSubscri
 
   public TracedOnSubscribe(
       Observable<T> originalObservable, Instrumenter<REQUEST, ?> instrumenter, REQUEST request) {
-    delegate = __OpenTelemetryTracingUtil.extractOnSubscribe(originalObservable);
+    delegate = OpenTelemetryTracingUtil.extractOnSubscribe(originalObservable);
     this.instrumenter = instrumenter;
     this.request = request;
 

instrumentation/rxjava/rxjava-1.0/library/src/main/java/rx/__OpenTelemetryTracingUtil.java → instrumentation/rxjava/rxjava-1.0/library/src/main/java/rx/OpenTelemetryTracingUtil.java

@@ -8,11 +8,10 @@
 /**
  * This class must be in the rx package in order to access the package accessible onSubscribe field.
  */
-@SuppressWarnings("checkstyle:TypeName")
-public final class __OpenTelemetryTracingUtil {
+public final class OpenTelemetryTracingUtil {
   public static <T> Observable.OnSubscribe<T> extractOnSubscribe(Observable<T> observable) {
     return observable.onSubscribe;
   }
 
-  private __OpenTelemetryTracingUtil() {}
+  private OpenTelemetryTracingUtil() {}
 }

javaagent/src/test/java/io/opentelemetry/javaagent/classloading/ShadowPackageRenamingTest.java

@@ -38,7 +38,7 @@ public class ShadowPackageRenamingTest {
           "org.objectweb.asm",
           "com.kenai",
           // Custom RxJava Utility
-          "rx.__OpenTelemetryTracingUtil");
+          "rx.OpenTelemetryTracingUtil");
 
   @Test
   void agentDependenciesRenamed() throws Exception {

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java

@@ -448,6 +448,7 @@ void errorSpan() {
           try {
             doRequest(method, uri);
           } catch (Throwable ignored) {
+            // ignored
           }
         });