From e3712910b1bb2aea3495ae6805fbd6489b147824 Mon Sep 17 00:00:00 2001 From: Qiyang Huang Date: Sun, 16 Sep 2018 08:30:05 -0400 Subject: [PATCH] Muzzle Mongo Instrumentations Add muzzle blocks. --- .../instrumentation/mongo-3.1/mongo-3.1.gradle | 17 +++++++---------- .../mongo-async-3.3/mongo-async-3.3.gradle | 18 ++++++++---------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle b/dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle index a505f5058c..39bd88a231 100644 --- a/dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle +++ b/dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle @@ -1,13 +1,10 @@ -apply plugin: 'version-scan' - -versionScan { - group = "org.mongodb" - module = "mongo-java-driver" - scanMethods = true - versions = "[3.1,)" - verifyPresent = [ - 'com.mongodb.MongoClientOptions$Builder': 'addCommandListener' - ] +muzzle { + pass { + group = "org.mongodb" + module = "mongo-java-driver" + versions = "[3.1,)" + assertInverse = true + } } apply from: "${rootDir}/gradle/java.gradle" diff --git a/dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle b/dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle index 364da95300..2b3ca2667c 100644 --- a/dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle +++ b/dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle @@ -1,13 +1,11 @@ -apply plugin: 'version-scan' - -versionScan { - group = "org.mongodb" - module = "mongodb-driver-async" - scanMethods = true - versions = "[3.3,)" - verifyPresent = [ - 'com.mongodb.async.client.MongoClientSettings$Builder': 'addCommandListener' - ] +muzzle { + pass { + group = "org.mongodb" + module = "mongodb-driver-async" + versions = "[3.3,)" + extraDependency 'org.mongodb:mongo-java-driver:3.3.0' + assertInverse = true + } } apply from: "${rootDir}/gradle/java.gradle"