Add database tag to DefaultMongoCommandTagsProvider (#4298)

Author: nathankooij

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/mongodb/DefaultMongoCommandTagsProvider.java

@@ -54,7 +54,7 @@ public class DefaultMongoCommandTagsProvider implements MongoCommandTagsProvider
 
     @Override
     public Iterable<Tag> commandTags(CommandEvent event) {
-        return Tags.of(Tag.of("command", event.getCommandName()),
+        return Tags.of(Tag.of("command", event.getCommandName()), Tag.of("database", event.getDatabaseName()),
                 Tag.of("collection", getAndRemoveCollectionNameForCommand(event)),
                 Tag.of("cluster.id",
                         event.getConnectionDescription().getConnectionId().getServerId().getClusterId().getValue()),

micrometer-core/src/test/java/io/micrometer/core/instrument/binder/mongodb/DefaultMongoCommandTagsProviderTest.java

@@ -49,7 +49,8 @@ class DefaultMongoCommandTagsProviderTest {
     void defaultCommandTags() {
         CommandSucceededEvent event = commandSucceededEvent(5150);
         Iterable<Tag> tags = tagsProvider.commandTags(event);
-        assertThat(tags).containsExactlyInAnyOrder(Tag.of("command", "find"), Tag.of("collection", "unknown"),
+        assertThat(tags).containsExactlyInAnyOrder(Tag.of("command", "find"), Tag.of("database", "db1"),
+                Tag.of("collection", "unknown"),
                 Tag.of("cluster.id", connectionDesc.getConnectionId().getServerId().getClusterId().getValue()),
                 Tag.of("server.address", "localhost:5150"), Tag.of("status", "SUCCESS"));
     }
@@ -84,12 +85,12 @@ void handlesCommandsOverLimitGracefully() {
     }
 
     private CommandStartedEvent commandStartedEvent(int requestId) {
-        return new CommandStartedEvent(requestId, connectionDesc, "db1", "find",
+        return new CommandStartedEvent(null, -1, requestId, connectionDesc, "db1", "find",
                 new BsonDocument("find", new BsonString("collection-" + requestId)));
     }
 
     private CommandSucceededEvent commandSucceededEvent(int requestId) {
-        return new CommandSucceededEvent(requestId, connectionDesc, "find", new BsonDocument(), 1200L);
+        return new CommandSucceededEvent(null, -1, requestId, connectionDesc, "db1", "find", new BsonDocument(), 1200L);
     }
 
     @Nested

micrometer-core/src/test/java/io/micrometer/core/instrument/binder/mongodb/MongoMetricsCommandListenerTest.java

@@ -76,7 +76,7 @@ void shouldCreateSuccessCommandMetric() {
         mongo.getDatabase("test").getCollection("testCol").insertOne(new Document("testDoc", new Date()));
 
         Tags tags = Tags.of("cluster.id", clusterId.get(), "server.address", String.format("%s:%s", host, port),
-                "command", "insert", "collection", "testCol", "status", "SUCCESS");
+                "command", "insert", "database", "test", "collection", "testCol", "status", "SUCCESS");
         assertThat(registry.get("mongodb.driver.commands").tags(tags).timer().count()).isEqualTo(1);
     }
 
@@ -85,7 +85,7 @@ void shouldCreateFailedCommandMetric() {
         mongo.getDatabase("test").getCollection("testCol").dropIndex("nonExistentIndex");
 
         Tags tags = Tags.of("cluster.id", clusterId.get(), "server.address", String.format("%s:%s", host, port),
-                "command", "dropIndexes", "collection", "testCol", "status", "FAILED");
+                "command", "dropIndexes", "database", "test", "collection", "testCol", "status", "FAILED");
         assertThat(registry.get("mongodb.driver.commands").tags(tags).timer().count()).isEqualTo(1);
     }
 
@@ -110,7 +110,8 @@ public void clusterOpening(ClusterOpeningEvent event) {
         try (MongoClient mongo = MongoClients.create(settings)) {
             mongo.getDatabase("test").getCollection("testCol").insertOne(new Document("testDoc", new Date()));
             Tags tags = Tags.of("cluster.id", clusterId.get(), "server.address", String.format("%s:%s", host, port),
-                    "command", "insert", "collection", "testCol", "status", "SUCCESS", "mongoz", "5150");
+                    "command", "insert", "database", "test", "collection", "testCol", "status", "SUCCESS", "mongoz",
+                    "5150");
             assertThat(registry.get("mongodb.driver.commands").tags(tags).timer().count()).isEqualTo(1);
         }
     }
@@ -136,7 +137,8 @@ public void clusterOpening(ClusterOpeningEvent event) {
         try (MongoClient mongo = MongoClients.create(settings)) {
             mongo.getDatabase("test").getCollection("testCol").dropIndex("nonExistentIndex");
             Tags tags = Tags.of("cluster.id", clusterId.get(), "server.address", String.format("%s:%s", host, port),
-                    "command", "dropIndexes", "collection", "testCol", "status", "FAILED", "mongoz", "5150");
+                    "command", "dropIndexes", "database", "test", "collection", "testCol", "status", "FAILED", "mongoz",
+                    "5150");
             assertThat(registry.get("mongodb.driver.commands").tags(tags).timer().count()).isEqualTo(1);
         }
     }