Mark capture-query-parameters as experimental

Author: trask

instrumentation/jdbc/README.md

@@ -3,5 +3,5 @@
 | System property                                              | Type    | Default | Description                                                                                                                                                                                                                                                                   |
 |--------------------------------------------------------------|---------|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `otel.instrumentation.jdbc.statement-sanitizer.enabled`      | Boolean | `true`  | Enables the DB statement sanitization.                                                                                                                                                                                                                                        |
-| `otel.instrumentation.jdbc.capture-query-parameters`         | Boolean | `false` | Enable the capture of query parameters as span attributes. Enabling this option disables the statement sanitization. <p>WARNING: captured query parameters may contain sensitive information such as passwords, personally identifiable information or protected health info. |
+| `otel.instrumentation.jdbc.experimental.capture-query-parameters`         | Boolean | `false` | Enable the capture of query parameters as span attributes. Enabling this option disables the statement sanitization. <p>WARNING: captured query parameters may contain sensitive information such as passwords, personally identifiable information or protected health info. |
 | `otel.instrumentation.jdbc.experimental.transaction.enabled` | Boolean | `false` | Enables experimental instrumentation to create spans for COMMIT and ROLLBACK operations.                                                                                                                                                                                      |

instrumentation/jdbc/javaagent/build.gradle.kts

@@ -91,7 +91,7 @@ tasks {
     filter {
       includeTestsMatching("PreparedStatementParametersTest")
     }
-    jvmArgs("-Dotel.instrumentation.jdbc.capture-query-parameters=true")
+    jvmArgs("-Dotel.instrumentation.jdbc.experimental.capture-query-parameters=true")
   }
 
   check {

instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcSingletons.java

@@ -35,7 +35,7 @@ public final class JdbcSingletons {
 
     CAPTURE_QUERY_PARAMETERS =
         AgentInstrumentationConfig.get()
-            .getBoolean("otel.instrumentation.jdbc.capture-query-parameters", false);
+            .getBoolean("otel.instrumentation.jdbc.experimental.capture-query-parameters", false);
 
     STATEMENT_INSTRUMENTER =
         JdbcInstrumenterFactory.createStatementInstrumenter(

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcInstrumenterFactory.java

@@ -34,7 +34,7 @@ public final class JdbcInstrumenterFactory {
 
   public static boolean captureQueryParameters() {
     return ConfigPropertiesUtil.getBoolean(
-        "otel.instrumentation.jdbc.capture-query-parameters", false);
+        "otel.instrumentation.jdbc.experimental.capture-query-parameters", false);
   }
 
   public static Instrumenter<DbRequest, Void> createStatementInstrumenter(

instrumentation/jdbc/metadata.yaml

@@ -22,7 +22,7 @@ configurations:
     description: Used to specify a mapping from host names or IP addresses to peer services.
     type: map
     default: ""
-  - name: otel.instrumentation.jdbc.capture-query-parameters
+  - name: otel.instrumentation.jdbc.experimental.capture-query-parameters
     description: >
       Sets whether the query parameters should be captured as span attributes named
       <code>db.query.parameter.&lt;key&gt;</code>. Enabling this option disables the statement

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/jdbc/DataSourcePostProcessor.java

@@ -58,7 +58,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
           .setCaptureQueryParameters(
               configPropertiesProvider
                   .getObject()
-                  .getBoolean("otel.instrumentation.jdbc.capture-query-parameters", false))
+                  .getBoolean("otel.instrumentation.jdbc.experimental.capture-query-parameters", false))
           .setTransactionInstrumenterEnabled(
               configPropertiesProvider
                   .getObject()

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -352,7 +352,7 @@
       "defaultValue": true
     },
     {
-      "name": "otel.instrumentation.jdbc.capture-query-parameters",
+      "name": "otel.instrumentation.jdbc.experimental.capture-query-parameters",
       "type": "java.lang.Boolean",
       "description": "Sets whether the query parameters should be captured as span attributes named <code>db.query.parameter.&lt;key&gt;</code>. Enabling this option disables the statement sanitization.<p>WARNING: captured query parameters may contain sensitive information such as passwords, personally identifiable information or protected health info.",
       "defaultValue": false