Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Make MeterRegistry lazy in TimerObservationHandlerObservationRegistryCustomizer"

Browse Source 
This reverts commit 04391275c1.
This commit is contained in:
Moritz Halbritter
2022-07-19 16:33:35 +02:00
parent e35140d54f
commit 5030cfedcc
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizer.java
View File

@@ -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<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));
}
}

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/TimerObservationHandlerObservationRegistryCustomizerTests.java
View File

@@ -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<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();