fix

Author: trask

instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoAttributesExtractor.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.instrumentation.mongo.v3_1;
 
+import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
 import static java.util.Arrays.asList;
 
 import com.mongodb.event.CommandStartedEvent;
@@ -19,6 +20,8 @@
 
 class MongoAttributesExtractor implements AttributesExtractor<CommandStartedEvent, Void> {
   // copied from DbIncubatingAttributes
+  private static final AttributeKey<String> DB_COLLECTION_NAME =
+      AttributeKey.stringKey("db.collection.name");
   private static final AttributeKey<String> DB_MONGODB_COLLECTION =
       AttributeKey.stringKey("db.mongodb.collection");
 
@@ -27,7 +30,11 @@ public void onStart(
       AttributesBuilder attributes, Context parentContext, CommandStartedEvent event) {
     String collectionName = collectionName(event);
     if (collectionName != null) {
-      attributes.put(DB_MONGODB_COLLECTION, collectionName);
+      if (emitStableDatabaseSemconv()) {
+        attributes.put(DB_COLLECTION_NAME, collectionName);
+      } else {
+        attributes.put(DB_MONGODB_COLLECTION, collectionName);
+      }
     }
   }
 

instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java

@@ -170,7 +170,9 @@ void testQueries(Parameter parameter) {
                             .hasAttributesSatisfyingExactly(
                                 equalTo(
                                     DB_CONNECTION_STRING,
-                                    parameter.system + "://localhost:" + port),
+                                    emitStableDatabaseSemconv()
+                                        ? null
+                                        : parameter.system + "://localhost:" + port),
                                 equalTo(DB_SYSTEM, parameter.system),
                                 equalTo(maybeStable(DB_NAME), DB),
                                 equalTo(DB_USER, emitStableDatabaseSemconv() ? null : USER_DB),