converted tests green

Author: jaydeluca

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/test/groovy/Aws2SqsSuppressReceiveSpansTest.groovy

@@ -1,3 +1,8 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
 
 import io.opentelemetry.instrumentation.awssdk.v2_2.AbstractAws2SqsSuppressReceiveSpansTest;

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/Aws2SqsSuppressReceiveSpansTest.java

@@ -1,26 +1,23 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package io.opentelemetry.instrumentation.awssdk.v2_2;
 
-import org.junit.jupiter.api.BeforeAll;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.URISyntaxException;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.services.sqs.SqsClient;
 import software.amazon.awssdk.services.sqs.SqsClientBuilder;
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
-import java.net.URISyntaxException;
-
-import static org.assertj.core.api.Assertions.assertThat;
 
 class Aws2SqsSuppressReceiveSpansDefaultPropagatorTest extends Aws2SqsSuppressReceiveSpansTest {
 
-  @BeforeAll
-  static void setup() {
-    AwsSdkTelemetryBuilder telemetryBuilder = AwsSdkTelemetry.builder(testing.getOpenTelemetry())
-        .setCaptureExperimentalSpanAttributes(true);
-    configure(telemetryBuilder);
-    telemetry = telemetryBuilder.build();
-  }
-
-  static void configure(AwsSdkTelemetryBuilder telemetryBuilder) {}
+  @Override
+  protected void configure(AwsSdkTelemetryBuilder telemetryBuilder) {}
 
   @Override
   boolean isSqsAttributeInjectionEnabled() {
@@ -31,10 +28,11 @@ boolean isSqsAttributeInjectionEnabled() {
   void testDuplicateTracingInterceptor() throws URISyntaxException {
     SqsClientBuilder builder = SqsClient.builder();
     configureSdkClient(builder);
-    ClientOverrideConfiguration overrideConfiguration = ClientOverrideConfiguration.builder()
-        .addExecutionInterceptor(telemetry.newExecutionInterceptor())
-        .addExecutionInterceptor(telemetry.newExecutionInterceptor())
-        .build();
+    ClientOverrideConfiguration overrideConfiguration =
+        ClientOverrideConfiguration.builder()
+            .addExecutionInterceptor(telemetry.newExecutionInterceptor())
+            .addExecutionInterceptor(telemetry.newExecutionInterceptor())
+            .build();
     builder.overrideConfiguration(overrideConfiguration);
     SqsClient client = configureSqsClient(builder.build());
 
@@ -45,6 +43,6 @@ void testDuplicateTracingInterceptor() throws URISyntaxException {
     assertThat(response.messages().size()).isEqualTo(1);
     response.messages().forEach(message -> getTesting().runWithSpan("process child", () -> {}));
 
-    assertSqsTraces(true, false);
+    assertSqsTraces(false, false);
   }
 }

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

@@ -1,28 +1,45 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package io.opentelemetry.instrumentation.awssdk.v2_2;
 
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
 import software.amazon.awssdk.services.sqs.SqsClient;
 
-public abstract class Aws2SqsSuppressReceiveSpansTest extends AbstractAws2SqsSuppressReceiveSpansTest {
+public abstract class Aws2SqsSuppressReceiveSpansTest
+    extends AbstractAws2SqsSuppressReceiveSpansTest {
   @RegisterExtension
   static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
 
+  @BeforeEach
+  void setup() {
+    AwsSdkTelemetryBuilder telemetryBuilder =
+        AwsSdkTelemetry.builder(getTesting().getOpenTelemetry())
+            .setCaptureExperimentalSpanAttributes(true);
+    configure(telemetryBuilder);
+    telemetry = telemetryBuilder.build();
+  }
+
   @Override
   protected InstrumentationExtension getTesting() {
     return testing;
   }
 
-  protected static AwsSdkTelemetry telemetry;
+  protected abstract void configure(AwsSdkTelemetryBuilder telemetryBuilder);
+
+  protected AwsSdkTelemetry telemetry;
 
   @Override
   protected ClientOverrideConfiguration.Builder createOverrideConfigurationBuilder() {
     return ClientOverrideConfiguration.builder()
-        .addExecutionInterceptor(
-            telemetry.newExecutionInterceptor());
+        .addExecutionInterceptor(telemetry.newExecutionInterceptor());
   }
 
   @Override

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

@@ -1,20 +1,21 @@
-package io.opentelemetry.instrumentation.awssdk.v2_2;
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
-import org.junit.jupiter.api.BeforeAll;
+package io.opentelemetry.instrumentation.awssdk.v2_2;
 
-/** We want to test the combination of W3C + Xray, as that's what you'll get in prod if you enable W3C. */
-class Aws2SqsSuppressReceiveSpansW3CPropagatorAndXrayPropagatorTest extends Aws2SqsSuppressReceiveSpansTest {
+/**
+ * We want to test the combination of W3C + Xray, as that's what you'll get in prod if you enable
+ * W3C.
+ */
+class Aws2SqsSuppressReceiveSpansW3CPropagatorAndXrayPropagatorTest
+    extends Aws2SqsSuppressReceiveSpansTest {
 
-  @BeforeAll
-  static void setup() {
-    AwsSdkTelemetryBuilder telemetryBuilder = AwsSdkTelemetry.builder(testing.getOpenTelemetry())
-        .setCaptureExperimentalSpanAttributes(true);
-    configure(telemetryBuilder);
-    telemetry = telemetryBuilder.build();
-  }
-
-  static void configure(AwsSdkTelemetryBuilder telemetryBuilder) {
-    telemetryBuilder.setUseConfiguredPropagatorForMessaging(isSqsAttributeInjectionEnabled()); // Difference to main test
+  @Override
+  protected void configure(AwsSdkTelemetryBuilder telemetryBuilder) {
+    telemetryBuilder.setUseConfiguredPropagatorForMessaging(
+        isSqsAttributeInjectionEnabled()); // Difference to main test
   }
 
   @Override

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

@@ -1,10 +1,18 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package io.opentelemetry.instrumentation.awssdk.v2_2;
 
 class Aws2SqsSuppressReceiveSpansW3CPropagatorTest extends Aws2SqsSuppressReceiveSpansTest {
   @Override
-  void configure(AwsSdkTelemetryBuilder telemetryBuilder) {
-    telemetryBuilder.setUseConfiguredPropagatorForMessaging(isSqsAttributeInjectionEnabled()) // Difference to main test
-        .setUseXrayPropagator(isXrayInjectionEnabled()); // Disable to confirm messaging propagator actually works
+  protected void configure(AwsSdkTelemetryBuilder telemetryBuilder) {
+    telemetryBuilder
+        .setUseConfiguredPropagatorForMessaging(
+            isSqsAttributeInjectionEnabled()) // Difference to main test
+        .setUseXrayPropagator(
+            isXrayInjectionEnabled()); // Disable to confirm messaging propagator actually works
   }
 
   @Override