merge main

Author: jaydeluca

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

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesGetter.java

@@ -10,38 +10,16 @@
 /** An interface for getting attributes common to database clients. */
 public interface DbClientCommonAttributesGetter<REQUEST, RESPONSE> {
 
-  @Deprecated
-  @Nullable
-  default String getSystem(REQUEST request) {
-    return null;
-  }
-
-  // TODO: make this required to implement
-  @Nullable
-  default String getDbSystem(REQUEST request) {
-    return getSystem(request);
-  }
+  String getDbSystem(REQUEST request);
 
   @Deprecated
   @Nullable
   default String getUser(REQUEST request) {
     return null;
   }
 
-  /**
-   * @deprecated Use {@link #getDbNamespace(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String getName(REQUEST request) {
-    return null;
-  }
-
-  // TODO: make this required to implement
   @Nullable
-  default String getDbNamespace(REQUEST request) {
-    return getName(request);
-  }
+  String getDbNamespace(REQUEST request);
 
   @Deprecated
   @Nullable

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java

@@ -27,8 +27,8 @@
  *
  * <p>It sets the same set of attributes as {@link DbClientAttributesExtractor} plus an additional
  * <code>db.sql.table</code> attribute. The raw SQL statements returned by the {@link
- * SqlClientAttributesGetter#getRawQueryText(Object)} method are sanitized before use, all statement
- * parameters are removed.
+ * SqlClientAttributesGetter#getRawQueryTexts(Object)} method are sanitized before use, all
+ * statement parameters are removed.
  */
 public final class SqlClientAttributesExtractor<REQUEST, RESPONSE>
     extends DbClientCommonAttributesExtractor<

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesGetter.java

@@ -5,13 +5,9 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
-import static java.util.Collections.emptySet;
-import static java.util.Collections.singleton;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * An interface for getting SQL database client attributes.
@@ -27,42 +23,14 @@
 public interface SqlClientAttributesGetter<REQUEST, RESPONSE>
     extends DbClientCommonAttributesGetter<REQUEST, RESPONSE> {
 
-  /**
-   * Get the raw SQL statement. The value returned by this method is later sanitized by the {@link
-   * SqlClientAttributesExtractor} before being set as span attribute.
-   *
-   * @deprecated Use {@link #getRawQueryText(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String getRawStatement(REQUEST request) {
-    return null;
-  }
-
-  /**
-   * Get the raw SQL query text. The value returned by this method is later sanitized by the {@link
-   * SqlClientAttributesExtractor} before being set as span attribute.
-   *
-   * @deprecated Use {@link #getRawQueryTexts(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String getRawQueryText(REQUEST request) {
-    return getRawStatement(request);
-  }
-
   /**
    * Get the raw SQL query texts. The values returned by this method is later sanitized by the
    * {@link SqlClientAttributesExtractor} before being set as span attribute.
    *
    * <p>If {@code request} is not a batch query, then this method should return a collection with a
    * single element.
    */
-  // TODO: make this required to implement
-  default Collection<String> getRawQueryTexts(REQUEST request) {
-    String rawQueryText = getRawQueryText(request);
-    return rawQueryText == null ? emptySet() : singleton(rawQueryText);
-  }
+  Collection<String> getRawQueryTexts(REQUEST request);
 
   // TODO: make this required to implement
   default Long getBatchSize(REQUEST request) {

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/InstrumenterContextTest.java

@@ -34,6 +34,15 @@ void testSqlSanitizer() {
     String testQuery = "SELECT name FROM test WHERE id = 1";
     SqlClientAttributesGetter<Object, Void> getter =
         new SqlClientAttributesGetter<Object, Void>() {
+          @Override
+          public String getDbSystem(Object o) {
+            return "testdb";
+          }
+
+          @Override
+          public String getDbNamespace(Object o) {
+            return null;
+          }
 
           @Override
           public Collection<String> getRawQueryTexts(Object request) {

instrumentation/dropwizard/dropwizard-views-0.7/javaagent/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
 }
 
 tasks.withType<Test>().configureEach {
-  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  jvmArgs("-Dotel.instrumentation.common.experimental.view-telemetry.enabled=true")
 
   systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
   systemProperty("metadataConfig", "otel.instrumentation.common.experimental.controller-telemetry.enabled=true")

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<View, Void> INSTRUMENTER =
       Instrumenter.<View, Void>builder(
               GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, DropwizardSingletons::spanName)
-          .setEnabled(ExperimentalConfig.get().controllerTelemetryEnabled())
+          .setEnabled(ExperimentalConfig.get().viewTelemetryEnabled())
           .buildInstrumenter();
 
   private static String spanName(View view) {

instrumentation/dropwizard/dropwizard-views-0.7/metadata.yaml

@@ -1,6 +1,6 @@
 description: This instrumentation enables the creation of spans for Dropwizard views.
 configurations:
-  - name: otel.instrumentation.common.experimental.controller-telemetry.enabled
-    description: Enables the creation of experimental controller (INTERNAL) spans.
+  - name: otel.instrumentation.common.experimental.view-telemetry.enabled
+    description: Enables the creation of experimental view (INTERNAL) spans.
     type: boolean
     default: false

instrumentation/elasticsearch/elasticsearch-transport-5.0/metadata.yaml

@@ -1,8 +1,18 @@
 description: >
-  This instrumentation enables client spans for Elasticsearch transport client requests. Each call
-  produces a span named after the Elasticsearch action, enriched with transport-specific attributes.
+  This instrumentation enables client spans and metrics for Elasticsearch transport client requests.
+  Each call produces a span named after the Elasticsearch action, enriched with transport-specific
+  attributes.
 configurations:
   - name: otel.instrumentation.elasticsearch.experimental-span-attributes
-    description: Enable the capture of experimental span attributes.
+    description: >
+      Enable the capture of experimental span attributes including `elasticsearch.action`,
+      `elasticsearch.request`, `elasticsearch.request.indices`,
+      `elasticsearch.request.search.types`, `elasticsearch.type`, `elasticsearch.id`,
+      `elasticsearch.version`, `elasticsearch.shard.broadcast.total`,
+      `elasticsearch.shard.broadcast.successful`, `elasticsearch.shard.broadcast.failed`,
+      `elasticsearch.shard.replication.total`, `elasticsearch.shard.replication.successful`,
+      `elasticsearch.shard.replication.failed`, `elasticsearch.response.status`,
+      `elasticsearch.shard.bulk.id`, `elasticsearch.shard.bulk.index`,
+      `elasticsearch.node.failures`, and `elasticsearch.node.cluster.name`.
     type: boolean
     default: false

instrumentation/elasticsearch/elasticsearch-transport-5.3/metadata.yaml

@@ -1,8 +1,18 @@
 description: >
-  This instrumentation enables client spans for Elasticsearch transport client requests. Each call
-  produces a span named after the Elasticsearch action, enriched with transport-specific attributes.
+  This instrumentation enables client spans and metrics for Elasticsearch transport client requests.
+  Each call produces a span named after the Elasticsearch action, enriched with transport-specific
+  attributes.
 configurations:
   - name: otel.instrumentation.elasticsearch.experimental-span-attributes
-    description: Enable the capture of experimental span attributes.
+    description: >
+      Enable the capture of experimental span attributes including `elasticsearch.action`,
+      `elasticsearch.request`, `elasticsearch.request.indices`,
+      `elasticsearch.request.search.types`, `elasticsearch.type`, `elasticsearch.id`,
+      `elasticsearch.version`, `elasticsearch.shard.broadcast.total`,
+      `elasticsearch.shard.broadcast.successful`, `elasticsearch.shard.broadcast.failed`,
+      `elasticsearch.shard.replication.total`, `elasticsearch.shard.replication.successful`,
+      `elasticsearch.shard.replication.failed`, `elasticsearch.response.status`,
+      `elasticsearch.shard.bulk.id`, `elasticsearch.shard.bulk.index`,
+      `elasticsearch.node.failures`, and `elasticsearch.node.cluster.name`.
     type: boolean
     default: false