Issue #3455: do not catch exceptions thrown by Observation supplier

reactor · Jun 29, 2023 · 3a611db · 3a611db
1 parent 942a2ce
commit 3a611db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/...er/src/main/java/reactor/core/observability/micrometer/MicrometerObservationListener.java b/...er/src/main/java/reactor/core/observability/micrometer/MicrometerObservationListener.java
@@ -106,13 +106,9 @@ private static Observation defaultObservation(
 			MicrometerObservationListenerConfiguration configuration,
 			@Nullable Function<ObservationRegistry, Observation> observationSupplier) {
 		if (observationSupplier != null) {
-			try {
-				final Observation observation = observationSupplier.apply(configuration.registry);
-				if (observation != null) {
-					return observation;
-				}
-			} catch (final Exception e) {
-				LOGGER.error("Error creating observation with given supplier, use default supplier instead", e);
+			final Observation observation = observationSupplier.apply(configuration.registry);
+			if (observation != null) {
+				return observation;
 			}
 		}
 		return Observation.createNotStarted(configuration.sequenceName, configuration.registry);

diff --git a/...rc/test/java/reactor/core/observability/micrometer/MicrometerObservationListenerTest.java b/...rc/test/java/reactor/core/observability/micrometer/MicrometerObservationListenerTest.java
@@ -38,6 +38,7 @@
 
 import static io.micrometer.observation.tck.TestObservationRegistryAssert.assertThat;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * @author Simon Baslé
@@ -330,18 +331,8 @@ void tapFromMonoWithObservationSupplierThrowingException(boolean automatic) {
 
 		assertThat(registry).as("before subscription").doesNotHaveAnyObservation();
 
-		mono.block();
-
-		assertThat(registry)
-				.hasSingleObservationThat()
-				.hasNameEqualTo("testMono")
-				.hasContextualNameEqualTo("testMono")
-				.as("subscribeToTerminalObservation")
-				.hasBeenStarted()
-				.hasBeenStopped()
-				.hasLowCardinalityKeyValue("reactor.type", "Mono")
-				.hasLowCardinalityKeyValue("reactor.status",  "completed")
-				.hasKeyValuesCount(2);
+		assertThatThrownBy(mono::block)
+				.isInstanceOf(IllegalStateException.class);
 	}
 
 	@ParameterizedTestWithName