Code review sweep (run 25220695081) (#18488)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Author: otelbot[bot]

instrumentation/play/play-ws/play-ws-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayScalaWsClientBaseTest.java

@@ -20,7 +20,6 @@
 import scala.collection.JavaConverters;
 import scala.concurrent.Await;
 import scala.concurrent.ExecutionContext;
-import scala.concurrent.Future;
 import scala.concurrent.duration.Duration;
 import scala.util.Try;
 
@@ -52,14 +51,7 @@ public StandaloneWSRequest buildRequest(String method, URI uri, Map<String, Stri
   public int sendRequest(
       StandaloneWSRequest request, String method, URI uri, Map<String, String> headers)
       throws Exception {
-    Future<StandaloneWSResponse> futureResponse = request.execute();
-    Await.ready(futureResponse, Duration.apply(10, SECONDS));
-    Try<StandaloneWSResponse> value = futureResponse.value().get();
-    if (value.isSuccess()) {
-      return value.get().status();
-    }
-    // Catch the Throwable and rethrow it
-    throw (Exception) value.failed().get();
+    return Await.result(request.execute(), Duration.apply(10, SECONDS)).status();
   }
 
   @Override

instrumentation/powerjob-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/BasicProcessorInstrumentation.java

@@ -89,6 +89,7 @@ public void end(@Nullable ProcessResult result, @Nullable Throwable throwable) {
     }
 
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
+    @Nullable
     public static AdviceScope onSchedule(
         @Advice.This BasicProcessor handler, @Advice.Argument(0) TaskContext taskContext) {
       return AdviceScope.start(handler, taskContext);

instrumentation/quarkus-resteasy-reactive/quarkus-common-testing/src/main/java/io/opentelemetry/instrumentation/quarkus/resteasy/reactive/AbstractQuarkusJaxRsTest.java

@@ -20,6 +20,7 @@
 import io.opentelemetry.testing.internal.armeria.common.HttpMethod;
 import java.time.Duration;
 import java.util.Map;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -30,20 +31,29 @@ public abstract class AbstractQuarkusJaxRsTest {
   static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
   private static WebClient client;
+  private static ClientFactory clientFactory;
   private static int port;
 
   @BeforeAll
   static void setUp() {
+    clientFactory = ClientFactory.builder().connectTimeout(Duration.ofMinutes(1)).build();
     client =
         WebClient.builder()
             .responseTimeout(Duration.ofMinutes(1))
             .writeTimeout(Duration.ofMinutes(1))
-            .factory(ClientFactory.builder().connectTimeout(Duration.ofMinutes(1)).build())
+            .factory(clientFactory)
             .decorator(LoggingClient.newDecorator())
             .build();
     port = Integer.parseInt(System.getProperty("quarkus.http.test-port"));
   }
 
+  @AfterAll
+  static void cleanUp() {
+    if (clientFactory != null) {
+      clientFactory.close();
+    }
+  }
+
   @Test
   void testPathOnMethod() {
     AggregatedHttpResponse response = request("/test");

instrumentation/r2dbc-1.0/library/src/test/java/io/opentelemetry/instrumentation/r2dbc/v1_0/SqlCommenterTest.java

@@ -20,6 +20,7 @@
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.Experimental;
 import io.opentelemetry.instrumentation.reactor.v3_1.ContextPropagationOperator;
+import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
 import io.r2dbc.proxy.ProxyConnectionFactory;
@@ -32,7 +33,6 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -49,6 +49,8 @@ class SqlCommenterTest {
   @RegisterExtension
   private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
 
+  @RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+
   private static final ContextPropagationOperator tracingOperator =
       ContextPropagationOperator.create();
 
@@ -62,6 +64,7 @@ class SqlCommenterTest {
   @BeforeAll
   static void setup() {
     tracingOperator.registerOnEachOperator();
+    cleanup.deferAfterAll(tracingOperator::resetOnEachOperator);
 
     container =
         new GenericContainer<>("mariadb:10.3.6")
@@ -72,17 +75,12 @@ static void setup() {
             .withExposedPorts(3306)
             .withLogConsumer(new Slf4jLogConsumer(logger))
             .withStartupTimeout(Duration.ofMinutes(2));
+    cleanup.deferAfterAll(container::stop);
 
     container.start();
     port = container.getMappedPort(3306);
   }
 
-  @AfterAll
-  static void stop() {
-    container.stop();
-    tracingOperator.resetOnEachOperator();
-  }
-
   @ParameterizedTest
   @ValueSource(booleans = {true, false})
   void testSqlCommenter(boolean sqlCommenterEnabled) {

instrumentation/r2dbc-1.0/metadata.yaml

@@ -29,6 +29,7 @@ configurations:
     type: boolean
     default: false
   - name: otel.instrumentation.common.peer-service-mapping
+    declarative_name: java.common.peer_service_mapping
     description: Used to specify a mapping from host names or IP addresses to peer services.
     type: map
     default: ""

instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java

@@ -296,14 +296,14 @@ void testMetrics() {
 
   private static class Parameter {
 
-    final String system;
-    final String queryText;
-    final String expectedQueryText;
-    final String spanName;
-    final String table;
-    final String operation;
+    private final String system;
+    private final String queryText;
+    private final String expectedQueryText;
+    private final String spanName;
+    private final String table;
+    private final String operation;
 
-    Parameter(
+    private Parameter(
         String system,
         String queryText,
         String expectedQueryText,
@@ -318,7 +318,7 @@ private static class Parameter {
       this.operation = operation;
     }
 
-    String getQuerySummary() {
+    private String getQuerySummary() {
       if (!emitStableDatabaseSemconv()) {
         return null;
       }
@@ -328,19 +328,19 @@ String getQuerySummary() {
   }
 
   private static class DbSystemProps {
-    final String system;
-    final String image;
-    final int port;
-    final Map<String, String> envVariables = new HashMap<>();
+    private final String system;
+    private final String image;
+    private final int port;
+    private final Map<String, String> envVariables = new HashMap<>();
 
-    DbSystemProps(String system, String image, int port) {
+    private DbSystemProps(String system, String image, int port) {
       this.system = system;
       this.image = image;
       this.port = port;
     }
 
     @CanIgnoreReturnValue
-    DbSystemProps envVariables(String... keyValues) {
+    private DbSystemProps envVariables(String... keyValues) {
       for (int i = 0; i < keyValues.length / 2; i++) {
         envVariables.put(keyValues[2 * i], keyValues[2 * i + 1]);
       }

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/v2_7/RabbitChannelInstrumentation.java

@@ -74,18 +74,18 @@ public void transform(TypeTransformer transformer) {
                         .or(namedOneOf("processAsync", "open", "close", "abort", "basicGet"))))
             .and(isPublic())
             .and(canThrow(IOException.class).or(canThrow(InterruptedException.class))),
-        RabbitChannelInstrumentation.class.getName() + "$ChannelMethodAdvice");
+        getClass().getName() + "$ChannelMethodAdvice");
     transformer.applyAdviceToMethod(
         named("basicPublish").and(takesArguments(6)),
-        RabbitChannelInstrumentation.class.getName() + "$ChannelPublishAdvice");
+        getClass().getName() + "$ChannelPublishAdvice");
     transformer.applyAdviceToMethod(
         named("basicGet").and(takesArgument(0, String.class)),
-        RabbitChannelInstrumentation.class.getName() + "$ChannelGetAdvice");
+        getClass().getName() + "$ChannelGetAdvice");
     transformer.applyAdviceToMethod(
         named("basicConsume")
             .and(takesArgument(0, String.class))
             .and(takesArgument(6, named("com.rabbitmq.client.Consumer"))),
-        RabbitChannelInstrumentation.class.getName() + "$ChannelConsumeAdvice");
+        getClass().getName() + "$ChannelConsumeAdvice");
   }
 
   // TODO Why do we start span here and not in ChannelPublishAdvice below?

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/v2_7/RabbitCommandInstrumentation.java

@@ -35,8 +35,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   @Override
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
-        isConstructor(),
-        RabbitCommandInstrumentation.class.getName() + "$CommandConstructorAdvice");
+        isConstructor(), getClass().getName() + "$CommandConstructorAdvice");
   }
 
   public static final class SpanHolder {

instrumentation/rabbitmq-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/v2_7/RabbitSingletons.java

@@ -30,7 +30,7 @@ public class RabbitSingletons {
   private static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
       DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "rabbitmq")
           .getBoolean("experimental_span_attributes/development", false);
-  private static final String instrumentationName = "io.opentelemetry.rabbitmq-2.7";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.rabbitmq-2.7";
   private static final Instrumenter<ChannelAndMethod, Void> channelInstrumenter =
       createChannelInstrumenter(false);
   private static final Instrumenter<ChannelAndMethod, Void> channelPublishInstrumenter =
@@ -59,7 +59,7 @@ static Instrumenter<DeliveryRequest, Void> deliverInstrumenter() {
 
   private static Instrumenter<ChannelAndMethod, Void> createChannelInstrumenter(boolean publish) {
     return Instrumenter.<ChannelAndMethod, Void>builder(
-            GlobalOpenTelemetry.get(), instrumentationName, ChannelAndMethod::getMethod)
+            GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, ChannelAndMethod::getMethod)
         .addAttributesExtractor(
             buildMessagingAttributesExtractor(
                 new RabbitChannelAttributesGetter(), publish ? MessageOperation.PUBLISH : null))
@@ -82,7 +82,7 @@ private static Instrumenter<ReceiveRequest, GetResponse> createReceiveInstrument
     }
 
     return Instrumenter.<ReceiveRequest, GetResponse>builder(
-            GlobalOpenTelemetry.get(), instrumentationName, ReceiveRequest::spanName)
+            GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, ReceiveRequest::spanName)
         .addAttributesExtractors(extractors)
         .setEnabled(ExperimentalConfig.get().messagingReceiveInstrumentationEnabled())
         .addSpanLinksExtractor(
@@ -104,7 +104,7 @@ private static Instrumenter<DeliveryRequest, Void> createDeliverInstrumenter() {
     }
 
     return Instrumenter.<DeliveryRequest, Void>builder(
-            GlobalOpenTelemetry.get(), instrumentationName, DeliveryRequest::spanName)
+            GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, DeliveryRequest::spanName)
         .addAttributesExtractors(extractors)
         .buildConsumerInstrumenter(new DeliveryRequestGetter());
   }

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

@@ -9,7 +9,6 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.time.Duration;
-import javax.annotation.Nullable;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.slf4j.Logger;
@@ -22,7 +21,6 @@ abstract class AbstractRabbitMqTest {
   protected static final boolean EXPERIMENTAL_ATTRIBUTES_ENABLED =
       Boolean.getBoolean("otel.instrumentation.rabbitmq.experimental-span-attributes");
 
-  @Nullable
   static <T> T experimental(T value) {
     return EXPERIMENTAL_ATTRIBUTES_ENABLED ? value : null;
   }