diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 8a2f7273a32e..b0ccd453aea6 100644 --- a/dependencyManagement/build.gradle.kts +++ b/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" diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java index 363a608666e8..6fcde8978997 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseInstrumentationModule.java +++ b/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 injectedClassNames() { - return singletonList("rx.__OpenTelemetryTracingUtil"); + return singletonList("rx.OpenTelemetryTracingUtil"); } } diff --git a/instrumentation/graphql-java/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetry.java b/instrumentation/graphql-java/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetry.java index 4671cce91cfb..4b6ec25adfe4 100644 --- a/instrumentation/graphql-java/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetry.java +++ b/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"; diff --git a/instrumentation/graphql-java/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetryBuilder.java b/instrumentation/graphql-java/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetryBuilder.java index ddccbffef220..b6fabdd808bf 100644 --- a/instrumentation/graphql-java/graphql-java-12.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v12_0/GraphQLTelemetryBuilder.java +++ b/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; diff --git a/instrumentation/graphql-java/graphql-java-20.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v20_0/GraphQLTelemetry.java b/instrumentation/graphql-java/graphql-java-20.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v20_0/GraphQLTelemetry.java index 7b7f598f0f46..75a4aefc86be 100644 --- a/instrumentation/graphql-java/graphql-java-20.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v20_0/GraphQLTelemetry.java +++ b/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}. */ diff --git a/instrumentation/graphql-java/graphql-java-20.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v20_0/GraphQLTelemetryBuilder.java b/instrumentation/graphql-java/graphql-java-20.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v20_0/GraphQLTelemetryBuilder.java index a7c285e9dc82..7e23e5f71fcb 100644 --- a/instrumentation/graphql-java/graphql-java-20.0/library/src/main/java/io/opentelemetry/instrumentation/graphql/v20_0/GraphQLTelemetryBuilder.java +++ b/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; diff --git a/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java b/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java index c58f5c48d8aa..6b3b7bdcb4cc 100644 --- a/instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixInstrumentationModule.java +++ b/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 typeInstrumentations() { @Override public List injectedClassNames() { - return singletonList("rx.__OpenTelemetryTracingUtil"); + return singletonList("rx.OpenTelemetryTracingUtil"); } } diff --git a/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerMdcTest.java b/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerMdcTest.java index 518ca25aa289..53d013dbe051 100644 --- a/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/mdc/v1_1/JbossLogmanagerMdcTest.java +++ b/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"); diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java b/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java index 8347f81df4f8..98bd4d562c83 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/RabbitMqTest.java +++ b/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 } } diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java index 9a005c90315c..6f565a02a80d 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java +++ b/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(); diff --git a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java b/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java index d25aa7e4fcd4..ca9fa0d72f6c 100644 --- a/instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java +++ b/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(); diff --git a/instrumentation/rxjava/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v1_0/TracedOnSubscribe.java b/instrumentation/rxjava/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v1_0/TracedOnSubscribe.java index bf3a3d95081e..a89d08eab040 100644 --- a/instrumentation/rxjava/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v1_0/TracedOnSubscribe.java +++ b/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 implements Observable.OnSubscribe { private final Observable.OnSubscribe delegate; @@ -20,7 +20,7 @@ public final class TracedOnSubscribe implements Observable.OnSubscri public TracedOnSubscribe( Observable originalObservable, Instrumenter instrumenter, REQUEST request) { - delegate = __OpenTelemetryTracingUtil.extractOnSubscribe(originalObservable); + delegate = OpenTelemetryTracingUtil.extractOnSubscribe(originalObservable); this.instrumenter = instrumenter; this.request = request; diff --git a/instrumentation/rxjava/rxjava-1.0/library/src/main/java/rx/__OpenTelemetryTracingUtil.java b/instrumentation/rxjava/rxjava-1.0/library/src/main/java/rx/OpenTelemetryTracingUtil.java similarity index 72% rename from instrumentation/rxjava/rxjava-1.0/library/src/main/java/rx/__OpenTelemetryTracingUtil.java rename to instrumentation/rxjava/rxjava-1.0/library/src/main/java/rx/OpenTelemetryTracingUtil.java index 647d6d9e800b..8de33d4417a9 100644 --- a/instrumentation/rxjava/rxjava-1.0/library/src/main/java/rx/__OpenTelemetryTracingUtil.java +++ b/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 Observable.OnSubscribe extractOnSubscribe(Observable observable) { return observable.onSubscribe; } - private __OpenTelemetryTracingUtil() {} + private OpenTelemetryTracingUtil() {} } diff --git a/javaagent/src/test/java/io/opentelemetry/javaagent/classloading/ShadowPackageRenamingTest.java b/javaagent/src/test/java/io/opentelemetry/javaagent/classloading/ShadowPackageRenamingTest.java index 226d0495afc7..dd01e3d11d48 100644 --- a/javaagent/src/test/java/io/opentelemetry/javaagent/classloading/ShadowPackageRenamingTest.java +++ b/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 { diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java index 4d9fa69793c8..73db5eac8c02 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java +++ b/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 } });