Code review sweep (run 24913425314) (open-telemetry#18275)

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-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaNoReceiveTelemetryTest.java

@@ -326,7 +326,7 @@ void shouldHandleFailureInKafkaBatchListener() {
             trace -> {
               if (isLibraryInstrumentationTest() && Boolean.getBoolean("testLatestDeps")) {
                 // in latest dep tests process spans are not created for retries because spring does
-                // not call the success/failure methods on the BatchInterceptor for reties
+                // not call the success/failure methods on the BatchInterceptor for retries
                 trace.hasSpansSatisfyingExactly(span -> span.hasName("consumer").hasNoParent());
               } else {
                 trace.hasSpansSatisfyingExactly(

instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/AbstractSpringKafkaTest.java

@@ -42,7 +42,7 @@ public abstract class AbstractSpringKafkaTest {
       AttributeKey.stringKey("messaging.client_id");
   protected static KafkaContainer kafka;
 
-  ConfigurableApplicationContext applicationContext;
+  private ConfigurableApplicationContext applicationContext;
   protected KafkaTemplate<String, String> kafkaTemplate;
 
   @BeforeAll
@@ -91,7 +91,7 @@ void tearDownApp() {
     }
   }
 
-  static final MethodHandle send;
+  private static final MethodHandle send;
 
   static {
     MethodHandle sendMethod = null;

instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/BatchRecordListener.java

@@ -16,7 +16,7 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.kafka.annotation.KafkaListener;
 
-public class BatchRecordListener {
+class BatchRecordListener {
 
   private static final AtomicInteger lastBatchSize = new AtomicInteger();
   private static volatile CountDownLatch messageReceived = new CountDownLatch(2);
@@ -26,7 +26,7 @@ public class BatchRecordListener {
       id = "testBatchListener",
       topics = "testBatchTopic",
       containerFactory = "batchFactory")
-  public void listener(List<ConsumerRecord<String, String>> records) {
+  void listener(List<ConsumerRecord<String, String>> records) {
     lastBatchSize.set(records.size());
     IntStream.range(0, records.size()).forEach(it -> messageReceived.countDown());
 
@@ -40,16 +40,16 @@ record -> {
         });
   }
 
-  public static void reset(int expectedMessages) {
+  static void reset(int expectedMessages) {
     messageReceived = new CountDownLatch(expectedMessages);
     lastBatchSize.set(0);
   }
 
-  public static void waitForMessages() throws InterruptedException {
+  static void waitForMessages() throws InterruptedException {
     assertThat(messageReceived.await(30, SECONDS)).isTrue();
   }
 
-  public static int getLastBatchSize() {
+  static int getLastBatchSize() {
     return lastBatchSize.get();
   }
 }

instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/ConsumerConfig.java

@@ -18,30 +18,30 @@
 
 @SpringBootConfiguration
 @EnableAutoConfiguration
-public class ConsumerConfig {
+class ConsumerConfig {
 
   @Bean
-  public NewTopic batchTopic() {
+  NewTopic batchTopic() {
     return TopicBuilder.name("testBatchTopic").partitions(1).replicas(1).build();
   }
 
   @Bean
-  public NewTopic singleTopic() {
+  NewTopic singleTopic() {
     return TopicBuilder.name("testSingleTopic").partitions(1).replicas(1).build();
   }
 
   @Bean
-  public BatchRecordListener batchRecordListener() {
+  BatchRecordListener batchRecordListener() {
     return new BatchRecordListener();
   }
 
   @Bean
-  public SingleRecordListener singleRecordListener() {
+  SingleRecordListener singleRecordListener() {
     return new SingleRecordListener();
   }
 
   @Bean
-  public ConcurrentKafkaListenerContainerFactory<String, String> batchFactory(
+  ConcurrentKafkaListenerContainerFactory<String, String> batchFactory(
       ConsumerFactory<String, String> consumerFactory,
       ObjectProvider<
               ContainerCustomizer<
@@ -57,7 +57,7 @@ public ConcurrentKafkaListenerContainerFactory<String, String> batchFactory(
   }
 
   @Bean
-  public ConcurrentKafkaListenerContainerFactory<String, String> singleFactory(
+  ConcurrentKafkaListenerContainerFactory<String, String> singleFactory(
       ConsumerFactory<String, String> consumerFactory,
       ObjectProvider<
               ContainerCustomizer<

instrumentation/spring/spring-kafka-2.7/testing/src/main/java/io/opentelemetry/testing/SingleRecordListener.java

@@ -9,14 +9,14 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.kafka.annotation.KafkaListener;
 
-public class SingleRecordListener {
+class SingleRecordListener {
   private int failureCount;
 
   @KafkaListener(
       id = "testSingleListener",
       topics = "testSingleTopic",
       containerFactory = "singleFactory")
-  public void listener(ConsumerRecord<String, String> record) {
+  void listener(ConsumerRecord<String, String> record) {
     GlobalTraceUtil.runWithSpan("consumer", () -> {});
     if (record.value().equals("error") && failureCount < 2) {
       failureCount++;

instrumentation/spring/spring-pulsar-1.0/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.pulsar.experimental-span-attributes
+    declarative_name: java.pulsar.experimental_span_attributes/development
     description: >
       Enables capturing experimental span attribute `messaging.pulsar.message.type` on PRODUCER spans.
     type: boolean

instrumentation/spring/spring-pulsar-1.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/pulsar/v1_0/AbstractSpringPulsarTest.java

@@ -58,15 +58,15 @@ public abstract class AbstractSpringPulsarTest {
       Boolean.getBoolean("otel.instrumentation.pulsar.experimental-span-attributes");
   private static final DockerImageName DEFAULT_IMAGE_NAME =
       DockerImageName.parse("apachepulsar/pulsar:4.0.2");
+  private static final String OTEL_SUBSCRIPTION = "otel-subscription";
+  protected static final String OTEL_TOPIC = "persistent://public/default/otel-topic";
   private static PulsarContainer pulsarContainer;
   private static ConfigurableApplicationContext applicationContext;
   private static PulsarTemplate<String> pulsarTemplate;
   private static PulsarClient client;
   private static CountDownLatch latch;
-  private static final String OTEL_SUBSCRIPTION = "otel-subscription";
   protected static String brokerHost;
   protected static int brokerPort;
-  protected static final String OTEL_TOPIC = "persistent://public/default/otel-topic";
 
   @BeforeAll
   @SuppressWarnings("unchecked")

instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMqTest.java

@@ -38,7 +38,6 @@
 import java.util.Map;
 import org.assertj.core.api.AbstractLongAssert;
 import org.assertj.core.api.AbstractStringAssert;
-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;
@@ -77,6 +76,7 @@ static void setUp() throws UnknownHostException {
             .withExposedPorts(5672)
             .waitingFor(Wait.forLogMessage(".*Server startup complete.*", 1))
             .withStartupTimeout(Duration.ofMinutes(2));
+    cleanup.deferAfterAll(rabbitMqContainer::stop);
     rabbitMqContainer.start();
 
     SpringApplication app = new SpringApplication(ConsumerConfig.class);
@@ -88,23 +88,14 @@ static void setUp() throws UnknownHostException {
     app.setDefaultProperties(props);
 
     applicationContext = app.run();
+    cleanup.deferAfterAll(applicationContext);
 
     connectionFactory = new ConnectionFactory();
     connectionFactory.setHost(rabbitMqContainer.getHost());
     connectionFactory.setPort(rabbitMqContainer.getMappedPort(5672));
     ip = InetAddress.getByName(rabbitMqContainer.getHost()).getHostAddress();
   }
 
-  @AfterAll
-  static void teardown() {
-    if (rabbitMqContainer != null) {
-      rabbitMqContainer.stop();
-    }
-    if (applicationContext != null) {
-      applicationContext.close();
-    }
-  }
-
   @SuppressWarnings("deprecation") // using deprecated semconv
   private static List<AttributeAssertion> getAssertions(
       String destination,

instrumentation/spring/spring-rabbit-1.0/metadata.yaml

@@ -5,6 +5,7 @@ semantic_conventions:
   - MESSAGING_SPANS
 configurations:
   - 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: ''