rename

Author: zeitlinger

…lemetry/smoketest/AbstractSmokeTest.java …oketest/AbstractRemoteTelemetryTest.javasmoke-tests/src/main/java/io/opentelemetry/smoketest/AbstractSmokeTest.java renamed to smoke-tests/src/main/java/io/opentelemetry/smoketest/AbstractRemoteTelemetryTest.java smoke-tests/src/main/java/io/opentelemetry/smoketest/AbstractSmokeTest.java renamed to smoke-tests/src/main/java/io/opentelemetry/smoketest/AbstractRemoteTelemetryTest.java

@@ -4,6 +4,6 @@
 import org.junit.jupiter.api.TestInstance;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public abstract class AbstractSmokeTest {
-  public abstract void configureTelemetryRetriever(Consumer<JavaTelemetryRetriever> action);
+public abstract class AbstractRemoteTelemetryTest {
+  public abstract void configureTelemetryRetriever(Consumer<RemoteTelemetryRetriever> action);
 }

…ry/smoketest/JavaTelemetryRetriever.java …/smoketest/RemoteTelemetryRetriever.javasmoke-tests/src/main/java/io/opentelemetry/smoketest/JavaTelemetryRetriever.java renamed to smoke-tests/src/main/java/io/opentelemetry/smoketest/RemoteTelemetryRetriever.java smoke-tests/src/main/java/io/opentelemetry/smoketest/JavaTelemetryRetriever.java renamed to smoke-tests/src/main/java/io/opentelemetry/smoketest/RemoteTelemetryRetriever.java

@@ -25,11 +25,11 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-public class JavaTelemetryRetriever {
+public class RemoteTelemetryRetriever {
   private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
   private final WebClient client;
 
-  public JavaTelemetryRetriever(int backendPort) {
+  public RemoteTelemetryRetriever(int backendPort) {
     client = WebClient.of("http://localhost:" + backendPort);
   }
 

smoke-tests/src/main/java/io/opentelemetry/smoketest/SmokeTestInstrumentationExtension.java

@@ -16,14 +16,14 @@ public static SmokeTestInstrumentationExtension create() {
   public void beforeEach(ExtensionContext extensionContext) {
     Object testInstance = extensionContext.getRequiredTestInstance();
 
-    if (!(testInstance instanceof AbstractSmokeTest)) {
+    if (!(testInstance instanceof AbstractRemoteTelemetryTest)) {
       throw new AssertionError(
           "SmokeTestInstrumentationExtension can only be applied to a subclass of "
               + "AbstractSmokeTest");
     }
 
     SmokeTestRunner smokeTestRunner = (SmokeTestRunner) getTestRunner();
-    ((AbstractSmokeTest) testInstance).configureTelemetryRetriever(
+    ((AbstractRemoteTelemetryTest) testInstance).configureTelemetryRetriever(
         smokeTestRunner::setTelemetryRetriever);
 
     super.beforeEach(extensionContext);

smoke-tests/src/main/java/io/opentelemetry/smoketest/SmokeTestRunner.java

@@ -11,7 +11,7 @@ public class SmokeTestRunner extends InstrumentationTestRunner {
 
   private static final SmokeTestRunner INSTANCE = new SmokeTestRunner();
 
-  private JavaTelemetryRetriever telemetryRetriever;
+  private RemoteTelemetryRetriever telemetryRetriever;
 
   public static SmokeTestRunner instance() {
     return INSTANCE;
@@ -21,7 +21,7 @@ private SmokeTestRunner() {
     super(OpenTelemetry.noop());
   }
 
-  void setTelemetryRetriever(JavaTelemetryRetriever telemetryRetriever) {
+  void setTelemetryRetriever(RemoteTelemetryRetriever telemetryRetriever) {
     this.telemetryRetriever = telemetryRetriever;
   }
 

smoke-tests/src/test/java/io/opentelemetry/smoketest/JavaSmokeTest.java

@@ -10,6 +10,7 @@
 import static java.util.stream.Collectors.toSet;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.MetricsAssert;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.metrics.data.MetricData;
@@ -25,18 +26,21 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.containers.output.OutputFrame;
 import org.testcontainers.containers.output.ToStringConsumer;
 
-public abstract class JavaSmokeTest extends AbstractSmokeTest {
+public abstract class JavaSmokeTest extends AbstractRemoteTelemetryTest {
   private static final Pattern TRACE_ID_PATTERN =
       Pattern.compile(".*trace_id=(?<traceId>[a-zA-Z0-9]+).*");
   protected static final TestContainerManager containerManager = createContainerManager();
-  private JavaTelemetryRetriever telemetryRetriever;
+  private RemoteTelemetryRetriever telemetryRetriever;
 
   protected String agentPath =
       System.getProperty("io.opentelemetry.smoketest.agent.shadowJar.path");
 
+  @RegisterExtension static final AutoCleanupExtension autoCleanup = AutoCleanupExtension.create();
+
   protected WebClient client() {
     return WebClient.of("h1c://localhost:" + containerManager.getTargetMappedPort(8080));
   }
@@ -72,7 +76,7 @@ protected List<Integer> getExtraPorts() {
   @BeforeAll
   void setUp() {
     containerManager.startEnvironmentOnce();
-    telemetryRetriever = new JavaTelemetryRetriever(containerManager.getBackendMappedPort());
+    telemetryRetriever = new RemoteTelemetryRetriever(containerManager.getBackendMappedPort());
   }
 
   public void runTarget(int jdk, TargetRunner runner) throws Exception {
@@ -84,12 +88,14 @@ public void runTarget(int jdk, TargetRunner runner) throws Exception {
     }
   }
 
-  private Consumer<OutputFrame> startTarget(int jdk) {
+  protected Consumer<OutputFrame> startTarget(int jdk) {
     return startTarget(String.valueOf(jdk), null, false);
   }
 
-  public Consumer<OutputFrame> startTarget(String jdk, String serverVersion, boolean windows) {
+  protected Consumer<OutputFrame> startTarget(String jdk, String serverVersion, boolean windows) {
     String targetImage = getTargetImage(jdk, serverVersion, windows);
+    autoCleanup.deferCleanup(this::stopTarget);
+
     return containerManager.startTarget(
         targetImage,
         agentPath,
@@ -171,7 +177,7 @@ private static TestContainerManager createContainerManager() {
   }
 
   @Override
-  public void configureTelemetryRetriever(Consumer<JavaTelemetryRetriever> action) {
+  public void configureTelemetryRetriever(Consumer<RemoteTelemetryRetriever> action) {
     action.accept(telemetryRetriever);
   }
 }

smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java

@@ -16,8 +16,8 @@
 
 @DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
 class SecurityManagerSmokeTest extends JavaSmokeTest {
-  @RegisterExtension static final InstrumentationExtension testing = SmokeTestInstrumentationExtension.create();
-  @RegisterExtension static final AutoCleanupExtension autoCleanup = AutoCleanupExtension.create();
+  @RegisterExtension
+  static final InstrumentationExtension testing = SmokeTestInstrumentationExtension.create();
 
   @Override
   protected String getTargetImage(String jdk) {
@@ -36,8 +36,7 @@ protected Map<String, String> getExtraEnv() {
   @ValueSource(ints = {8, 11, 17, 21, 23})
   void securityManagerSmokeTest(int jdk) {
     startTarget(jdk);
-    autoCleanup.deferCleanup(this::stopTarget);
-
-    testing.waitAndAssertTraces(trace -> trace.hasSpansSatisfyingExactly(span -> span.hasName("test")));
+    testing.waitAndAssertTraces(
+        trace -> trace.hasSpansSatisfyingExactly(span -> span.hasName("test")));
   }
 }