More database terminology alignment (#16147)

Author: trask

instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java

@@ -32,9 +32,10 @@ protected CassandraTelemetryBuilder(OpenTelemetry openTelemetry) {
   }
 
   /**
-   * Sets whether the {@code db.statement} attribute on the spans emitted by the constructed {@link
-   * CassandraTelemetry} should be sanitized. If set to {@code true}, all parameters that can
-   * potentially contain sensitive information will be masked. Enabled by default.
+   * Sets whether the {@code db.statement}/{@code db.query.text} attribute on the spans emitted by
+   * the constructed {@link CassandraTelemetry} should be sanitized. If set to {@code true}, all
+   * parameters that can potentially contain sensitive information will be masked. Enabled by
+   * default.
    */
   @CanIgnoreReturnValue
   public CassandraTelemetryBuilder setQuerySanitizationEnabled(boolean enabled) {

instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbImplInstrumentation.java

@@ -140,17 +140,17 @@ public static InfluxDbScope onEnter(
               // write data by UDP protocol, in this way, can't get database name.
               : arg0 instanceof Integer ? "" : String.valueOf(arg0);
 
-      String operation;
+      String operationName;
       if ("createDatabase".equals(methodName)) {
-        operation = "CREATE DATABASE";
+        operationName = "CREATE DATABASE";
       } else if ("deleteDatabase".equals(methodName)) {
-        operation = "DROP DATABASE";
+        operationName = "DROP DATABASE";
       } else {
-        operation = "WRITE";
+        operationName = "WRITE";
       }
 
       InfluxDbRequest influxDbRequest =
-          InfluxDbRequest.create(httpUrl.host(), httpUrl.port(), database, operation, null);
+          InfluxDbRequest.create(httpUrl.host(), httpUrl.port(), database, operationName, null);
 
       if (!instrumenter().shouldStart(parentContext, influxDbRequest)) {
         return null;

instrumentation/influxdb-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/influxdb/v2_4/InfluxDbRequest.java

@@ -19,12 +19,12 @@ public abstract class InfluxDbRequest {
       SqlQuerySanitizer.create(AgentCommonConfig.get().isQuerySanitizationEnabled());
 
   public static InfluxDbRequest create(
-      String host, int port, String namespace, String operation, String sql) {
+      String host, int port, String namespace, String operationName, String sql) {
     SqlQuery sqlQuery = SemconvStability.emitOldDatabaseSemconv() ? sanitizer.sanitize(sql) : null;
     SqlQuery sqlQueryWithSummary =
         SemconvStability.emitStableDatabaseSemconv() ? sanitizer.sanitizeWithSummary(sql) : null;
     return new AutoValue_InfluxDbRequest(
-        host, port, namespace, operation, sqlQuery, sqlQueryWithSummary);
+        host, port, namespace, operationName, sqlQuery, sqlQueryWithSummary);
   }
 
   public abstract String getHost();

instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceTelemetryBuilder.java

@@ -24,9 +24,10 @@ public final class LettuceTelemetryBuilder {
   }
 
   /**
-   * Sets whether the {@code db.statement} attribute on the spans emitted by the constructed {@link
-   * LettuceTelemetry} should be sanitized. If set to {@code true}, all parameters that can
-   * potentially contain sensitive information will be masked. Enabled by default.
+   * Sets whether the {@code db.statement}/{@code db.query.text} attribute on the spans emitted by
+   * the constructed {@link LettuceTelemetry} should be sanitized. If set to {@code true}, all
+   * parameters that can potentially contain sensitive information will be masked. Enabled by
+   * default.
    */
   @CanIgnoreReturnValue
   public LettuceTelemetryBuilder setQuerySanitizationEnabled(boolean querySanitizationEnabled) {

instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java

@@ -271,7 +271,7 @@ private void fillEndpoint(OpenTelemetryEndpoint endpoint) {
     @CanIgnoreReturnValue
     @SuppressWarnings({"UnusedMethod", "EffectivelyPrivate"})
     public synchronized Tracer.Span start(RedisCommand<?, ?, ?> command) {
-      // Extract args BEFORE calling start() so db.statement can include them
+      // Extract args BEFORE calling start() so db.query.text can include them
       // when it's set on SpanBuilder (making it available to samplers)
       if (command.getArgs() != null) {
         argsList = OtelCommandArgsUtil.getCommandArgs(command.getArgs());

instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoTelemetryBuilder.java

@@ -26,9 +26,10 @@ public final class MongoTelemetryBuilder {
   }
 
   /**
-   * Sets whether the {@code db.statement} attribute on the spans emitted by the constructed {@link
-   * MongoTelemetry} should be sanitized. If set to {@code true}, all parameters that can
-   * potentially contain sensitive information will be masked. Enabled by default.
+   * Sets whether the {@code db.statement}/{@code db.query.text} attribute on the spans emitted by
+   * the constructed {@link MongoTelemetry} should be sanitized. If set to {@code true}, all
+   * parameters that can potentially contain sensitive information will be masked. Enabled by
+   * default.
    */
   @CanIgnoreReturnValue
   public MongoTelemetryBuilder setQuerySanitizationEnabled(boolean querySanitizationEnabled) {

instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/R2dbcTelemetryBuilder.java

@@ -41,9 +41,10 @@ public R2dbcTelemetryBuilder addAttributesExtractor(
   }
 
   /**
-   * Sets whether the {@code db.statement} attribute on the spans emitted by the constructed {@link
-   * R2dbcTelemetry} should be sanitized. If set to {@code true}, all parameters that can
-   * potentially contain sensitive information will be masked. Enabled by default.
+   * Sets whether the {@code db.statement}/{@code db.query.text} attribute on the spans emitted by
+   * the constructed {@link R2dbcTelemetry} should be sanitized. If set to {@code true}, all
+   * parameters that can potentially contain sensitive information will be masked. Enabled by
+   * default.
    */
   @CanIgnoreReturnValue
   public R2dbcTelemetryBuilder setQuerySanitizationEnabled(boolean enabled) {