Deprecate getDbSystem/getResponseStatus, add getDbSystemName/getResponseStatusCode

- Deprecated DbClientCommonAttributesGetter.getDbSystem() in favor of getDbSystemName()
- Deprecated DbClientCommonAttributesGetter.getResponseStatus() in favor of getResponseStatusCode()
- Updated DbClientAttributesExtractor to call the new methods
- Updated test implementations to use new method names
- Old methods now delegate to new methods by default for backward compatibility

Author: trask

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

@@ -77,14 +77,14 @@ static <REQUEST, RESPONSE> void onStartCommon(
       internalSet(
           attributes,
           DB_SYSTEM_NAME,
-          SemconvStability.stableDbSystemName(getter.getDbSystem(request)));
+          SemconvStability.stableDbSystemName(getter.getDbSystemName(request)));
       internalSet(attributes, DB_NAMESPACE, getter.getDbNamespace(request));
       internalSet(attributes, DB_QUERY_TEXT, getter.getDbQueryText(request));
       internalSet(attributes, DB_OPERATION_NAME, getter.getDbOperationName(request));
       internalSet(attributes, DB_QUERY_SUMMARY, getter.getDbQuerySummary(request));
     }
     if (SemconvStability.emitOldDatabaseSemconv()) {
-      internalSet(attributes, DB_SYSTEM, getter.getDbSystem(request));
+      internalSet(attributes, DB_SYSTEM, getter.getDbSystemName(request));
       internalSet(attributes, DB_USER, getter.getUser(request));
       internalSet(attributes, DB_NAME, getter.getDbNamespace(request));
       internalSet(attributes, DB_CONNECTION_STRING, getter.getConnectionString(request));
@@ -114,7 +114,8 @@ static <REQUEST, RESPONSE> void onEndCommon(
         internalSet(attributes, ERROR_TYPE, error.getClass().getName());
       }
       if (error != null || response != null) {
-        internalSet(attributes, DB_RESPONSE_STATUS_CODE, getter.getResponseStatus(response, error));
+        internalSet(
+            attributes, DB_RESPONSE_STATUS_CODE, getter.getResponseStatusCode(response, error));
       }
     }
   }

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

@@ -15,7 +15,15 @@
 @Deprecated
 public interface DbClientCommonAttributesGetter<REQUEST, RESPONSE> {
 
-  String getDbSystem(REQUEST request);
+  /**
+   * @deprecated Use {@link #getDbSystemName(REQUEST)} instead.
+   */
+  @Deprecated
+  default String getDbSystem(REQUEST request) {
+    return getDbSystemName(request);
+  }
+
+  String getDbSystemName(REQUEST request);
 
   @Deprecated
   @Nullable
@@ -32,8 +40,17 @@ default String getConnectionString(REQUEST request) {
     return null;
   }
 
+  /**
+   * @deprecated Use {@link #getResponseStatusCode(RESPONSE, Throwable)} instead.
+   */
+  @Deprecated
   @Nullable
   default String getResponseStatus(@Nullable RESPONSE response, @Nullable Throwable error) {
+    return getResponseStatusCode(response, error);
+  }
+
+  @Nullable
+  default String getResponseStatusCode(@Nullable RESPONSE response, @Nullable Throwable error) {
     return null;
   }
 }

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java

@@ -26,7 +26,7 @@ class DbClientAttributesExtractorTest {
   static final class TestAttributesGetter
       implements DbClientAttributesGetter<Map<String, String>, Void> {
     @Override
-    public String getDbSystem(Map<String, String> map) {
+    public String getDbSystemName(Map<String, String> map) {
       return map.get("db.system");
     }
 

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java

@@ -39,7 +39,7 @@ public Collection<String> getRawQueryTexts(Map<String, Object> map) {
     }
 
     @Override
-    public String getDbSystem(Map<String, Object> map) {
+    public String getDbSystemName(Map<String, Object> map) {
       return read(map, "db.system");
     }
 

instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/internal/InstrumenterContextTest.java

@@ -35,7 +35,7 @@ void testSqlSanitizer() {
     SqlClientAttributesGetter<Object, Void> getter =
         new SqlClientAttributesGetter<Object, Void>() {
           @Override
-          public String getDbSystem(Object o) {
+          public String getDbSystemName(Object o) {
             return "testdb";
           }
 

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcAttributesGetter.java

@@ -22,7 +22,7 @@ public final class JdbcAttributesGetter implements SqlClientAttributesGetter<DbR
 
   @Nullable
   @Override
-  public String getDbSystem(DbRequest request) {
+  public String getDbSystemName(DbRequest request) {
     return request.getDbInfo().getSystem();
   }