|
14 | 14 | * limitations under the License.
|
15 | 15 | */
|
16 | 16 |
|
17 |
| -package org.springframework.boot.actuate.autoconfigure.observation; |
| 17 | +package org.springframework.boot.actuate.autoconfigure.observability; |
18 | 18 |
|
19 | 19 | import java.util.List;
|
20 | 20 |
|
21 | 21 | import io.micrometer.core.instrument.MeterRegistry;
|
22 | 22 | import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler;
|
23 | 23 | import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler.IgnoredMeters;
|
24 | 24 | import io.micrometer.core.instrument.observation.MeterObservationHandler;
|
25 |
| -import io.micrometer.observation.GlobalObservationConvention; |
26 | 25 | import io.micrometer.observation.Observation;
|
27 |
| -import io.micrometer.observation.ObservationFilter; |
28 |
| -import io.micrometer.observation.ObservationHandler; |
29 |
| -import io.micrometer.observation.ObservationPredicate; |
30 | 26 | import io.micrometer.observation.ObservationRegistry;
|
31 |
| -import io.micrometer.observation.aop.ObservedAspect; |
32 | 27 | import io.micrometer.tracing.Tracer;
|
33 | 28 | import io.micrometer.tracing.handler.TracingAwareMeterObservationHandler;
|
34 | 29 | import io.micrometer.tracing.handler.TracingObservationHandler;
|
35 |
| -import org.aspectj.weaver.Advice; |
36 | 30 |
|
37 |
| -import org.springframework.beans.factory.ObjectProvider; |
38 | 31 | import org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration;
|
39 | 32 | import org.springframework.boot.autoconfigure.AutoConfiguration;
|
40 | 33 | import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
41 | 34 | import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
42 |
| -import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty; |
43 | 35 | import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
44 | 36 | import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
45 | 37 | import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
|
46 | 38 | import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
47 |
| -import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration; |
| 39 | +import org.springframework.boot.micrometer.observation.autoconfigure.ObservationHandlerGrouping; |
| 40 | +import org.springframework.boot.micrometer.observation.autoconfigure.ObservationProperties; |
48 | 41 | import org.springframework.context.annotation.Bean;
|
49 | 42 | import org.springframework.context.annotation.Configuration;
|
50 |
| -import org.springframework.core.annotation.Order; |
51 | 43 |
|
52 | 44 | /**
|
53 | 45 | * {@link EnableAutoConfiguration Auto-configuration} for the Micrometer Observation API.
|
|
58 | 50 | * @author Vedran Pavic
|
59 | 51 | * @since 3.0.0
|
60 | 52 | */
|
61 |
| -@AutoConfiguration(after = { CompositeMeterRegistryAutoConfiguration.class, MicrometerTracingAutoConfiguration.class }) |
| 53 | +@AutoConfiguration( |
| 54 | + beforeName = "org.springframework.boot.micrometer.observation.autoconfigure.ObservationAutoConfiguration", |
| 55 | + afterName = "org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration", |
| 56 | + after = MicrometerTracingAutoConfiguration.class) |
62 | 57 | @ConditionalOnClass(ObservationRegistry.class)
|
63 |
| -@EnableConfigurationProperties(ObservationProperties.class) |
64 |
| -public class ObservationAutoConfiguration { |
65 |
| - |
66 |
| - @Bean |
67 |
| - static ObservationRegistryPostProcessor observationRegistryPostProcessor( |
68 |
| - ObjectProvider<ObservationRegistryCustomizer<?>> observationRegistryCustomizers, |
69 |
| - ObjectProvider<ObservationPredicate> observationPredicates, |
70 |
| - ObjectProvider<GlobalObservationConvention<?>> observationConventions, |
71 |
| - ObjectProvider<ObservationHandler<?>> observationHandlers, |
72 |
| - ObjectProvider<ObservationHandlerGrouping> observationHandlerGrouping, |
73 |
| - ObjectProvider<ObservationFilter> observationFilters) { |
74 |
| - return new ObservationRegistryPostProcessor(observationRegistryCustomizers, observationPredicates, |
75 |
| - observationConventions, observationHandlers, observationHandlerGrouping, observationFilters); |
76 |
| - } |
77 |
| - |
78 |
| - @Bean |
79 |
| - @ConditionalOnMissingBean |
80 |
| - ObservationRegistry observationRegistry() { |
81 |
| - return ObservationRegistry.create(); |
82 |
| - } |
83 |
| - |
84 |
| - @Bean |
85 |
| - @Order(0) |
86 |
| - PropertiesObservationFilterPredicate propertiesObservationFilter(ObservationProperties properties) { |
87 |
| - return new PropertiesObservationFilterPredicate(properties); |
88 |
| - } |
| 58 | +public class ObservabilityAutoConfiguration { |
89 | 59 |
|
90 | 60 | @Configuration(proxyBeanMethods = false)
|
91 | 61 | @ConditionalOnClass(MeterRegistry.class)
|
@@ -126,6 +96,7 @@ ObservationHandlerGrouping metricsAndTracingObservationHandlerGrouping() {
|
126 | 96 | @Configuration(proxyBeanMethods = false)
|
127 | 97 | @ConditionalOnBean(MeterRegistry.class)
|
128 | 98 | @ConditionalOnMissingBean(MeterObservationHandler.class)
|
| 99 | + @EnableConfigurationProperties(ObservationProperties.class) |
129 | 100 | static class MeterObservationHandlerConfiguration {
|
130 | 101 |
|
131 | 102 | @ConditionalOnMissingBean(type = "io.micrometer.tracing.Tracer")
|
@@ -158,17 +129,4 @@ TracingAwareMeterObservationHandler<Observation.Context> tracingAwareMeterObserv
|
158 | 129 |
|
159 | 130 | }
|
160 | 131 |
|
161 |
| - @Configuration(proxyBeanMethods = false) |
162 |
| - @ConditionalOnClass(Advice.class) |
163 |
| - @ConditionalOnBooleanProperty("management.observations.annotations.enabled") |
164 |
| - static class ObservedAspectConfiguration { |
165 |
| - |
166 |
| - @Bean |
167 |
| - @ConditionalOnMissingBean |
168 |
| - ObservedAspect observedAspect(ObservationRegistry observationRegistry) { |
169 |
| - return new ObservedAspect(observationRegistry); |
170 |
| - } |
171 |
| - |
172 |
| - } |
173 |
| - |
174 | 132 | }
|
0 commit comments