Code review sweep (run 24912525812) (open-telemetry#18274)

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

Author: otelbot[bot]

instrumentation/spring/spring-integration-4.1/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/integration/v4_1/AbstractSpringCloudStreamProducerTest.java

@@ -17,7 +17,7 @@ public abstract class AbstractSpringCloudStreamProducerTest {
   private static final boolean HAS_PRODUCER_SPAN =
       Boolean.getBoolean("otel.instrumentation.spring-integration.producer.enabled");
 
-  @RegisterExtension final RabbitExtension rabbit;
+  @RegisterExtension private final RabbitExtension rabbit;
 
   protected final InstrumentationExtension testing;
 

instrumentation/spring/spring-integration-4.1/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/integration/v4_1/AbstractSpringCloudStreamRabbitTest.java

@@ -12,7 +12,7 @@
 
 public abstract class AbstractSpringCloudStreamRabbitTest {
 
-  @RegisterExtension final RabbitExtension rabbit;
+  @RegisterExtension private final RabbitExtension rabbit;
 
   protected final InstrumentationExtension testing;
 

instrumentation/spring/spring-integration-4.1/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/integration/v4_1/RabbitExtension.java

@@ -106,7 +106,7 @@ private static Class<?>[] getContextClasses(Class<?> mainContext, Class<?> addit
   @EnableAutoConfiguration
   @EnableBinding(Source.class)
   static class ProducerConfig {
-    @Autowired Source source;
+    @Autowired private Source source;
 
     @Bean
     Runnable producer() {

instrumentation/spring/spring-jms/spring-jms-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v2_0/SpringTemplateTest.java

@@ -13,6 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.instrumentation.spring.jms.v2_0.AbstractJmsTest;
+import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.trace.data.SpanData;
@@ -41,7 +42,6 @@
 import org.hornetq.core.server.HornetQServers;
 import org.hornetq.jms.client.HornetQConnectionFactory;
 import org.jetbrains.annotations.NotNull;
-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;
@@ -53,6 +53,9 @@ class SpringTemplateTest extends AbstractJmsTest {
   @RegisterExtension
   private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
+  @RegisterExtension
+  private static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+
   private static HornetQServer server;
   private static final String messageText = "a message";
   private static JmsTemplate template;
@@ -78,6 +81,7 @@ static void setup() throws Exception {
 
     server = HornetQServers.newHornetQServer(config);
     server.start();
+    cleanup.deferAfterAll(server::stop);
 
     ServerLocator serverLocator =
         HornetQClient.createServerLocatorWithoutHA(
@@ -92,23 +96,19 @@ static void setup() throws Exception {
     HornetQConnectionFactory connectionFactory =
         HornetQJMSClient.createConnectionFactoryWithoutHA(
             JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName()));
+    cleanup.deferAfterAll(connectionFactory::close);
 
     connection = connectionFactory.createConnection();
     connection.start();
     session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
     session.run();
+    cleanup.deferAfterAll(connection);
+    cleanup.deferAfterAll(session);
 
     template = new JmsTemplate(connectionFactory);
     template.setReceiveTimeout(SECONDS.toMillis(10));
   }
 
-  @AfterAll
-  static void cleanup() throws Exception {
-    session.close();
-    connection.close();
-    server.stop();
-  }
-
   @Test
   void sendingMessageToDestinationNameGeneratesSpans() throws JMSException {
     Queue queue = session.createQueue("SpringTemplateJms2");

instrumentation/spring/spring-jms/spring-jms-2.0/metadata.yaml

@@ -5,12 +5,14 @@ semantic_conventions:
 library_link: https://docs.spring.io/spring-framework/reference/integration/jms.html
 configurations:
   - name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled
+    declarative_name: java.common.messaging.receive_telemetry/development.enabled
     description: >
       Enables experimental receive telemetry, which will cause consumers to start a new trace, with
       only a span link connecting it to the producer trace.
     type: boolean
     default: false
   - name: otel.instrumentation.messaging.experimental.capture-headers
+    declarative_name: java.common.messaging.capture_headers/development
     description: A comma-separated list of header names to capture as span attributes.
     type: list
     default: ''

instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/AbstractSpringJmsListenerTest.java

@@ -18,7 +18,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
-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;
@@ -54,13 +53,7 @@ static void setUp() {
             .withStartupTimeout(Duration.ofMinutes(2))
             .withLogConsumer(new Slf4jLogConsumer(logger));
     broker.start();
-  }
-
-  @AfterAll
-  static void tearDown() {
-    if (broker != null) {
-      broker.close();
-    }
+    cleanup.deferAfterAll(broker);
   }
 
   @ParameterizedTest

instrumentation/spring/spring-jms/spring-jms-6.0/metadata.yaml

@@ -5,12 +5,14 @@ semantic_conventions:
 library_link: https://docs.spring.io/spring-framework/reference/integration/jms.html
 configurations:
   - name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled
+    declarative_name: java.common.messaging.receive_telemetry/development.enabled
     description: >
       Enables experimental receive telemetry, which will cause consumers to start a new trace, with
       only a span link connecting it to the producer trace.
     type: boolean
     default: false
   - name: otel.instrumentation.messaging.experimental.capture-headers
+    declarative_name: java.common.messaging.capture_headers/development
     description: A comma-separated list of header names to capture as span attributes.
     type: list
     default: ''

instrumentation/spring/spring-kafka-2.7/metadata.yaml

@@ -5,16 +5,19 @@ semantic_conventions:
   - MESSAGING_SPANS
 configurations:
   - name: otel.instrumentation.messaging.experimental.receive-telemetry.enabled
+    declarative_name: java.common.messaging.receive_telemetry/development.enabled
     description: >
       Enables experimental receive telemetry, which will cause consumers to start a new trace, with
       only a span link connecting it to the producer trace.
     type: boolean
     default: false
   - name: otel.instrumentation.messaging.experimental.capture-headers
+    declarative_name: java.common.messaging.capture_headers/development
     description: A comma-separated list of header names to capture as span attributes.
     type: list
     default: ''
   - name: otel.instrumentation.kafka.experimental-span-attributes
+    declarative_name: java.kafka.experimental_span_attributes/development
     description: Enables the capture of the experimental consumer attribute `kafka.record.queue_time_ms` and `messaging.kafka.bootstrap.servers`.
     type: boolean
     default: false