Code review sweep (run 24915320445) (open-telemetry#18277)

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-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/client/WebClientHelper.java

@@ -19,7 +19,7 @@ public class WebClientHelper {
 
   private static final Instrumenter<ClientRequest, ClientResponse> instrumenter =
       JavaagentHttpClientInstrumenters.create(
-          "io.opentelemetry.spring-webflux-5.0", WebClientHttpAttributesGetter.INSTANCE);
+          "io.opentelemetry.spring-webflux-5.0", new WebClientHttpAttributesGetter());
 
   public static void addFilter(List<ExchangeFilterFunction> exchangeFilterFunctions) {
     for (ExchangeFilterFunction filterFunction : exchangeFilterFunctions) {

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxClientTelemetryBuilder.java

@@ -35,7 +35,7 @@ public final class SpringWebfluxClientTelemetryBuilder {
   SpringWebfluxClientTelemetryBuilder(OpenTelemetry openTelemetry) {
     builder =
         DefaultHttpClientInstrumenterBuilder.create(
-            INSTRUMENTATION_NAME, openTelemetry, WebClientHttpAttributesGetter.INSTANCE);
+            INSTRUMENTATION_NAME, openTelemetry, new WebClientHttpAttributesGetter());
     this.openTelemetry = openTelemetry;
   }
 

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerTelemetryBuilder.java

@@ -35,7 +35,7 @@ public final class SpringWebfluxServerTelemetryBuilder {
             INSTRUMENTATION_NAME,
             openTelemetry,
             WebfluxServerHttpAttributesGetter.INSTANCE,
-            WebfluxTextMapGetter.INSTANCE);
+            new WebfluxTextMapGetter());
   }
 
   /**

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxTextMapGetter.java

@@ -13,9 +13,7 @@
 import javax.annotation.Nullable;
 import org.springframework.web.server.ServerWebExchange;
 
-enum WebfluxTextMapGetter implements TextMapGetter<ServerWebExchange> {
-  INSTANCE;
-
+class WebfluxTextMapGetter implements TextMapGetter<ServerWebExchange> {
   @Override
   public Iterable<String> keys(ServerWebExchange exchange) {
     return HeaderUtil.getKeys(exchange.getRequest().getHeaders());

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/internal/WebClientHttpAttributesGetter.java

@@ -17,10 +17,8 @@
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
-public enum WebClientHttpAttributesGetter
+public class WebClientHttpAttributesGetter
     implements HttpClientAttributesGetter<ClientRequest, ClientResponse> {
-  INSTANCE;
-
   @Override
   public String getUrlFull(ClientRequest request) {
     return request.url().toString();

instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/AbstractSpringWebfluxClientInstrumentationTest.java

@@ -141,8 +141,8 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
     } catch (ClassNotFoundException e) {
       try {
         httpStatusCodeClass = Class.forName("org.springframework.http.HttpStatus");
-      } catch (ClassNotFoundException e2) {
-        throw new LinkageError("Did not find neither HttpStatus nor HttpStatusCode class", e2);
+      } catch (ClassNotFoundException f) {
+        throw new LinkageError("Did not find neither HttpStatus nor HttpStatusCode class", f);
       }
     }
 
@@ -164,8 +164,8 @@ private static int getStatusCode(ClientResponse response) {
     try {
       Object statusCode = GET_STATUS_CODE.invoke(response);
       return (int) STATUS_CODE_VALUE.invoke(statusCode);
-    } catch (Throwable e) {
-      throw new AssertionError(e);
+    } catch (Throwable t) {
+      throw new AssertionError(t);
     }
   }
 

instrumentation/spring/spring-webflux/spring-webflux-5.3/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxSingleConnection.java

@@ -25,7 +25,7 @@ class SpringWebfluxSingleConnection implements SingleConnection {
   private final int port;
   private final WebClient webClient;
 
-  public SpringWebfluxSingleConnection(
+  SpringWebfluxSingleConnection(
       String host, int port, UnaryOperator<WebClient.Builder> instrumentationFunction) {
     this.host = host;
     this.port = port;

instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/DispatcherServletInstrumentation.java

@@ -39,12 +39,12 @@ public void transform(TypeTransformer transformer) {
             .and(named("onRefresh"))
             .and(takesArgument(0, named("org.springframework.context.ApplicationContext")))
             .and(takesArguments(1)),
-        DispatcherServletInstrumentation.class.getName() + "$HandlerMappingAdvice");
+        getClass().getName() + "$HandlerMappingAdvice");
     transformer.applyAdviceToMethod(
         isProtected()
             .and(named("render"))
             .and(takesArgument(0, named("org.springframework.web.servlet.ModelAndView"))),
-        DispatcherServletInstrumentation.class.getName() + "$RenderAdvice");
+        getClass().getName() + "$RenderAdvice");
   }
 
   /**

instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java

@@ -47,7 +47,7 @@ public void transform(TypeTransformer transformer) {
             .and(nameStartsWith("handle"))
             .and(takesArgument(0, named("javax.servlet.http.HttpServletRequest")))
             .and(takesArguments(3)),
-        HandlerAdapterInstrumentation.class.getName() + "$ControllerAdvice");
+        getClass().getName() + "$ControllerAdvice");
   }
 
   @SuppressWarnings("unused")

instrumentation/spring/spring-webmvc/spring-webmvc-3.1/metadata.yaml

@@ -10,16 +10,19 @@ features:
 library_link: https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/servlet/mvc/package-summary.html
 configurations:
   - name: otel.instrumentation.spring-webmvc.experimental-span-attributes
+    declarative_name: java.spring_webmvc.experimental_span_attributes/development
     type: boolean
     default: false
     description: > 
       Enables the capture of experimental span attributes `spring-webmvc.view.name` and
       `spring-webmvc.view.type`.
   - 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.common.experimental.view-telemetry.enabled
+    declarative_name: java.common.view_telemetry/development.enabled
     description: Enables the creation of experimental view spans.
     type: boolean
     default: false