Comments

Author: heyams

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

@@ -26,7 +26,7 @@ public static <REQUEST> SpanNameExtractor<REQUEST> create(
    * Returns a {@link SpanNameExtractor} that constructs the span name according to DB semantic
    * conventions: {@code <db.operation> <db.name>.<identifier>}.
    *
-   * @see SqlStatementInfo#getOperation() () used to extract {@code <db.operation>}.
+   * @see SqlStatementInfo#getOperation() used to extract {@code <db.operation>}.
    * @see DbClientAttributesGetter#getDbNamespace(Object) used to extract {@code <db.namespace>}.
    * @see SqlStatementInfo#getMainIdentifier() used to extract {@code <db.table>} or stored
    *     procedure name.

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

@@ -33,6 +33,7 @@ default String getRawStatement(REQUEST request) {
     return null;
   }
 
+  // TODO: make this required to implement
   @Nullable
   default String getRawQueryText(REQUEST request) {
     return getRawStatement(request);

instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceDbAttributesGetter.java

@@ -22,7 +22,7 @@ final class LettuceDbAttributesGetter implements DbClientAttributesGetter<RedisC
       RedisCommandSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled());
 
   @Override
-  public String getDbSystem(RedisCommand<?, ?, ?> redisCommand) {
+  public String getDbSystem(RedisCommand<?, ?, ?> request) {
     return REDIS;
   }
 
@@ -33,8 +33,8 @@ public String getUser(RedisCommand<?, ?, ?> request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(RedisCommand<?, ?, ?> request) {
     return null;
   }
@@ -46,8 +46,8 @@ public String getConnectionString(RedisCommand<?, ?, ?> request) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbQueryText(RedisCommand<?, ?, ?> request) {
     String command = LettuceInstrumentationUtil.getCommandName(request);
     List<String> args =
@@ -57,8 +57,8 @@ public String getDbQueryText(RedisCommand<?, ?, ?> request) {
     return sanitizer.sanitize(command, args);
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbOperationName(RedisCommand<?, ?, ?> request) {
     return request.getType().name();
   }

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

@@ -94,14 +94,6 @@ public String getConnectionString() {
     return connectionString;
   }
 
-  /**
-   * @deprecated use {@link #getDbQueryText()} instead
-   */
-  @Deprecated
-  public String getRawStatement() {
-    return rawStatement;
-  }
-
   public String getDbQueryText() {
     return rawStatement;
   }

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

@@ -15,8 +15,8 @@
 public enum R2dbcSqlAttributesGetter implements SqlClientAttributesGetter<DbExecution> {
   INSTANCE;
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbSystem(DbExecution request) {
     return request.getSystem();
   }
@@ -28,8 +28,8 @@ public String getUser(DbExecution request) {
     return request.getUser();
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(DbExecution request) {
     return request.getName();
   }

instrumentation/rediscala-1.8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rediscala/RediscalaAttributesGetter.java

@@ -26,8 +26,8 @@ public String getUser(RedisCommand<?, ?> redisCommand) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(RedisCommand<?, ?> redisCommand) {
     return null;
   }
@@ -39,8 +39,8 @@ public String getConnectionString(RedisCommand<?, ?> redisCommand) {
     return null;
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbQueryText(RedisCommand<?, ?> redisCommand) {
     return null;
   }

instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientAttributesGetter.java

@@ -31,8 +31,8 @@ public String getUser(VertxRedisClientRequest request) {
     return request.getUser();
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbNamespace(VertxRedisClientRequest request) {
     return null;
   }
@@ -44,14 +44,14 @@ public String getConnectionString(VertxRedisClientRequest request) {
     return request.getConnectionString();
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbQueryText(VertxRedisClientRequest request) {
     return sanitizer.sanitize(request.getCommand(), request.getArgs());
   }
 
-  @Nullable
   @Override
+  @Nullable
   public String getDbOperationName(VertxRedisClientRequest request) {
     return request.getCommand();
   }

instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientRequest.java

@@ -16,14 +16,6 @@ public VertxSqlClientRequest(String statement, SqlConnectOptions sqlConnectOptio
     this.sqlConnectOptions = sqlConnectOptions;
   }
 
-  /**
-   * @deprecated Use {@link #getDbQueryText()} instead.
-   */
-  @Deprecated
-  public String getStatement() {
-    return statement;
-  }
-
   public String getDbQueryText() {
     return statement;
   }