Review fixes for jms-3.0:javaagent (#18095)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>

Author: otelbot[bot]

instrumentation/jms/jms-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/JmsSingletons.java

@@ -14,9 +14,9 @@
 public class JmsSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jms-3.0";
 
-  private static final Instrumenter<MessageWithDestination, Void> PRODUCER_INSTRUMENTER;
-  private static final Instrumenter<MessageWithDestination, Void> CONSUMER_RECEIVE_INSTRUMENTER;
-  private static final Instrumenter<MessageWithDestination, Void> CONSUMER_PROCESS_INSTRUMENTER;
+  private static final Instrumenter<MessageWithDestination, Void> producerInstrumenter;
+  private static final Instrumenter<MessageWithDestination, Void> consumerReceiveInstrumenter;
+  private static final Instrumenter<MessageWithDestination, Void> consumerProcessInstrumenter;
 
   static {
     JmsInstrumenterFactory factory =
@@ -25,21 +25,21 @@ public class JmsSingletons {
             .setMessagingReceiveTelemetryEnabled(
                 ExperimentalConfig.get().messagingReceiveInstrumentationEnabled());
 
-    PRODUCER_INSTRUMENTER = factory.createProducerInstrumenter();
-    CONSUMER_RECEIVE_INSTRUMENTER = factory.createConsumerReceiveInstrumenter();
-    CONSUMER_PROCESS_INSTRUMENTER = factory.createConsumerProcessInstrumenter(false);
+    producerInstrumenter = factory.createProducerInstrumenter();
+    consumerReceiveInstrumenter = factory.createConsumerReceiveInstrumenter();
+    consumerProcessInstrumenter = factory.createConsumerProcessInstrumenter(false);
   }
 
   public static Instrumenter<MessageWithDestination, Void> producerInstrumenter() {
-    return PRODUCER_INSTRUMENTER;
+    return producerInstrumenter;
   }
 
   public static Instrumenter<MessageWithDestination, Void> consumerReceiveInstrumenter() {
-    return CONSUMER_RECEIVE_INSTRUMENTER;
+    return consumerReceiveInstrumenter;
   }
 
   public static Instrumenter<MessageWithDestination, Void> consumerProcessInstrumenter() {
-    return CONSUMER_PROCESS_INSTRUMENTER;
+    return consumerProcessInstrumenter;
   }
 
   private JmsSingletons() {}

instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/AbstractJms3Test.java

@@ -108,7 +108,7 @@ static void tearDown() throws JMSException {
   @ParameterizedTest
   @MethodSource("destinationArguments")
   void testMessageListener(DestinationFactory destinationFactory, boolean isTemporary)
-      throws Exception {
+      throws JMSException {
 
     // given
     Destination destination = destinationFactory.create(session);
@@ -129,7 +129,7 @@ void testMessageListener(DestinationFactory destinationFactory, boolean isTempor
     testing.runWithSpan("parent", () -> producer.send(destination, sentMessage));
 
     // then
-    TextMessage receivedMessage = receivedMessageFuture.get(10, SECONDS);
+    TextMessage receivedMessage = receivedMessageFuture.orTimeout(10, SECONDS).join();
     assertThat(receivedMessage.getText()).isEqualTo(sentMessage.getText());
 
     String actualDestinationName = ((ActiveMQDestination) destination).getName();
@@ -186,7 +186,7 @@ void shouldNotEmitTelemetryOnEmptyReceive(
   @ParameterizedTest
   @MethodSource("destinationArguments")
   void shouldCaptureMessageHeaders(DestinationFactory destinationFactory, boolean isTemporary)
-      throws Exception {
+      throws JMSException {
 
     // given
     Destination destination = destinationFactory.create(session);
@@ -209,7 +209,7 @@ void shouldCaptureMessageHeaders(DestinationFactory destinationFactory, boolean
     testing.runWithSpan("parent", () -> producer.send(sentMessage));
 
     // then
-    TextMessage receivedMessage = receivedMessageFuture.get(10, SECONDS);
+    TextMessage receivedMessage = receivedMessageFuture.orTimeout(10, SECONDS).join();
     assertThat(receivedMessage.getText()).isEqualTo(sentMessage.getText());
 
     String actualDestinationName = ((ActiveMQDestination) destination).getName();

instrumentation/jms/jms-3.0/metadata.yaml

@@ -7,12 +7,14 @@ semantic_conventions:
 library_link: https://jakarta.ee/specifications/messaging/3.0/
 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: >
       Enables capturing messaging headers as span attributes. Provide a comma-separated list of
       header names to capture.