|
10 | 10 | import org.aspectj.lang.annotation.Aspect;
|
11 | 11 | import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
|
12 | 12 | import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
13 |
| -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; |
14 | 13 | import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
15 | 14 | import org.springframework.context.annotation.Bean;
|
16 | 15 | import org.springframework.context.annotation.Configuration;
|
|
23 | 22 | @ConditionalOnProperty(name = "otel.instrumentation.annotations.enabled", matchIfMissing = true)
|
24 | 23 | @Configuration
|
25 | 24 | public class InstrumentationAnnotationsAutoConfiguration {
|
26 |
| - |
27 |
| - @Bean |
28 |
| - @ConditionalOnMissingBean |
29 |
| - ParameterNameDiscoverer parameterNameDiscoverer() { |
30 |
| - return new DefaultParameterNameDiscoverer(); |
31 |
| - } |
| 25 | + private final ParameterNameDiscoverer parameterNameDiscoverer = |
| 26 | + new DefaultParameterNameDiscoverer(); |
32 | 27 |
|
33 | 28 | @Bean
|
34 | 29 | @ConditionalOnClass(WithSpan.class)
|
35 |
| - InstrumentationWithSpanAspect otelInstrumentationWithSpanAspect( |
36 |
| - OpenTelemetry openTelemetry, ParameterNameDiscoverer parameterNameDiscoverer) { |
| 30 | + InstrumentationWithSpanAspect otelInstrumentationWithSpanAspect(OpenTelemetry openTelemetry) { |
37 | 31 | return new InstrumentationWithSpanAspect(openTelemetry, parameterNameDiscoverer);
|
38 | 32 | }
|
39 | 33 |
|
40 | 34 | @Bean
|
41 | 35 | @SuppressWarnings("deprecation") // instrumenting deprecated class for backwards compatibility
|
42 | 36 | @ConditionalOnClass(io.opentelemetry.extension.annotations.WithSpan.class)
|
43 |
| - SdkExtensionWithSpanAspect otelSdkExtensionWithSpanAspect( |
44 |
| - OpenTelemetry openTelemetry, ParameterNameDiscoverer parameterNameDiscoverer) { |
| 37 | + SdkExtensionWithSpanAspect otelSdkExtensionWithSpanAspect(OpenTelemetry openTelemetry) { |
45 | 38 | return new SdkExtensionWithSpanAspect(openTelemetry, parameterNameDiscoverer);
|
46 | 39 | }
|
47 | 40 | }
|
0 commit comments