up

Author: trask

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

@@ -26,6 +26,8 @@ public interface DbClientAttributesGetter<REQUEST, RESPONSE>
   String getDbSystemName(REQUEST request);
 
   /**
+   * This method will be removed in 2.24.0.
+   * 
    * @deprecated Use {@link #getDbSystemName(REQUEST)} instead.
    */
   @Deprecated
@@ -42,6 +44,8 @@ default String getResponseStatusCode(@Nullable RESPONSE response, @Nullable Thro
   }
 
   /**
+   * This method will be removed in 2.24.0.
+   * 
    * @deprecated Use {@link #getResponseStatusCode(RESPONSE, Throwable)} instead.
    */
   @Deprecated
@@ -50,51 +54,34 @@ default String getResponseStatus(@Nullable RESPONSE response, @Nullable Throwabl
     return getResponseStatusCode(response, error);
   }
 
+  /**
+   * This method will be removed in 3.0.
+   * 
+   * @deprecated there is no replacement at this time.
+   */
   @Deprecated
   @Nullable
   default String getUser(REQUEST request) {
     return null;
   }
 
-  @Deprecated
-  @Nullable
-  default String getConnectionString(REQUEST request) {
-    return null;
-  }
-
   /**
-   * @deprecated Use {@link #getDbQueryText(REQUEST)} instead.
+   * This method will be removed in 3.0.
+   * 
+   * @deprecated there is no replacement at this time.
    */
   @Deprecated
   @Nullable
-  default String getStatement(REQUEST request) {
+  default String getConnectionString(REQUEST request) {
     return null;
   }
 
-  // TODO: make this required to implement
-  @Nullable
-  default String getDbQueryText(REQUEST request) {
-    return getStatement(request);
-  }
-
-  // TODO: make this required to implement
   @Nullable
-  default String getDbQuerySummary(REQUEST request) {
-    return null;
-  }
+  String getDbQueryText(REQUEST request);
 
-  /**
-   * @deprecated Use {@link #getDbOperationName(REQUEST)} instead.
-   */
-  @Deprecated
   @Nullable
-  default String getOperation(REQUEST request) {
-    return null;
-  }
+  String getDbQuerySummary(REQUEST request);
 
-  // TODO: make this required to implement
   @Nullable
-  default String getDbOperationName(REQUEST request) {
-    return getOperation(request);
-  }
+  String getDbOperationName(REQUEST request);
 }

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

@@ -20,7 +20,7 @@
 final class CassandraSqlAttributesGetter
     implements SqlClientAttributesGetter<CassandraRequest, ExecutionInfo> {
   // copied from DbIncubatingAttributes.DbSystemIncubatingValues
-  private static final String CASSANDRA = \"cassandra\";
+  private static final String CASSANDRA = "cassandra";
 
   @Override
   public String getDbSystemName(CassandraRequest request) {