Skip to content

Commit c3c86ec

Browse files
committed
add comments
1 parent 7700877 commit c3c86ec

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies {
2020
testLibrary("io.micrometer:micrometer-registry-prometheus:1.0.1")
2121

2222
if (latestDepTest) {
23+
// Micrometer moved into its own Spring Boot starter in version 4
2324
testLibrary("org.springframework.boot:spring-boot-starter-micrometer-metrics:4.0.0")
2425
}
2526

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ public static class GetCandidateConfigurationsAdvice {
3939
public static List<String> onExit(@Advice.Return List<String> originalConfigurations) {
4040
List<String> configurations = originalConfigurations;
4141
if (configurations.contains(
42+
// Spring Boot 2.x-3.x location
4243
"org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration")
4344
|| configurations.contains(
45+
// Spring Boot 4.x location
4446
"org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration")) {
4547
List<String> configs = new ArrayList<>(configurations.size() + 1);
4648
configs.addAll(configurations);

0 commit comments

Comments
 (0)