Skip to content

Commit 0b29129

Browse files
committed
Add support for TracingObservationHandler
- Add dependency management for micrometer-tracing-api - TracingObservationHandlers are grouped into a FirstMatchingCompositeObservationHandler, when found. See spring-projectsgh-30156
1 parent f846229 commit 0b29129

File tree

10 files changed

+313
-2
lines changed

10 files changed

+313
-2
lines changed

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ dependencies {
4848
optional("io.dropwizard.metrics:metrics-jmx")
4949
optional("io.lettuce:lettuce-core")
5050
optional("io.micrometer:micrometer-core")
51+
optional("io.micrometer:micrometer-tracing-api")
5152
optional("io.micrometer:micrometer-binders")
5253
optional("io.micrometer:micrometer-registry-appoptics")
5354
optional("io.micrometer:micrometer-registry-atlas") {

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ObservationAutoConfiguration.java

+6
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,27 @@
2222
import io.micrometer.core.instrument.observation.Observation.GlobalTagsProvider;
2323
import io.micrometer.core.instrument.observation.ObservationHandler;
2424
import io.micrometer.core.instrument.observation.ObservationPredicate;
25+
import io.micrometer.tracing.handler.TracingObservationHandler;
2526

2627
import org.springframework.boot.autoconfigure.AutoConfiguration;
2728
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2829
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2930
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
31+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
3032
import org.springframework.context.annotation.Bean;
3133

3234
/**
3335
* {@link EnableAutoConfiguration Auto-configuration} for the Micrometer Observation API.
3436
*
37+
* If {@link TracingObservationHandler} is on the classpath,
38+
* {@link TracingAutoConfiguration} is used.
39+
*
3540
* @author Moritz Halbritter
3641
* @since 3.0.0
3742
*/
3843
@AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class)
3944
@ConditionalOnBean(MeterRegistry.class)
45+
@ConditionalOnMissingClass("io.micrometer.tracing.handler.TracingObservationHandler")
4046
public class ObservationAutoConfiguration {
4147

4248
@Bean

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/ObservationMeterRegistryCustomizer.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,12 @@ private void registerGlobalTagsProvider(MeterRegistry registry) {
7272
}
7373

7474
@SuppressWarnings("rawtypes")
75-
private void registerObservationHandlers(MeterRegistry registry) {
75+
protected void registerObservationHandlers(MeterRegistry registry) {
7676
List<ObservationHandler> meterHandlers = new ArrayList<>();
7777
for (ObservationHandler<?> observationHandler : this.observationHandlers) {
78+
if (ignoreHandler(observationHandler)) {
79+
continue;
80+
}
7881
if (observationHandler instanceof MeterObservationHandler) {
7982
meterHandlers.add(observationHandler);
8083
}
@@ -88,4 +91,12 @@ private void registerObservationHandlers(MeterRegistry registry) {
8891
}
8992
}
9093

94+
protected boolean ignoreHandler(ObservationHandler<?> observationHandler) {
95+
return false;
96+
}
97+
98+
protected List<ObservationHandler<?>> getObservationHandlers() {
99+
return this.observationHandlers;
100+
}
101+
91102
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/*
2+
* Copyright 2012-2022 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.actuate.autoconfigure.metrics;
18+
19+
import java.util.List;
20+
21+
import io.micrometer.core.instrument.observation.Observation.GlobalTagsProvider;
22+
import io.micrometer.core.instrument.observation.ObservationHandler;
23+
import io.micrometer.core.instrument.observation.ObservationPredicate;
24+
import io.micrometer.tracing.handler.TracingObservationHandler;
25+
26+
import org.springframework.boot.autoconfigure.AutoConfiguration;
27+
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
28+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
29+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
30+
import org.springframework.context.annotation.Bean;
31+
32+
/**
33+
* {@link EnableAutoConfiguration Auto-configuration} for the Micrometer Tracing API.
34+
*
35+
* If {@link TracingObservationHandler} is not on the classpath,
36+
* {@link ObservationAutoConfiguration} is used.
37+
*
38+
* @author Moritz Halbritter
39+
* @since 3.0.0
40+
*/
41+
@AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class)
42+
@ConditionalOnClass(TracingObservationHandler.class)
43+
public class TracingAutoConfiguration {
44+
45+
@Bean
46+
@ConditionalOnMissingBean
47+
public TracingMeterRegistryCustomizer enableTimerObservationHandler(
48+
List<ObservationPredicate> observationPredicates, List<GlobalTagsProvider<?>> tagProviders,
49+
List<ObservationHandler<?>> observationHandlers) {
50+
return new TracingMeterRegistryCustomizer(observationPredicates, tagProviders, observationHandlers);
51+
}
52+
53+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
* Copyright 2012-2022 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.actuate.autoconfigure.metrics;
18+
19+
import java.util.ArrayList;
20+
import java.util.List;
21+
22+
import io.micrometer.core.instrument.MeterRegistry;
23+
import io.micrometer.core.instrument.observation.Observation.GlobalTagsProvider;
24+
import io.micrometer.core.instrument.observation.ObservationHandler;
25+
import io.micrometer.core.instrument.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
26+
import io.micrometer.core.instrument.observation.ObservationPredicate;
27+
import io.micrometer.tracing.handler.TracingObservationHandler;
28+
29+
/**
30+
* Customizes a {@link MeterRegistry} for Micrometer tracing. Works like
31+
* {@link ObservationMeterRegistryCustomizer}, only that {@link TracingObservationHandler}
32+
* are grouped into a {@link FirstMatchingCompositeObservationHandler}.
33+
*
34+
* @author Moritz Halbritter
35+
* @since 3.0.0
36+
*/
37+
public class TracingMeterRegistryCustomizer extends ObservationMeterRegistryCustomizer {
38+
39+
public TracingMeterRegistryCustomizer(List<ObservationPredicate> observationPredicates,
40+
List<GlobalTagsProvider<?>> tagProviders, List<ObservationHandler<?>> observationHandlers) {
41+
super(observationPredicates, tagProviders, observationHandlers);
42+
}
43+
44+
@Override
45+
@SuppressWarnings("rawtypes")
46+
protected void registerObservationHandlers(MeterRegistry registry) {
47+
super.registerObservationHandlers(registry);
48+
List<ObservationHandler> tracingHandlers = new ArrayList<>();
49+
for (ObservationHandler<?> observationHandler : getObservationHandlers()) {
50+
if (isTracingHandler(observationHandler)) {
51+
tracingHandlers.add(observationHandler);
52+
}
53+
}
54+
if (!tracingHandlers.isEmpty()) {
55+
registry.observationConfig()
56+
.observationHandler(new FirstMatchingCompositeObservationHandler(tracingHandlers));
57+
}
58+
}
59+
60+
@Override
61+
protected boolean ignoreHandler(ObservationHandler<?> observationHandler) {
62+
return isTracingHandler(observationHandler);
63+
}
64+
65+
private boolean isTracingHandler(ObservationHandler<?> observationHandler) {
66+
return observationHandler instanceof TracingObservationHandler;
67+
}
68+
69+
}

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration
4646
org.springframework.boot.actuate.autoconfigure.metrics.MetricsEndpointAutoConfiguration
4747
org.springframework.boot.actuate.autoconfigure.metrics.ObservationAutoConfiguration
4848
org.springframework.boot.actuate.autoconfigure.metrics.SystemMetricsAutoConfiguration
49+
org.springframework.boot.actuate.autoconfigure.metrics.TracingAutoConfiguration
4950
org.springframework.boot.actuate.autoconfigure.metrics.amqp.RabbitMetricsAutoConfiguration
5051
org.springframework.boot.actuate.autoconfigure.metrics.cache.CacheMetricsAutoConfiguration
5152
org.springframework.boot.actuate.autoconfigure.metrics.data.RepositoryMetricsAutoConfiguration

Diff for: spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/ObservationAutoConfigurationTests.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@
3333
import io.micrometer.core.instrument.observation.ObservationRegistry;
3434
import io.micrometer.core.instrument.observation.ObservationRegistry.ObservationConfig;
3535
import io.micrometer.core.instrument.observation.TimerObservationHandler;
36+
import io.micrometer.tracing.handler.TracingObservationHandler;
3637
import org.junit.jupiter.api.Test;
3738

3839
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
3940
import org.springframework.boot.autoconfigure.AutoConfigurations;
41+
import org.springframework.boot.test.context.FilteredClassLoader;
4042
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4143
import org.springframework.context.annotation.Bean;
4244
import org.springframework.context.annotation.Configuration;
@@ -53,6 +55,7 @@
5355
class ObservationAutoConfigurationTests {
5456

5557
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().with(MetricsRun.simple())
58+
.withClassLoader(new FilteredClassLoader(TracingObservationHandler.class))
5659
.withConfiguration(AutoConfigurations.of(ObservationAutoConfiguration.class));
5760

5861
@Test
@@ -93,7 +96,7 @@ void autoConfiguresObservationHandler() {
9396
assertThat(handlers.get(1)).isInstanceOf(CustomObservationHandler.class);
9497
assertThat(handlers.get(2)).isInstanceOf(FirstMatchingCompositeObservationHandler.class);
9598
assertThat(handlers.get(3)).isInstanceOf(AllMatchingCompositeObservationHandler.class);
96-
// CustomMeterObservationHandlers gets wrapped into a
99+
// CustomMeterObservationHandlers get wrapped into a
97100
// FirstMatchingCompositeObservationHandler
98101
assertThat(handlers.get(4)).isInstanceOf(FirstMatchingCompositeObservationHandler.class);
99102
List<ObservationHandler> containedHandlers = ((CompositeObservationHandler) handlers.get(4)).getHandlers();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
/*
2+
* Copyright 2012-2022 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.actuate.autoconfigure.metrics;
18+
19+
import java.lang.reflect.Method;
20+
import java.util.Collection;
21+
import java.util.List;
22+
23+
import io.micrometer.core.instrument.observation.MeterObservationHandler;
24+
import io.micrometer.core.instrument.observation.Observation.Context;
25+
import io.micrometer.core.instrument.observation.ObservationHandler;
26+
import io.micrometer.core.instrument.observation.ObservationHandler.AllMatchingCompositeObservationHandler;
27+
import io.micrometer.core.instrument.observation.ObservationHandler.CompositeObservationHandler;
28+
import io.micrometer.core.instrument.observation.ObservationHandler.FirstMatchingCompositeObservationHandler;
29+
import io.micrometer.core.instrument.observation.ObservationRegistry;
30+
import io.micrometer.core.instrument.observation.ObservationRegistry.ObservationConfig;
31+
import io.micrometer.core.instrument.observation.TimerObservationHandler;
32+
import io.micrometer.tracing.Tracer;
33+
import io.micrometer.tracing.handler.DefaultTracingObservationHandler;
34+
import org.junit.jupiter.api.Test;
35+
import org.mockito.Mockito;
36+
37+
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
38+
import org.springframework.boot.autoconfigure.AutoConfigurations;
39+
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
40+
import org.springframework.context.annotation.Bean;
41+
import org.springframework.context.annotation.Configuration;
42+
import org.springframework.core.annotation.Order;
43+
import org.springframework.util.ReflectionUtils;
44+
45+
import static org.assertj.core.api.Assertions.assertThat;
46+
47+
/**
48+
* Tests for {@link TracingAutoConfiguration}.
49+
*
50+
* @author Moritz Halbritter
51+
*/
52+
class TracingAutoConfigurationTests {
53+
54+
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().with(MetricsRun.simple())
55+
.withConfiguration(AutoConfigurations.of(TracingAutoConfiguration.class));
56+
57+
@Test
58+
@SuppressWarnings("rawtypes")
59+
void autoConfiguresObservationHandler() {
60+
this.contextRunner.withUserConfiguration(ObservationHandlers.class).run((context) -> {
61+
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
62+
List<ObservationHandler<?>> handlers = getObservationHandlers(observationRegistry);
63+
assertThat(handlers).hasSize(6);
64+
assertThat(handlers.get(0)).isInstanceOf(TimerObservationHandler.class);
65+
assertThat(handlers.get(1)).isInstanceOf(CustomObservationHandler.class);
66+
assertThat(handlers.get(2)).isInstanceOf(FirstMatchingCompositeObservationHandler.class);
67+
assertThat(handlers.get(3)).isInstanceOf(AllMatchingCompositeObservationHandler.class);
68+
// CustomMeterObservationHandlers get wrapped into a
69+
// FirstMatchingCompositeObservationHandler
70+
assertThat(handlers.get(4)).isInstanceOf(FirstMatchingCompositeObservationHandler.class);
71+
List<ObservationHandler> containedHandlers = ((CompositeObservationHandler) handlers.get(4)).getHandlers();
72+
assertThat(containedHandlers).hasSize(2);
73+
assertThat(containedHandlers.get(0)).isInstanceOf(CustomMeterObservationHandler.class);
74+
assertThat(containedHandlers.get(1)).isInstanceOf(CustomMeterObservationHandler.class);
75+
assertThat(handlers.get(4)).isInstanceOf(FirstMatchingCompositeObservationHandler.class);
76+
// DefaultTracingObservationHandler get wrapped into a
77+
// FirstMatchingCompositeObservationHandler
78+
containedHandlers = ((CompositeObservationHandler) handlers.get(5)).getHandlers();
79+
assertThat(containedHandlers).hasSize(2);
80+
assertThat(containedHandlers.get(0)).isInstanceOf(DefaultTracingObservationHandler.class);
81+
assertThat(containedHandlers.get(1)).isInstanceOf(DefaultTracingObservationHandler.class);
82+
83+
});
84+
}
85+
86+
@SuppressWarnings("unchecked")
87+
private List<ObservationHandler<?>> getObservationHandlers(ObservationRegistry registry) {
88+
Method method = ReflectionUtils.findMethod(ObservationConfig.class, "getObservationHandlers");
89+
ReflectionUtils.makeAccessible(method);
90+
return List.copyOf(
91+
(Collection<ObservationHandler<?>>) ReflectionUtils.invokeMethod(method, registry.observationConfig()));
92+
}
93+
94+
@Configuration(proxyBeanMethods = false)
95+
static class ObservationHandlers {
96+
97+
@Bean
98+
@Order(6)
99+
DefaultTracingObservationHandler customTracingHandler2() {
100+
return new DefaultTracingObservationHandler(Mockito.mock(Tracer.class));
101+
}
102+
103+
@Bean
104+
@Order(5)
105+
DefaultTracingObservationHandler customTracingHandler1() {
106+
return new DefaultTracingObservationHandler(Mockito.mock(Tracer.class));
107+
}
108+
109+
@Bean
110+
@Order(4)
111+
AllMatchingCompositeObservationHandler customAllMatchingCompositeObservationHandler() {
112+
return new AllMatchingCompositeObservationHandler();
113+
}
114+
115+
@Bean
116+
@Order(3)
117+
FirstMatchingCompositeObservationHandler customFirstMatchingCompositeObservationHandler() {
118+
return new FirstMatchingCompositeObservationHandler();
119+
}
120+
121+
@Bean
122+
@Order(2)
123+
ObservationHandler<Context> customObservationHandler() {
124+
return new CustomObservationHandler();
125+
}
126+
127+
@Bean
128+
@Order(1)
129+
MeterObservationHandler<Context> customMeterObservationHandler2() {
130+
return new CustomMeterObservationHandler();
131+
}
132+
133+
@Bean
134+
@Order(0)
135+
MeterObservationHandler<Context> customMeterObservationHandler1() {
136+
return new CustomMeterObservationHandler();
137+
}
138+
139+
}
140+
141+
static class CustomObservationHandler implements ObservationHandler<Context> {
142+
143+
@Override
144+
public boolean supportsContext(Context context) {
145+
return true;
146+
}
147+
148+
}
149+
150+
static class CustomMeterObservationHandler implements MeterObservationHandler<Context> {
151+
152+
@Override
153+
public boolean supportsContext(Context context) {
154+
return true;
155+
}
156+
157+
}
158+
159+
}

Diff for: spring-boot-project/spring-boot-actuator/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies {
2424
optional("io.lettuce:lettuce-core")
2525
optional("io.micrometer:micrometer-core")
2626
optional("io.micrometer:micrometer-binders")
27+
optional("io.micrometer:micrometer-tracing-api")
2728
optional("io.micrometer:micrometer-registry-prometheus")
2829
optional("io.prometheus:simpleclient_pushgateway") {
2930
exclude(group: "javax.xml.bind", module: "jaxb-api")

0 commit comments

Comments
 (0)