Skip to content

Commit b85a04e

Browse files
committed
use spring conditions
1 parent 77e61d7 commit b85a04e

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java17RuntimeMetricsAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public void stopMetrics() {
4444
}
4545

4646
@Bean
47-
CommandLineRunner startMetrics(OpenTelemetry openTelemetry, ConfigProperties configProperties) {
47+
CommandLineRunner startMetricsForJava17(
48+
OpenTelemetry openTelemetry, ConfigProperties configProperties) {
4849
return (args) -> {
4950
logger.debug("Use runtime metrics instrumentation for Java 17+");
5051
RuntimeMetrics.builder(openTelemetry)

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/Java8RuntimeMetricsAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ public void stopMetrics() {
4545
}
4646

4747
@Bean
48-
CommandLineRunner startMetrics(OpenTelemetry openTelemetry, ConfigProperties configProperties) {
48+
CommandLineRunner startMetricsForJava8(
49+
OpenTelemetry openTelemetry, ConfigProperties configProperties) {
4950
return (args) -> {
5051
logger.debug("Use runtime metrics instrumentation for Java 8");
5152
RuntimeMetrics.builder(openTelemetry)

instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/runtimemetrics/RuntimeMetricsBeanRegistrationExcludeFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ public boolean isExcludedFromAotProcessing(RegisteredBean registeredBean) {
2020
// The JFR-based runtime metric code is excluded from the Spring AOT processing step.
2121
// That way, this code is not included in a Spring native image application.
2222

23-
return Java17RuntimeMetricsAutoConfiguration.class.equals(registeredBean.getBeanClass());
23+
return "startMetricsForJava17".equals(registeredBean.getBeanName());
2424
}
2525
}

0 commit comments

Comments
 (0)