Code review sweep (run 24919538656) (open-telemetry#18282)

otelbot[bot] · web-flow · commit 51c0581211e1 · 2026-04-24T22:20:36.000-07:00
diff --git a/instrumentation/vaadin-14.2/metadata.yaml b/instrumentation/vaadin-14.2/metadata.yaml
@@ -8,6 +8,7 @@ features:
   - CONTROLLER_SPANS
 configurations:
   - name: otel.instrumentation.common.experimental.controller-telemetry.enabled
+    declarative_name: java.common.controller_telemetry/development.enabled
     description: Enables the creation of experimental controller spans.
     type: boolean
     default: false
diff --git a/instrumentation/vaadin-14.2/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/v14_2/AbstractVaadinTest.java b/instrumentation/vaadin-14.2/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/v14_2/AbstractVaadinTest.java
@@ -29,7 +29,6 @@
 import java.util.HashMap;
 import java.util.List;
 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;
@@ -76,25 +75,19 @@ static ConfigurableApplicationContext start(int port, String contextPath) {
   @BeforeAll
   protected void setup() throws URISyntaxException {
     startServer();
+    cleanup.deferAfterAll(this::cleanupServer);
 
     Testcontainers.exposeHostPorts(port);
 
     browser =
         new BrowserWebDriverContainer("selenium/standalone-chrome:4.43.0")
             .withLogConsumer(new Slf4jLogConsumer(logger));
     browser.start();
+    cleanup.deferAfterAll(browser::stop);
 
     address = new URI("http://host.testcontainers.internal:" + port + getContextPath() + "/");
   }
 
-  @AfterAll
-  void cleanup() {
-    cleanupServer();
-    if (browser != null) {
-      browser.stop();
-    }
-  }
-
   protected void prepareVaadinBaseDir(File baseDir) {}
 
   protected static void copyClasspathResource(String resource, Path destination) {
diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/metadata.yaml b/instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/metadata.yaml
@@ -8,16 +8,19 @@ semantic_conventions:
 library_link: https://vertx.io/docs/vertx-core/java/
 configurations:
   - name: otel.instrumentation.http.known-methods
+    declarative_name: java.common.http.known_methods
     description: >
       Configures the instrumentation to recognize an alternative set of HTTP request methods. All
       other methods will be treated as `_OTHER`.
     type: list
     default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
   - name: otel.instrumentation.http.client.capture-request-headers
+    declarative_name: general.http.client.request_captured_headers
     description: List of HTTP request headers to capture in HTTP client telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.client.capture-response-headers
+    declarative_name: general.http.client.response_captured_headers
     description: List of HTTP response headers to capture in HTTP client telemetry.
     type: list
     default: ""
@@ -26,13 +29,15 @@ configurations:
     type: map
     default: ""
   - name: otel.instrumentation.http.client.emit-experimental-telemetry
+    declarative_name: java.common.http.client.emit_experimental_telemetry/development
     description: >
       Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size`
       and `http.response.body.size` attributes to spans, and records `http.client.request.size` and
       `http.client.response.size` metrics.
     type: boolean
     default: false
   - name: otel.instrumentation.http.client.experimental.redact-query-parameters
+    declarative_name: java.common.http.client.redact_query_parameters/development
     description: Redact sensitive URL parameters. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
     type: boolean
     default: true
diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/metadata.yaml b/instrumentation/vertx/vertx-http-client/vertx-http-client-4.0/metadata.yaml
@@ -6,16 +6,19 @@ semantic_conventions:
 library_link: https://vertx.io/
 configurations:
   - name: otel.instrumentation.http.known-methods
+    declarative_name: java.common.http.known_methods
     description: >
       Configures the instrumentation to recognize an alternative set of HTTP request methods. All
       other methods will be treated as `_OTHER`.
     type: list
     default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
   - name: otel.instrumentation.http.client.capture-request-headers
+    declarative_name: general.http.client.request_captured_headers
     description: List of HTTP request headers to capture in HTTP client telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.client.capture-response-headers
+    declarative_name: general.http.client.response_captured_headers
     description: List of HTTP response headers to capture in HTTP client telemetry.
     type: list
     default: ""
@@ -24,13 +27,15 @@ configurations:
     type: map
     default: ""
   - name: otel.instrumentation.http.client.emit-experimental-telemetry
+    declarative_name: java.common.http.client.emit_experimental_telemetry/development
     description: >
       Enable the capture of experimental HTTP client telemetry. Adds the `http.request.body.size`
       and `http.response.body.size` attributes to spans, and records `http.client.request.size` and
       `http.client.response.size` metrics.
     type: boolean
     default: false
   - name: otel.instrumentation.http.client.experimental.redact-query-parameters
+    declarative_name: java.common.http.client.redact_query_parameters/development
     description: Redact sensitive URL parameters. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
     type: boolean
-    default: true
+    default: true
diff --git a/instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/metadata.yaml b/instrumentation/vertx/vertx-http-client/vertx-http-client-5.0/metadata.yaml
@@ -7,16 +7,19 @@ semantic_conventions:
 library_link: https://vertx.io/docs/vertx-core/java/
 configurations:
   - name: otel.instrumentation.http.known-methods
+    declarative_name: java.common.http.known_methods
     description: >
       Configures the instrumentation to recognize an alternative set of HTTP request methods. All
       other methods will be treated as `_OTHER`.
     type: list
     default: "CONNECT,DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT,TRACE"
   - name: otel.instrumentation.http.client.capture-request-headers
+    declarative_name: general.http.client.request_captured_headers
     description: List of HTTP request headers to capture in HTTP client telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.client.capture-response-headers
+    declarative_name: general.http.client.response_captured_headers
     description: List of HTTP response headers to capture in HTTP client telemetry.
     type: list
     default: ""
@@ -32,6 +35,7 @@ configurations:
     type: boolean
     default: false
   - name: otel.instrumentation.http.client.experimental.redact-query-parameters
+    declarative_name: java.common.http.client.redact_query_parameters/development
     description: Redact sensitive URL parameters. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
     type: boolean
-    default: true
+    default: true
diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/metadata.yaml b/instrumentation/vertx/vertx-kafka-client-3.6/metadata.yaml
@@ -9,18 +9,22 @@ disabled_by_default: true
 classification: library
 configurations:
   - name: otel.instrumentation.kafka.producer-propagation.enabled
+    declarative_name: java.kafka.producer_propagation.enabled
     description: Enable context propagation for Kafka message producers.
     type: boolean
     default: true
   - 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
   - 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.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.
diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractBatchRecordsNoReceiveTelemetryVertxKafkaTest.java b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractBatchRecordsNoReceiveTelemetryVertxKafkaTest.java
@@ -28,7 +28,7 @@
 public abstract class AbstractBatchRecordsNoReceiveTelemetryVertxKafkaTest
     extends AbstractVertxKafkaTest {
 
-  final CountDownLatch consumerReady = new CountDownLatch(1);
+  private final CountDownLatch consumerReady = new CountDownLatch(1);
 
   @BeforeAll
   void setUpTopicAndConsumer() {
diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractBatchRecordsVertxKafkaTest.java b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractBatchRecordsVertxKafkaTest.java
@@ -27,7 +27,7 @@
 @TestMethodOrder(OrderAnnotation.class)
 public abstract class AbstractBatchRecordsVertxKafkaTest extends AbstractVertxKafkaTest {
 
-  final CountDownLatch consumerReady = new CountDownLatch(1);
+  private final CountDownLatch consumerReady = new CountDownLatch(1);
 
   @BeforeAll
   void setUpTopicAndConsumer() {
diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractSingleRecordNoReceiveTelemetryVertxKafkaTest.java b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractSingleRecordNoReceiveTelemetryVertxKafkaTest.java
@@ -18,7 +18,7 @@
 public abstract class AbstractSingleRecordNoReceiveTelemetryVertxKafkaTest
     extends AbstractVertxKafkaTest {
 
-  final CountDownLatch consumerReady = new CountDownLatch(1);
+  private final CountDownLatch consumerReady = new CountDownLatch(1);
 
   @BeforeAll
   void setUpTopicAndConsumer() {
diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractSingleRecordVertxKafkaTest.java b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractSingleRecordVertxKafkaTest.java
@@ -21,7 +21,7 @@
 
 public abstract class AbstractSingleRecordVertxKafkaTest extends AbstractVertxKafkaTest {
 
-  final CountDownLatch consumerReady = new CountDownLatch(1);
+  private final CountDownLatch consumerReady = new CountDownLatch(1);
 
   @BeforeAll
   void setUpTopicAndConsumer() {
diff --git a/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractVertxKafkaTest.java b/instrumentation/vertx/vertx-kafka-client-3.6/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/kafka/AbstractVertxKafkaTest.java
@@ -24,7 +24,6 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.vertx.core.AsyncResult;
@@ -58,9 +57,6 @@ public abstract class AbstractVertxKafkaTest {
 
   private static final Logger logger = LoggerFactory.getLogger(AbstractVertxKafkaTest.class);
 
-  private static final AttributeKey<String> MESSAGING_CLIENT_ID =
-      AttributeKey.stringKey("messaging.client_id");
-
   KafkaContainer kafka;
   Vertx vertx;
   protected KafkaProducer<String, String> kafkaProducer;
@@ -181,7 +177,7 @@ protected static List<AttributeAssertion> sendAttributes(
                 equalTo(MESSAGING_SYSTEM, KAFKA),
                 equalTo(MESSAGING_DESTINATION_NAME, record.topic()),
                 equalTo(MESSAGING_OPERATION, "publish"),
-                satisfies(MESSAGING_CLIENT_ID, val -> val.startsWith("producer")),
+                satisfies(stringKey("messaging.client_id"), val -> val.startsWith("producer")),
                 satisfies(MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty),
                 satisfies(MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative)));
     if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) {
@@ -213,7 +209,7 @@ private List<AttributeAssertion> batchConsumerAttributes(String topic, String op
                 equalTo(MESSAGING_SYSTEM, KAFKA),
                 equalTo(MESSAGING_DESTINATION_NAME, topic),
                 equalTo(MESSAGING_OPERATION, operation),
-                satisfies(MESSAGING_CLIENT_ID, val -> val.startsWith("consumer")),
+                satisfies(stringKey("messaging.client_id"), val -> val.startsWith("consumer")),
                 satisfies(MESSAGING_BATCH_MESSAGE_COUNT, AbstractLongAssert::isPositive)));
     if (hasConsumerGroup()) {
       assertions.add(equalTo(MESSAGING_KAFKA_CONSUMER_GROUP, "test"));
@@ -229,7 +225,7 @@ protected List<AttributeAssertion> processAttributes(KafkaProducerRecord<String,
                 equalTo(MESSAGING_SYSTEM, KAFKA),
                 equalTo(MESSAGING_DESTINATION_NAME, record.topic()),
                 equalTo(MESSAGING_OPERATION, "process"),
-                satisfies(MESSAGING_CLIENT_ID, val -> val.startsWith("consumer")),
+                satisfies(stringKey("messaging.client_id"), val -> val.startsWith("consumer")),
                 satisfies(MESSAGING_DESTINATION_PARTITION_ID, AbstractStringAssert::isNotEmpty),
                 satisfies(MESSAGING_KAFKA_MESSAGE_OFFSET, AbstractLongAssert::isNotNegative)));
     if (Boolean.getBoolean("otel.instrumentation.kafka.experimental-span-attributes")) {
