cleanup

Author: jaydeluca

instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2SqsSuppressReceiveSpansW3cPropagatorTest.java

@@ -21,7 +21,7 @@ boolean isSqsAttributeInjectionEnabled() {
   }
 
   @Override
-  boolean isXrayInjectionEnabled() {
+  protected boolean isXrayInjectionEnabled() {
     return false;
   }
 }

instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/Aws2SqsW3cPropagatorTest.java

@@ -22,7 +22,7 @@ boolean isSqsAttributeInjectionEnabled() {
   }
 
   @Override
-  boolean isXrayInjectionEnabled() {
+  protected boolean isXrayInjectionEnabled() {
     return false;
   }
 }

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

@@ -55,7 +55,6 @@
 import software.amazon.awssdk.services.sqs.model.SendMessageRequest;
 
 public abstract class AbstractAws2SqsBaseTest {
-
   protected abstract InstrumentationExtension getTesting();
 
   protected abstract SqsClient configureSqsClient(SqsClient sqsClient);
@@ -64,12 +63,16 @@ public abstract class AbstractAws2SqsBaseTest {
 
   protected abstract ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder();
 
+  protected abstract void assertSqsTraces(Boolean withParent, Boolean captureHeaders);
+
   protected static final StaticCredentialsProvider CREDENTIALS_PROVIDER =
       StaticCredentialsProvider.create(
           AwsBasicCredentials.create("my-access-key", "my-secret-key"));
 
-  protected static int sqsPort;
-  protected static SQSRestServer sqs;
+  static int sqsPort;
+  static SQSRestServer sqs;
+
+  protected final String queueUrl = "http://localhost:" + sqsPort + "/000000000000/testSdkSqs";
 
   static Map<String, MessageAttributeValue> dummyMessageAttributes(int count) {
     Map<String, MessageAttributeValue> map = new HashMap<>();
@@ -80,8 +83,6 @@ static Map<String, MessageAttributeValue> dummyMessageAttributes(int count) {
     return map;
   }
 
-  protected final String queueUrl = "http://localhost:" + sqsPort + "/000000000000/testSdkSqs";
-
   ReceiveMessageRequest receiveMessageRequest =
       ReceiveMessageRequest.builder().queueUrl(queueUrl).build();
 
@@ -111,11 +112,11 @@ static Map<String, MessageAttributeValue> dummyMessageAttributes(int count) {
               e -> e.messageBody("e3").id("i3").messageAttributes(dummyMessageAttributes(10)))
           .build();
 
-  boolean isXrayInjectionEnabled() {
+  protected boolean isXrayInjectionEnabled() {
     return true;
   }
 
-  protected void configureSdkClient(SqsClientBuilder builder) throws URISyntaxException {
+  void configureSdkClient(SqsClientBuilder builder) throws URISyntaxException {
     builder
         .overrideConfiguration(createOverrideConfigurationBuilder().build())
         .endpointOverride(new URI("http://localhost:" + sqsPort));
@@ -135,8 +136,6 @@ boolean isSqsAttributeInjectionEnabled() {
         "otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", false);
   }
 
-  protected abstract void assertSqsTraces(Boolean withParent, Boolean captureHeaders);
-
   @BeforeAll
   static void setUp() {
     sqs = SQSRestServerBuilder.withPort(0).withInterface("localhost").start();