diff --git a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/ExperimentalConfig.java b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/ExperimentalConfig.java index 3179216d4250..c0f19055429a 100644 --- a/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/ExperimentalConfig.java +++ b/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/bootstrap/internal/ExperimentalConfig.java @@ -33,43 +33,18 @@ public ExperimentalConfig(InstrumentationConfig config) { } public boolean controllerTelemetryEnabled() { - // TODO: remove that `suppress...` flag after 1.13 release - DeprecatedConfigPropertyWarning.warnIfUsed( - config, - "otel.instrumentation.common.experimental.suppress-controller-spans", - "otel.instrumentation.common.experimental.controller-telemetry.enabled"); - boolean suppressControllerSpans = - config.getBoolean( - "otel.instrumentation.common.experimental.suppress-controller-spans", false); return config.getBoolean( - "otel.instrumentation.common.experimental.controller-telemetry.enabled", - !suppressControllerSpans); + "otel.instrumentation.common.experimental.controller-telemetry.enabled", true); } public boolean viewTelemetryEnabled() { - // TODO: remove that `suppress...` flag after 1.13 release - DeprecatedConfigPropertyWarning.warnIfUsed( - config, - "otel.instrumentation.common.experimental.suppress-view-spans", - "otel.instrumentation.common.experimental.view-telemetry.enabled"); - boolean suppressViewSpans = - config.getBoolean("otel.instrumentation.common.experimental.suppress-view-spans", false); return config.getBoolean( - "otel.instrumentation.common.experimental.view-telemetry.enabled", !suppressViewSpans); + "otel.instrumentation.common.experimental.view-telemetry.enabled", true); } public boolean messagingReceiveInstrumentationEnabled() { - // TODO: remove that `suppress...` flag after 1.13 release - DeprecatedConfigPropertyWarning.warnIfUsed( - config, - "otel.instrumentation.common.experimental.suppress-messaging-receive-spans", - "otel.instrumentation.messaging.experimental.receive-telemetry.enabled"); - boolean receiveSpansSuppressed = - config.getBoolean( - "otel.instrumentation.common.experimental.suppress-messaging-receive-spans", true); return config.getBoolean( - "otel.instrumentation.messaging.experimental.receive-telemetry.enabled", - !receiveSpansSuppressed); + "otel.instrumentation.messaging.experimental.receive-telemetry.enabled", false); } public List getMessagingHeaders() {