Code review sweep (run 24941446472) (open-telemetry#18297)

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

Author: otelbot[bot]

instrumentation/alibaba-druid-1.0/metadata.yaml

@@ -7,6 +7,7 @@ semantic_conventions:
   - DATABASE_POOL_METRICS
 configurations:
   - name: otel.semconv-stability.opt-in
+    declarative_name: general.semconv_stability.opt_in
     description: >
       Opt-in to emit stable semantic conventions instead of the old
       experimental semantic conventions. Accepts a comma-separated list of semantic convention

instrumentation/apache-dbcp-2.0/metadata.yaml

@@ -11,6 +11,7 @@ semantic_conventions:
   - DATABASE_POOL_METRICS
 configurations:
   - name: otel.semconv-stability.opt-in
+    declarative_name: general.semconv_stability.opt_in
     description: >
       Opt-in to emit stable semantic conventions instead of the old
       experimental semantic conventions. Accepts a comma-separated list of semantic convention

instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboSingletons.java

@@ -11,7 +11,7 @@
 import io.opentelemetry.instrumentation.api.incubator.semconv.service.peer.ServicePeerAttributesExtractor;
 import org.apache.dubbo.rpc.Filter;
 
-public class DubboSingletons {
+class DubboSingletons {
   private static final Filter clientFilter;
   private static final Filter serverFilter;
 
@@ -26,11 +26,11 @@ public class DubboSingletons {
     serverFilter = telemetry.newServerFilter();
   }
 
-  public static Filter clientFilter() {
+  static Filter clientFilter() {
     return clientFilter;
   }
 
-  public static Filter serverFilter() {
+  static Filter serverFilter() {
     return serverFilter;
   }
 

instrumentation/apache-dubbo-2.7/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersGetterTest.java

@@ -26,7 +26,7 @@ class DubboHeadersGetterTest {
   @Mock RpcInvocation rpcInvocation;
 
   @Test
-  void testKeys() throws Exception {
+  void testKeys() throws ReflectiveOperationException {
     when(context.getUrl()).thenReturn(new URL("http", "localhost", 1));
     when(context.getRemoteAddress()).thenReturn(new InetSocketAddress(1));
     when(context.getLocalAddress()).thenReturn(new InetSocketAddress(1));
@@ -43,7 +43,7 @@ void testKeys() throws Exception {
   }
 
   @SuppressWarnings("unchecked")
-  private Map<Object, Object> getObjectAttachments() throws Exception {
+  private Map<Object, Object> getObjectAttachments() throws ReflectiveOperationException {
     return (Map<Object, Object>)
         RpcInvocation.class.getMethod("getObjectAttachments").invoke(rpcInvocation);
   }

instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java

@@ -31,7 +31,6 @@
 import java.lang.reflect.Field;
 import java.net.InetAddress;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 import org.apache.dubbo.common.utils.NetUtils;
 import org.apache.dubbo.config.ApplicationConfig;
@@ -280,8 +279,7 @@ void testApacheDubboBase() throws ReflectiveOperationException {
   }
 
   @Test
-  void testApacheDubboTest()
-      throws ExecutionException, InterruptedException, ReflectiveOperationException {
+  void testApacheDubboTest() throws ReflectiveOperationException {
     int port = PortUtils.findOpenPort();
     protocolConfig.setPort(port);
 
@@ -315,7 +313,7 @@ void testApacheDubboTest()
                 genericService.$invokeAsync(
                     "hello", new String[] {String.class.getName()}, new Object[] {"hello"}));
 
-    assertThat(response.get()).isEqualTo("hello");
+    assertThat(response.join()).isEqualTo("hello");
 
     testing()
         .waitAndAssertTraces(

instrumentation/apache-elasticjob-3.0/metadata.yaml

@@ -3,11 +3,12 @@ description: This instrumentation enables spans for Apache ElasticJob job execut
 library_link: https://shardingsphere.apache.org/elasticjob/
 configurations:
   - name: otel.instrumentation.apache-elasticjob.experimental-span-attributes
+    declarative_name: java.apache_elasticjob.experimental_span_attributes/development
     description: >
       Enables experimental span attributes `job.system`, `scheduling.apache-elasticjob.job.name`,
       `scheduling.apache-elasticjob.task.id`, `scheduling.apache-elasticjob.sharding.item.index`,
       `scheduling.apache-elasticjob.sharding.total.count`,
       `scheduling.apache-elasticjob.sharding.item.parameter`, and
       `scheduling.apache-elasticjob.job.type`.
     type: boolean
-    default: false
+    default: false

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/v4_1/ApacheHttpAsyncClientInstrumentation.java

@@ -68,7 +68,7 @@ public static class ClientAdvice {
       @ToArgument(value = 3, index = 1)
     })
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
-    public static Object[] methodEnter(
+    public static Object[] onEnter(
         @Advice.Argument(0) HttpAsyncRequestProducer requestProducer,
         @Advice.Argument(2) HttpContext httpContext,
         @Advice.Argument(3) FutureCallback<?> futureCallback) {

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/v4_1/ApacheHttpAsyncClientSingletons.java

@@ -9,7 +9,7 @@
 import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
 import org.apache.http.HttpResponse;
 
-public class ApacheHttpAsyncClientSingletons {
+class ApacheHttpAsyncClientSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.apache-httpasyncclient-4.1";
 
   private static final Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter;
@@ -22,7 +22,7 @@ public class ApacheHttpAsyncClientSingletons {
             new HttpHeaderSetter());
   }
 
-  public static Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter() {
+  static Instrumenter<ApacheHttpClientRequest, HttpResponse> instrumenter() {
     return instrumenter;
   }
 

instrumentation/apache-httpasyncclient-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpasyncclient/v4_1/ApacheHttpClientRequest.java

@@ -21,7 +21,7 @@
 import org.apache.http.HttpRequest;
 import org.apache.http.ProtocolVersion;
 
-public class ApacheHttpClientRequest {
+class ApacheHttpClientRequest {
 
   private static final Logger logger = Logger.getLogger(ApacheHttpClientRequest.class.getName());
 
@@ -30,7 +30,7 @@ public class ApacheHttpClientRequest {
   private final HttpRequest delegate;
   @Nullable private final HttpHost target;
 
-  public ApacheHttpClientRequest(@Nullable HttpHost httpHost, HttpRequest httpRequest) {
+  ApacheHttpClientRequest(@Nullable HttpHost httpHost, HttpRequest httpRequest) {
     URI calculatedUri = getUri(httpRequest);
     if (calculatedUri != null && httpHost != null) {
       uri = getCalculatedUri(httpHost, calculatedUri);
@@ -41,7 +41,7 @@ public ApacheHttpClientRequest(@Nullable HttpHost httpHost, HttpRequest httpRequ
     target = httpHost;
   }
 
-  public List<String> getHeader(String name) {
+  List<String> getHeader(String name) {
     return headersToList(delegate.getHeaders(name));
   }
 
@@ -57,16 +57,16 @@ static List<String> headersToList(Header[] headers) {
     return headersList;
   }
 
-  public void setHeader(String name, String value) {
+  void setHeader(String name, String value) {
     delegate.setHeader(name, value);
   }
 
-  public String getMethod() {
+  String getMethod() {
     return delegate.getRequestLine().getMethod();
   }
 
   @Nullable
-  public String getUrl() {
+  String getUrl() {
     return uri != null ? uri.toString() : null;
   }
 
@@ -80,7 +80,7 @@ String getProtocolVersion() {
   }
 
   @Nullable
-  public String getServerAddress() {
+  String getServerAddress() {
     if (uri != null) {
       return uri.getHost();
     }
@@ -91,7 +91,7 @@ public String getServerAddress() {
   }
 
   @Nullable
-  public Integer getServerPort() {
+  Integer getServerPort() {
     if (uri != null) {
       return uri.getPort();
     }
@@ -102,7 +102,7 @@ public Integer getServerPort() {
   }
 
   @Nullable
-  public String getScheme() {
+  String getScheme() {
     if (uri != null) {
       return uri.getScheme();
     }
@@ -149,7 +149,7 @@ private static URI getCalculatedUri(HttpHost httpHost, URI uri) {
   }
 
   @Nullable
-  public InetSocketAddress getNetworkPeerAddress() {
+  InetSocketAddress getNetworkPeerAddress() {
     if (target == null) {
       return null;
     }

instrumentation/apache-httpasyncclient-4.1/metadata.yaml

@@ -6,16 +6,19 @@ semantic_conventions:
   - HTTP_CLIENT_METRICS
 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.sanitization.url.experimental.sensitive-query-parameters
+    declarative_name: general.sanitization.url.sensitive_query_parameters/development
     description: List of URL query parameter names whose values are redacted in URL attributes. See https://opentelemetry.io/docs/specs/semconv/http/http-spans.
     type: list
     default: "AWSAccessKeyId,Signature,sig,X-Goog-Signature"