diff --git a/dd-java-agent/instrumentation/mongo/bson-document/build.gradle b/dd-java-agent/instrumentation/mongo/bson-document/build.gradle deleted file mode 100644 index f5c502564ef..00000000000 --- a/dd-java-agent/instrumentation/mongo/bson-document/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -muzzle { - pass { - group = "org.mongodb" - module = "mongo-java-driver" - versions = "[3.1,)" - assertInverse = true - } -} - -apply from: "$rootDir/gradle/java.gradle" - -dependencies { - compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' - - implementation(project(':dd-java-agent:instrumentation:mongo:common')) { - transitive = false - } -} diff --git a/dd-java-agent/instrumentation/mongo/bson-document/gradle.lockfile b/dd-java-agent/instrumentation/mongo/bson-document/gradle.lockfile deleted file mode 100644 index 93b3691d276..00000000000 --- a/dd-java-agent/instrumentation/mongo/bson-document/gradle.lockfile +++ /dev/null @@ -1,120 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.3=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs:4.9.8=spotbugs -com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs -com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath -com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor -com.google.auto:auto-common:1.2.1=annotationProcessor,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.thoughtworks.qdox:qdox:1.12.1=codenarc -commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.20.0=spotbugs -de.thetaphi:forbiddenapis:3.10=compileClasspath -io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath -io.sqreen:libsqreen:17.3.0=testRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath -jaxen:jaxen:2.0.0=spotbugs -junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.1=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.1=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.9=spotbugs -org.apache.ant:ant-antlr:1.10.14=codenarc -org.apache.ant:ant-junit:1.10.14=codenarc -org.apache.bcel:bcel:6.11.0=spotbugs -org.apache.commons:commons-lang3:3.19.0=spotbugs -org.apache.commons:commons-text:1.14.0=spotbugs -org.apache.logging.log4j:log4j-api:2.25.2=spotbugs -org.apache.logging.log4j:log4j-core:2.25.2=spotbugs -org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,testAnnotationProcessor -org.codehaus.groovy:groovy-ant:3.0.23=codenarc -org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc -org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc -org.codehaus.groovy:groovy-json:3.0.23=codenarc -org.codehaus.groovy:groovy-json:3.0.25=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-templates:3.0.23=codenarc -org.codehaus.groovy:groovy-xml:3.0.23=codenarc -org.codehaus.groovy:groovy:3.0.23=codenarc -org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath -org.codenarc:CodeNarc:3.7.0=codenarc -org.dom4j:dom4j:2.2.0=spotbugs -org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath -org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath -org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.14.1=testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath -org.junit:junit-bom:5.14.0=spotbugs -org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=testRuntimeClasspath -org.mongodb:mongo-java-driver:3.1.0=compileClasspath -org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.9=spotbugs -org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm-commons:9.9=spotbugs,testRuntimeClasspath -org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm-tree:9.9=spotbugs,testRuntimeClasspath -org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-util:9.9=spotbugs -org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm:9.9=spotbugs,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath -org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j -org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.3.3=spotbugs -empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/mongo/bson-document/readme.md b/dd-java-agent/instrumentation/mongo/bson-document/readme.md deleted file mode 100644 index f0ea7c6c7c4..00000000000 --- a/dd-java-agent/instrumentation/mongo/bson-document/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -This is an instrumentation project. - -This project provides instrumentation for `com.mongodb.connection.ByteBufBsonDocument` required by `driver-3.1` project. -This instrumentation may not be included in the `driver-3.1` since it breaks muzzle check there - the client API classes are changing between Mongo 3.1 and Mongo 3.4 and having this instrumentation extracted makes it manageable. - -The instrumentation is tested in `driver-3.1` project. diff --git a/dd-java-agent/instrumentation/mongo/build.gradle b/dd-java-agent/instrumentation/mongo/build.gradle deleted file mode 100644 index ac3518d159c..00000000000 --- a/dd-java-agent/instrumentation/mongo/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -apply from: "$rootDir/gradle/java.gradle" - -dependencies { - testImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() -} diff --git a/dd-java-agent/instrumentation/mongo/common/build.gradle b/dd-java-agent/instrumentation/mongo/common/build.gradle deleted file mode 100644 index 3cc97d7c961..00000000000 --- a/dd-java-agent/instrumentation/mongo/common/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply from: "$rootDir/gradle/java.gradle" - -dependencies { - compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' - - implementation project(':dd-trace-core') - - testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output - testImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' -} diff --git a/dd-java-agent/instrumentation/mongo/gradle.lockfile b/dd-java-agent/instrumentation/mongo/gradle.lockfile deleted file mode 100644 index a929f43852c..00000000000 --- a/dd-java-agent/instrumentation/mongo/gradle.lockfile +++ /dev/null @@ -1,129 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.3=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.4.2=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.4.2=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.4.2=testCompileClasspath,testRuntimeClasspath -com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs:4.9.8=spotbugs -com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs -com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath -com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor -com.google.auto:auto-common:1.2.1=annotationProcessor,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.13.2=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.thoughtworks.qdox:qdox:1.12.1=codenarc -commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.20.0=spotbugs -de.thetaphi:forbiddenapis:3.10=compileClasspath -io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath -io.sqreen:libsqreen:17.3.0=testRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath -jaxen:jaxen:2.0.0=spotbugs -junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.1=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.1=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -net.sf.saxon:Saxon-HE:12.9=spotbugs -org.apache.ant:ant-antlr:1.10.14=codenarc -org.apache.ant:ant-junit:1.10.14=codenarc -org.apache.bcel:bcel:6.11.0=spotbugs -org.apache.commons:commons-compress:1.24.0=testCompileClasspath,testRuntimeClasspath -org.apache.commons:commons-lang3:3.19.0=spotbugs -org.apache.commons:commons-text:1.14.0=spotbugs -org.apache.logging.log4j:log4j-api:2.25.2=spotbugs -org.apache.logging.log4j:log4j-core:2.25.2=spotbugs -org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,testAnnotationProcessor -org.codehaus.groovy:groovy-ant:3.0.23=codenarc -org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc -org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc -org.codehaus.groovy:groovy-json:3.0.23=codenarc -org.codehaus.groovy:groovy-json:3.0.25=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-templates:3.0.23=codenarc -org.codehaus.groovy:groovy-xml:3.0.23=codenarc -org.codehaus.groovy:groovy:3.0.23=codenarc -org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath -org.codenarc:CodeNarc:3.7.0=codenarc -org.dom4j:dom4j:2.2.0=spotbugs -org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath -org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.jetbrains:annotations:17.0.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.14.1=testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath -org.junit:junit-bom:5.14.0=spotbugs -org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=testRuntimeClasspath -org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.9=spotbugs -org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm-commons:9.9=spotbugs,testRuntimeClasspath -org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm-tree:9.9=spotbugs,testRuntimeClasspath -org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-util:9.9=spotbugs -org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm:9.9=spotbugs,testRuntimeClasspath -org.rnorth.duct-tape:duct-tape:1.0.8=testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath -org.slf4j:slf4j-api:1.7.36=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j -org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.testcontainers:mongodb:1.21.3=testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.21.3=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.3.3=spotbugs -empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle new file mode 100644 index 00000000000..44e168aaf3d --- /dev/null +++ b/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle @@ -0,0 +1,20 @@ +plugins { + id 'java-test-fixtures' +} + +apply from: "$rootDir/gradle/java.gradle" + +dependencies { + compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' + + implementation project(':dd-trace-core') + + testFixturesCompileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' + testFixturesCompileOnly(libs.bundles.groovy) + testFixturesCompileOnly(libs.bundles.spock) + testFixturesImplementation(project(':dd-java-agent:instrumentation-testing')) + testFixturesImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() + + //testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output + testImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' +} diff --git a/dd-java-agent/instrumentation/mongo/common/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/mongo/common/gradle.lockfile rename to dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile diff --git a/dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber.java rename to dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber.java diff --git a/dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/Context.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/Context.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/Context.java rename to dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/Context.java diff --git a/dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java rename to dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java diff --git a/dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java rename to dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java diff --git a/dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator.java rename to dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator.java diff --git a/dd-java-agent/instrumentation/mongo/common/src/test/groovy/MongoCommentInjectorTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-common/src/test/groovy/MongoCommentInjectorTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/common/src/test/groovy/MongoCommentInjectorTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-common/src/test/groovy/MongoCommentInjectorTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/src/test/groovy/MongoBaseTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-common/src/testFixtures/groovy/MongoBaseTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/src/test/groovy/MongoBaseTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-common/src/testFixtures/groovy/MongoBaseTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/build.gradle similarity index 79% rename from dd-java-agent/instrumentation/mongo/driver-3.1/build.gradle rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/build.gradle index 0e11b8bf42d..7c9da94525f 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.1/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/build.gradle @@ -1,5 +1,6 @@ muzzle { pass { + name = "driver-only" group = "org.mongodb" module = "mongo-java-driver" versions = "[3.1,)" @@ -25,15 +26,14 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' - implementation(project(':dd-java-agent:instrumentation:mongo:common')) { + implementation(project(':dd-java-agent:instrumentation:mongo:mongo-common')) { transitive = false } - testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output + testImplementation project(':dd-java-agent:instrumentation:mongo:mongo-common').sourceSets.test.output + testImplementation testFixtures(project(':dd-java-agent:instrumentation:mongo:mongo-common')) testImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() - testImplementation project(':dd-java-agent:instrumentation:mongo:bson-document') - testImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' latestDepTestImplementation group: 'org.mongodb', name: 'mongo-java-driver', version: '+' } diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.1/gradle.lockfile rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/gradle.lockfile diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/readme.md b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/readme.md similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.1/readme.md rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/readme.md diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber31.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber31.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber31.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber31.java diff --git a/dd-java-agent/instrumentation/mongo/bson-document/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java similarity index 96% rename from dd-java-agent/instrumentation/mongo/bson-document/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java index 5765055676e..b86ff449d5b 100644 --- a/dd-java-agent/instrumentation/mongo/bson-document/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/ByteBufBsonDocumentInstrumentation.java @@ -42,6 +42,11 @@ public Map contextStore() { return singletonMap("org.bson.BsonDocument", "org.bson.ByteBuf"); } + @Override + public String muzzleDirective() { + return "driver-only"; + } + @Override public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice(isConstructor(), getClass().getName() + "$ExposeBuffer"); diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoClient31Instrumentation.java diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator31.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator31.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator31.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator31.java diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/BsonScrubber31Test.groovy b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/test/groovy/BsonScrubber31Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/BsonScrubber31Test.groovy rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/test/groovy/BsonScrubber31Test.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoJava31ClientTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/test/groovy/MongoJava31ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.1/src/test/groovy/MongoJava31ClientTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/src/test/groovy/MongoJava31ClientTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/build.gradle similarity index 84% rename from dd-java-agent/instrumentation/mongo/driver-3.4/build.gradle rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/build.gradle index f797f7439a6..5bbd1a43204 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.4/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/build.gradle @@ -33,17 +33,18 @@ dependencies { compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.0' compileOnly group: 'org.mongodb', name: 'mongodb-driver-core', version: '3.4.0' - implementation(project(':dd-java-agent:instrumentation:mongo:common')) { + implementation(project(':dd-java-agent:instrumentation:mongo:mongo-common')) { transitive = false } - testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output + testImplementation project(':dd-java-agent:instrumentation:mongo:mongo-common').sourceSets.test.output + testImplementation testFixtures(project(':dd-java-agent:instrumentation:mongo:mongo-common')) testImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() // We need to pull in this dependency to get the 'suspend span' instrumentation for spock tests // as well as to test the instrumentaiton 'layering' (3.4 instrumentation should take precedence // over 3.1 - otherwise the tests here should fail) - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.1')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.1')) { transitive = false } diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.4/gradle.lockfile rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/gradle.lockfile diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/readme.md b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/readme.md similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.4/readme.md rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/readme.md diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber34.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber34.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber34.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/BsonScrubber34.java diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoClient34Instrumentation.java diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator34.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator34.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator34.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/main/java/datadog/trace/instrumentation/mongo/MongoDecorator34.java diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/src/test/groovy/BsonScrubber34Test.groovy b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/test/groovy/BsonScrubber34Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.4/src/test/groovy/BsonScrubber34Test.groovy rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/test/groovy/BsonScrubber34Test.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-3.4/src/test/groovy/MongoJava34ClientTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/test/groovy/MongoJava34ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.4/src/test/groovy/MongoJava34ClientTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/src/test/groovy/MongoJava34ClientTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-3.6/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/build.gradle similarity index 83% rename from dd-java-agent/instrumentation/mongo/driver-3.6/build.gradle rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/build.gradle index ff39860944e..de3d1d0011e 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.6/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/build.gradle @@ -33,20 +33,22 @@ dependencies { compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.6.0' compileOnly group: 'org.mongodb', name: 'mongodb-driver-core', version: '3.6.0' - implementation(project(':dd-java-agent:instrumentation:mongo:common')) { + implementation(project(':dd-java-agent:instrumentation:mongo:mongo-common')) { transitive = false } - testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output + testImplementation project(':dd-java-agent:instrumentation:mongo:mongo-common').sourceSets.test.output + testImplementation testFixtures(project(':dd-java-agent:instrumentation:mongo:mongo-common')) + testImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() // We need to pull in this dependency to get the 'suspend span' instrumentation for spock tests // as well as to test the instrumentaiton 'layering' (3.4 instrumentation should take precedence // over 3.1 - otherwise the tests here should fail) - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.1')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.1')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.4')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.4')) { transitive = false } diff --git a/dd-java-agent/instrumentation/mongo/driver-3.6/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.6/gradle.lockfile rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/gradle.lockfile diff --git a/dd-java-agent/instrumentation/mongo/driver-3.6/readme.md b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/readme.md similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.6/readme.md rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/readme.md diff --git a/dd-java-agent/instrumentation/mongo/driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection36Instrumentation.java diff --git a/dd-java-agent/instrumentation/mongo/driver-3.6/src/test/groovy/DefaultServerConnection36InstrumentationTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/test/groovy/DefaultServerConnection36InstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.6/src/test/groovy/DefaultServerConnection36InstrumentationTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/src/test/groovy/DefaultServerConnection36InstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-3.8/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/build.gradle similarity index 81% rename from dd-java-agent/instrumentation/mongo/driver-3.8/build.gradle rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/build.gradle index 9a74c8cb898..db1def27b2d 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.8/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/build.gradle @@ -33,23 +33,24 @@ dependencies { compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.8.0' compileOnly group: 'org.mongodb', name: 'mongodb-driver-core', version: '3.8.0' - implementation(project(':dd-java-agent:instrumentation:mongo:common')) { + implementation(project(':dd-java-agent:instrumentation:mongo:mongo-common')) { transitive = false } - testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output + testImplementation project(':dd-java-agent:instrumentation:mongo:mongo-common').sourceSets.test.output + testImplementation testFixtures(project(':dd-java-agent:instrumentation:mongo:mongo-common')) testImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() // We need to pull in this dependency to get the 'suspend span' instrumentation for spock tests // as well as to test the instrumentaiton 'layering' (3.4 instrumentation should take precedence // over 3.1 - otherwise the tests here should fail) - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.1')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.1')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.4')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.4')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.6')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.6')) { transitive = false } diff --git a/dd-java-agent/instrumentation/mongo/driver-3.8/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.8/gradle.lockfile rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/mongo/driver-3.8/readme.md b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/readme.md similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.8/readme.md rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/readme.md diff --git a/dd-java-agent/instrumentation/mongo/driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection38Instrumentation.java diff --git a/dd-java-agent/instrumentation/mongo/driver-3.8/src/test/groovy/DefaultServerConnection38InstrumentationTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/test/groovy/DefaultServerConnection38InstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.8/src/test/groovy/DefaultServerConnection38InstrumentationTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/src/test/groovy/DefaultServerConnection38InstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/build.gradle similarity index 87% rename from dd-java-agent/instrumentation/mongo/driver-4.0/build.gradle rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/build.gradle index fe57a8d9d00..928546f28fc 100644 --- a/dd-java-agent/instrumentation/mongo/driver-4.0/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/build.gradle @@ -27,20 +27,21 @@ dependencies { compileOnly group: 'org.mongodb', name: 'mongodb-driver-sync', version: '4.0.0' compileOnly group: 'org.mongodb', name: 'mongodb-driver-reactivestreams', version: '4.0.0' - implementation(project(':dd-java-agent:instrumentation:mongo:common')) { + implementation(project(':dd-java-agent:instrumentation:mongo:mongo-common')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.1')) { + testImplementation testFixtures(project(':dd-java-agent:instrumentation:mongo:mongo-common')) + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.1')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.4')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.4')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.6')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.6')) { transitive = false } - testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output + testImplementation project(':dd-java-agent:instrumentation:mongo:mongo-common').sourceSets.test.output testImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() testImplementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: '4.0.1' diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/gradle.lockfile rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/readme.md b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/readme.md similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/readme.md rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/readme.md diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg0Advice.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg0Advice.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg0Advice.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg0Advice.java diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg1Advice.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg1Advice.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg1Advice.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg1Advice.java diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg2Advice.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg2Advice.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg2Advice.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/Arg2Advice.java diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseCluster410Instrumentation.java diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/BaseClusterInstrumentation.java diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/CallbackWrapper.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/CallbackWrapper.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/CallbackWrapper.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/CallbackWrapper.java diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPool410Instrumentation.java diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultConnectionPoolInstrumentation.java diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/InternalStreamConnectionInstrumentation.java diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/Mongo4ClientTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/test/groovy/Mongo4ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/Mongo4ClientTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/test/groovy/Mongo4ClientTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/MongoDBMCommentTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/test/groovy/MongoDBMCommentTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/MongoDBMCommentTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/test/groovy/MongoDBMCommentTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/MongoReactiveClientTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/test/groovy/MongoReactiveClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/MongoReactiveClientTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/src/test/groovy/MongoReactiveClientTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/build.gradle similarity index 75% rename from dd-java-agent/instrumentation/mongo/driver-3.3-async-test/build.gradle rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/build.gradle index 62b42c755e8..aa871b76a13 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/build.gradle @@ -4,14 +4,15 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') dependencies { - testImplementation(project(':dd-java-agent:instrumentation:mongo:common')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-common')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.1')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.1')) { transitive = false } - testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output + testImplementation project(':dd-java-agent:instrumentation:mongo:mongo-common').sourceSets.test.output + testImplementation testFixtures(project(':dd-java-agent:instrumentation:mongo:mongo-common')) testImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() testImplementation group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0' diff --git a/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.3-async-test/gradle.lockfile rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/gradle.lockfile diff --git a/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/readme.md b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/readme.md similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.3-async-test/readme.md rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/readme.md diff --git a/dd-java-agent/instrumentation/mongo/driver-3.3-async-test/src/test/groovy/MongoAsyncClientTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/src/test/groovy/MongoAsyncClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.3-async-test/src/test/groovy/MongoAsyncClientTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/src/test/groovy/MongoAsyncClientTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/build.gradle similarity index 80% rename from dd-java-agent/instrumentation/mongo/driver-3.1-core-test/build.gradle rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/build.gradle index 45bdfd90056..a0f89a42216 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/build.gradle @@ -3,18 +3,20 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') dependencies { - testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output + testImplementation project(':dd-java-agent:instrumentation:mongo:mongo-common').sourceSets.test.output testImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() // We need to pull in this dependency to get the 'suspend span' instrumentation for spock tests // as well as to test the instrumentaiton 'layering' (3.4 instrumentation should take precedence // over 3.1 - otherwise the tests here should fail) - testImplementation(project(':dd-java-agent:instrumentation:mongo:common')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-common')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.1')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.1')) { transitive = false } + testImplementation testFixtures(project(':dd-java-agent:instrumentation:mongo:mongo-common')) + testImplementation group: 'org.mongodb', name: 'mongodb-driver', version: '3.1.0' latestDepTestImplementation group: 'org.mongodb', name: 'mongodb-driver', version: '3.6+' diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.1-core-test/gradle.lockfile rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/gradle.lockfile diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/readme.md b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/readme.md similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.1-core-test/readme.md rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/readme.md diff --git a/dd-java-agent/instrumentation/mongo/driver-3.1-core-test/src/test/groovy/MongoCore31ClientTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/src/test/groovy/MongoCore31ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.1-core-test/src/test/groovy/MongoCore31ClientTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/src/test/groovy/MongoCore31ClientTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/build.gradle similarity index 77% rename from dd-java-agent/instrumentation/mongo/driver-3.7-core-test/build.gradle rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/build.gradle index 64ba6ea627d..cdd6948ae80 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/build.gradle @@ -3,24 +3,26 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') dependencies { - testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output + testImplementation project(':dd-java-agent:instrumentation:mongo:mongo-common').sourceSets.test.output testImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() // We need to pull in this dependency to get the 'suspend span' instrumentation for spock tests // as well as to test the instrumentaiton 'layering' (3.4 instrumentation should take precedence // over 3.1 - otherwise the tests here should fail) - testImplementation(project(':dd-java-agent:instrumentation:mongo:common')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-common')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.1')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.1')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.4')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.4')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.6')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.6')) { transitive = false } + testImplementation testFixtures(project(':dd-java-agent:instrumentation:mongo:mongo-common')) + testImplementation group: 'org.mongodb', name: 'mongodb-driver', version: '3.7.0' latestDepTestImplementation group: 'org.mongodb', name: 'mongodb-driver', version: '3.+' diff --git a/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.7-core-test/gradle.lockfile rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/gradle.lockfile diff --git a/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/readme.md b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/readme.md similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.7-core-test/readme.md rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/readme.md diff --git a/dd-java-agent/instrumentation/mongo/driver-3.7-core-test/src/test/groovy/MongoCore37ClientTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/src/test/groovy/MongoCore37ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.7-core-test/src/test/groovy/MongoCore37ClientTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/src/test/groovy/MongoCore37ClientTest.groovy diff --git a/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/build.gradle similarity index 72% rename from dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/build.gradle rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/build.gradle index 982c2fb4966..18327f98667 100644 --- a/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/build.gradle @@ -4,22 +4,24 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') dependencies { - testImplementation(project(':dd-java-agent:instrumentation:mongo:common')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-common')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.1')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.1')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.4')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.4')) { transitive = false } - testImplementation(project(':dd-java-agent:instrumentation:mongo:driver-3.6')) { + testImplementation(project(':dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.6')) { transitive = false } - testImplementation project(':dd-java-agent:instrumentation:mongo').sourceSets.test.output + testImplementation testFixtures(project(':dd-java-agent:instrumentation:mongo:mongo-common')) + testImplementation project(':dd-java-agent:instrumentation:mongo:mongo-common').sourceSets.test.output testImplementation group: 'org.testcontainers', name: 'mongodb', version: libs.versions.testcontainers.get() + testImplementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: '3.10.0' latestDepTestImplementation group: 'org.mongodb', name: 'mongodb-driver-sync', version: '3.+' } diff --git a/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/gradle.lockfile rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/gradle.lockfile diff --git a/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/readme.md b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/readme.md similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/readme.md rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/readme.md diff --git a/dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/src/test/groovy/MongoSyncClientTest.groovy b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/src/test/groovy/MongoSyncClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/mongo/driver-3.10-sync-test/src/test/groovy/MongoSyncClientTest.groovy rename to dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/src/test/groovy/MongoSyncClientTest.groovy diff --git a/settings.gradle.kts b/settings.gradle.kts index b7b1c2d88ea..d3b24b25b42 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -454,18 +454,16 @@ include( ":dd-java-agent:instrumentation:micronaut:micronaut-http-server-netty:micronaut-http-server-netty-3.0", ":dd-java-agent:instrumentation:micronaut:micronaut-http-server-netty:micronaut-http-server-netty-4.0", ":dd-java-agent:instrumentation:micronaut:micronaut-http-server-netty:micronaut-http-server-netty-common", - ":dd-java-agent:instrumentation:mongo:bson-document", - ":dd-java-agent:instrumentation:mongo:common", - ":dd-java-agent:instrumentation:mongo:driver-3.1-core-test", - ":dd-java-agent:instrumentation:mongo:driver-3.1", - ":dd-java-agent:instrumentation:mongo:driver-3.10-sync-test", - ":dd-java-agent:instrumentation:mongo:driver-3.3-async-test", - ":dd-java-agent:instrumentation:mongo:driver-3.4", - ":dd-java-agent:instrumentation:mongo:driver-3.6", - ":dd-java-agent:instrumentation:mongo:driver-3.7-core-test", - ":dd-java-agent:instrumentation:mongo:driver-3.8", - ":dd-java-agent:instrumentation:mongo:driver-4.0", - ":dd-java-agent:instrumentation:mongo", + ":dd-java-agent:instrumentation:mongo:mongo-common", + ":dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.1", + ":dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.4", + ":dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.6", + ":dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-3:mongo-driver-3.8", + ":dd-java-agent:instrumentation:mongo:mongo-driver:mongo-driver-4.0", + ":dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-async-3.3", + ":dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-core-3.1", + ":dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-core-3.7", + ":dd-java-agent:instrumentation:mongo:mongo-test:mongo-test-sync-3.10", ":dd-java-agent:instrumentation:mule-4.5", ":dd-java-agent:instrumentation:netty:netty-3.8", ":dd-java-agent:instrumentation:netty:netty-4.0",