Skip to content

Commit 7511882

Browse files
committed
fix annotation
1 parent aa86281 commit 7511882

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java

+9-5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.micrometer.core.instrument.MeterRegistry;
1010
import io.opentelemetry.javaagent.instrumentation.micrometer.v1_5.MicrometerSingletons;
1111
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
12+
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
1213
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
1314
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
1415
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -18,12 +19,15 @@
1819
import org.springframework.context.annotation.Configuration;
1920

2021
@Configuration
22+
// see
23+
// https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java
24+
// for an example of how configure a MeterRegistry properly
2125
// CompositeMeterRegistryAutoConfiguration configures the "final" composite registry
22-
@AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class)
23-
// configure after the SimpleMeterRegistry has initialized; it is normally the last MeterRegistry
24-
// implementation to be configured, as it's used as a fallback
25-
// the OTel registry should be added in addition to that fallback and not replace it
26-
@AutoConfigureAfter(SimpleMetricsExportAutoConfiguration.class)
26+
@AutoConfigureBefore({
27+
CompositeMeterRegistryAutoConfiguration.class,
28+
SimpleMetricsExportAutoConfiguration.class
29+
})
30+
@AutoConfigureAfter(MetricsAutoConfiguration.class)
2731
@ConditionalOnBean(Clock.class)
2832
@ConditionalOnClass(MeterRegistry.class)
2933
public class OpenTelemetryMeterRegistryAutoConfiguration {

0 commit comments

Comments
 (0)