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 index 34bcdd3b9a88..213520de1674 100644 --- 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 index 34e5d9b7efc2..99b08598bea2 100644 --- 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 index eba6b45fb0d5..0ab386d6b130 100644 --- 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 index 28516ab04b09..a8ff1b5fca49 100644 --- 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 additionalAttributes) - throws Exception { + throws ReflectiveOperationException { assertThat(response).isNotNull(); @@ -125,7 +125,8 @@ public void assertRequestWithMockedResponse( } @SuppressWarnings("unchecked") - protected List extractRequestHandlers(Object client) throws Exception { + protected List extractRequestHandlers(Object client) + throws ReflectiveOperationException { Field requestHandler2sField = AmazonWebServiceClient.class.getDeclaredField("requestHandler2s"); requestHandler2sField.setAccessible(true); return (List) 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 index 0ce99d4ec6e6..3cbbb5e4bd3e 100644 --- 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 index c63e850d1357..4626c2086a5b 100644 --- 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 index 03933ce7b9ab..c2b591c658ab 100644 --- 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 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 index c8ee02ae9860..b6e158ac1f92 100644 --- 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 additionalAttributes, Function 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 index 294e3fc17201..d81d7f153f53 100644 --- 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 index c4b6ac2581cc..7c6bbfc8c459 100644 --- 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 call, List 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 index 94c17445f157..e77ac7088e58 100644 --- 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 index c42cdec061d5..b6e469277256 100644 --- 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 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 index a0c396634d94..2bf122e39249 100644 --- 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 additionalAttributes, Function call) - throws Exception { + throws ReflectiveOperationException { AWSStepFunctionsClientBuilder clientBuilder = AWSStepFunctionsClientBuilder.standard();