Code review sweep (run 24946562825) (#18304)

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

Author: otelbot[bot]

instrumentation/aws-lambda/aws-lambda-events-3.11/metadata.yaml

@@ -8,7 +8,7 @@ semantic_conventions:
 library_link: https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html
 configurations:
   - name: otel.instrumentation.aws-lambda.flush-timeout
+    declarative_name: java.aws_lambda.flush_timeout
     type: int
     default: 10000
     description: Flush timeout in milliseconds.
-

instrumentation/aws-lambda/aws-lambda-events-common-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/common/v2_2/internal/CustomJodaModule.java

@@ -33,7 +33,7 @@ class CustomJodaModule extends SimpleModule {
 
   private static final long serialVersionUID = 1L;
 
-  public CustomJodaModule() {
+  CustomJodaModule() {
     addDeserializer(DateTime.class, new DateTimeDeserialiser());
   }
 

instrumentation/aws-lambda/aws-lambda-events-common-2.2/library/src/main/java/io/opentelemetry/instrumentation/awslambdaevents/common/v2_2/internal/SqsMessageSpanLinksExtractor.java

@@ -21,6 +21,7 @@
 
 class SqsMessageSpanLinksExtractor implements SpanLinksExtractor<SQSMessage> {
   private static final String AWS_TRACE_HEADER_SQS_ATTRIBUTE_KEY = "AWSTraceHeader";
+  private static final MapGetter mapGetter = new MapGetter();
 
   // lower-case map getter used for extraction
   static final String AWS_TRACE_HEADER_PROPAGATOR_KEY = "x-amzn-trace-id";
@@ -34,7 +35,7 @@ public void extract(SpanLinksBuilder spanLinks, Context parentContext, SQSMessag
               .extract(
                   Context.root(), // We don't want the ambient context.
                   singletonMap(AWS_TRACE_HEADER_PROPAGATOR_KEY, parentHeader),
-                  new MapGetter());
+                  mapGetter);
       SpanContext messageSpanCtx = Span.fromContext(xrayContext).getSpanContext();
       if (messageSpanCtx.isValid()) {
         spanLinks.addLink(messageSpanCtx);

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsInstrumentationModule.java

@@ -27,7 +27,7 @@ public void doTransform(TypeTransformer transformer) {
 
   @SuppressWarnings("unused")
   public static class RegisterAdvice {
-    @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
+    @Advice.OnMethodExit(inline = false)
     public static void onExit() {
       // (indirectly) using SqsImpl class here to make sure it is available from SqsAccess
       // (injected into app classloader) and checked by Muzzle

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws0ClientTest.java

@@ -115,7 +115,8 @@ private static Stream<Arguments> provideArguments() {
   @ParameterizedTest
   @SuppressWarnings("unchecked")
   @MethodSource("provideArguments")
-  void testRequestHandlerIsHookedUpWithConstructor(boolean addHandler, int size) throws Exception {
+  void testRequestHandlerIsHookedUpWithConstructor(boolean addHandler, int size)
+      throws ReflectiveOperationException {
     BasicAWSCredentials credentials = new BasicAWSCredentials("asdf", "qwerty");
     AmazonS3Client client = new AmazonS3Client(credentials);
     if (addHandler) {
@@ -126,7 +127,7 @@ void testRequestHandlerIsHookedUpWithConstructor(boolean addHandler, int size) t
 
     assertThat(requestHandler2s).isNotNull();
     assertThat(requestHandler2s).hasSize(size);
-    assertThat(requestHandler2s.stream().findFirst().get().getClass().getSimpleName())
+    assertThat(requestHandler2s.get(0).getClass().getSimpleName())
         .isEqualTo("TracingRequestHandler");
   }
 
@@ -191,7 +192,7 @@ void testSendRequestWithMockedResponse(
       Function<AmazonWebServiceClient, Object> call,
       Map<String, String> additionalAttributes,
       String body)
-      throws Exception {
+      throws ReflectiveOperationException {
     server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body));
 
     Object response = call.apply(client);
@@ -201,7 +202,7 @@ void testSendRequestWithMockedResponse(
 
     assertThat(requestHandler2s).isNotNull();
     assertThat(requestHandler2s).hasSize(handlerCount);
-    assertThat(requestHandler2s.stream().findFirst().get().getClass().getSimpleName())
+    assertThat(requestHandler2s.get(0).getClass().getSimpleName())
         .isEqualTo("TracingRequestHandler");
 
     testing.waitAndAssertTraces(
@@ -362,7 +363,8 @@ void testCallingGeneratePresignedUrlDoesNotLeakContext() {
   }
 
   @SuppressWarnings("unchecked")
-  private static List<RequestHandler2> extractRequestHandlers(Object client) throws Exception {
+  private static List<RequestHandler2> extractRequestHandlers(Object client)
+      throws ReflectiveOperationException {
     Field requestHandler2sField = AmazonWebServiceClient.class.getDeclaredField("requestHandler2s");
     requestHandler2sField.setAccessible(true);
     return (List<RequestHandler2>) requestHandler2sField.get(client);

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsRequest.java

@@ -9,5 +9,5 @@
 
 abstract class AbstractSqsRequest {
 
-  public abstract Request<?> getRequest();
+  abstract Request<?> getRequest();
 }

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkAttributesExtractor.java

@@ -119,7 +119,7 @@ private static ResponseMetadata getResponseMetadata(@Nullable Response<?> respon
     return null;
   }
 
-  public static void setAttribute(
+  private static void setAttribute(
       AttributesBuilder attributes,
       AttributeKey<String> key,
       Object carrier,

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/PluginImplUtil.java

@@ -9,7 +9,7 @@
 
 import java.util.logging.Logger;
 
-final class PluginImplUtil { // TODO: Copy & paste from v2
+final class PluginImplUtil {
   private static final Logger logger = Logger.getLogger(PluginImplUtil.class.getName());
 
   /**
@@ -20,14 +20,14 @@ final class PluginImplUtil { // TODO: Copy & paste from v2
    * the Impl is available only when the corresponding InstrumentationModule was successfully
    * applied (muzzle passed).
    *
-   * <p>Note that an present-but-incompatible library can only be reliably detected by Muzzle. In
+   * <p>Note that a present-but-incompatible library can only be reliably detected by Muzzle. In
    * library-mode, users need to ensure they are using a compatible SDK (component) versions
    * themselves.
    *
-   * @param implSimpleClassName The simple name of the impl class, e.g. {@code "SqsImpl"}. *
+   * @param implSimpleClassName The simple name of the impl class, e.g. {@code "SqsImpl"}.
    */
   static boolean isImplPresent(String implSimpleClassName) {
-    // Computing the full name dynamically name here because library instrumentation classes are
+    // Compute the full name dynamically here because library instrumentation classes are
     // relocated when embedded in the agent.
     // We use getName().replace() instead of getPackage() because the latter is not guaranteed to
     // work in all cases (e.g., we might be loaded into a custom classloader that doesn't handle it)

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/RequestAccess.java

@@ -122,7 +122,7 @@ private static <T> T invokeOrNull(
     }
     try {
       return returnType.cast(method.invoke(obj));
-    } catch (Throwable t) {
+    } catch (Throwable ignored) {
       return null;
     }
   }
@@ -172,7 +172,7 @@ private static MethodHandle findAccessorOrNull(
     try {
       return MethodHandles.publicLookup()
           .findVirtual(clz, methodName, MethodType.methodType(returnType));
-    } catch (Throwable t) {
+    } catch (Throwable ignored) {
       return null;
     }
   }
@@ -183,7 +183,7 @@ private static MethodHandle findLambdaGetConfigurationMethod(Class<?> clz) {
       Class<?> returnType =
           Class.forName("com.amazonaws.services.lambda.model.FunctionConfiguration");
       return findAccessorOrNull(clz, "getConfiguration", returnType);
-    } catch (Throwable t) {
+    } catch (Throwable ignored) {
       return null;
     }
   }
@@ -197,7 +197,7 @@ private static MethodHandle findGetLambdaArnMethod() {
         Class<?> lambdaConfigurationClass =
             Class.forName("com.amazonaws.services.lambda.model.FunctionConfiguration");
         return findAccessorOrNull(lambdaConfigurationClass, "getFunctionArn");
-      } catch (Throwable t) {
+      } catch (Throwable ignored) {
         return null;
       }
     }

instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/SqsImpl.java

@@ -86,7 +86,7 @@ private static Field getMessagesField() {
       Field field = ReceiveMessageResult.class.getDeclaredField("messages");
       field.setAccessible(true);
       return field;
-    } catch (Exception e) {
+    } catch (Exception ignored) {
       return null;
     }
   }