Code review sweep (run 24908813707) (open-telemetry#18271)

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

Author: otelbot[bot]

.github/agents/knowledge/general-rules.md

@@ -76,7 +76,10 @@ Do not flag the following patterns (common false positives):
 
 - FQCN is acceptable when class-name collision makes import impossible.
 - Do not claim that a Java non-capturing lambda or method reference allocates per
-  call. On HotSpot / OpenJDK 8+, these are cached at the call site.
+  call. On HotSpot / OpenJDK 8+, these are cached at the `invokedynamic` call site.
+  Do not suggest hoisting such a lambda into a `private static final` field for
+  allocation/performance reasons — it is pure noise. If a PR makes that hoist,
+  flag it and recommend reverting to the in-line lambda.
 
 ## [Style] Visibility modifiers
 

instrumentation/spring/spring-boot-resources/javaagent-unit-tests/build.gradle.kts

@@ -3,9 +3,7 @@ plugins {
 }
 
 dependencies {
-  testCompileOnly("com.google.auto.service:auto-service-annotations")
-
   testImplementation(project(":instrumentation:spring:spring-boot-resources:javaagent"))
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
-  testImplementation(project(path = ":smoke-tests:images:spring-boot", configuration = "springBootJar"))
+  testRuntimeOnly(project(path = ":smoke-tests:images:spring-boot", configuration = "springBootJar"))
 }

instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/aws/AcknowledgementExecutionContextInstrumentation.java

@@ -39,7 +39,7 @@ public static Scope methodEnter(@Advice.Argument(0) Collection<Message<?>> messa
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
-    public static void methodExit(@Advice.Enter Scope scope) {
+    public static void methodExit(@Advice.Enter @Nullable Scope scope) {
       if (scope != null) {
         scope.close();
       }

instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/aws/MessagingMessageListenerAdapterInstrumentation.java

@@ -41,7 +41,8 @@ public static SpringAwsUtil.MessageScope methodEnter(@Advice.Argument(0) Message
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
     public static void methodExit(
-        @Advice.Enter SpringAwsUtil.MessageScope scope, @Advice.Thrown Throwable throwable) {
+        @Advice.Enter @Nullable SpringAwsUtil.MessageScope scope,
+        @Advice.Thrown @Nullable Throwable throwable) {
       if (scope != null) {
         scope.close(throwable);
       }

instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/aws/SpringAwsUtil.java

@@ -92,13 +92,13 @@ public static Scope handleBatch(Collection<Message<?>> messages) {
   }
 
   public static class MessageScope {
-    final Instrumenter<SqsProcessRequest, Response> instrumenter;
-    final Context context;
-    final SqsProcessRequest request;
-    final Response response;
-    final Scope scope;
+    private final Instrumenter<SqsProcessRequest, Response> instrumenter;
+    private final Context context;
+    private final SqsProcessRequest request;
+    private final Response response;
+    private final Scope scope;
 
-    MessageScope(
+    private MessageScope(
         Instrumenter<SqsProcessRequest, Response> instrumenter,
         Context context,
         SqsProcessRequest request,
@@ -110,21 +110,21 @@ public static class MessageScope {
       this.scope = context.makeCurrent();
     }
 
-    public void close(Throwable throwable) {
+    public void close(@Nullable Throwable throwable) {
       scope.close();
       instrumenter.end(context, request, response, throwable);
     }
   }
 
   private static class TracingContext {
-    final ExecutionAttributes request;
-    final Response response;
-    final Instrumenter<SqsProcessRequest, Response> instrumenter;
-    final TracingExecutionInterceptor config;
-    final Context receiveContext;
-    final software.amazon.awssdk.services.sqs.model.Message sqsMessage;
-
-    TracingContext(
+    private final ExecutionAttributes request;
+    private final Response response;
+    private final Instrumenter<SqsProcessRequest, Response> instrumenter;
+    private final TracingExecutionInterceptor config;
+    @Nullable private final Context receiveContext;
+    private final software.amazon.awssdk.services.sqs.model.Message sqsMessage;
+
+    private TracingContext(
         TracingList tracingList, software.amazon.awssdk.services.sqs.model.Message sqsMessage) {
       this.request = tracingList.getRequest();
       this.response = tracingList.getResponse();

instrumentation/spring/spring-cloud-aws-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/aws/AwsSqsTestApplication.java

@@ -19,7 +19,7 @@
 @SpringBootApplication
 class AwsSqsTestApplication {
   static int sqsPort;
-  static Consumer<String> messageHandler;
+  static volatile Consumer<String> messageHandler;
 
   @Bean
   SqsTemplate sqsTemplate(SqsAsyncClient sqsAsyncClient) {

instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/metadata.yaml

@@ -8,6 +8,7 @@ features:
   - HTTP_ROUTE
 configurations:
   - name: otel.instrumentation.spring-cloud-gateway.experimental-span-attributes
+    declarative_name: java.spring_cloud_gateway.experimental_span_attributes/development
     type: boolean
     default: false
     description: > 

instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/webmvc/v5_0/Gateway43MvcTestApplication.java

@@ -18,9 +18,9 @@
 import org.springframework.web.servlet.function.ServerResponse;
 
 @SpringBootApplication
-public class Gateway43MvcTestApplication {
+class Gateway43MvcTestApplication {
   @Bean
-  public RouterFunction<ServerResponse> gatewayRouterFunction() {
+  RouterFunction<ServerResponse> gatewayRouterFunction() {
     HandlerFunction<ServerResponse> echoHandler =
         request -> {
           try {

instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/metadata.yaml

@@ -6,6 +6,7 @@ description: >
 library_link: https://github.com/spring-cloud/spring-cloud-gateway
 configurations:
   - name: otel.instrumentation.spring-cloud-gateway.experimental-span-attributes
+    declarative_name: java.spring_cloud_gateway.experimental_span_attributes/development
     type: boolean
     default: false
     description: >

instrumentation/spring/spring-core-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/core/v2_0/SimpleAsyncTaskExecutorInstrumentationTest.java

@@ -96,7 +96,7 @@ private static void executeTwoTasks(ThrowingConsumer<AsyncTask> task) {
                         .hasParent(trace.getSpan(0))));
   }
 
-  static class AsyncTask implements Runnable, Callable<Object> {
+  private static class AsyncTask implements Runnable, Callable<Object> {
 
     private static final Tracer tracer = GlobalOpenTelemetry.getTracer("test");