Use mongo.getServerAddressList() instead of getAllAddress (#256)

This allows a "mongodb+srv://" URI to be used.

Use embedded mongo in tests as getServerAddressList requires
a working connection to return a proper list of addresses.

Fixes #255

Author: JoakimLofgren

instrument-starters/opentracing-spring-cloud-mongo-starter/src/main/java/io/opentracing/contrib/spring/cloud/mongo/TracingMongoClientPostProcessor.java

@@ -37,7 +37,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
       final TracingCommandListener commandListener = new TracingCommandListener.Builder(tracer)
           .build();
 
-      return new TracingMongoClient(commandListener, client.getAllAddress(), client.getCredentialsList(), client.getMongoClientOptions());
+      return new TracingMongoClient(commandListener, client.getServerAddressList(), client.getCredentialsList(), client.getMongoClientOptions());
     }
 
     return bean;

instrument-starters/opentracing-spring-cloud-mongo-starter/src/test/java/io/opentracing/contrib/spring/cloud/mongo/MongoTracingAutoConfigurationTest.java

@@ -23,6 +23,7 @@
 import org.junit.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration;
 import org.springframework.boot.context.annotation.UserConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
@@ -36,8 +37,12 @@ public class MongoTracingAutoConfigurationTest {
   @Test
   public void createsTracingPostProcessor() {
     final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+        .withPropertyValues("spring.data.mongodb.port=27017") // Otherwise a random embedded mongo port is used
         .withConfiguration(UserConfigurations.of(TracerConfig.class, MongoConfig.class))
-        .withConfiguration(AutoConfigurations.of(MongoTracingAutoConfiguration.class));
+        .withConfiguration(AutoConfigurations.of(
+            MongoTracingAutoConfiguration.class,
+            EmbeddedMongoAutoConfiguration.class
+        ));
 
     contextRunner.run(context -> Assertions.assertThat(context).hasSingleBean(TracingMongoClientPostProcessor.class));
   }
@@ -73,10 +78,12 @@ public void doesNotCreateTracingPostProcessorWhenDisabled() {
   @Test
   public void createsTracingPostProcessorWhenAutoConfigured() {
     final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+        .withPropertyValues("spring.data.mongodb.port=27017") // Otherwise a random embedded mongo port is used
         .withConfiguration(AutoConfigurations.of(
             MongoTracingAutoConfiguration.class,
             TracerAutoConfiguration.class,
-            MongoAutoConfiguration.class
+            MongoAutoConfiguration.class,
+            EmbeddedMongoAutoConfiguration.class
         ));
 
     contextRunner.run(context -> Assertions.assertThat(context).hasSingleBean(TracingMongoClientPostProcessor.class));

instrument-starters/opentracing-spring-cloud-mongo-starter/src/test/java/io/opentracing/contrib/spring/cloud/mongo/TracingMongoClientPostProcessorTest.java

@@ -18,8 +18,17 @@
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
 import com.mongodb.MongoClientURI;
+import de.flapdoodle.embed.mongo.MongodExecutable;
+import de.flapdoodle.embed.mongo.MongodProcess;
+import de.flapdoodle.embed.mongo.MongodStarter;
+import de.flapdoodle.embed.mongo.config.MongodConfigBuilder;
+import de.flapdoodle.embed.mongo.config.Net;
+import de.flapdoodle.embed.mongo.distribution.Version;
+import de.flapdoodle.embed.process.runtime.Network;
 import io.opentracing.Tracer;
 import io.opentracing.contrib.mongo.TracingMongoClient;
+import java.io.IOException;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -34,9 +43,23 @@ public class TracingMongoClientPostProcessorTest {
 
   private TracingMongoClientPostProcessor processor;
 
+  private MongodProcess process;
+
   @Before
-  public void setup() {
+  public void setup() throws IOException {
     processor = new TracingMongoClientPostProcessor(tracer);
+
+    MongodStarter starter = MongodStarter.getDefaultInstance();
+    MongodExecutable executable = starter.prepare(new MongodConfigBuilder()
+        .version(Version.Main.PRODUCTION)
+        .net(new Net(27017, Network.localhostIsIPv6()))
+        .build());
+    process = executable.start();
+  }
+
+  @After
+  public void tearDown() {
+    process.stop();
   }
 
   @Test

pom.xml

@@ -90,7 +90,7 @@
     <version.org.springframework.boot>2.1.5.RELEASE</version.org.springframework.boot>
     <version.org.springframework.cloud-spring-cloud-dependencies>Greenwich.SR1</version.org.springframework.cloud-spring-cloud-dependencies>
     <version.org.awaitility-awaitility>3.0.0</version.org.awaitility-awaitility>
-    <version.de.flapdoodle-embed.mongo>2.0.3</version.de.flapdoodle-embed.mongo>
+    <version.de.flapdoodle-embed.mongo>2.2.0</version.de.flapdoodle-embed.mongo>
     <version.cz.jirutka.spring-embedmongo-spring>1.3.1</version.cz.jirutka.spring-embedmongo-spring>
     <version.org.slf4j-log4j-over-slf4j>1.7.25</version.org.slf4j-log4j-over-slf4j>
     <version.reactor-core>3.2.8.RELEASE</version.reactor-core>