Comments

Author: heyams

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

@@ -29,6 +29,7 @@ default String getStatement(REQUEST request) {
     return null;
   }
 
+  // TODO: make this required to implement
   @Nullable
   default String getDbQueryText(REQUEST request) {
     return getStatement(request);
@@ -43,6 +44,7 @@ default String getOperation(REQUEST request) {
     return null;
   }
 
+  // TODO: make this required to implement
   @Nullable
   default String getDbOperationName(REQUEST request) {
     return getOperation(request);

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

@@ -37,6 +37,7 @@ abstract class DbClientCommonAttributesExtractor<
   @SuppressWarnings("deprecation") // until old db semconv are dropped
   @Override
   public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
+    internalSet(attributes, DB_SYSTEM, getter.getDbSystem(request));
     if (SemconvStability.emitStableDatabaseSemconv()) {
       internalSet(attributes, DB_NAMESPACE, getter.getDbNamespace(request));
     }
@@ -45,7 +46,6 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
       internalSet(attributes, DB_NAME, getter.getDbNamespace(request));
       internalSet(attributes, DB_CONNECTION_STRING, getter.getConnectionString(request));
     }
-    internalSet(attributes, DB_SYSTEM, getter.getDbSystem(request));
   }
 
   @Override

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

@@ -16,6 +16,7 @@ default String getSystem(REQUEST request) {
     return null;
   }
 
+  // TODO: make this required to implement
   @Nullable
   default String getDbSystem(REQUEST request) {
     return getSystem(request);
@@ -34,6 +35,7 @@ default String getName(REQUEST request) {
     return null;
   }
 
+  // TODO: make this required to implement
   @Nullable
   default String getDbNamespace(REQUEST request) {
     return getName(request);

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

@@ -73,9 +73,9 @@ private GenericDbClientSpanNameExtractor(DbClientAttributesGetter<REQUEST> gette
 
     @Override
     public String extract(REQUEST request) {
-      String dbName = getter.getDbNamespace(request);
-      String operation = getter.getDbOperationName(request);
-      return computeSpanName(dbName, operation, null);
+      String namespace = getter.getDbNamespace(request);
+      String operationName = getter.getDbOperationName(request);
+      return computeSpanName(namespace, operationName, null);
     }
   }
 
@@ -93,10 +93,10 @@ private SqlClientSpanNameExtractor(SqlClientAttributesGetter<REQUEST> getter) {
 
     @Override
     public String extract(REQUEST request) {
-      String dbName = getter.getDbNamespace(request);
+      String namespace = getter.getDbNamespace(request);
       SqlStatementInfo sanitizedStatement = sanitizer.sanitize(getter.getRawQueryText(request));
       return computeSpanName(
-          dbName, sanitizedStatement.getOperation(), sanitizedStatement.getMainIdentifier());
+          namespace, sanitizedStatement.getOperation(), sanitizedStatement.getMainIdentifier());
     }
   }
 }

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

@@ -78,7 +78,8 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
           DB_QUERY_TEXT,
           statementSanitizationEnabled ? sanitizedStatement.getFullStatement() : rawQueryText);
       internalSet(attributes, DB_OPERATION_NAME, operation);
-    } else if (SemconvStability.emitOldDatabaseSemconv()) {
+    }
+    if (SemconvStability.emitOldDatabaseSemconv()) {
       internalSet(
           attributes,
           DB_STATEMENT,