diff --git a/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerObservationListener.java b/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerObservationListener.java index 2013f8c4f1..29f05e7935 100644 --- a/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerObservationListener.java +++ b/reactor-core-micrometer/src/main/java/reactor/core/observability/micrometer/MicrometerObservationListener.java @@ -106,13 +106,9 @@ private static Observation defaultObservation( MicrometerObservationListenerConfiguration configuration, @Nullable Function 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/reactor-core-micrometer/src/test/java/reactor/core/observability/micrometer/MicrometerObservationListenerTest.java b/reactor-core-micrometer/src/test/java/reactor/core/observability/micrometer/MicrometerObservationListenerTest.java index cde6d1f0fc..a0cf2ed107 100644 --- a/reactor-core-micrometer/src/test/java/reactor/core/observability/micrometer/MicrometerObservationListenerTest.java +++ b/reactor-core-micrometer/src/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