Code review sweep (run 25255576018) (open-telemetry#18510)

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-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java

@@ -48,7 +48,8 @@ class SpringSchedulingTest {
   @RegisterExtension
   private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
-  @RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+  @RegisterExtension
+  private static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
 
   @Test
   void scheduleOneTimeTest() throws InterruptedException {

instrumentation/spring/spring-security-config-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/security/config/v6_0/EnduserAttributesCapturer.java

@@ -83,6 +83,9 @@ public void captureEnduserAttributes(
       if (enduserRoleEnabled || enduserScopeEnabled) {
         for (GrantedAuthority authority : authentication.getAuthorities()) {
           String authorityString = authority.getAuthority();
+          if (authorityString == null) {
+            continue;
+          }
           if (enduserRoleEnabled && authorityString.startsWith(roleGrantedAuthorityPrefix)) {
             roleBuilder = appendSuffix(roleGrantedAuthorityPrefix, authorityString, roleBuilder);
           } else if (enduserScopeEnabled

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts

@@ -74,7 +74,7 @@ tasks {
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
     jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 
-    systemProperty("metadataConfig", "otel.instrumentation.common.experimental.controller-telemetry.enabled")
+    systemProperty("metadataConfig", "otel.instrumentation.common.experimental.controller-telemetry.enabled=true")
     systemProperty("testLatestDeps", otelProps.testLatestDeps)
     systemProperty("collectMetadata", otelProps.collectMetadata)
   }
@@ -85,7 +85,7 @@ tasks {
     jvmArgs("-Dotel.semconv-stability.opt-in=service.peer")
     systemProperty(
       "metadataConfig",
-      "otel.instrumentation.common.experimental.controller-telemetry.enabled," +
+      "otel.instrumentation.common.experimental.controller-telemetry.enabled=true," +
         "otel.semconv-stability.opt-in=service.peer"
     )
   }

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/DispatcherHandlerInstrumentation.java

@@ -44,11 +44,9 @@ public void transform(TypeTransformer transformer) {
   public static class HandleAdvice {
 
     @AssignReturned.ToReturned
-    @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
+    @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
     public static Mono<Void> methodExit(
-        @Advice.Thrown Throwable throwable,
-        @Advice.Argument(0) ServerWebExchange exchange,
-        @Advice.Return Mono<Void> originalMono) {
+        @Advice.Argument(0) ServerWebExchange exchange, @Advice.Return Mono<Void> originalMono) {
       Mono<Void> mono = originalMono;
       if (mono != null) {
         // note: it seems like this code should go in @OnMethodExit of

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerCodeAttributesGetter.java

@@ -8,7 +8,7 @@
 import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
 import org.springframework.web.method.HandlerMethod;
 
-public class HandlerCodeAttributesGetter implements CodeAttributesGetter<Object> {
+class HandlerCodeAttributesGetter implements CodeAttributesGetter<Object> {
   @Override
   public Class<?> getCodeClass(Object handler) {
     if (handler instanceof HandlerMethod) {

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/WebfluxSpanNameExtractor.java

@@ -10,7 +10,7 @@
 import io.opentelemetry.instrumentation.api.semconv.util.SpanNames;
 import org.springframework.web.method.HandlerMethod;
 
-public class WebfluxSpanNameExtractor implements SpanNameExtractor<Object> {
+class WebfluxSpanNameExtractor implements SpanNameExtractor<Object> {
 
   private final SpanNameExtractor<Object> handlerSpanNameExtractor =
       CodeSpanNameExtractor.create(new HandlerCodeAttributesGetter());

instrumentation/spring/spring-webflux/spring-webflux-5.0/testing-webflux7/build.gradle.kts

@@ -22,6 +22,6 @@ otelJava {
   minJavaVersionSupported.set(JavaVersion.VERSION_17)
 }
 
-tasks.withType<Test>().configureEach {
+tasks.test {
   jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }

instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/server/SpringWebFluxTestApplication.java

@@ -78,6 +78,7 @@ RouterFunction<ServerResponse> greetRouterFunction(GreetingHandler greetingHandl
               try {
                 slowRequestLatch.await(10, SECONDS);
               } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 throw new IllegalStateException(e);
               }
               return Mono.delay(Duration.ofMillis(100))

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

@@ -66,15 +66,15 @@ private static Integer getStatusCode(ServerHttpResponse response) {
     if (GET_RAW_STATUS_CODE != null) {
       try {
         return (Integer) GET_RAW_STATUS_CODE.invoke(response);
-      } catch (Throwable e) {
+      } catch (Throwable ignored) {
         // ignore
       }
     }
     if (GET_STATUS_CODE != null && STATUS_CODE_VALUE != null) {
       try {
         Object statusCode = GET_STATUS_CODE.invoke(response);
         return (Integer) STATUS_CODE_VALUE.invoke(statusCode);
-      } catch (Throwable e) {
+      } catch (Throwable ignored) {
         // ignore
       }
     }

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

@@ -43,7 +43,7 @@ public final class HeaderUtil {
       headerNames =
           MethodHandles.lookup()
               .findVirtual(HttpHeaders.class, "headerNames", MethodType.methodType(Set.class));
-    } catch (Throwable t) {
+    } catch (Throwable ignored) {
       // ignore - will fall back to casting to Map
     }
     HEADER_NAMES = headerNames;
@@ -59,7 +59,7 @@ private static MethodHandle firstAvailableHandle(
   private static MethodHandle findGetHeadersMethod(MethodType methodType) {
     try {
       return MethodHandles.lookup().findVirtual(HttpHeaders.class, "get", methodType);
-    } catch (Throwable t) {
+    } catch (Throwable ignored) {
       return null;
     }
   }
@@ -72,7 +72,7 @@ public static List<String> getHeader(HttpHeaders headers, String name) {
         if (result != null) {
           return result;
         }
-      } catch (Throwable t) {
+      } catch (Throwable ignored) {
         // ignore
       }
     }
@@ -88,7 +88,7 @@ public static Set<String> getKeys(HttpHeaders headers) {
         if (result != null) {
           return result;
         }
-      } catch (Throwable t) {
+      } catch (Throwable ignored) {
         // ignore
       }
     } else {