Skip to content

Commit ff82b8d

Browse files
committed
Add auto-configuration for a no-op tracer
This auto-configuration ensures, if Micrometer Tracing is on the classpath, that there is always a tracer. It backs off if there is already a tracer, for example contributed by the Brave or the Otel auto-configurations, which are run before. See gh-38568
1 parent ea87787 commit ff82b8d

File tree

5 files changed

+125
-2
lines changed

5 files changed

+125
-2
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
* @author Jonatan Ivanov
6363
* @since 3.0.0
6464
*/
65-
@AutoConfiguration(before = MicrometerTracingAutoConfiguration.class)
65+
@AutoConfiguration(before = { MicrometerTracingAutoConfiguration.class, NoopTracerAutoConfiguration.class })
6666
@ConditionalOnClass({ Tracer.class, BraveTracer.class })
6767
@EnableConfigurationProperties(TracingProperties.class)
6868
@Import({ BravePropagationConfigurations.PropagationWithoutBaggage.class,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright 2012-2023 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.tracing;
18+
19+
import io.micrometer.tracing.Tracer;
20+
21+
import org.springframework.boot.autoconfigure.AutoConfiguration;
22+
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
23+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
24+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
25+
import org.springframework.context.annotation.Bean;
26+
27+
/**
28+
* {@link EnableAutoConfiguration Auto-configuration} for a no-op implementation of
29+
* {@link Tracer}.
30+
*
31+
* @author Moritz Halbritter
32+
* @since 3.2.1
33+
*/
34+
@AutoConfiguration(before = MicrometerTracingAutoConfiguration.class)
35+
@ConditionalOnClass(Tracer.class)
36+
@ConditionalOnMissingBean(Tracer.class)
37+
public class NoopTracerAutoConfiguration {
38+
39+
@Bean
40+
Tracer noopTracer() {
41+
return Tracer.NOOP;
42+
}
43+
44+
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
* @author Yanming Zhou
6767
* @since 3.0.0
6868
*/
69-
@AutoConfiguration(value = "openTelemetryTracingAutoConfiguration", before = MicrometerTracingAutoConfiguration.class)
69+
@AutoConfiguration(value = "openTelemetryTracingAutoConfiguration",
70+
before = { MicrometerTracingAutoConfiguration.class, NoopTracerAutoConfiguration.class })
7071
@ConditionalOnClass({ OtelTracer.class, SdkTracerProvider.class, OpenTelemetry.class })
7172
@EnableConfigurationProperties(TracingProperties.class)
7273
@Import({ OpenTelemetryPropagationConfigurations.PropagationWithoutBaggage.class,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ org.springframework.boot.actuate.autoconfigure.startup.StartupEndpointAutoConfig
104104
org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributorAutoConfiguration
105105
org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration
106106
org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration
107+
org.springframework.boot.actuate.autoconfigure.tracing.NoopTracerAutoConfiguration
107108
org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryAutoConfiguration
108109
org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpAutoConfiguration
109110
org.springframework.boot.actuate.autoconfigure.tracing.prometheus.PrometheusExemplarsAutoConfiguration
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
/*
2+
* Copyright 2012-2023 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.tracing;
18+
19+
import io.micrometer.tracing.Tracer;
20+
import org.junit.jupiter.api.Test;
21+
22+
import org.springframework.boot.autoconfigure.AutoConfigurations;
23+
import org.springframework.boot.test.context.FilteredClassLoader;
24+
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
25+
import org.springframework.context.annotation.Bean;
26+
import org.springframework.context.annotation.Configuration;
27+
28+
import static org.assertj.core.api.Assertions.assertThat;
29+
import static org.mockito.Mockito.mock;
30+
31+
/**
32+
* Tests for {@link NoopTracerAutoConfiguration}.
33+
*
34+
* @author Moritz Halbritter
35+
*/
36+
class NoopTracerAutoConfigurationTests {
37+
38+
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
39+
.withConfiguration(AutoConfigurations.of(NoopTracerAutoConfiguration.class));
40+
41+
@Test
42+
void shouldSupplyNoopTracer() {
43+
this.contextRunner.run((context) -> {
44+
assertThat(context).hasSingleBean(Tracer.class);
45+
Tracer tracer = context.getBean(Tracer.class);
46+
assertThat(tracer).isEqualTo(Tracer.NOOP);
47+
});
48+
}
49+
50+
@Test
51+
void shouldBackOffOnCustomTracer() {
52+
this.contextRunner.withUserConfiguration(CustomTracerConfiguration.class).run((context) -> {
53+
assertThat(context).hasSingleBean(Tracer.class);
54+
assertThat(context).hasBean("customTracer");
55+
Tracer tracer = context.getBean(Tracer.class);
56+
assertThat(tracer).isNotEqualTo(Tracer.NOOP);
57+
});
58+
}
59+
60+
@Test
61+
void shouldBackOffIfMicrometerTracingIsMissing() {
62+
this.contextRunner.withClassLoader(new FilteredClassLoader("io.micrometer.tracing"))
63+
.run((context) -> assertThat(context).doesNotHaveBean(Tracer.class));
64+
65+
}
66+
67+
@Configuration(proxyBeanMethods = false)
68+
private static class CustomTracerConfiguration {
69+
70+
@Bean
71+
Tracer customTracer() {
72+
return mock(Tracer.class);
73+
}
74+
75+
}
76+
77+
}

0 commit comments

Comments
 (0)