diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/driver-3.1.gradle b/dd-java-agent/instrumentation/mongo/driver-3.1/driver-3.1.gradle index f93bacc3e2..747c30ad60 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.1/driver-3.1.gradle +++ b/dd-java-agent/instrumentation/mongo/driver-3.1/driver-3.1.gradle @@ -29,7 +29,7 @@ dependencies { testCompile project(':dd-java-agent:testing') testCompile project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output - testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '2.2.0' + testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5' testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' latestDepTestCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '+' diff --git a/dd-java-agent/instrumentation/mongo/driver-async-3.3/driver-async-3.3.gradle b/dd-java-agent/instrumentation/mongo/driver-async-3.3/driver-async-3.3.gradle index 36b7fbe845..0461926bfb 100644 --- a/dd-java-agent/instrumentation/mongo/driver-async-3.3/driver-async-3.3.gradle +++ b/dd-java-agent/instrumentation/mongo/driver-async-3.3/driver-async-3.3.gradle @@ -1,3 +1,9 @@ +// Set properties before any plugins get loaded +ext { + // Since we're using CompletableFutures in the test... + minJavaVersionForTests = JavaVersion.VERSION_1_8 +} + muzzle { pass { group = "org.mongodb" @@ -34,7 +40,7 @@ dependencies { testCompile project(':dd-java-agent:testing') testCompile project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output - testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '2.2.0' + testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5' testCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0' latestDepTestCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '+' diff --git a/dd-java-agent/instrumentation/mongo/mongo.gradle b/dd-java-agent/instrumentation/mongo/mongo.gradle index 437c738bcd..f91b66b0cc 100644 --- a/dd-java-agent/instrumentation/mongo/mongo.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo.gradle @@ -5,7 +5,7 @@ dependencies { testImplementation deps.autoservice testCompile project(':dd-java-agent:testing') - testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '2.2.0' + testCompile group: 'de.flapdoodle.embed', name: 'de.flapdoodle.embed.mongo', version: '1.50.5' } // Forcing strict test execution order (no parallel execution) to ensure proper mongo executable initialization. diff --git a/dd-java-agent/instrumentation/mongo/src/test/groovy/MongoBaseTest.groovy b/dd-java-agent/instrumentation/mongo/src/test/groovy/MongoBaseTest.groovy index 0fede79b21..c945733e35 100644 --- a/dd-java-agent/instrumentation/mongo/src/test/groovy/MongoBaseTest.groovy +++ b/dd-java-agent/instrumentation/mongo/src/test/groovy/MongoBaseTest.groovy @@ -17,7 +17,7 @@ import spock.lang.Shared */ class MongoBaseTest extends AgentTestRunner { // https://github.com/flapdoodle-oss/de.flapdoodle.embed.mongo#executable-collision - private static final MongodStarter starter = MongodStarter.getDefaultInstance() + private static final MongodStarter STARTER = MongodStarter.getDefaultInstance() @Shared int port = PortUtils.randomOpenPort() @@ -33,7 +33,7 @@ class MongoBaseTest extends AgentTestRunner { .net(new Net("localhost", port, Network.localhostIsIPv6())) .build() - mongodExe = starter.prepare(mongodConfig) + mongodExe = STARTER.prepare(mongodConfig) mongod = mongodExe.start() }