revert aws test

Author: zeitlinger

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

@@ -98,11 +98,10 @@ public abstract class AbstractAws2ClientCoreTest {
 
   protected abstract ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder();
 
-  protected boolean isSqsAttributeInjectionEnabled() {
+  protected static boolean isSqsAttributeInjectionEnabled() {
     // See io.opentelemetry.instrumentation.awssdk.v2_2.autoconfigure.TracingExecutionInterceptor
     return ConfigPropertiesUtil.getBoolean(
-            getTesting().getOpenTelemetry(), "aws_sdk", "experimental_use_propagator_for_messaging")
-        .orElse(false);
+        "otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", false);
   }
 
   protected void configureSdkClient(SdkClientBuilder<?, ?> builder) {

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

@@ -126,8 +126,7 @@ private static void cleanResponses() {
   public boolean isRecordIndividualHttpErrorEnabled() {
     // See io.opentelemetry.instrumentation.awssdk.v2_2.autoconfigure.TracingExecutionInterceptor
     return ConfigPropertiesUtil.getBoolean(
-            getTesting().getOpenTelemetry(), "aws_sdk", "experimental_record_individual_http_error")
-        .orElse(false);
+        "otel.instrumentation.aws-sdk.experimental-record-individual-http-error", false);
   }
 
   @SuppressWarnings("deprecation") // using deprecated semconv

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

@@ -273,7 +273,7 @@ public abstract class AbstractAws2ClientTest extends AbstractAws2ClientCoreTest
           + "    </ResponseMetadata>"
           + "</CreateTopicResponse>";
 
-  private void assumeSupportedConfig(String operation) {
+  private static void assumeSupportedConfig(String operation) {
     Assumptions.assumeFalse(
         operation.equals("SendMessage") && isSqsAttributeInjectionEnabled(),
         "Cannot check Sqs.SendMessage here due to hard-coded MD5.");

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

@@ -132,8 +132,7 @@ protected void configureSdkClient(SqsAsyncClientBuilder builder) throws URISynta
   protected boolean isSqsAttributeInjectionEnabled() {
     // See io.opentelemetry.instrumentation.awssdk.v2_2.autoconfigure.TracingExecutionInterceptor
     return ConfigPropertiesUtil.getBoolean(
-            getTesting().getOpenTelemetry(), "aws_sdk", "experimental_use_propagator_for_messaging")
-        .orElse(false);
+        "otel.instrumentation.aws-sdk.experimental-use-propagator-for-messaging", false);
   }
 
   @BeforeAll