Skip to content

Update spring-boot-actuator-autoconfigure for spring boot 4 #15433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 4 commits into from
Nov 24, 2025
Merged

Update spring-boot-actuator-autoconfigure for spring boot 4 #15433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
478306d
Update spring-boot-actuator-autoconfigure for spring boot 4
jaydeluca Nov 23, 2025
7700877
move comment
jaydeluca Nov 24, 2025
c3c86ec
add comments
jaydeluca Nov 24, 2025
bc67ee2
Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instru…
jaydeluca Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,22 @@ muzzle {
}
}

val latestDepTest = findProperty("testLatestDeps") as Boolean

dependencies {
library("org.springframework.boot:spring-boot-actuator-autoconfigure:2.0.0.RELEASE")
library("io.micrometer:micrometer-core:1.5.0")
testLibrary("io.micrometer:micrometer-registry-prometheus:1.0.1")

if (latestDepTest) {
// Micrometer moved into its own Spring Boot starter in version 4
testLibrary("org.springframework.boot:spring-boot-starter-micrometer-metrics:4.0.0")
Copy link
Member

@trask trask Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a brief comment here?

}

implementation(project(":instrumentation:micrometer:micrometer-1.5:javaagent"))

// dependency management pins logback-classic to 1.3 which is the last release that supports java 8
latestDepTestLibrary("ch.qos.logback:logback-classic:latest.release")
// tests don't work with spring boot 4 yet
latestDepTestLibrary("org.springframework.boot:spring-boot-actuator-autoconfigure:3.+") // documented limitation
}

tasks.withType<Test>().configureEach {
Expand All @@ -33,8 +38,6 @@ tasks.withType<Test>().configureEach {
jvmArgs("-Dotel.instrumentation.spring-boot-actuator-autoconfigure.enabled=true")
}

val latestDepTest = findProperty("testLatestDeps") as Boolean

// spring 6 (spring boot 3) requires java 17
if (latestDepTest) {
otelJava {
Expand Down
6 changes: 5 additions & 1 deletion .../instrumentation/spring/actuator/v2_0/AutoConfigurationImportSelectorInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ public static class GetCandidateConfigurationsAdvice {
public static List<String> onExit(@Advice.Return List<String> originalConfigurations) {
List<String> configurations = originalConfigurations;
if (configurations.contains(
"org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration")) {
// Spring Boot 2.x-3.x location
"org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration")
|| configurations.contains(
// Spring Boot 4.x location
"org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration")) {
List<String> configs = new ArrayList<>(configurations.size() + 1);
configs.addAll(configurations);
// using class reference here so that muzzle will consider it a dependency of this advice
Expand Down
14 changes: 10 additions & 4 deletions ...ent/instrumentation/spring/actuator/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
import java.util.List;
import java.util.Set;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
Expand All @@ -27,11 +25,19 @@

@Configuration
// CompositeMeterRegistryAutoConfiguration configures the "final" composite registry
@AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class)
@AutoConfigureBefore(
name = {
"org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration", // Spring Boot 2.x-3.x location
"org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration" // Spring Boot 4.x location
})
// configure after the SimpleMeterRegistry has initialized; it is normally the last MeterRegistry
// implementation to be configured, as it's used as a fallback
// the OTel registry should be added in addition to that fallback and not replace it
@AutoConfigureAfter(SimpleMetricsExportAutoConfiguration.class)
@AutoConfigureAfter(
name = {
"org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration", // Spring Boot 2.x-3.x location
"org.springframework.boot.micrometer.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration" // Spring Boot 4.x location
})
@ConditionalOnBean(Clock.class)
@ConditionalOnClass(MeterRegistry.class)
public class OpenTelemetryMeterRegistryAutoConfiguration {
Expand Down
Loading