diff --git a/CHANGELOG.md b/CHANGELOG.md index 09d25e07a0cd..95cc8352be16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Unreleased +### Migration notes + +- The configuration option used to enable traces generated by the `dropwizard-views` instrumentation has changed from `otel.instrumentation.common.experimental.controller-telemetry.enabled` to `otel.instrumentation.common.experimental.view-telemetry.enabled` + ([#14475](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14475)) + ## Version 2.19.0 (2025-08-17) ### 📈 Enhancements diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml index 905e7e73fc8d..d846cbafa5eb 100644 --- a/docs/instrumentation-list.yaml +++ b/docs/instrumentation-list.yaml @@ -2269,10 +2269,6 @@ libraries: description: Enables the creation of experimental view (INTERNAL) spans. type: boolean default: false - - name: otel.instrumentation.common.experimental.controller-telemetry.enabled - description: Enables the creation of experimental controller (INTERNAL) spans. - type: boolean - default: false elasticsearch: - name: elasticsearch-api-client-7.16 description: This instrumentation enables client spans for Elasticsearch API client diff --git a/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/build.gradle.kts b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/build.gradle.kts index 2672a8d00d4f..6637eb42fafb 100644 --- a/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/build.gradle.kts +++ b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/build.gradle.kts @@ -18,5 +18,5 @@ dependencies { } tasks.withType().configureEach { - jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true") + jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true") } diff --git a/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardSingletons.java b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardSingletons.java index f9c799c12e65..d9902baa96ab 100644 --- a/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardSingletons.java +++ b/instrumentation/dropwizard/dropwizard-views-0.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/dropwizardviews/DropwizardSingletons.java @@ -17,7 +17,7 @@ public final class DropwizardSingletons { private static final Instrumenter INSTRUMENTER = Instrumenter.builder( GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, DropwizardSingletons::spanName) - .setEnabled(ExperimentalConfig.get().controllerTelemetryEnabled()) + .setEnabled(ExperimentalConfig.get().viewTelemetryEnabled()) .buildInstrumenter(); private static String spanName(View view) { diff --git a/instrumentation/dropwizard/dropwizard-views-0.7/metadata.yaml b/instrumentation/dropwizard/dropwizard-views-0.7/metadata.yaml index af390acec7fa..f91619c8d87c 100644 --- a/instrumentation/dropwizard/dropwizard-views-0.7/metadata.yaml +++ b/instrumentation/dropwizard/dropwizard-views-0.7/metadata.yaml @@ -3,7 +3,3 @@ configurations: description: Enables the creation of experimental view (INTERNAL) spans. type: boolean default: false - - name: otel.instrumentation.common.experimental.controller-telemetry.enabled - description: Enables the creation of experimental controller (INTERNAL) spans. - type: boolean - default: false