open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #498 from DataDog/gary/muzzle-mongo 

Muzzle Mongo Instrumentations
This commit is contained in:
Gary Huang 2018-09-19 15:31:34 -04:00 committed by GitHub
parent 7eaf069e45 91f0b1d662
commit ba8efa5bc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle
View File

@ -1,13 +1,10 @@
apply plugin: 'version-scan' muzzle {
pass {
versionScan {
group = "org.mongodb" group = "org.mongodb"
module = "mongo-java-driver" module = "mongo-java-driver"
scanMethods = true
versions = "[3.1,)" versions = "[3.1,)"
verifyPresent = [ assertInverse = true
'com.mongodb.MongoClientOptions$Builder': 'addCommandListener' }
]
} }
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"
@ -21,7 +18,7 @@ testSets {
} }
dependencies { dependencies {
compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')
@ -31,7 +28,7 @@ dependencies {
implementation deps.autoservice implementation deps.autoservice
testCompile project(':dd-trace-ot') testCompile project(':dd-trace-ot')
testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
} }
configurations.latestDepTestCompile { configurations.latestDepTestCompile {

16
dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle
View File

@ -1,13 +1,11 @@
apply plugin: 'version-scan' muzzle {
pass {
versionScan {
group = "org.mongodb" group = "org.mongodb"
module = "mongodb-driver-async" module = "mongodb-driver-async"
scanMethods = true
versions = "[3.3,)" versions = "[3.3,)"
verifyPresent = [ extraDependency 'org.mongodb:mongo-java-driver:3.3.0'
'com.mongodb.async.client.MongoClientSettings$Builder': 'addCommandListener' assertInverse = true
] }
} }
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"
@ -17,8 +15,8 @@ dependencies {
compile(project(':dd-java-agent:instrumentation:mongo-3.1')) { compile(project(':dd-java-agent:instrumentation:mongo-3.1')) {
transitive = false transitive = false
} }
compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.3.0'
compileOnly group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2' compileOnly group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0'
compile project(':dd-java-agent:agent-tooling') compile project(':dd-java-agent:agent-tooling')