**[edison-mongo]** add command listener to MongoClient

otto-de · Nov 24, 2021 · 2c1541e · 2c1541e
1 parent ebfdd14
commit 2c1541e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,10 @@
 * **[edison-core]** 
   * Update to Spring Boot 2.5.0 and Spring 5.3.8
 
+## 2.4.7.1
+* **[edison-mongo]** 
+  * add command listener to MongoClient
+
 ## 2.4.7
 * **[edison-mongo]** add writeConcern to MongoProperties
 * **[edison-togglz]** change ConditionalOnBean(MongoClient) to ConditionalOnClass(MongoClient) for MongoTogglzConfiguration  

diff --git a/edison-mongo/src/main/java/de/otto/edison/mongo/configuration/MongoConfiguration.java b/edison-mongo/src/main/java/de/otto/edison/mongo/configuration/MongoConfiguration.java
@@ -4,6 +4,7 @@
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
+import com.mongodb.event.CommandListener;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.slf4j.Logger;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -52,10 +53,10 @@ public MongoCompressor zlibCompressor() {
     @Bean
     @Primary
     @ConditionalOnMissingBean(name = "mongoClient", value = MongoClient.class)
-    public MongoClient mongoClient(final MongoProperties mongoProperties, List<MongoCompressor> possibleCompressors) {
+    public MongoClient mongoClient(final MongoProperties mongoProperties, final List<MongoCompressor> possibleCompressors, final List<CommandListener> commandListeners) {
         LOG.info("Creating MongoClient");
 
-        MongoClientSettings mongoClientSettings = mongoProperties.toMongoClientSettings(codecRegistry(), possibleCompressors);
+        MongoClientSettings mongoClientSettings = mongoProperties.toMongoClientSettings(codecRegistry(), possibleCompressors, commandListeners);
 
         return MongoClients.create(mongoClientSettings);
     }

diff --git a/edison-mongo/src/main/java/de/otto/edison/mongo/configuration/MongoProperties.java b/edison-mongo/src/main/java/de/otto/edison/mongo/configuration/MongoProperties.java
@@ -1,6 +1,7 @@
 package de.otto.edison.mongo.configuration;
 
 import com.mongodb.*;
+import com.mongodb.event.CommandListener;
 import de.otto.edison.status.domain.Datasource;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.slf4j.Logger;
@@ -262,7 +263,7 @@ public void setClientServerCompressionEnabled(boolean clientServerCompressionEna
         this.clientServerCompressionEnabled = clientServerCompressionEnabled;
     }
 
-    public MongoClientSettings toMongoClientSettings(final CodecRegistry codecRegistry, List<MongoCompressor> possibleCompressors) {
+    public MongoClientSettings toMongoClientSettings(final CodecRegistry codecRegistry, final List<MongoCompressor> possibleCompressors, final List<CommandListener> commandListeners) {
         MongoClientSettings.Builder clientOptionsBuilder = MongoClientSettings.builder()
                 .applyToSslSettings(builder -> builder.enabled(sslEnabled))
                 .codecRegistry(codecRegistry)
@@ -282,12 +283,15 @@ public MongoClientSettings toMongoClientSettings(final CodecRegistry codecRegist
         if (isClientServerCompressionEnabled()) {
             clientOptionsBuilder.compressorList(possibleCompressors);
         }
-        if(useAuthorizedConnection()) {
+        if (useAuthorizedConnection()) {
             clientOptionsBuilder.credential(getMongoCredentials());
         }
         if (nonNull(writeConcern)) {
             clientOptionsBuilder.writeConcern(WriteConcern.valueOf(writeConcern));
         }
+        if (nonNull(commandListeners)) {
+            commandListeners.forEach(e->clientOptionsBuilder.addCommandListener(e));
+        }
 
         return clientOptionsBuilder.build();
     }

diff --git a/edison-mongo/src/test/java/de/otto/edison/mongo/configuration/MongoPropertiesTest.java b/edison-mongo/src/test/java/de/otto/edison/mongo/configuration/MongoPropertiesTest.java
@@ -25,7 +25,7 @@ void shouldConfigureCompressorListWhenClientServerCompressionIsEnabled() {
 
         //when
         props.setClientServerCompressionEnabled(true);
-        MongoClientSettings mongoClientOptions = props.toMongoClientSettings(MongoClientSettings.getDefaultCodecRegistry(), Collections.singletonList(MongoCompressor.createZlibCompressor()));
+        MongoClientSettings mongoClientOptions = props.toMongoClientSettings(MongoClientSettings.getDefaultCodecRegistry(), Collections.singletonList(MongoCompressor.createZlibCompressor()), null);
 
         //then
         assertThat(mongoClientOptions.getCompressorList(), is(Collections.singletonList(MongoCompressor.createZlibCompressor())));
@@ -38,7 +38,7 @@ void shouldNotConfigureCompressorListWhenClientServerCompressionIsDisabled() {
 
         //when
         props.setClientServerCompressionEnabled(false);
-        MongoClientSettings mongoClientOptions = props.toMongoClientSettings(MongoClientSettings.getDefaultCodecRegistry(), Collections.singletonList(MongoCompressor.createZlibCompressor()));
+        MongoClientSettings mongoClientOptions = props.toMongoClientSettings(MongoClientSettings.getDefaultCodecRegistry(), Collections.singletonList(MongoCompressor.createZlibCompressor()), null);
 
         //then
         assertThat(mongoClientOptions.getCompressorList(), is(Collections.emptyList()));