Speedup SB smoke test (#62)

* Speedup SB smoke test

Signed-off-by: Pavol Loffay <[email protected]>

* fixes

Signed-off-by: Pavol Loffay <[email protected]>

Author: pavolloffay

smoke-tests/src/test/java/org/hypertrace/agent/smoketest/AbstractSmokeTest.java

@@ -42,6 +42,7 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.shaded.com.fasterxml.jackson.core.JsonProcessingException;
 import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
 public abstract class AbstractSmokeTest {
@@ -61,7 +62,6 @@ public abstract class AbstractSmokeTest {
   private static final Network network = Network.newNetwork();
   private static OpenTelemetryCollector collector;
   private static OpenTelemetryStorage openTelemetryStorage;
-  protected GenericContainer target;
 
   private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
   protected OkHttpClient client =
@@ -123,18 +123,16 @@ GenericContainer createAppUnderTest(int jdk) {
           "agentPath is not set, configure it via env var SMOKETEST_JAVAAGENT_PATH");
     }
     log.info("Agent path {}", agentPath);
-    target =
-        new GenericContainer<>(getTargetImage(jdk))
-            .withExposedPorts(8080)
-            .withNetwork(network)
-            .withLogConsumer(new Slf4jLogConsumer(log))
-            .withCopyFileToContainer(MountableFile.forHostPath(agentPath), "/javaagent.jar")
-            .withEnv("JAVA_TOOL_OPTIONS", "-javaagent:/javaagent.jar")
-            .withEnv("OTEL_BSP_MAX_EXPORT_BATCH", "1")
-            .withEnv("OTEL_BSP_SCHEDULE_DELAY", "10")
-            .withEnv("OTEL_EXPORTER_ZIPKIN_ENDPOINT", OTEL_EXPORTER_ENDPOINT)
-            .withEnv("OTEL_EXPORTER", OTEL_EXPORTER);
-    return target;
+    return new GenericContainer<>(DockerImageName.parse(getTargetImage(jdk)))
+        .withExposedPorts(8080)
+        .withNetwork(network)
+        .withLogConsumer(new Slf4jLogConsumer(log))
+        .withCopyFileToContainer(MountableFile.forHostPath(agentPath), "/javaagent.jar")
+        .withEnv("JAVA_TOOL_OPTIONS", "-javaagent:/javaagent.jar")
+        .withEnv("OTEL_BSP_MAX_EXPORT_BATCH", "1")
+        .withEnv("OTEL_BSP_SCHEDULE_DELAY", "10")
+        .withEnv("OTEL_EXPORTER_ZIPKIN_ENDPOINT", OTEL_EXPORTER_ENDPOINT)
+        .withEnv("OTEL_EXPORTER", OTEL_EXPORTER);
   }
 
   protected static int countSpansByName(

smoke-tests/src/test/java/org/hypertrace/agent/smoketest/OpenTelemetryCollector.java

@@ -20,6 +20,7 @@
 import java.util.Set;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
 
 public class OpenTelemetryCollector extends GenericContainer<OpenTelemetryCollector> {
 
@@ -29,7 +30,7 @@ public class OpenTelemetryCollector extends GenericContainer<OpenTelemetryCollec
   public static final int HEALTH_CHECK_PORT = 13133;
 
   public OpenTelemetryCollector(String dockerImage) {
-    super(dockerImage);
+    super(DockerImageName.parse(dockerImage));
     init();
   }
 

smoke-tests/src/test/java/org/hypertrace/agent/smoketest/OpenTelemetryStorage.java

@@ -18,13 +18,14 @@
 
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 
 /** @author Pavol Loffay */
 public class OpenTelemetryStorage extends GenericContainer<OpenTelemetryStorage> {
   public static final int PORT = 8080;
 
   public OpenTelemetryStorage(String dockerImage) {
-    super(dockerImage);
+    super(DockerImageName.parse(dockerImage));
     init();
   }
 

smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootDisabledBodyCaptureTest.java

@@ -57,7 +57,7 @@ void afterEach() {
   @Test
   public void springBootSmokeTest() throws IOException {
     // TODO test with multiple JDK (11, 14)
-    String url = String.format("http://localhost:%d/greeting", target.getMappedPort(8080));
+    String url = String.format("http://localhost:%d/greeting", app.getMappedPort(8080));
     Request request = new Request.Builder().url(url).get().build();
 
     Response response = client.newCall(request).execute();

smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootTest.java

@@ -25,7 +25,7 @@
 import java.util.stream.Collectors;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -38,25 +38,27 @@ protected String getTargetImage(int jdk) {
     return "open-telemetry-docker-dev.bintray.io/java/smoke-springboot-jdk" + jdk + ":latest";
   }
 
-  private GenericContainer app;
+  private static GenericContainer app;
 
   @BeforeEach
   void beforeEach() {
-    app = createAppUnderTest(8);
-    app.start();
+    if (app == null) {
+      // TODO test with JDK (11, 14)
+      app = createAppUnderTest(8);
+      app.start();
+    }
   }
 
-  @AfterEach
-  void afterEach() {
+  @AfterAll
+  static void afterEach() {
     if (app != null) {
       app.stop();
     }
   }
 
   @Test
   public void springBootSmokeTest() throws IOException {
-    // TODO test with multiple JDK (11, 14)
-    String url = String.format("http://localhost:%d/greeting", target.getMappedPort(8080));
+    String url = String.format("http://localhost:%d/greeting", app.getMappedPort(8080));
     Request request = new Request.Builder().url(url).get().build();
 
     Response response = client.newCall(request).execute();
@@ -106,7 +108,7 @@ public void springBootSmokeTest() throws IOException {
 
   @Test
   public void springBootMockBlockingTest() throws IOException {
-    String url = String.format("http://localhost:%d/greeting", target.getMappedPort(8080));
+    String url = String.format("http://localhost:%d/greeting", app.getMappedPort(8080));
     Request request = new Request.Builder().url(url).addHeader("block", "true").get().build();
     Response response = client.newCall(request).execute();
     Collection<ExportTraceServiceRequest> traces = waitForTraces();