bring back and deprecate public api

Author: trask

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

@@ -18,56 +18,63 @@
  * from the attribute methods, but implement as many as possible for best compliance with the
  * OpenTelemetry specification.
  */
-public interface DbClientAttributesGetter<REQUEST> {
+@SuppressWarnings("deprecation") // using deprecated semconv
+public interface DbClientAttributesGetter<REQUEST> extends DbClientCommonAttributesGetter<REQUEST> {
 
-  @Deprecated
   @Nullable
-  default String getSystem(REQUEST request) {
+  String getDbSystem(REQUEST request);
+
+  @Nullable
+  String getDbNamespace(REQUEST request);
+
+  @Nullable
+  default String getDbQueryText(REQUEST request) {
     return null;
   }
 
-  // TODO: make this required to implement
   @Nullable
-  default String getDbSystem(REQUEST request) {
-    return getSystem(request);
+  default String getDbOperationName(REQUEST request) {
+    return null;
   }
 
+  /**
+   * @deprecated Use {@link #getDbSystem(Object)} instead.
+   */
   @Deprecated
+  @Override
   @Nullable
-  String getUser(REQUEST request);
+  default String getSystem(REQUEST request) {
+    return getDbSystem(request);
+  }
 
-  /**
-   * @deprecated Use {@link #getDbNamespace(Object)} instead.
-   */
   @Deprecated
   @Nullable
-  default String getName(REQUEST request) {
+  default String getUser(REQUEST request) {
     return null;
   }
 
-  // TODO: make this required to implement
+  /**
+   * @deprecated Use {@link #getDbNamespace(Object)} instead.
+   */
+  @Deprecated
   @Nullable
-  default String getDbNamespace(REQUEST request) {
-    return getName(request);
+  default String getName(REQUEST request) {
+    return getDbNamespace(request);
   }
 
   @Deprecated
   @Nullable
-  String getConnectionString(REQUEST request);
+  default String getConnectionString(REQUEST request) {
+    return null;
+  }
 
   /**
    * @deprecated Use {@link #getDbQueryText(REQUEST)} instead.
    */
   @Deprecated
   @Nullable
   default String getStatement(REQUEST request) {
-    return null;
-  }
-
-  // TODO: make this required to implement
-  @Nullable
-  default String getDbQueryText(REQUEST request) {
-    return getStatement(request);
+    return getDbQueryText(request);
   }
 
   /**
@@ -76,12 +83,6 @@ default String getDbQueryText(REQUEST request) {
   @Deprecated
   @Nullable
   default String getOperation(REQUEST request) {
-    return null;
-  }
-
-  // TODO: make this required to implement
-  @Nullable
-  default String getDbOperationName(REQUEST request) {
-    return getOperation(request);
+    return getDbOperationName(request);
   }
 }

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
+
+import javax.annotation.Nullable;
+
+/** An interface for getting attributes common to database clients. */
+@Deprecated
+public interface DbClientCommonAttributesGetter<REQUEST> {
+
+  @Nullable
+  String getSystem(REQUEST request);
+
+  @Nullable
+  String getUser(REQUEST request);
+
+  @Nullable
+  String getName(REQUEST request);
+
+  @Nullable
+  String getConnectionString(REQUEST request);
+}