Assert no exception span event in logs-only mode

trask · trask · commit 2ddd571aaf88 · 2026-05-09T11:40:34.000-07:00
diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractControllerSpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractControllerSpringWebFluxServerTest.java
@@ -46,6 +46,8 @@ protected SpanDataAssert assertHandlerSpan(
                         equalTo(EXCEPTION_TYPE, "java.lang.IllegalStateException"),
                         equalTo(EXCEPTION_MESSAGE, EXCEPTION.getBody()),
                         satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
+      } else {
+        span.hasEventsSatisfyingExactly();
       }
     } else if (endpoint == NOT_FOUND) {
       span.hasStatus(StatusData.error());
@@ -78,6 +80,8 @@ protected SpanDataAssert assertHandlerSpan(
                           satisfies(EXCEPTION_MESSAGE, val -> val.contains("404")),
                           satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
         }
+      } else {
+        span.hasEventsSatisfyingExactly();
       }
       if (emitExceptionAsLogs()) {
         if (testLatestDeps()) {
diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractHandlerSpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractHandlerSpringWebFluxServerTest.java
@@ -45,6 +45,8 @@ protected SpanDataAssert assertHandlerSpan(
                         equalTo(EXCEPTION_TYPE, "java.lang.IllegalStateException"),
                         equalTo(EXCEPTION_MESSAGE, EXCEPTION.getBody()),
                         satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
+      } else {
+        span.hasEventsSatisfyingExactly();
       }
     } else if (endpoint == NOT_FOUND) {
       span.hasStatus(StatusData.error());
@@ -77,6 +79,8 @@ protected SpanDataAssert assertHandlerSpan(
                           satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class)),
                           satisfies(EXCEPTION_MESSAGE, val -> val.contains("404"))));
         }
+      } else {
+        span.hasEventsSatisfyingExactly();
       }
       if (emitExceptionAsLogs()) {
         if (testLatestDeps()) {
diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractSpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractSpringWebfluxTest.java
@@ -418,6 +418,8 @@ void get404Test() {
                   if (emitExceptionAsSpanEvents()) {
                     span.hasEventsSatisfyingExactly(
                         AbstractSpringWebfluxTest::resource404Exception);
+                  } else {
+                    span.hasEventsSatisfyingExactly();
                   }
                   span.hasAttributesSatisfyingExactly(
                       codeFunctionAssertions(
@@ -561,6 +563,8 @@ void getToBadEndpointTest(Parameter parameter) {
                                     satisfies(
                                         EXCEPTION_STACKTRACE,
                                         val -> val.isInstanceOf(String.class))));
+                  } else {
+                    span.hasEventsSatisfyingExactly();
                   }
                   span.hasAttributesSatisfyingExactly(assertCodeFunction(parameter));
                 }));

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ protected SpanDataAssert assertHandlerSpan(`
`46`	`46`	`equalTo(EXCEPTION_TYPE, "java.lang.IllegalStateException"),`
`47`	`47`	`equalTo(EXCEPTION_MESSAGE, EXCEPTION.getBody()),`
`48`	`48`	`satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));`
	`49`	`+ } else {`
	`50`	`+ span.hasEventsSatisfyingExactly();`
`49`	`51`	`}`
`50`	`52`	`} else if (endpoint == NOT_FOUND) {`
`51`	`53`	`span.hasStatus(StatusData.error());`
`@@ -78,6 +80,8 @@ protected SpanDataAssert assertHandlerSpan(`
`78`	`80`	`satisfies(EXCEPTION_MESSAGE, val -> val.contains("404")),`
`79`	`81`	`satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));`
`80`	`82`	`}`
	`83`	`+ } else {`
	`84`	`+ span.hasEventsSatisfyingExactly();`
`81`	`85`	`}`
`82`	`86`	`if (emitExceptionAsLogs()) {`
`83`	`87`	`if (testLatestDeps()) {`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ protected SpanDataAssert assertHandlerSpan(`
`45`	`45`	`equalTo(EXCEPTION_TYPE, "java.lang.IllegalStateException"),`
`46`	`46`	`equalTo(EXCEPTION_MESSAGE, EXCEPTION.getBody()),`
`47`	`47`	`satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));`
	`48`	`+ } else {`
	`49`	`+ span.hasEventsSatisfyingExactly();`
`48`	`50`	`}`
`49`	`51`	`} else if (endpoint == NOT_FOUND) {`
`50`	`52`	`span.hasStatus(StatusData.error());`
`@@ -77,6 +79,8 @@ protected SpanDataAssert assertHandlerSpan(`
`77`	`79`	`satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class)),`
`78`	`80`	`satisfies(EXCEPTION_MESSAGE, val -> val.contains("404"))));`
`79`	`81`	`}`
	`82`	`+ } else {`
	`83`	`+ span.hasEventsSatisfyingExactly();`
`80`	`84`	`}`
`81`	`85`	`if (emitExceptionAsLogs()) {`
`82`	`86`	`if (testLatestDeps()) {`