more cleanups

Author: jaydeluca

instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.java

@@ -68,17 +68,17 @@ public abstract class AbstractAws2ClientCoreTest {
 
   protected abstract ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder();
 
-  static boolean isSqsAttributeInjectionEnabled() {
+  protected static boolean isSqsAttributeInjectionEnabled() {
     // See io.opentelemetry.instrumentation.awssdk.v2_2.autoconfigure.TracingExecutionInterceptor
     return ConfigPropertiesUtil.getBoolean(
         "otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", false);
   }
 
-  static final StaticCredentialsProvider CREDENTIALS_PROVIDER =
+  protected static final StaticCredentialsProvider CREDENTIALS_PROVIDER =
       StaticCredentialsProvider.create(
           AwsBasicCredentials.create("my-access-key", "my-secret-key"));
 
-  static MockWebServerExtension server = new MockWebServerExtension();
+  protected static MockWebServerExtension server = new MockWebServerExtension();
 
   @BeforeAll
   static void setup() {
@@ -95,21 +95,21 @@ void prepTest() {
     server.beforeTestExecution(null);
   }
 
-  void configureSdkClient(SdkClientBuilder<?, ?> builder) {
+  protected void configureSdkClient(SdkClientBuilder<?, ?> builder) {
     builder.overrideConfiguration(createOverrideConfigurationBuilder().build());
   }
 
-  static ImmutableMap<String, AttributeValue> createTableRequestKey =
+  private static final ImmutableMap<String, AttributeValue> createTableRequestKey =
       ImmutableMap.of(
           "anotherKey", AttributeValue.builder().s("value").build(),
           "key", AttributeValue.builder().s("value").build());
 
-  static ImmutableMap<String, AttributeValue> getItemRequestKey =
+  private static final ImmutableMap<String, AttributeValue> getItemRequestKey =
       ImmutableMap.of(
           "keyOne", AttributeValue.builder().s("value").build(),
           "keyTwo", AttributeValue.builder().s("differentValue").build());
 
-  static ImmutableMap<String, AttributeValue> putItemRequestKey =
+  private static final ImmutableMap<String, AttributeValue> putItemRequestKey =
       ImmutableMap.of(
           "key", AttributeValue.builder().s("value").build(),
           "attributeOne", AttributeValue.builder().s("one").build(),
@@ -144,7 +144,7 @@ private void executeCall(String operation, Object response)
                     }));
   }
 
-  static CreateTableRequest createTableRequest() {
+  private static CreateTableRequest createTableRequest() {
     return CreateTableRequest.builder()
         .tableName("sometable")
         .globalSecondaryIndexes(
@@ -174,7 +174,7 @@ static CreateTableRequest createTableRequest() {
   }
 
   @SuppressWarnings("deprecation") // uses deprecated semconv
-  static void assertCreateTableRequest(SpanDataAssert span) {
+  private static void assertCreateTableRequest(SpanDataAssert span) {
     span.hasName("DynamoDb.CreateTable")
         .hasKind(SpanKind.CLIENT)
         .hasNoParent()
@@ -200,7 +200,7 @@ static void assertCreateTableRequest(SpanDataAssert span) {
   }
 
   @SuppressWarnings("deprecation") // using deprecated semconv
-  static void assertQueryRequest(SpanDataAssert span) {
+  private static void assertQueryRequest(SpanDataAssert span) {
     span.hasName("DynamoDb.Query")
         .hasKind(SpanKind.CLIENT)
         .hasNoParent()
@@ -223,7 +223,7 @@ static void assertQueryRequest(SpanDataAssert span) {
   }
 
   @SuppressWarnings("deprecation") // uses deprecated semconv
-  static void assertDynamoDbRequest(SpanDataAssert span, String operation) {
+  private static void assertDynamoDbRequest(SpanDataAssert span, String operation) {
     span.hasName("DynamoDb." + operation)
         .hasKind(SpanKind.CLIENT)
         .hasNoParent()

instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.java

@@ -35,13 +35,15 @@
 import io.opentelemetry.testing.internal.armeria.common.MediaType;
 import io.opentelemetry.testing.internal.armeria.common.ResponseHeaders;
 import io.opentelemetry.testing.internal.armeria.testing.junit5.server.mock.RecordedRequest;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -96,7 +98,7 @@ private static void assumeSupportedConfig(String operation) {
   // Force localhost instead of relying on mock server because using ip is yet another corner case
   // of the virtual bucket changes introduced by aws sdk v2.18.0. When using IP, there is no way to
   // prefix the hostname with the bucket name as label.
-  URI clientUri = URI.create("http://localhost:" + server.httpPort());
+  private final URI clientUri = URI.create("http://localhost:" + server.httpPort());
 
   private static final String ec2BodyContent =
       "<AllocateAddressResponse xmlns=\"http://ec2.amazonaws.com/doc/2016-11-15/\">"
@@ -110,26 +112,6 @@ private static void assumeSupportedConfig(String operation) {
           + " <ResponseMetadata><RequestId>0ac9cda2-bbf4-11d3-f92b-31fa5e8dbc99</RequestId></ResponseMetadata>"
           + "</DeleteOptionGroupResponse>";
 
-  S3ClientBuilder s3ClientBuilder() throws Exception {
-    S3ClientBuilder builder = S3Client.builder();
-    if (Boolean.getBoolean("testLatestDeps")) {
-      Method forcePathStyleMethod =
-          S3ClientBuilder.class.getMethod("forcePathStyle", Boolean.class);
-      forcePathStyleMethod.invoke(builder, true);
-    }
-    return builder;
-  }
-
-  S3AsyncClientBuilder s3AsyncClientBuilder() throws Exception {
-    S3AsyncClientBuilder builder = S3AsyncClient.builder();
-    if (Boolean.getBoolean("testLatestDeps")) {
-      Method forcePathStyleMethod =
-          S3AsyncClientBuilder.class.getMethod("forcePathStyle", Boolean.class);
-      forcePathStyleMethod.invoke(builder, true);
-    }
-    return builder;
-  }
-
   @SuppressWarnings("deprecation") // uses deprecated semconv
   private void clientAssertions(
       String service, String operation, String method, Object response, String requestId) {
@@ -259,7 +241,12 @@ private static Stream<Arguments> provideS3Arguments() {
   @MethodSource("provideS3Arguments")
   void testS3SendOperationRequestWithBuilder(
       String operation, String method, Function<S3Client, Object> call) throws Exception {
-    S3ClientBuilder builder = s3ClientBuilder();
+    S3ClientBuilder builder = S3Client.builder();
+    if (Boolean.getBoolean("testLatestDeps")) {
+      Method forcePathStyleMethod =
+          S3ClientBuilder.class.getMethod("forcePathStyle", Boolean.class);
+      forcePathStyleMethod.invoke(builder, true);
+    }
     configureSdkClient(builder);
     S3Client client =
         builder
@@ -287,8 +274,17 @@ void testS3AsyncSendOperationRequestWithBuilder(
       Function<S3Client, Object> call,
       Function<S3AsyncClient, Future<?>> asyncCall,
       String body)
-      throws Exception {
-    S3AsyncClientBuilder builder = s3AsyncClientBuilder();
+      throws NoSuchMethodException,
+          InvocationTargetException,
+          IllegalAccessException,
+          ExecutionException,
+          InterruptedException {
+    S3AsyncClientBuilder builder = S3AsyncClient.builder();
+    if (Boolean.getBoolean("testLatestDeps")) {
+      Method forcePathStyleMethod =
+          S3AsyncClientBuilder.class.getMethod("forcePathStyle", Boolean.class);
+      forcePathStyleMethod.invoke(builder, true);
+    }
     configureSdkClient(builder);
     S3AsyncClient client =
         builder
@@ -519,14 +515,7 @@ void testEc2SendOperationRequestWithBuilder() throws Exception {
             .credentialsProvider(CREDENTIALS_PROVIDER)
             .build();
 
-    String content =
-        "<AllocateAddressResponse xmlns=\"http://ec2.amazonaws.com/doc/2016-11-15/\">"
-            + " <requestId>59dbff89-35bd-4eac-99ed-be587EXAMPLE</requestId>"
-            + " <publicIp>192.0.2.1</publicIp>"
-            + " <domain>standard</domain>"
-            + "</AllocateAddressResponse>";
-
-    server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, content));
+    server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, ec2BodyContent));
     Object response = client.allocateAddress();
 
     assertThat(response.getClass().getSimpleName())