dup

Author: trask

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/TracingExecutionInterceptor.java

@@ -336,7 +336,8 @@ private void populateRequestAttributes(
       if (operation != null) {
         if (SemconvStability.emitStableDatabaseSemconv()) {
           span.setAttribute(DB_OPERATION_NAME, operation);
-        } else {
+        }
+        if (SemconvStability.emitOldDatabaseSemconv()) {
           span.setAttribute(DB_OPERATION, operation);
         }
       }

instrumentation/camel-2.20/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/decorators/DbSpanDecorator.java

@@ -129,15 +129,17 @@ public void pre(
     if (statement != null) {
       if (SemconvStability.emitStableDatabaseSemconv()) {
         attributes.put(DbIncubatingAttributes.DB_QUERY_TEXT, statement);
-      } else {
+      }
+      if (SemconvStability.emitOldDatabaseSemconv()) {
         attributes.put(DbIncubatingAttributes.DB_STATEMENT, statement);
       }
     }
     String dbName = getDbName(endpoint);
     if (dbName != null) {
       if (SemconvStability.emitStableDatabaseSemconv()) {
         attributes.put(DbIncubatingAttributes.DB_NAMESPACE, dbName);
-      } else {
+      }
+      if (SemconvStability.emitOldDatabaseSemconv()) {
         attributes.put(DbIncubatingAttributes.DB_NAME, dbName);
       }
     }

instrumentation/lettuce/lettuce-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v4_0/LettuceConnectAttributesExtractor.java

@@ -26,7 +26,6 @@ public void onStart(AttributesBuilder attributes, Context parentContext, RedisUR
       if (SemconvStability.emitStableDatabaseSemconv()) {
         attributes.put(DbIncubatingAttributes.DB_NAMESPACE, String.valueOf(database));
       }
-
       if (SemconvStability.emitOldDatabaseSemconv()) {
         attributes.put(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, (long) database);
       }

instrumentation/lettuce/lettuce-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_0/LettuceConnectAttributesExtractor.java

@@ -26,7 +26,6 @@ public void onStart(AttributesBuilder attributes, Context parentContext, RedisUR
       if (SemconvStability.emitStableDatabaseSemconv()) {
         attributes.put(DbIncubatingAttributes.DB_NAMESPACE, String.valueOf(database));
       }
-
       if (SemconvStability.emitOldDatabaseSemconv()) {
         attributes.put(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, (long) database);
       }