From e6e2190f683841e5798ebd5b7390f8538648cd0c Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Thu, 20 Jan 2022 18:28:45 +0900 Subject: [PATCH] Fix most lint warnings. (#5180) * Fix most lint warnings. * Fix test --- .attach_pid876 | 0 .../MessagingAttributesExtractorTest.java | 5 ++++- .../javaagent/src/test/java/AkkaAsyncChild.java | 2 +- .../src/test/java/TracingRequestHandlerTest.java | 2 +- .../awssdk/v2_2/FieldMapperTest.java | 4 ++-- .../javaagent/src/test/java/JavaAsyncChild.java | 2 +- .../javaagent/build.gradle.kts | 2 ++ .../instrumentation/oshi/AbstractMetricsTest.java | 5 +++-- .../javaagent/src/test/java/ScalaAsyncChild.java | 2 +- .../javaagent/build.gradle.kts | 2 ++ .../javaagent/build.gradle.kts | 1 + .../javaagent/instrumentation/api/CallDepth.java | 15 --------------- .../instrumentation/api/CallDepthTest.java | 11 ----------- javaagent-tooling/build.gradle.kts | 1 + 14 files changed, 19 insertions(+), 35 deletions(-) create mode 100644 .attach_pid876 diff --git a/.attach_pid876 b/.attach_pid876 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java index 24d9376fcb..d1971fa3a6 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java @@ -74,7 +74,10 @@ class MessagingAttributesExtractorTest { entry(SemanticAttributes.MESSAGING_MESSAGE_PAYLOAD_COMPRESSED_SIZE_BYTES, 10L)); expectedEntries.add(entry(SemanticAttributes.MESSAGING_OPERATION, operation.operationName())); - assertThat(startAttributes.build()).containsOnly(expectedEntries.toArray(new MapEntry[0])); + @SuppressWarnings({"unchecked", "rawtypes"}) + MapEntry, ?>[] expectedEntriesArr = + expectedEntries.toArray(new MapEntry[0]); + assertThat(startAttributes.build()).containsOnly(expectedEntriesArr); assertThat(endAttributes.build()) .containsOnly(entry(SemanticAttributes.MESSAGING_MESSAGE_ID, "42")); diff --git a/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/test/java/AkkaAsyncChild.java b/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/test/java/AkkaAsyncChild.java index 81b0f5ce08..77af1f4537 100644 --- a/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/test/java/AkkaAsyncChild.java +++ b/instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/test/java/AkkaAsyncChild.java @@ -10,7 +10,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; -public class AkkaAsyncChild extends ForkJoinTask implements Runnable, Callable { +public class AkkaAsyncChild extends ForkJoinTask implements Runnable, Callable { private static final Tracer tracer = GlobalOpenTelemetry.getTracer("test"); private final AtomicBoolean blockThread; diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/src/test/java/TracingRequestHandlerTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/src/test/java/TracingRequestHandlerTest.java index 0f796d8788..3f8716ce2d 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/src/test/java/TracingRequestHandlerTest.java +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/src/test/java/TracingRequestHandlerTest.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; class TracingRequestHandlerTest { - private static Response response(Request request) { + private static Response response(Request request) { return new Response<>(new SendMessageResult(), new HttpResponse(request, new HttpGet())); } diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapperTest.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapperTest.java index c72ede715a..983c1edfde 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapperTest.java +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/FieldMapperTest.java @@ -63,7 +63,7 @@ public class FieldMapperTest { MethodHandleFactory methodHandleFactory = new MethodHandleFactory(); Serializer serializer = mock(Serializer.class); FieldMapper underTest = new FieldMapper(serializer, methodHandleFactory); - Map> items = new HashMap(); + Map> items = new HashMap<>(); BatchWriteItemRequest sdkRequest = BatchWriteItemRequest.builder().requestItems(items).build(); given(serializer.serialize(items)).willReturn("firstTable,secondTable"); @@ -83,7 +83,7 @@ public class FieldMapperTest { MethodHandleFactory methodHandleFactory = new MethodHandleFactory(); Serializer serializer = mock(Serializer.class); FieldMapper underTest = new FieldMapper(serializer, methodHandleFactory); - Map> items = new HashMap(); + Map> items = new HashMap<>(); BatchWriteItemResponse sdkResponse = BatchWriteItemResponse.builder() .consumedCapacity(ConsumedCapacity.builder().build()) diff --git a/instrumentation/executors/javaagent/src/test/java/JavaAsyncChild.java b/instrumentation/executors/javaagent/src/test/java/JavaAsyncChild.java index 1eedd34544..66cd7c9904 100644 --- a/instrumentation/executors/javaagent/src/test/java/JavaAsyncChild.java +++ b/instrumentation/executors/javaagent/src/test/java/JavaAsyncChild.java @@ -10,7 +10,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ForkJoinTask; import java.util.concurrent.atomic.AtomicBoolean; -public class JavaAsyncChild extends ForkJoinTask implements Runnable, Callable { +public class JavaAsyncChild extends ForkJoinTask implements Runnable, Callable { private static final Tracer tracer = GlobalOpenTelemetry.getTracer("test"); private final AtomicBoolean blockThread; diff --git a/instrumentation/external-annotations/javaagent/build.gradle.kts b/instrumentation/external-annotations/javaagent/build.gradle.kts index 2b8ede98db..55fbe3de27 100644 --- a/instrumentation/external-annotations/javaagent/build.gradle.kts +++ b/instrumentation/external-annotations/javaagent/build.gradle.kts @@ -29,6 +29,8 @@ dependencies { testImplementation("org.springframework.cloud:spring-cloud-sleuth-core:2.2.4.RELEASE") { isTransitive = false } + // For some annotations used by sleuth + testCompileOnly("org.springframework:spring-core:4.3.30.RELEASE") } tasks { diff --git a/instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/AbstractMetricsTest.java b/instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/AbstractMetricsTest.java index 2b9c4f3f12..3f1777b9d9 100644 --- a/instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/AbstractMetricsTest.java +++ b/instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/AbstractMetricsTest.java @@ -12,9 +12,9 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.metrics.SdkMeterProvider; import io.opentelemetry.sdk.metrics.data.MetricData; -import io.opentelemetry.sdk.metrics.testing.InMemoryMetricReader; import io.opentelemetry.sdk.testing.assertj.MetricAssertions; import io.opentelemetry.sdk.testing.assertj.MetricDataAssert; +import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; import java.util.Collection; import java.util.function.Consumer; import org.junit.jupiter.api.AfterAll; @@ -37,7 +37,8 @@ class AbstractMetricsTest { GlobalOpenTelemetry.resetForTest(); } - protected void waitAndAssertMetrics(Consumer... assertions) { + @SafeVarargs + protected final void waitAndAssertMetrics(Consumer... assertions) { await() .untilAsserted( () -> { diff --git a/instrumentation/scala-executors/javaagent/src/test/java/ScalaAsyncChild.java b/instrumentation/scala-executors/javaagent/src/test/java/ScalaAsyncChild.java index 26eeb390a8..f2b7935e0c 100644 --- a/instrumentation/scala-executors/javaagent/src/test/java/ScalaAsyncChild.java +++ b/instrumentation/scala-executors/javaagent/src/test/java/ScalaAsyncChild.java @@ -10,7 +10,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import scala.concurrent.forkjoin.ForkJoinTask; -public class ScalaAsyncChild extends ForkJoinTask implements Runnable, Callable { +public class ScalaAsyncChild extends ForkJoinTask implements Runnable, Callable { private static final Tracer tracer = GlobalOpenTelemetry.getTracer("test"); private final AtomicBoolean blockThread; diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts index 12a6a8d4c8..8bb85af41f 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts @@ -15,7 +15,9 @@ dependencies { library("io.vertx:vertx-core:3.0.0") compileOnly("io.vertx:vertx-codegen:3.0.0") + testCompileOnly("io.vertx:vertx-codegen:3.0.0") compileOnly("io.vertx:vertx-docgen:3.0.0") + testCompileOnly("io.vertx:vertx-docgen:3.0.0") compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts index a0e2080b8a..738278707e 100644 --- a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts @@ -15,6 +15,7 @@ dependencies { library("io.vertx:vertx-core:4.0.0") compileOnly("io.vertx:vertx-codegen:4.0.0") + testCompileOnly("io.vertx:vertx-codegen:4.0.0") implementation(project(":instrumentation:vertx:vertx-http-client:vertx-http-client-common:javaagent")) diff --git a/javaagent-instrumentation-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/CallDepth.java b/javaagent-instrumentation-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/CallDepth.java index 9108a0d35e..0c1717b11f 100644 --- a/javaagent-instrumentation-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/CallDepth.java +++ b/javaagent-instrumentation-api/src/main/java/io/opentelemetry/javaagent/instrumentation/api/CallDepth.java @@ -53,19 +53,4 @@ public final class CallDepth { public int decrementAndGet() { return --this.depth; } - - /** - * Get current call depth. This method may be used by vendor distributions to extend existing - * instrumentations. - */ - @Deprecated - public int get() { - return depth; - } - - /** Reset the call depth to its initial value. */ - @Deprecated - public void reset() { - depth = 0; - } } diff --git a/javaagent-instrumentation-api/src/test/java/io/opentelemetry/javaagent/instrumentation/api/CallDepthTest.java b/javaagent-instrumentation-api/src/test/java/io/opentelemetry/javaagent/instrumentation/api/CallDepthTest.java index b6090b1a1b..bbbe7f8e69 100644 --- a/javaagent-instrumentation-api/src/test/java/io/opentelemetry/javaagent/instrumentation/api/CallDepthTest.java +++ b/javaagent-instrumentation-api/src/test/java/io/opentelemetry/javaagent/instrumentation/api/CallDepthTest.java @@ -19,17 +19,6 @@ class CallDepthTest { assertThat(CallDepth.forClass(String.class).getAndIncrement()).isOne(); assertThat(CallDepth.forClass(Integer.class).getAndIncrement()).isOne(); - CallDepth.forClass(String.class).reset(); - assertThat(CallDepth.forClass(Integer.class).getAndIncrement()).isEqualTo(2); - - CallDepth.forClass(Integer.class).reset(); - - assertThat(CallDepth.forClass(String.class).getAndIncrement()).isZero(); - assertThat(CallDepth.forClass(Integer.class).getAndIncrement()).isZero(); - - assertThat(CallDepth.forClass(String.class).getAndIncrement()).isOne(); - assertThat(CallDepth.forClass(Integer.class).getAndIncrement()).isOne(); - assertThat(CallDepth.forClass(String.class).decrementAndGet()).isOne(); assertThat(CallDepth.forClass(Integer.class).decrementAndGet()).isOne(); diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts index 9cc0de54dd..8e2492750e 100644 --- a/javaagent-tooling/build.gradle.kts +++ b/javaagent-tooling/build.gradle.kts @@ -39,6 +39,7 @@ dependencies { annotationProcessor("com.google.auto.service:auto-service") compileOnly("com.google.auto.service:auto-service-annotations") + testCompileOnly("com.google.auto.service:auto-service-annotations") // Used by byte-buddy but not brought in as a transitive dependency. compileOnly("com.google.code.findbugs:annotations")