up

Author: trask

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

@@ -74,10 +74,10 @@ static <REQUEST, RESPONSE> void onStartCommon(
       DbClientAttributesGetter<REQUEST, RESPONSE> getter,
       REQUEST request) {
     if (SemconvStability.emitStableDatabaseSemconv()) {
-      String dbSystem = getter.getDbSystem(request);
-      if (dbSystem != null) {
-        internalSet(attributes, DB_SYSTEM_NAME, SemconvStability.stableDbSystemName(dbSystem));
-      }
+      internalSet(
+          attributes,
+          DB_SYSTEM_NAME,
+          SemconvStability.stableDbSystemName(getter.getDbSystem(request)));
       internalSet(attributes, DB_NAMESPACE, getter.getDbNamespace(request));
       internalSet(attributes, DB_QUERY_TEXT, getter.getDbQueryText(request));
       internalSet(attributes, DB_OPERATION_NAME, getter.getDbOperationName(request));

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

@@ -41,6 +41,12 @@ default String getDbQueryText(REQUEST request) {
     return getStatement(request);
   }
 
+  // TODO: make this required to implement
+  @Nullable
+  default String getDbQuerySummary(REQUEST request) {
+    return null;
+  }
+
   /**
    * @deprecated Use {@link #getDbOperationName(REQUEST)} instead.
    */
@@ -55,9 +61,4 @@ default String getOperation(REQUEST request) {
   default String getDbOperationName(REQUEST request) {
     return getOperation(request);
   }
-
-  @Nullable
-  default String getDbQuerySummary(REQUEST request) {
-    return null;
-  }
 }