Code review sweep (run 24871753530) (open-telemetry#18254)

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

Author: otelbot[bot]

instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/OpenTelemetryExecInitializer.java

@@ -15,6 +15,8 @@
 public final class OpenTelemetryExecInitializer implements ExecInitializer {
   public static final ExecInitializer INSTANCE = new OpenTelemetryExecInitializer();
 
+  private OpenTelemetryExecInitializer() {}
+
   @Override
   public void init(Execution execution) {
     // Propagates ContextHolder to child execution because the response interceptor is triggered in

instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/OpenTelemetryExecInterceptor.java

@@ -19,6 +19,8 @@ public final class OpenTelemetryExecInterceptor implements ExecInterceptor {
 
   public static final ExecInterceptor INSTANCE = new OpenTelemetryExecInterceptor();
 
+  private OpenTelemetryExecInterceptor() {}
+
   @Override
   public void intercept(Execution execution, ExecType type, Block continuation) throws Exception {
     Context otelCtx = execution.maybeGet(Context.class).orElse(null);

instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/OpenTelemetryFallbackErrorHandler.java

@@ -43,7 +43,7 @@ final class OpenTelemetryFallbackErrorHandler implements ClientErrorHandler, Ser
   private static final Logger logger =
       Logger.getLogger(OpenTelemetryFallbackErrorHandler.class.getName());
 
-  OpenTelemetryFallbackErrorHandler() {}
+  private OpenTelemetryFallbackErrorHandler() {}
 
   @Override
   public void error(Context context, int statusCode) {

instrumentation/ratpack/ratpack-1.7/metadata.yaml

@@ -14,35 +14,42 @@ features:
 library_link: https://ratpack.io/
 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
   - name: otel.instrumentation.http.server.capture-request-headers
+    declarative_name: general.http.server.request_captured_headers
     description: List of HTTP request headers to capture in HTTP server telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.server.capture-response-headers
+    declarative_name: general.http.server.response_captured_headers
     description: List of HTTP response headers to capture in HTTP server telemetry.
     type: list
     default: ""
   - name: otel.instrumentation.http.server.emit-experimental-telemetry
+    declarative_name: java.common.http.server.emit_experimental_telemetry/development
     description: >
       Enable the capture of experimental HTTP server telemetry. Adds the `http.request.body.size`
       and `http.response.body.size` attributes to spans, and records `http.server.request.size` and
       `http.server.response.size` metrics.
     type: boolean
     default: false
   - 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: ""
@@ -51,13 +58,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

instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ContextPropagationOperatorInstrumentationTest.java

@@ -176,8 +176,8 @@ void storeContextForcesItToBecomeCurrent() {
                     (Mono<String>)
                         MONO_CONTEXT_WRITE_METHOD.invoke(
                             interim, new StoreOpenTelemetryContext(span));
-              } catch (Throwable e) {
-                throw new RuntimeException(e);
+              } catch (Throwable t) {
+                throw new RuntimeException(t);
               }
               return interim.doFinally(unused -> span.end());
             });

instrumentation/reactor/reactor-3.1/metadata.yaml

@@ -7,6 +7,7 @@ features:
 library_link: https://projectreactor.io/
 configurations:
   - name: otel.instrumentation.reactor.experimental-span-attributes
+    declarative_name: java.reactor.experimental_span_attributes/development
     description: >
       Enables the capture of the experimental `reactor.canceled` attribute on spans when reactive
       streams are cancelled.

instrumentation/reactor/reactor-kafka-1.0/metadata.yaml

@@ -6,18 +6,21 @@ semantic_conventions:
 library_link: https://projectreactor.io/docs/kafka/release/reference/
 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.
     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`.
     type: boolean
     default: false

instrumentation/reactor/reactor-kafka-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/reactor/kafka/v1_0/AbstractReactorKafkaTest.java

@@ -73,7 +73,7 @@ public abstract class AbstractReactorKafkaTest {
 
   @RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
 
-  static KafkaContainer kafka;
+  private static KafkaContainer kafka;
   protected static KafkaSender<String, String> sender;
   protected static KafkaReceiver<String, String> receiver;
 
@@ -207,7 +207,7 @@ private static void assertWithoutReceiveTelemetry(SenderRecord<String, String, O
   }
 
   @SuppressWarnings("deprecation") // using deprecated semconv
-  protected static List<AttributeAssertion> sendAttributes(ProducerRecord<String, String> record) {
+  private static List<AttributeAssertion> sendAttributes(ProducerRecord<String, String> record) {
     List<AttributeAssertion> assertions =
         new ArrayList<>(
             asList(
@@ -229,7 +229,7 @@ protected static List<AttributeAssertion> sendAttributes(ProducerRecord<String,
   }
 
   @SuppressWarnings("deprecation") // using deprecated semconv
-  protected static List<AttributeAssertion> receiveAttributes(String topic) {
+  private static List<AttributeAssertion> receiveAttributes(String topic) {
     ArrayList<AttributeAssertion> assertions =
         new ArrayList<>(
             asList(
@@ -245,8 +245,7 @@ protected static List<AttributeAssertion> receiveAttributes(String topic) {
   }
 
   @SuppressWarnings("deprecation") // using deprecated semconv
-  protected static List<AttributeAssertion> processAttributes(
-      ProducerRecord<String, String> record) {
+  private static List<AttributeAssertion> processAttributes(ProducerRecord<String, String> record) {
     List<AttributeAssertion> assertions =
         new ArrayList<>(
             asList(