Revert "Make MeterRegistry lazy in TimerObservationHandlerObservationRegistryCustomizer"

This reverts commit 0439127.

Author: mhalbritter

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfiguration.java

@@ -67,7 +67,7 @@ static class MetricsConfiguration {
 
 		@Bean
 		TimerObservationHandlerObservationRegistryCustomizer enableTimerObservationHandler(
-				ObjectProvider<MeterRegistry> meterRegistry) {
+				MeterRegistry meterRegistry) {
 			return new TimerObservationHandlerObservationRegistryCustomizer(meterRegistry);
 		}
 

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.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 @@
 class TimerObservationHandlerObservationRegistryCustomizer
 		implements ObservationRegistryCustomizer<ObservationRegistry> {
 
-	private final ObjectProvider<MeterRegistry> meterRegistry;
+	private final MeterRegistry meterRegistry;
 
-	TimerObservationHandlerObservationRegistryCustomizer(ObjectProvider<MeterRegistry> 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));
 	}
 
 }

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.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 @@
 class TimerObservationHandlerObservationRegistryCustomizerTests {
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void customizeInstallsTimerObservationHandler() {
 		MeterRegistry meterRegistry = new SimpleMeterRegistry();
-		ObjectProvider<MeterRegistry> 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();