Code review sweep (run 24947827165) (#18305)

otelbot[bot] · web-flow · commit 3af91d25c41a · 2026-04-25T21:43:01.000-07:00
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/autoconfigure/TracingRequestHandler.java b/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/autoconfigure/TracingRequestHandler.java
@@ -23,7 +23,7 @@
  */
 public final class TracingRequestHandler extends RequestHandler2 {
 
-  private static final RequestHandler2 DELEGATE = buildDelegate(GlobalOpenTelemetry.get());
+  private static final RequestHandler2 delegate = buildDelegate(GlobalOpenTelemetry.get());
 
   @SuppressWarnings("deprecation") // using deprecated config property
   private static RequestHandler2 buildDelegate(OpenTelemetry openTelemetry) {
@@ -56,21 +56,21 @@ private static RequestHandler2 buildDelegate(OpenTelemetry openTelemetry) {
 
   @Override
   public void beforeRequest(Request<?> request) {
-    DELEGATE.beforeRequest(request);
+    delegate.beforeRequest(request);
   }
 
   @Override
   public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request) {
-    return DELEGATE.beforeMarshalling(request);
+    return delegate.beforeMarshalling(request);
   }
 
   @Override
   public void afterResponse(Request<?> request, Response<?> response) {
-    DELEGATE.afterResponse(request, response);
+    delegate.afterResponse(request, response);
   }
 
   @Override
   public void afterError(Request<?> request, Response<?> response, Exception e) {
-    DELEGATE.afterError(request, response, e);
+    delegate.afterError(request, response, e);
   }
 }
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/awssdk/v1_11/instrumentor/SqsSuppressReceiveSpansTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/awssdk/v1_11/instrumentor/SqsSuppressReceiveSpansTest.java
@@ -22,7 +22,7 @@ protected InstrumentationExtension testing() {
   }
 
   @Override
-  public AmazonSQSAsyncClientBuilder configureClient(AmazonSQSAsyncClientBuilder client) {
+  protected AmazonSQSAsyncClientBuilder configureClient(AmazonSQSAsyncClientBuilder client) {
     return client;
   }
 }
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsTracingTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SqsTracingTest.java
@@ -22,7 +22,7 @@ protected InstrumentationExtension testing() {
   }
 
   @Override
-  public AmazonSQSAsyncClientBuilder configureClient(AmazonSQSAsyncClientBuilder client) {
+  protected AmazonSQSAsyncClientBuilder configureClient(AmazonSQSAsyncClientBuilder client) {
     return client;
   }
 }
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractBaseAwsClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractBaseAwsClientTest.java
@@ -77,7 +77,7 @@ public void assertRequestWithMockedResponse(
       String operation,
       String method,
       List<AttributeAssertion> additionalAttributes)
-      throws Exception {
+      throws ReflectiveOperationException {
 
     assertThat(response).isNotNull();
 
@@ -125,7 +125,8 @@ public void assertRequestWithMockedResponse(
   }
 
   @SuppressWarnings("unchecked")
-  protected List<RequestHandler2> extractRequestHandlers(Object client) throws Exception {
+  protected List<RequestHandler2> extractRequestHandlers(Object client)
+      throws ReflectiveOperationException {
     Field requestHandler2sField = AmazonWebServiceClient.class.getDeclaredField("requestHandler2s");
     requestHandler2sField.setAccessible(true);
     return (List<RequestHandler2>) requestHandler2sField.get(client);
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractDynamoDbClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractDynamoDbClientTest.java
@@ -42,7 +42,7 @@ protected boolean hasRequestId() {
 
   @SuppressWarnings("deprecation") // using deprecated semconv
   @Test
-  void sendRequestWithMockedResponse() throws Exception {
+  void sendRequestWithMockedResponse() throws ReflectiveOperationException {
     AmazonDynamoDBClientBuilder clientBuilder = AmazonDynamoDBClientBuilder.standard();
     AmazonDynamoDB client =
         configureClient(clientBuilder)
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractEc2ClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractEc2ClientTest.java
@@ -24,7 +24,7 @@ protected boolean hasRequestId() {
   }
 
   @Test
-  void sendRequestWithMockedResponse() throws Exception {
+  void sendRequestWithMockedResponse() throws ReflectiveOperationException {
     AmazonEC2ClientBuilder clientBuilder = AmazonEC2ClientBuilder.standard();
     AmazonEC2 client =
         configureClient(clientBuilder)
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractKinesisClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractKinesisClientTest.java
@@ -35,7 +35,7 @@ protected boolean hasRequestId() {
   @ParameterizedTest
   @MethodSource("provideArguments")
   void testSendRequestWithMockedResponse(String operation, Function<AmazonKinesis, Object> call)
-      throws Exception {
+      throws ReflectiveOperationException {
     AmazonKinesisClientBuilder clientBuilder = AmazonKinesisClientBuilder.standard();
 
     AmazonKinesis client =
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractLambdaClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractLambdaClientTest.java
@@ -172,7 +172,7 @@ void testSendRequestWithMockedResponse(
       String responseBody,
       List<AttributeAssertion> additionalAttributes,
       Function<AWSLambda, Object> call)
-      throws Exception {
+      throws ReflectiveOperationException {
     AWSLambdaClientBuilder clientBuilder = AWSLambdaClientBuilder.standard();
     AWSLambda client =
         configureClient(clientBuilder)
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractRdsClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractRdsClientTest.java
@@ -25,7 +25,7 @@ protected boolean hasRequestId() {
   }
 
   @Test
-  void sendRequestWithMockedResponse() throws Exception {
+  void sendRequestWithMockedResponse() throws ReflectiveOperationException {
     AmazonRDSClientBuilder clientBuilder = AmazonRDSClientBuilder.standard();
     AmazonRDS client =
         configureClient(clientBuilder)
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractS3ClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractS3ClientTest.java
@@ -64,7 +64,7 @@ void testSendRequestWithMockedResponse(
       String method,
       Function<AmazonS3, Object> call,
       List<AttributeAssertion> additionalAttributes)
-      throws Exception {
+      throws ReflectiveOperationException {
 
     AmazonS3 client =
         configureClient(clientBuilder)
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSecretsManagerClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSecretsManagerClientTest.java
@@ -31,7 +31,7 @@ protected boolean hasRequestId() {
   }
 
   @Test
-  void sendCreateSecretRequestWithMockedResponse() throws Exception {
+  void sendCreateSecretRequestWithMockedResponse() throws ReflectiveOperationException {
     AWSSecretsManagerClientBuilder clientBuilder = AWSSecretsManagerClientBuilder.standard();
     AWSSecretsManager client =
         configureClient(clientBuilder)
@@ -62,7 +62,7 @@ void sendCreateSecretRequestWithMockedResponse() throws Exception {
   }
 
   @Test
-  void sendDescribeSecretRequestWithMockedResponse() throws Exception {
+  void sendDescribeSecretRequestWithMockedResponse() throws ReflectiveOperationException {
     AWSSecretsManagerClientBuilder clientBuilder = AWSSecretsManagerClientBuilder.standard();
     AWSSecretsManager client =
         configureClient(clientBuilder)
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSnsClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSnsClientTest.java
@@ -61,7 +61,7 @@ void testSendRequestWithMockedResponse(
       String operation,
       String responseBody,
       List<AttributeAssertion> additionalAttributes)
-      throws Exception {
+      throws ReflectiveOperationException {
     AmazonSNSClientBuilder clientBuilder = AmazonSNSClientBuilder.standard();
     AmazonSNS client =
         configureClient(clientBuilder)
diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractStepFunctionsClientTest.java b/instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractStepFunctionsClientTest.java
@@ -41,7 +41,7 @@ void testSendRequestWithMockedResponse(
       String operation,
       List<AttributeAssertion> additionalAttributes,
       Function<AWSStepFunctions, Object> call)
-      throws Exception {
+      throws ReflectiveOperationException {
 
     AWSStepFunctionsClientBuilder clientBuilder = AWSStepFunctionsClientBuilder.standard();
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`public final class TracingRequestHandler extends RequestHandler2 {`
`25`	`25`
`26`		`- private static final RequestHandler2 DELEGATE = buildDelegate(GlobalOpenTelemetry.get());`
	`26`	`+ private static final RequestHandler2 delegate = buildDelegate(GlobalOpenTelemetry.get());`
`27`	`27`
`28`	`28`	`@SuppressWarnings("deprecation") // using deprecated config property`
`29`	`29`	`private static RequestHandler2 buildDelegate(OpenTelemetry openTelemetry) {`
`@@ -56,21 +56,21 @@ private static RequestHandler2 buildDelegate(OpenTelemetry openTelemetry) {`
`56`	`56`
`57`	`57`	`@Override`
`58`	`58`	`public void beforeRequest(Request<?> request) {`
`59`		`- DELEGATE.beforeRequest(request);`
	`59`	`+ delegate.beforeRequest(request);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Override`
`63`	`63`	`public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request) {`
`64`		`- return DELEGATE.beforeMarshalling(request);`
	`64`	`+ return delegate.beforeMarshalling(request);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`
`68`	`68`	`public void afterResponse(Request<?> request, Response<?> response) {`
`69`		`- DELEGATE.afterResponse(request, response);`
	`69`	`+ delegate.afterResponse(request, response);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Override`
`73`	`73`	`public void afterError(Request<?> request, Response<?> response, Exception e) {`
`74`		`- DELEGATE.afterError(request, response, e);`
	`74`	`+ delegate.afterError(request, response, e);`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ protected InstrumentationExtension testing() {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
`25`		`- public AmazonSQSAsyncClientBuilder configureClient(AmazonSQSAsyncClientBuilder client) {`
	`25`	`+ protected AmazonSQSAsyncClientBuilder configureClient(AmazonSQSAsyncClientBuilder client) {`
`26`	`26`	`return client;`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected boolean hasRequestId() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`@Test`
`27`		`- void sendRequestWithMockedResponse() throws Exception {`
	`27`	`+ void sendRequestWithMockedResponse() throws ReflectiveOperationException {`
`28`	`28`	`AmazonEC2ClientBuilder clientBuilder = AmazonEC2ClientBuilder.standard();`
`29`	`29`	`AmazonEC2 client =`
`30`	`30`	`configureClient(clientBuilder)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected boolean hasRequestId() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Test`
`28`		`- void sendRequestWithMockedResponse() throws Exception {`
	`28`	`+ void sendRequestWithMockedResponse() throws ReflectiveOperationException {`
`29`	`29`	`AmazonRDSClientBuilder clientBuilder = AmazonRDSClientBuilder.standard();`
`30`	`30`	`AmazonRDS client =`
`31`	`31`	`configureClient(clientBuilder)`