remove deprecated methods

Author: zeitlinger

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

@@ -10,12 +10,6 @@
 /** An interface for getting attributes common to database clients. */
 public interface DbClientCommonAttributesGetter<REQUEST, RESPONSE> {
 
-  @Deprecated
-  @Nullable
-  default String getSystem(REQUEST request) {
-    return null;
-  }
-
   String getDbSystem(REQUEST request);
 
   @Deprecated
@@ -24,15 +18,6 @@ default String getUser(REQUEST request) {
     return null;
   }
 
-  /**
-   * @deprecated Use {@link #getDbNamespace(Object)} instead.
-   */
-  @Deprecated
-  @Nullable
-  default String getName(REQUEST request) {
-    return null;
-  }
-
   @Nullable
   String getDbNamespace(REQUEST request);
 

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

@@ -8,7 +8,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * An interface for getting SQL database client attributes.
@@ -24,30 +23,6 @@
 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.