Prefactor DbInfo

Author: trask

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

@@ -109,7 +109,7 @@ static <REQUEST, RESPONSE> void onStartCommon(
     if (emitOldDatabaseSemconv()) {
       attributes.put(DB_SYSTEM, getter.getDbSystem(request));
       attributes.put(DB_USER, getter.getUser(request));
-      attributes.put(DB_NAME, getter.getDbNamespace(request));
+      attributes.put(DB_NAME, getter.getDbName(request));
       attributes.put(DB_CONNECTION_STRING, getter.getConnectionString(request));
       attributes.put(DB_STATEMENT, getter.getDbQueryText(request));
       attributes.put(DB_OPERATION, getter.getDbOperationName(request));

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

@@ -55,6 +55,17 @@ default String getDbSystem(REQUEST request) {
   @Nullable
   String getDbNamespace(REQUEST request);
 
+  /**
+   * Returns the old db.name value. This is only used for old semantic conventions.
+   *
+   * @deprecated Use {@link #getDbNamespace(Object)} instead.
+   */
+  @Deprecated // to be removed in 3.0
+  @Nullable
+  default String getDbName(REQUEST request) {
+    return getDbNamespace(request);
+  }
+
   /**
    * Returns the database user name. This is only used for old semantic conventions.
    *

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

@@ -44,18 +44,14 @@ public void onEnd(
       return;
     }
     if (emitStableDatabaseSemconv()) {
-      attributes.put(DB_NAMESPACE, getName(dbInfo));
-      attributes.put(DB_SYSTEM_NAME, SemconvStability.stableDbSystemName(dbInfo.getSystem()));
+      attributes.put(DB_NAMESPACE, dbInfo.getDbNamespace());
+      attributes.put(DB_SYSTEM_NAME, SemconvStability.stableDbSystemName(dbInfo.getDbSystemName()));
     }
     if (emitOldDatabaseSemconv()) {
-      attributes.put(DB_USER, dbInfo.getUser());
-      attributes.put(DB_NAME, getName(dbInfo));
-      attributes.put(DB_CONNECTION_STRING, dbInfo.getShortUrl());
-      attributes.put(DB_SYSTEM, dbInfo.getSystem());
+      attributes.put(DB_USER, dbInfo.getDbUser());
+      attributes.put(DB_NAME, dbInfo.getDbName());
+      attributes.put(DB_CONNECTION_STRING, dbInfo.getDbConnectionString());
+      attributes.put(DB_SYSTEM, dbInfo.getDbSystem());
     }
   }
-
-  private static String getName(DbInfo dbInfo) {
-    return dbInfo.getName();
-  }
 }

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

@@ -19,30 +19,42 @@ public final class JdbcAttributesGetter implements SqlClientAttributesGetter<DbR
 
   public static final JdbcAttributesGetter INSTANCE = new JdbcAttributesGetter();
 
-  @Nullable
   @Override
   public String getDbSystemName(DbRequest request) {
-    return request.getDbInfo().getSystem();
+    return request.getDbInfo().getDbSystemName();
+  }
+
+  @Deprecated // to be removed in 3.0
+  @Override
+  public String getDbSystem(DbRequest request) {
+    return request.getDbInfo().getDbSystem();
   }
 
   @Deprecated // to be removed in 3.0
   @Nullable
   @Override
   public String getUser(DbRequest request) {
-    return request.getDbInfo().getUser();
+    return request.getDbInfo().getDbUser();
   }
 
   @Nullable
   @Override
   public String getDbNamespace(DbRequest request) {
-    return request.getDbInfo().getName();
+    return request.getDbInfo().getDbNamespace();
+  }
+
+  @Deprecated // to be removed in 3.0
+  @Nullable
+  @Override
+  public String getDbName(DbRequest request) {
+    return request.getDbInfo().getDbName();
   }
 
   @Deprecated // to be removed in 3.0
   @Nullable
   @Override
   public String getConnectionString(DbRequest request) {
-    return request.getDbInfo().getShortUrl();
+    return request.getDbInfo().getDbConnectionString();
   }
 
   @Override
@@ -77,12 +89,12 @@ public boolean isParameterizedQuery(DbRequest request) {
   @Nullable
   @Override
   public String getServerAddress(DbRequest request) {
-    return request.getDbInfo().getHost();
+    return request.getDbInfo().getServerAddress();
   }
 
   @Nullable
   @Override
   public Integer getServerPort(DbRequest request) {
-    return request.getDbInfo().getPort();
+    return request.getDbInfo().getServerPort();
   }
 }