diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java index 77737d6653..546e32a76f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java @@ -67,7 +67,7 @@ public class ObservationAutoConfiguration { @Bean TimerObservationHandlerObservationRegistryCustomizer enableTimerObservationHandler( - ObjectProvider meterRegistry) { + MeterRegistry meterRegistry) { return new TimerObservationHandlerObservationRegistryCustomizer(meterRegistry); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizer.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizer.java index 232d6a66e7..55ad5b3072 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizer.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizer.java @@ -20,8 +20,6 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.observation.TimerObservationHandler; import io.micrometer.observation.ObservationRegistry; -import org.springframework.beans.factory.ObjectProvider; - /** * Registers the {@link TimerObservationHandler} with an {@link ObservationRegistry}. * @@ -30,15 +28,15 @@ import org.springframework.beans.factory.ObjectProvider; class TimerObservationHandlerObservationRegistryCustomizer implements ObservationRegistryCustomizer { - private final ObjectProvider meterRegistry; + private final MeterRegistry meterRegistry; - TimerObservationHandlerObservationRegistryCustomizer(ObjectProvider meterRegistry) { + TimerObservationHandlerObservationRegistryCustomizer(MeterRegistry meterRegistry) { this.meterRegistry = meterRegistry; } @Override public void customize(ObservationRegistry registry) { - registry.observationConfig().observationHandler(new TimerObservationHandler(this.meterRegistry.getObject())); + registry.observationConfig().observationHandler(new TimerObservationHandler(this.meterRegistry)); } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizerTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizerTests.java index d52fa0a3a4..7180a55e03 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizerTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizerTests.java @@ -21,9 +21,6 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import io.micrometer.observation.Observation; import io.micrometer.observation.ObservationRegistry; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; - -import org.springframework.beans.factory.ObjectProvider; import static org.assertj.core.api.Assertions.assertThat; @@ -35,13 +32,10 @@ import static org.assertj.core.api.Assertions.assertThat; class TimerObservationHandlerObservationRegistryCustomizerTests { @Test - @SuppressWarnings("unchecked") void customizeInstallsTimerObservationHandler() { MeterRegistry meterRegistry = new SimpleMeterRegistry(); - ObjectProvider meterRegistryProvider = Mockito.mock(ObjectProvider.class); - Mockito.when(meterRegistryProvider.getObject()).thenReturn(meterRegistry); TimerObservationHandlerObservationRegistryCustomizer sut = new TimerObservationHandlerObservationRegistryCustomizer( - meterRegistryProvider); + meterRegistry); ObservationRegistry observationRegistry = ObservationRegistry.create(); sut.customize(observationRegistry); Observation.start("test-1", observationRegistry).stop();