Skip to content

Commit 89c61e9

Browse files
committed
Adapt GlobalObservationConvention imports
See micrometer-metrics/micrometer#3387
1 parent e37a0cb commit 89c61e9

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.springframework.boot.actuate.autoconfigure.observation;
1818

1919
import io.micrometer.core.instrument.MeterRegistry;
20-
import io.micrometer.observation.Observation.GlobalObservationConvention;
20+
import io.micrometer.observation.GlobalObservationConvention;
2121
import io.micrometer.observation.ObservationHandler;
2222
import io.micrometer.observation.ObservationPredicate;
2323
import io.micrometer.observation.ObservationRegistry;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.util.List;
2020

21-
import io.micrometer.observation.Observation.GlobalObservationConvention;
21+
import io.micrometer.observation.GlobalObservationConvention;
2222
import io.micrometer.observation.ObservationHandler;
2323
import io.micrometer.observation.ObservationPredicate;
2424
import io.micrometer.observation.ObservationRegistry;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.observation;
1818

19-
import io.micrometer.observation.Observation.GlobalObservationConvention;
19+
import io.micrometer.observation.GlobalObservationConvention;
2020
import io.micrometer.observation.ObservationHandler;
2121
import io.micrometer.observation.ObservationPredicate;
2222
import io.micrometer.observation.ObservationRegistry;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/observation/ObservationAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import io.micrometer.core.instrument.MeterRegistry;
2525
import io.micrometer.core.instrument.observation.MeterObservationHandler;
2626
import io.micrometer.core.instrument.search.MeterNotFoundException;
27+
import io.micrometer.observation.GlobalObservationConvention;
2728
import io.micrometer.observation.Observation;
2829
import io.micrometer.observation.Observation.Context;
29-
import io.micrometer.observation.Observation.GlobalObservationConvention;
3030
import io.micrometer.observation.ObservationHandler;
3131
import io.micrometer.observation.ObservationHandler.AllMatchingCompositeObservationHandler;
3232
import io.micrometer.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;

0 commit comments

Comments
 (0)