Skip to content

Commit 7700877

Browse files
committed
move comment
1 parent 478306d commit 7700877

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,18 @@
2525

2626
@Configuration
2727
// CompositeMeterRegistryAutoConfiguration configures the "final" composite registry
28-
// Spring Boot 2.x-3.x location and Spring Boot 4.x location (package changed in 4.x)
2928
@AutoConfigureBefore(
3029
name = {
31-
"org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration",
32-
"org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration"
30+
"org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration", // Spring Boot 2.x-3.x location
31+
"org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration" // Spring Boot 4.x location
3332
})
3433
// configure after the SimpleMeterRegistry has initialized; it is normally the last MeterRegistry
3534
// implementation to be configured, as it's used as a fallback
3635
// the OTel registry should be added in addition to that fallback and not replace it
37-
// Spring Boot 2.x-3.x location and Spring Boot 4.x location (package changed in 4.x)
3836
@AutoConfigureAfter(
3937
name = {
40-
"org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration",
41-
"org.springframework.boot.micrometer.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration"
38+
"org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration", // Spring Boot 2.x-3.x location
39+
"org.springframework.boot.micrometer.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration" // Spring Boot 4.x location
4240
})
4341
@ConditionalOnBean(Clock.class)
4442
@ConditionalOnClass(MeterRegistry.class)

0 commit comments

Comments
 (0)