From e47be09fbdc83a40b3574f44d6cdcf2cc0c20463 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Sat, 3 Feb 2024 10:48:40 +0200 Subject: [PATCH] Disable actuator instrumentation by default (#10394) --- .../javaagent/build.gradle.kts | 2 ++ .../v2_0/SpringBootActuatorInstrumentationModule.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts index a40283fd27..ff8314ed20 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts @@ -23,6 +23,8 @@ tasks.withType().configureEach { // required on jdk17 jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") + + jvmArgs("-Dotel.instrumentation.spring-boot-actuator-autoconfigure.enabled=true") } val latestDepTest = findProperty("testLatestDeps") as Boolean diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/SpringBootActuatorInstrumentationModule.java b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/SpringBootActuatorInstrumentationModule.java index a189da3f81..ce3db47750 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/SpringBootActuatorInstrumentationModule.java +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/SpringBootActuatorInstrumentationModule.java @@ -15,6 +15,7 @@ import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule; import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.ClassInjector; import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.InjectionMode; +import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import java.util.List; import net.bytebuddy.matcher.ElementMatcher; @@ -62,4 +63,10 @@ public class SpringBootActuatorInstrumentationModule extends InstrumentationModu public List typeInstrumentations() { return singletonList(new AutoConfigurationImportSelectorInstrumentation()); } + + @Override + public boolean defaultEnabled(ConfigProperties config) { + // produces a lot of metrics that are already captured - e.g. JVM memory usage + return false; + } }