WIP

Author: PerfectSlayer

dd-smoke-tests/opentelemetry/src/test/java/datadog/smoketest/OpenTelemetrySmokeTest.java

@@ -1,41 +1,44 @@
 package datadog.smoketest;
 
+import static datadog.smoketest.backend.TraceBackend.testAgent;
+import static datadog.smoketest.trace.SpanMatcher.span;
+import static datadog.smoketest.trace.TraceMatcher.trace;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
-import datadog.smoketest.backend.EnabledIfDockerAvailable;
-import datadog.smoketest.backend.TraceBackend;
 import java.io.File;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-/**
- * S8 pilot — ported from the Groovy {@code OpenTelemetrySmokeTest} onto the new Java smoke base.
- * The OpenTelemetry sample app runs under the agent (OTel enabled), emits its traces, and exits;
- * the test-agent backend must receive all of them. This is the first end-to-end exercise of the new
- * base with a real agent and a non-server (batch) app. The {@code .testAgent()} container backend
- * needs Docker, so the test is skipped when Docker is unavailable.
- */
-@EnabledIfDockerAvailable
 class OpenTelemetrySmokeTest {
   private static final int TIMEOUT_SECONDS = 30;
+  private static final File WORKING_DIRECTORY = new File(System.getProperty("datadog.smoketest.builddir"));
+  private static final String APPLICATION_JAR = System.getProperty("datadog.smoketest.shadowJar.path");
 
   @RegisterExtension
   static final SmokeApp app =
       SmokeApp.named("opentelemetry")
-          .jar(System.getProperty("datadog.smoketest.shadowJar.path"))
+          .jar(APPLICATION_JAR)
           .jvmArgs("-Ddd.trace.otel.enabled=true")
-          .backend(TraceBackend.testAgent())
+          .workingDirectory(WORKING_DIRECTORY)
           .notAServer()
-          .workingDirectory(new File(System.getProperty("datadog.smoketest.builddir")))
+          .backend(testAgent())
           .build();
 
   @Test
   void receivesTraces() {
-    // 1 @WithSpan-annotated span + 10 manual OpenTelemetry spans, each its own trace.
-    app.traces().waitForTraceCount(11, TIMEOUT_SECONDS);
-
-    // The app then runs to completion and exits cleanly. (app-started telemetry is asserted
-    // automatically at teardown by SmokeApp's default check — the test body needn't check it.)
+    app.traces().assertTraces(
+        trace(span().root().operationName("Application.annotatedSpan")),
+        trace(span().root().resourceName("span-0")),
+        trace(span().root().resourceName("span-1")),
+        trace(span().root().resourceName("span-2")),
+        trace(span().root().resourceName("span-3")),
+        trace(span().root().resourceName("span-4")),
+        trace(span().root().resourceName("span-5")),
+        trace(span().root().resourceName("span-6")),
+        trace(span().root().resourceName("span-7")),
+        trace(span().root().resourceName("span-8")),
+        trace(span().root().resourceName("span-9"))
+    );
     app.assertCompletesWithValue(TIMEOUT_SECONDS, SECONDS, 0);
   }
 }