convert spring boot smoke test to java

Author: zeitlinger

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

@@ -44,14 +44,14 @@ public List<SpanData> waitForTraces() {
         convert(requests, ExportTraceServiceRequest::getResourceSpansList));
   }
 
-  public Collection<MetricData> waitForMetrics() {
+  public List<MetricData> waitForMetrics() {
     Collection<ExportMetricsServiceRequest> requests =
         waitForTelemetry("get-metrics", ExportMetricsServiceRequest::newBuilder);
     return TelemetryConverter.getMetricsData(
         convert(requests, ExportMetricsServiceRequest::getResourceMetricsList));
   }
 
-  public Collection<LogRecordData> waitForLogs() {
+  public List<LogRecordData> waitForLogs() {
     Collection<ExportLogsServiceRequest> requests =
         waitForTelemetry("get-logs", ExportLogsServiceRequest::newBuilder);
     return TelemetryConverter.getLogRecordData(
@@ -104,6 +104,10 @@ private String waitForContent(String path) throws InterruptedException {
       TimeUnit.MILLISECONDS.sleep(500);
     }
 
+    if ("true".equals(System.getenv("debug"))) {
+      System.out.println(content);
+    }
+
     return content;
   }
 

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

@@ -5,7 +5,10 @@
 
 package io.opentelemetry.smoketest;
 
+import java.util.function.Consumer;
+import org.testcontainers.containers.output.OutputFrame;
+
 @FunctionalInterface
 public interface TargetRunner {
-  void runInTarget() throws Exception;
+  void runInTarget(Consumer<OutputFrame> startTarget) throws Exception;
 }

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy

@@ -28,6 +28,6 @@ protected TargetWaitStrategy getWaitStrategy() {
   @DisplayName("verifies that debug logging is working by checking for a debug log on startup")
   @Test
   void verifyLogging() throws Exception {
-    withTarget(8, () -> {});
+    runTarget(8, output -> {});
   }
 }

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

@@ -7,20 +7,29 @@
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
+import static java.util.stream.Collectors.toSet;
 
+import io.opentelemetry.instrumentation.testing.junit.MetricsAssert;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
-import io.opentelemetry.sdk.metrics.data.MetricData;
+import io.opentelemetry.sdk.testing.assertj.MetricAssert;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.smoketest.windows.WindowsTestContainerManager;
 import io.opentelemetry.testing.internal.armeria.client.WebClient;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.Consumer;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.output.ToStringConsumer;
 
 public abstract class JavaSmokeTest {
+  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;
 
@@ -65,16 +74,16 @@ void setUp() {
     telemetryRetriever = new JavaTelemetryRetriever(containerManager.getBackendMappedPort());
   }
 
-  public void withTarget(int jdk, TargetRunner runner) throws Exception {
-    startTarget(jdk);
+  public void runTarget(int jdk, TargetRunner runner) throws Exception {
+    Consumer<OutputFrame> startTarget = startTarget(jdk);
     try {
-      runner.runInTarget();
+      runner.runInTarget(startTarget);
     } finally {
       stopTarget();
     }
   }
 
-  public Consumer<OutputFrame> startTarget(int jdk) {
+  private Consumer<OutputFrame> startTarget(int jdk) {
     return startTarget(String.valueOf(jdk), null, false);
   }
 
@@ -110,7 +119,7 @@ public void cleanup() {
     telemetryRetriever.clearTelemetry();
   }
 
-  public void stopTarget() {
+  private void stopTarget() {
     containerManager.stopTarget();
     cleanup();
   }
@@ -119,14 +128,36 @@ protected List<SpanData> waitForTraces() {
     return telemetryRetriever.waitForTraces();
   }
 
-  protected Collection<MetricData> waitForMetrics() {
-    return telemetryRetriever.waitForMetrics();
+  @SafeVarargs
+  @SuppressWarnings("varargs")
+  protected final void waitAndAssertMetrics(
+      String instrumentationName, Consumer<MetricAssert>... assertions) {
+    MetricsAssert.waitAndAssertMetrics(
+        () -> telemetryRetriever.waitForMetrics(), instrumentationName, assertions);
   }
 
   protected Collection<LogRecordData> waitForLogs() {
     return telemetryRetriever.waitForLogs();
   }
 
+  protected static boolean isVersionLogged(Consumer<OutputFrame> output, String version) {
+    return logLines(output)
+        .anyMatch(l -> l.contains("opentelemetry-javaagent - version: " + version));
+  }
+
+  private static Stream<String> logLines(Consumer<OutputFrame> output) {
+    return ((ToStringConsumer) output).toUtf8String().lines();
+  }
+
+  protected static Set<String> getLoggedTraceIds(Consumer<OutputFrame> output) {
+    return logLines(output).flatMap(l -> findTraceId(l)).collect(toSet());
+  }
+
+  private static Stream<String> findTraceId(String log) {
+    var m = TRACE_ID_PATTERN.matcher(log);
+    return m.matches() ? Stream.of(m.group("traceId")) : Stream.empty();
+  }
+
   private static TestContainerManager createContainerManager() {
     return TestContainerManager.useWindowsContainers()
         ? new WindowsTestContainerManager()

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

@@ -32,9 +32,9 @@ protected TargetWaitStrategy getWaitStrategy() {
   @ParameterizedTest
   @ValueSource(ints = {8, 11, 17})
   void shouldExportLogs(int jdk) throws Exception {
-    withTarget(
+    runTarget(
         jdk,
-        () -> {
+        output -> {
           client().get("/greeting").aggregate().join();
           Collection<LogRecordData> logs = waitForLogs();
 

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

@@ -38,9 +38,9 @@ protected boolean getSetServiceName() {
   @ParameterizedTest
   @ValueSource(ints = {17, 21, 23}) // Quarkus 3.7+ requires Java 17+
   void quarkusSmokeTest(int jdk) throws Exception {
-    withTarget(
+    runTarget(
         jdk,
-        () -> {
+        output -> {
           String currentAgentVersion;
           try (JarFile agentJar = new JarFile(agentPath)) {
             currentAgentVersion =

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

@@ -31,9 +31,9 @@ protected Map<String, String> getExtraEnv() {
   @ParameterizedTest
   @ValueSource(ints = {8, 11, 17, 21, 23})
   void securityManagerSmokeTest(int jdk) throws Exception {
-    withTarget(
+    runTarget(
         jdk,
-        () ->
+        output ->
             assertThat(waitForTraces())
                 .hasTracesSatisfyingExactly(
                     trace -> trace.hasSpansSatisfyingExactly(span -> span.hasName("test"))));