add app cleanup, assert events, rewrite test to use waitAndAssertTraces

open-telemetry · Jan 7, 2025 · af41bc7 · af41bc7
1 parent 0490ecd
commit af41bc7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/...va/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.java b/...va/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.java
@@ -19,9 +19,11 @@
 import static io.opentelemetry.semconv.UrlAttributes.URL_SCHEME;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -37,6 +39,11 @@ static void setup() throws Exception {
     app = new RatpackFunctionalTest(RatpackApp.class);
   }
 
+  @AfterAll
+  static void cleanup() {
+    app.close();
+  }
+
   @Test
   void testAddSpanOnHandlers() {
     assertThat(app.getHttpClient().get("foo").getBody().getText()).isEqualTo("hi-foo");
@@ -96,8 +103,18 @@ void testPropagateTraceToHttpCalls() {
 
   @Test
   void testIgnoreHandlersBeforeOpenTelemetryServerHandler() {
-    assertThat(app.getHttpClient().get("ignore").getBody().getText()).isEqualTo("ignored");
-    assertThat(testing.spans().stream().filter(span -> "GET /ignore".equals(span.getName())))
-        .isEmpty();
+    testing.runWithSpan(
+        "parent",
+        () ->
+            assertThat(app.getHttpClient().get("ignore").getBody().getText()).isEqualTo("ignored"));
+
+    testing.waitAndAssertTraces(
+        trace ->
+            trace.hasSpansSatisfyingExactly(
+                span ->
+                    span.hasName("parent")
+                        .hasNoParent()
+                        .hasKind(SpanKind.INTERNAL)
+                        .hasAttributes(Attributes.empty())));
   }
 }
diff --git a/...src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.java b/...src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.java
@@ -127,7 +127,8 @@ void testPropagateTraceWithInstrumentedAsyncOperations() throws Exception {
                     span.hasName("a-span")
                         .hasParent(trace.getSpan(0))
                         .hasAttributes(Attributes.empty())
-                        .hasTotalRecordedEvents(1)));
+                        .hasEventsSatisfyingExactly(
+                            event -> event.hasName("an-event").hasAttributes(Attributes.empty()))));
   }
 
   @Test
@@ -194,7 +195,8 @@ void testPropagateTraceWithInstrumentedAsyncConcurrentOperations() throws Except
                     span.hasName("a-span")
                         .hasParent(trace.getSpan(0))
                         .hasAttributes(Attributes.empty())
-                        .hasTotalRecordedEvents(1)),
+                        .hasEventsSatisfyingExactly(
+                            event -> event.hasName("an-event").hasAttributes(Attributes.empty()))),
         trace ->
             trace.hasSpansSatisfyingExactly(
                 span ->
@@ -215,6 +217,7 @@ void testPropagateTraceWithInstrumentedAsyncConcurrentOperations() throws Except
                     span.hasName("another-span")
                         .hasParent(trace.getSpan(0))
                         .hasAttributes(Attributes.empty())
-                        .hasTotalRecordedEvents(1)));
+                        .hasEventsSatisfyingExactly(
+                            event -> event.hasName("an-event").hasAttributes(Attributes.empty()))));
   }
 }