diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java index 422d357349a3..4edc0f616db4 100644 --- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java +++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java @@ -49,10 +49,27 @@ public final class InstrumenterBuilder { private static final Logger logger = Logger.getLogger(InstrumenterBuilder.class.getName()); - private static final SpanSuppressionStrategy spanSuppressionStrategy = - SpanSuppressionStrategy.fromConfig( + private static final SpanSuppressionStrategy spanSuppressionStrategy; + + static { + String value = + ConfigPropertiesUtil.getString( + "otel.instrumentation.common.experimental.span-suppression-strategy"); + + if (value == null) { + value = ConfigPropertiesUtil.getString( - "otel.instrumentation.experimental.span-suppression-strategy")); + "otel.instrumentation.experimental.span-suppression-strategy"); + + if (value != null) { + logger.warning( + "Using deprecated config: otel.instrumentation.experimental.span-suppression-strategy. " + + "Use otel.instrumentation.common.experimental.span-suppression-strategy instead."); + } + } + + spanSuppressionStrategy = SpanSuppressionStrategy.fromConfig(value); + } final OpenTelemetry openTelemetry; final String instrumentationName; diff --git a/instrumentation/camel-2.20/javaagent/build.gradle.kts b/instrumentation/camel-2.20/javaagent/build.gradle.kts index b1166690fa58..9880343bb340 100644 --- a/instrumentation/camel-2.20/javaagent/build.gradle.kts +++ b/instrumentation/camel-2.20/javaagent/build.gradle.kts @@ -74,7 +74,7 @@ tasks { jvmArgs("-Dotel.instrumentation.aws-sdk.experimental-span-attributes=true") // TODO: fix camel instrumentation so that it uses semantic attributes extractors - jvmArgs("-Dotel.instrumentation.experimental.span-suppression-strategy=span-kind") + jvmArgs("-Dotel.instrumentation.common.experimental.span-suppression-strategy=span-kind") // required on jdk17 jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java index 769908d7f2a8..cadb7026e863 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java @@ -284,7 +284,8 @@ private static void installEarlyInstrumentation( } private static void copyNecessaryConfigToSystemProperties(ConfigProperties config) { - for (String property : asList("otel.instrumentation.experimental.span-suppression-strategy")) { + for (String property : + asList("otel.instrumentation.common.experimental.span-suppression-strategy")) { String value = config.getString(property); if (value != null) { System.setProperty(property, value);