diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/OperatingSystem.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/OperatingSystem.kt index a7e46fc640e..e921a2889e5 100644 --- a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/OperatingSystem.kt +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/OperatingSystem.kt @@ -4,4 +4,3 @@ import java.util.Locale internal fun isWindows(osName: String = System.getProperty("os.name")): Boolean = osName.lowercase(Locale.ROOT).contains("windows") - diff --git a/buildSrc/src/main/kotlin/dd-trace-java.conventions.java.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.conventions.java.gradle.kts new file mode 100644 index 00000000000..171115e3d0b --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.conventions.java.gradle.kts @@ -0,0 +1,2 @@ +// Keep gradle/java.gradle as the source of truth while consumers move to plugins {}. +apply(from = rootDir.resolve("gradle/java.gradle")) diff --git a/buildSrc/src/main/kotlin/dd-trace-java.module.agent-product.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.module.agent-product.gradle.kts new file mode 100644 index 00000000000..10e5514f683 --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.module.agent-product.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("dd-trace-java.conventions.java") +} diff --git a/buildSrc/src/main/kotlin/dd-trace-java.module.annotation-processor.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.module.annotation-processor.gradle.kts new file mode 100644 index 00000000000..10e5514f683 --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.module.annotation-processor.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("dd-trace-java.conventions.java") +} diff --git a/buildSrc/src/main/kotlin/dd-trace-java.module.bootstrap-component.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.module.bootstrap-component.gradle.kts new file mode 100644 index 00000000000..10e5514f683 --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.module.bootstrap-component.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("dd-trace-java.conventions.java") +} diff --git a/buildSrc/src/main/kotlin/dd-trace-java.module.distributable.api.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.module.distributable.api.gradle.kts new file mode 100644 index 00000000000..dfd3f517486 --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.module.distributable.api.gradle.kts @@ -0,0 +1,5 @@ +plugins { + id("dd-trace-java.conventions.java") +} + +apply(from = rootDir.resolve("gradle/publish.gradle")) diff --git a/buildSrc/src/main/kotlin/dd-trace-java.module.instrumentation.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.module.instrumentation.gradle.kts new file mode 100644 index 00000000000..10e5514f683 --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.module.instrumentation.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("dd-trace-java.conventions.java") +} diff --git a/buildSrc/src/main/kotlin/dd-trace-java.module.internal-api.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.module.internal-api.gradle.kts new file mode 100644 index 00000000000..10e5514f683 --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.module.internal-api.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("dd-trace-java.conventions.java") +} diff --git a/buildSrc/src/main/kotlin/dd-trace-java.module.internal-library.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.module.internal-library.gradle.kts new file mode 100644 index 00000000000..10e5514f683 --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.module.internal-library.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("dd-trace-java.conventions.java") +} diff --git a/buildSrc/src/main/kotlin/dd-trace-java.module.internal-platform-component.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.module.internal-platform-component.gradle.kts new file mode 100644 index 00000000000..10e5514f683 --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.module.internal-platform-component.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("dd-trace-java.conventions.java") +} diff --git a/buildSrc/src/main/kotlin/dd-trace-java.module.smoke-test.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.module.smoke-test.gradle.kts new file mode 100644 index 00000000000..10e5514f683 --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.module.smoke-test.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("dd-trace-java.conventions.java") +} diff --git a/buildSrc/src/main/kotlin/dd-trace-java.module.testing-support.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.module.testing-support.gradle.kts new file mode 100644 index 00000000000..10e5514f683 --- /dev/null +++ b/buildSrc/src/main/kotlin/dd-trace-java.module.testing-support.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("dd-trace-java.conventions.java") +} diff --git a/communication/build.gradle.kts b/communication/build.gradle.kts index 8a4285843b0..7564f60cd59 100644 --- a/communication/build.gradle.kts +++ b/communication/build.gradle.kts @@ -1,11 +1,10 @@ plugins { `java-library` + id("dd-trace-java.module.internal-library") } description = "communication" -apply(from = rootDir.resolve("gradle/java.gradle")) - dependencies { implementation(libs.slf4j) diff --git a/components/annotations/build.gradle.kts b/components/annotations/build.gradle.kts index b8314ee7f33..842ffb608bf 100644 --- a/components/annotations/build.gradle.kts +++ b/components/annotations/build.gradle.kts @@ -1 +1,3 @@ -apply(from = "$rootDir/gradle/java.gradle") +plugins { + id("dd-trace-java.module.internal-platform-component") +} diff --git a/components/context/build.gradle.kts b/components/context/build.gradle.kts index 27992034fc2..2a346f6fabb 100644 --- a/components/context/build.gradle.kts +++ b/components/context/build.gradle.kts @@ -1,3 +1,5 @@ -apply(from = "$rootDir/gradle/java.gradle") +plugins { + id("dd-trace-java.module.internal-platform-component") +} extra["excludedClassesInstructionCoverage"] = listOf("datadog.context.ContextProviders") // covered by forked test diff --git a/components/environment/build.gradle.kts b/components/environment/build.gradle.kts index f921a6774a2..3bdf2520f8c 100644 --- a/components/environment/build.gradle.kts +++ b/components/environment/build.gradle.kts @@ -1,10 +1,9 @@ plugins { `java-library` id("com.gradleup.shadow") + id("dd-trace-java.module.bootstrap-component") } -apply(from = "$rootDir/gradle/java.gradle") - dependencies { compileOnly(project(":components:annotations")) } diff --git a/components/http/http-api/build.gradle.kts b/components/http/http-api/build.gradle.kts index 3175c919318..8fd8258ad12 100644 --- a/components/http/http-api/build.gradle.kts +++ b/components/http/http-api/build.gradle.kts @@ -1,10 +1,9 @@ plugins { `java-library` `java-test-fixtures` + id("dd-trace-java.module.internal-platform-component") } -apply(from = "$rootDir/gradle/java.gradle") - description = "HTTP Client API" extra["minimumBranchCoverage"] = 0 // extra(0.7) -- need a library implementation diff --git a/components/json/build.gradle.kts b/components/json/build.gradle.kts index ce67f74ff29..13cc3e7916c 100644 --- a/components/json/build.gradle.kts +++ b/components/json/build.gradle.kts @@ -1,9 +1,8 @@ plugins { id("me.champeau.jmh") + id("dd-trace-java.module.internal-platform-component") } -apply(from = "$rootDir/gradle/java.gradle") - jmh { jmhVersion = libs.versions.jmh.get() } diff --git a/components/native-loader/build.gradle.kts b/components/native-loader/build.gradle.kts index a4178348a71..b587050a468 100644 --- a/components/native-loader/build.gradle.kts +++ b/components/native-loader/build.gradle.kts @@ -1,9 +1,8 @@ plugins { `java-library` + id("dd-trace-java.module.internal-platform-component") } -apply(from = "$rootDir/gradle/java.gradle") - dependencies { implementation(project(":components:environment")) } diff --git a/dd-java-agent/agent-aiguard/build.gradle b/dd-java-agent/agent-aiguard/build.gradle index 70aab194be4..855e44d09f2 100644 --- a/dd-java-agent/agent-aiguard/build.gradle +++ b/dd-java-agent/agent-aiguard/build.gradle @@ -3,10 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'dd-trace-java.version-file' + id 'dd-trace-java.module.agent-product' } -apply from: "$rootDir/gradle/java.gradle" - java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -34,4 +33,3 @@ tasks.named("shadowJar", ShadowJar) { tasks.named("jar", Jar) { archiveClassifier = 'unbundled' } - diff --git a/dd-java-agent/agent-bootstrap/build.gradle b/dd-java-agent/agent-bootstrap/build.gradle index fc5866caebe..8ec48e6e928 100644 --- a/dd-java-agent/agent-bootstrap/build.gradle +++ b/dd-java-agent/agent-bootstrap/build.gradle @@ -1,11 +1,11 @@ -// The shadowJar of this project will be injected into the JVM's bootstrap classloader plugins { id 'com.gradleup.shadow' id 'me.champeau.jmh' + id 'dd-trace-java.module.bootstrap-component' + id 'idea' } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: "idea" +// The shadowJar of this project will be injected into the JVM's bootstrap classloader tasks.named("compileJava", JavaCompile) { configureCompiler(it, 8, JavaVersion.VERSION_1_8, "Need access to sun.* packages") diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle index 7dc7b558df3..3bae76fccd1 100644 --- a/dd-java-agent/agent-ci-visibility/build.gradle +++ b/dd-java-agent/agent-ci-visibility/build.gradle @@ -6,9 +6,9 @@ plugins { id 'com.gradleup.shadow' id 'org.jetbrains.kotlin.jvm' id 'dd-trace-java.version-file' + id 'dd-trace-java.module.agent-product' } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/test-with-kotlin.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle" diff --git a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/build.gradle b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/build.gradle index 51b7b0ecfdc..b55a0ff936f 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/build.gradle +++ b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.version-file' + id 'dd-trace-java.module.testing-support' } -apply from: "$rootDir/gradle/java.gradle" - dependencies { api project(':dd-java-agent:instrumentation-testing') api project(':dd-java-agent:agent-ci-visibility:civisibility-test-fixtures') @@ -11,4 +10,3 @@ dependencies { compileOnly(libs.bundles.groovy) compileOnly(libs.bundles.spock) } - diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle index a8a35e05a8a..3f39ff788b9 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle +++ b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.version-file' + id 'dd-trace-java.module.testing-support' } -apply from: "$rootDir/gradle/java.gradle" - dependencies { api project(':dd-java-agent:agent-ci-visibility') api project(':dd-java-agent:testing') @@ -22,4 +21,3 @@ dependencies { // civisibility-test-fixtures is a test-support module — every consumer pulls it on their test // classpath. Production-code-quality gates like forbidden APIs don't apply here. tasks.named('forbiddenApisMain').configure { enabled = false } - diff --git a/dd-java-agent/agent-crashtracking/build.gradle b/dd-java-agent/agent-crashtracking/build.gradle index 663611c6cf3..a9c24a2d2c3 100644 --- a/dd-java-agent/agent-crashtracking/build.gradle +++ b/dd-java-agent/agent-crashtracking/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.internal-library' +} // The functionality is tested in dd-smoke-tests/crashtracking @@ -30,4 +32,3 @@ dependencies { testImplementation libs.jackson.databind testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get() } - diff --git a/dd-java-agent/agent-debugger/build.gradle b/dd-java-agent/agent-debugger/build.gradle index b6836682a5d..6980b85a536 100644 --- a/dd-java-agent/agent-debugger/build.gradle +++ b/dd-java-agent/agent-debugger/build.gradle @@ -4,10 +4,9 @@ plugins { id 'com.gradleup.shadow' id 'dd-trace-java.version-file' id 'java-test-fixtures' + id 'dd-trace-java.module.agent-product' } -apply from: "$rootDir/gradle/java.gradle" - minimumInstructionCoverage = 0.1 minimumBranchCoverage = 0.6 excludedClassesCoverage += [ diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle b/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle index 3968a161e35..66c103d4da7 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.version-file' + id 'dd-trace-java.module.bootstrap-component' } -apply from: "$rootDir/gradle/java.gradle" - // Most of the classes are just object model // Those which needs test coverage, test classes are in agent-debugger project // to avoid pull dependencies diff --git a/dd-java-agent/agent-debugger/debugger-el/build.gradle b/dd-java-agent/agent-debugger/debugger-el/build.gradle index e1b92a20af9..a874029c514 100644 --- a/dd-java-agent/agent-debugger/debugger-el/build.gradle +++ b/dd-java-agent/agent-debugger/debugger-el/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.version-file' + id 'dd-trace-java.module.internal-library' } -apply from: "$rootDir/gradle/java.gradle" - minimumInstructionCoverage = 0.1 minimumBranchCoverage = 0.6 diff --git a/dd-java-agent/agent-debugger/debugger-test-scala/build.gradle b/dd-java-agent/agent-debugger/debugger-test-scala/build.gradle index f3b256d6d25..29cc1189160 100644 --- a/dd-java-agent/agent-debugger/debugger-test-scala/build.gradle +++ b/dd-java-agent/agent-debugger/debugger-test-scala/build.gradle @@ -1,9 +1,8 @@ plugins { id 'scala' + id 'dd-trace-java.module.internal-library' } -apply from: "$rootDir/gradle/java.gradle" - dependencies { implementation group: 'org.scala-lang', name: 'scala-compiler', version: '2.13.3' } diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle index 2433fd496b0..be3256a65b9 100644 --- a/dd-java-agent/agent-iast/build.gradle +++ b/dd-java-agent/agent-iast/build.gradle @@ -7,10 +7,9 @@ plugins { id 'com.google.protobuf' version '0.10.0' id 'net.ltgt.errorprone' version '3.1.0' id 'dd-trace-java.version-file' + id 'dd-trace-java.module.agent-product' } -apply from: "$rootDir/gradle/java.gradle" - tasks.withType(AbstractCompile).configureEach { configureCompiler(it, 11, JavaVersion.VERSION_1_8, "Ensure no APIs beyond JDK8 are used") } diff --git a/dd-java-agent/agent-iast/iast-test-fixtures/build.gradle b/dd-java-agent/agent-iast/iast-test-fixtures/build.gradle index bf1a59d1b83..1171db4843c 100644 --- a/dd-java-agent/agent-iast/iast-test-fixtures/build.gradle +++ b/dd-java-agent/agent-iast/iast-test-fixtures/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.version-file' + id 'dd-trace-java.module.testing-support' } -apply from: "$rootDir/gradle/java.gradle" - dependencies { api project(':dd-java-agent:agent-iast') api project(':dd-java-agent:instrumentation-testing') diff --git a/dd-java-agent/agent-installer/build.gradle b/dd-java-agent/agent-installer/build.gradle index b8c8aac5460..cbd7368766c 100644 --- a/dd-java-agent/agent-installer/build.gradle +++ b/dd-java-agent/agent-installer/build.gradle @@ -1,5 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" -apply plugin: "idea" +plugins { + id 'dd-trace-java.module.internal-library' + id 'idea' +} minimumBranchCoverage = 0.6 excludedClassesCoverage += ['datadog.trace.agent.tooling.*'] diff --git a/dd-java-agent/agent-jmxfetch/build.gradle b/dd-java-agent/agent-jmxfetch/build.gradle index e1eb54102a4..723878b03a7 100644 --- a/dd-java-agent/agent-jmxfetch/build.gradle +++ b/dd-java-agent/agent-jmxfetch/build.gradle @@ -9,8 +9,8 @@ import static java.nio.file.StandardOpenOption.CREATE plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.agent-product' } -apply from: "$rootDir/gradle/java.gradle" dependencies { api('com.datadoghq:jmxfetch:0.52.0') { diff --git a/dd-java-agent/agent-llmobs/build.gradle b/dd-java-agent/agent-llmobs/build.gradle index 55d3258fa0c..f534a9b8f32 100644 --- a/dd-java-agent/agent-llmobs/build.gradle +++ b/dd-java-agent/agent-llmobs/build.gradle @@ -3,10 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'dd-trace-java.version-file' + id 'dd-trace-java.module.agent-product' } -apply from: "$rootDir/gradle/java.gradle" - minimumBranchCoverage = 0.0 minimumInstructionCoverage = 0.0 diff --git a/dd-java-agent/agent-logging/build.gradle b/dd-java-agent/agent-logging/build.gradle index f4430f347ff..8e8b9d97fc8 100644 --- a/dd-java-agent/agent-logging/build.gradle +++ b/dd-java-agent/agent-logging/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.internal-library' +} excludedClassesCoverage += [ // Contains no code diff --git a/dd-java-agent/agent-logs-intake/build.gradle b/dd-java-agent/agent-logs-intake/build.gradle index 20d4f3d3ee1..39ac0a348e5 100644 --- a/dd-java-agent/agent-logs-intake/build.gradle +++ b/dd-java-agent/agent-logs-intake/build.gradle @@ -3,10 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'dd-trace-java.version-file' + id 'dd-trace-java.module.agent-product' } -apply from: "$rootDir/gradle/java.gradle" - excludedClassesCoverage += [ "datadog.trace.logging.intake.LogsWriterImpl", "datadog.trace.logging.intake.LogsIntakeSystem", diff --git a/dd-java-agent/agent-otel/otel-bootstrap/build.gradle b/dd-java-agent/agent-otel/otel-bootstrap/build.gradle index f03a7d3fa45..f076916d66d 100644 --- a/dd-java-agent/agent-otel/otel-bootstrap/build.gradle +++ b/dd-java-agent/agent-otel/otel-bootstrap/build.gradle @@ -2,14 +2,13 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.bootstrap-component' + id 'dd-trace-java.build-time-instrumentation' } def otelApiVersion = '1.38.0' def otelInstrumentationApiVersion = '2.4.0' -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.build-time-instrumentation' - configurations { def ec = register('embeddedClasspath') { visible = false diff --git a/dd-java-agent/agent-otel/otel-shim/build.gradle b/dd-java-agent/agent-otel/otel-shim/build.gradle index 4a979dd1056..074e7a3a0a4 100644 --- a/dd-java-agent/agent-otel/otel-shim/build.gradle +++ b/dd-java-agent/agent-otel/otel-shim/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.bootstrap-component' +} minimumInstructionCoverage = 0.0 minimumBranchCoverage = 0.0 diff --git a/dd-java-agent/agent-otel/otel-tooling/build.gradle b/dd-java-agent/agent-otel/otel-tooling/build.gradle index 5ff2c1331e7..3fb69322f96 100644 --- a/dd-java-agent/agent-otel/otel-tooling/build.gradle +++ b/dd-java-agent/agent-otel/otel-tooling/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.internal-library' +} minimumInstructionCoverage = 0.0 minimumBranchCoverage = 0.0 diff --git a/dd-java-agent/agent-profiling/build.gradle b/dd-java-agent/agent-profiling/build.gradle index e6585b3d510..a3627ed5d82 100644 --- a/dd-java-agent/agent-profiling/build.gradle +++ b/dd-java-agent/agent-profiling/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.agent-product' } -apply from: "$rootDir/gradle/java.gradle" - excludedClassesCoverage += [ 'com.datadog.profiling.agent.CompositeController', 'com.datadog.profiling.agent.CompositeController.CompositeRecordingData', diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle index a534c42c8e3..17391203229 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle @@ -1,5 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'idea' +plugins { + id 'dd-trace-java.module.internal-library' + id 'idea' +} tracerJava { addSourceSetFor(JavaVersion.VERSION_11) { diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle index de211639c87..f180a48fc10 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle @@ -1,10 +1,9 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.internal-library' + id 'idea' } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'idea' - testJvmConstraints { // the tests need Java 11 because the JFR writer got compiled with a version // of ByteBuffer.position(int) which is binary incompatible with Java 8 ¯\_(ツ)_/¯ diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle index ae9c4d64e43..f3d88e8cf4a 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle @@ -1,6 +1,9 @@ +plugins { + id 'dd-trace-java.module.internal-library' + id 'idea' +} + // Set properties before any plugins get loaded -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'idea' testJvmConstraints { minJavaVersion = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle index ebe645ce175..5014ad0dbde 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle @@ -1,5 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'idea' +plugins { + id 'dd-trace-java.module.internal-library' + id 'idea' +} tracerJava { addSourceSetFor(JavaVersion.VERSION_11) { diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle index 1b18f6015ae..1e311a7f5fc 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.internal-library' +} tracerJava { addSourceSetFor(JavaVersion.VERSION_11) { diff --git a/dd-java-agent/agent-profiling/profiling-controller/build.gradle b/dd-java-agent/agent-profiling/profiling-controller/build.gradle index e255fdf668d..c5ccf847121 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.internal-library' +} // We have some general logging paths that are hard to test minimumInstructionCoverage = 0.8 @@ -27,4 +29,3 @@ dependencies { testImplementation libs.bundles.mockito testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.0.1' } - diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle index 2fa61e6d34b..7fba3fa8240 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle @@ -1,13 +1,12 @@ plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.internal-library' + id 'idea' } ext { } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'idea' - def osName = System.getProperty('os.name', '').toLowerCase() // currently, only linux binaries are included minimumInstructionCoverage = osName.contains("linux") ? 0.5 : 0 diff --git a/dd-java-agent/agent-profiling/profiling-scrubber/build.gradle b/dd-java-agent/agent-profiling/profiling-scrubber/build.gradle index 5c369d3762b..8e6b80bbd30 100644 --- a/dd-java-agent/agent-profiling/profiling-scrubber/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-scrubber/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.internal-library' +} minimumInstructionCoverage = 0.0 minimumBranchCoverage = 0.0 diff --git a/dd-java-agent/agent-profiling/profiling-testing/build.gradle b/dd-java-agent/agent-profiling/profiling-testing/build.gradle index 473cc32b5b8..c8c15e0415e 100644 --- a/dd-java-agent/agent-profiling/profiling-testing/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-testing/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.testing-support' +} excludedClassesCoverage += [// These classes are using only for testing 'com.datadog.profiling.testing.*',] @@ -10,4 +12,3 @@ dependencies { api group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1' api group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get() } - diff --git a/dd-java-agent/agent-profiling/profiling-uploader/build.gradle b/dd-java-agent/agent-profiling/profiling-uploader/build.gradle index 1cd43b0e91f..8f11a78fc69 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-uploader/build.gradle @@ -1,9 +1,11 @@ +plugins { + id 'dd-trace-java.module.internal-library' +} + // Set properties before any plugins get loaded ext { } -apply from: "$rootDir/gradle/java.gradle" - minimumBranchCoverage = 0.80 excludedClassesCoverage += [ @@ -41,4 +43,3 @@ dependencies { testImplementation libs.jackson.databind testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get() } - diff --git a/dd-java-agent/agent-profiling/profiling-utils/build.gradle b/dd-java-agent/agent-profiling/profiling-utils/build.gradle index 996c66f9ff5..5a0520f2a88 100644 --- a/dd-java-agent/agent-profiling/profiling-utils/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-utils/build.gradle @@ -1,9 +1,11 @@ +plugins { + id 'dd-trace-java.module.internal-library' +} + // Set properties before any plugins get loaded ext { } -apply from: "$rootDir/gradle/java.gradle" - minimumBranchCoverage = 0.78 excludedClassesCoverage += [// an enum with no additional functionality diff --git a/dd-java-agent/agent-tooling/build.gradle b/dd-java-agent/agent-tooling/build.gradle index 3b60e25d281..abd4073d96c 100644 --- a/dd-java-agent/agent-tooling/build.gradle +++ b/dd-java-agent/agent-tooling/build.gradle @@ -1,8 +1,9 @@ plugins { id 'me.champeau.jmh' id 'java-test-fixtures' + id 'dd-trace-java.module.internal-library' } -apply from: "$rootDir/gradle/java.gradle" + apply from: "$rootDir/gradle/tries.gradle" minimumBranchCoverage = 0.6 diff --git a/dd-java-agent/appsec/appsec-test-fixtures/build.gradle b/dd-java-agent/appsec/appsec-test-fixtures/build.gradle index f053f31b066..a5a1915513a 100644 --- a/dd-java-agent/appsec/appsec-test-fixtures/build.gradle +++ b/dd-java-agent/appsec/appsec-test-fixtures/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.version-file' + id 'dd-trace-java.module.testing-support' } -apply from: "$rootDir/gradle/java.gradle" - dependencies { api project(':dd-java-agent:appsec') api project(':dd-java-agent:instrumentation-testing') diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle index 09537076f52..b4e7c45b32e 100644 --- a/dd-java-agent/appsec/build.gradle +++ b/dd-java-agent/appsec/build.gradle @@ -4,9 +4,9 @@ plugins { id 'com.gradleup.shadow' id 'me.champeau.jmh' id 'dd-trace-java.version-file' + id 'dd-trace-java.module.agent-product' } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/tries.gradle" dependencies { diff --git a/dd-java-agent/cws-tls/build.gradle b/dd-java-agent/cws-tls/build.gradle index 199340693e6..8fe99bac17c 100644 --- a/dd-java-agent/cws-tls/build.gradle +++ b/dd-java-agent/cws-tls/build.gradle @@ -4,10 +4,9 @@ import org.apache.maven.model.License plugins { id 'com.gradleup.shadow' id 'dd-trace-java.version-file' + id 'dd-trace-java.module.agent-product' } -apply from: "$rootDir/gradle/java.gradle" - excludedClassesCoverage += ['datadog.cws.erpc.*', 'datadog.cws.tls.*',] dependencies { diff --git a/dd-java-agent/ddprof-lib/build.gradle b/dd-java-agent/ddprof-lib/build.gradle index b4f3219ae23..82e502294d6 100644 --- a/dd-java-agent/ddprof-lib/build.gradle +++ b/dd-java-agent/ddprof-lib/build.gradle @@ -3,10 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id "com.gradleup.shadow" id "dd-trace-java.profiling-ddprof-override" + id 'dd-trace-java.module.internal-library' } -apply from: "$rootDir/gradle/java.gradle" - dependencies { // This module provides the ddprof library as an api dependency // so that other modules can easily depend on it. diff --git a/dd-java-agent/instrumentation-annotation-processor/build.gradle b/dd-java-agent/instrumentation-annotation-processor/build.gradle index ca8db42db6e..3c3d58fc6bd 100644 --- a/dd-java-agent/instrumentation-annotation-processor/build.gradle +++ b/dd-java-agent/instrumentation-annotation-processor/build.gradle @@ -1 +1,3 @@ -apply from: "$rootDir/gradle/java.gradle" \ No newline at end of file +plugins { + id 'dd-trace-java.module.annotation-processor' +} diff --git a/dd-java-agent/instrumentation-testing/build.gradle b/dd-java-agent/instrumentation-testing/build.gradle index fffe6e530ec..d26aa9176ea 100644 --- a/dd-java-agent/instrumentation-testing/build.gradle +++ b/dd-java-agent/instrumentation-testing/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.testing-support' +} dependencies { api libs.bytebuddy diff --git a/dd-java-agent/instrumentation/aerospike-4.0/build.gradle b/dd-java-agent/instrumentation/aerospike-4.0/build.gradle index f38182ab4bd..b67da684832 100644 --- a/dd-java-agent/instrumentation/aerospike-4.0/build.gradle +++ b/dd-java-agent/instrumentation/aerospike-4.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.aerospike' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir("latestDepTest", "test") addTestSuiteForDir("latest7DepTest", "test") addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test") diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle b/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle index 7fef692093b..f84b91f266e 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} def akkaVersion = '2.5.0' def scalaVersion = '2.11' @@ -12,7 +15,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle" addTestSuite('akka23Test') diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle index eb4aa4a9dd3..6611e586fba 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle @@ -1,6 +1,8 @@ -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' -apply plugin: 'dd-trace-java.call-site-instrumentation' +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' + id 'dd-trace-java.call-site-instrumentation' +} // Since we are using different scala versions for different test sets, // we put the test classes in the baseTest test set so that the scala diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/build.gradle index 68256addf7f..eb35365ff67 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.2-iast/build.gradle @@ -1,5 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle index c327673918f..1318dd3e538 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle @@ -1,5 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} tracerJava { addSourceSetFor(JavaVersion.VERSION_11) diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/build.gradle index 0cf8ceded0e..373a1e584f3 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/build.gradle +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -8,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle index fb4094bc578..3bcff8266ee 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { fail { group = "commons-httpclient" @@ -20,8 +24,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuite('iastIntegrationTest') addTestSuiteExtendingForDir('v41IastIntegrationTest', 'iastIntegrationTest', 'iastIntegrationTest') diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/build.gradle index 0bcee37c285..dadc96b033e 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/build.gradle +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.httpcomponents.client5" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/build.gradle b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/build.gradle index 096173402d1..15c38083df4 100644 --- a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/build.gradle +++ b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.httpcomponents" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/build.gradle b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/build.gradle index 60002ac1043..8319d87077a 100644 --- a/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/build.gradle +++ b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.httpcomponents.core5" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle index 282528c7562..c71ada778d6 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle @@ -1,5 +1,7 @@ plugins { id 'com.google.protobuf' version '0.10.0' + id 'dd-trace-java.module.instrumentation' + id 'idea' } muzzle { @@ -12,9 +14,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'idea' - // First version with Mac M1 support def protocVersion = '3.17.3' def grpcVersion = '1.42.2' diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle index 2d8e7cf20a5..dcce271fb93 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle +++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.linecorp.armeria" @@ -11,8 +15,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteForDir("jetty9Test", "test/jetty9") diff --git a/dd-java-agent/instrumentation/avro-1.11.3/build.gradle b/dd-java-agent/instrumentation/avro-1.11.3/build.gradle index 722a20f65d7..31f3e3ddd69 100644 --- a/dd-java-agent/instrumentation/avro-1.11.3/build.gradle +++ b/dd-java-agent/instrumentation/avro-1.11.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.apache.avro' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest','test') addTestSuiteForDir('latestDepTest8','test') diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-common/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-common/build.gradle index 5e69c67bd78..3d48cbcff41 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-common/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-common/build.gradle @@ -1 +1,3 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle index b3cfd6103bd..7e419d43131 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "software.amazon.awssdk" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle index 66d39617239..f21a227f1df 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "software.amazon.awssdk" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle index 0eea7cd0b7f..b0c49f3eb4f 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.amazonaws' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle index bf6427bcd06..de35825b2e5 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "software.amazon.awssdk" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle index 40d5d4c778f..5f7e5409650 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + // compiling against 1.11.0, but instrumentation should work against 1.10.33 with varying effects, // depending on the version's implementation. (i.e. DeleteOptionGroup may have less handlerCounts than // expected in 1.11.84. Testing against 1.11.0 instead of 1.10.33 because the RequestHandler class @@ -5,6 +9,7 @@ // keeping base test version on 1.11.0 because RequestHandler2 is abstract in 1.10.33, // therefore keeping base version as 1.11.0 even though the instrumentation probably // is able to support up to 1.10.33 + muzzle { pass { group = "com.amazonaws" @@ -14,8 +19,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - // Features used in test_1_11_106 (builder) is available since 1.11.84, but // using 1.11.106 because of previous concerns with byte code differences // in 1.11.106, also, the DeleteOptionGroup request generates more spans diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle index d5baeacb41b..2af29e151be 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "software.amazon.awssdk" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') // Broken: at some point S3 moved the bucket name to the hostname resulting in host not found somebucket.localhost on all S3 tests // addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/build.gradle index 4562a433bdc..b9307d3a0a9 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sfn-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "software.amazon.awssdk" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle index c508d19de1c..6ad983c5c4a 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.amazonaws" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle index 8d8378f3e2a..63610c31c8c 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "software.amazon.awssdk" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle index de7b0641103..ab37cfcac66 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.amazonaws" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle index bf27426fff7..734a548061c 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "software.amazon.awssdk" @@ -9,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/axis2-1.3/build.gradle b/dd-java-agent/instrumentation/axis2-1.3/build.gradle index 7ae221bc3e3..f7f51b193aa 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/build.gradle +++ b/dd-java-agent/instrumentation/axis2-1.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.axis2" @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteForDir('latestDepForkedTest', 'test') diff --git a/dd-java-agent/instrumentation/axway-api-7.5/build.gradle b/dd-java-agent/instrumentation/axway-api-7.5/build.gradle index b27dece098f..aa98fb0b531 100644 --- a/dd-java-agent/instrumentation/axway-api-7.5/build.gradle +++ b/dd-java-agent/instrumentation/axway-api-7.5/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { // It's difficult to split jars from axway apigateway monolith: diff --git a/dd-java-agent/instrumentation/azure-functions-1.2.2/build.gradle b/dd-java-agent/instrumentation/azure-functions-1.2.2/build.gradle index a7ad15700cc..1e2c1ac0ce6 100644 --- a/dd-java-agent/instrumentation/azure-functions-1.2.2/build.gradle +++ b/dd-java-agent/instrumentation/azure-functions-1.2.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.microsoft.azure.functions' @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 5e36217ad42..ecf86f74d00 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -7,96 +7,94 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.agent-product' id("dd-trace-java.instrumentation-naming") } -apply from: "$rootDir/gradle/java.gradle" - tasks.register("latestDepTest", Test) Project parent_project = project subprojects { Project subProj -> - subProj.pluginManager.withPlugin("dd-trace-java.build-time-instrumentation") { - subProj.extensions.configure(BuildTimeInstrumentationExtension) { - it.plugins.addAll( - 'datadog.trace.agent.tooling.muzzle.MuzzleGradlePlugin', - 'datadog.trace.agent.tooling.bytebuddy.NewTaskForGradlePlugin', - 'datadog.trace.agent.tooling.bytebuddy.reqctx.RewriteRequestContextAdvicePlugin', - ) - } + subProj.pluginManager.withPlugin("dd-trace-java.module.instrumentation") { + subProj.pluginManager.apply('dd-trace-java.build-time-instrumentation') + subProj.pluginManager.apply('dd-trace-java.muzzle') + + subProj.pluginManager.withPlugin("dd-trace-java.build-time-instrumentation") { + subProj.extensions.configure(BuildTimeInstrumentationExtension) { + it.plugins.addAll( + 'datadog.trace.agent.tooling.muzzle.MuzzleGradlePlugin', + 'datadog.trace.agent.tooling.bytebuddy.NewTaskForGradlePlugin', + 'datadog.trace.agent.tooling.bytebuddy.reqctx.RewriteRequestContextAdvicePlugin', + ) + } - subProj.configurations.named('buildTimeInstrumentationPlugin') { - it.dependencies.add(subProj.dependencies.project( - path: ':dd-java-agent:agent-tooling', - configuration: 'buildTimeInstrumentationToolingPlugins' - )) + subProj.configurations.named('buildTimeInstrumentationPlugin') { + it.dependencies.add(subProj.dependencies.project( + path: ':dd-java-agent:agent-tooling', + configuration: 'buildTimeInstrumentationToolingPlugins' + )) + } } - } - subProj.pluginManager.withPlugin("java") { - subProj.pluginManager.withPlugin("dd-trace-java.muzzle") { - subProj.configurations.matching { it.name == 'muzzleBootstrap' }.configureEach { - exclude group: 'org.snakeyaml', module: 'snakeyaml-engine' // we vendor this in the agent jar + subProj.pluginManager.withPlugin("java") { + subProj.pluginManager.withPlugin("dd-trace-java.muzzle") { + subProj.configurations.matching { it.name == 'muzzleBootstrap' }.configureEach { + exclude group: 'org.snakeyaml', module: 'snakeyaml-engine' // we vendor this in the agent jar + } } - } - subProj.tasks.withType(Javadoc).configureEach { enabled = false } + subProj.tasks.withType(Javadoc).configureEach { enabled = false } - // Add instrumentation-specific forbiddenApi rules - subProj.tasks.withType(CheckForbiddenApis).configureEach { - signaturesFiles = subProj.files( - "$rootDir/gradle/forbiddenApiFilters/main.txt", - "$rootDir/gradle/forbiddenApiFilters/instrumentation.txt") - } + // Add instrumentation-specific forbiddenApi rules. + subProj.tasks.withType(CheckForbiddenApis).configureEach { + signaturesFiles = subProj.files( + "$rootDir/gradle/forbiddenApiFilters/main.txt", + "$rootDir/gradle/forbiddenApiFilters/instrumentation.txt") + } - // Configures base dependencies for additional sourceSet - subProj.configurations - .matching { it.name.matches("${MAIN_SOURCE_SET_NAME}_java\\d+${IMPLEMENTATION_CONFIGURATION_NAME.capitalize()}") } - .configureEach { - it.dependencies.add(subProj.dependencyFactory.create(project(':dd-trace-api'))) - it.dependencies.add(subProj.dependencyFactory.create(project(':dd-java-agent:agent-tooling'))) - it.dependencies.addLater(libs.bytebuddy) - } + // Configures base dependencies for additional sourceSet + subProj.configurations + .matching { it.name.matches("${MAIN_SOURCE_SET_NAME}_java\\d+${IMPLEMENTATION_CONFIGURATION_NAME.capitalize()}") } + .configureEach { + it.dependencies.add(subProj.dependencyFactory.create(project(':dd-trace-api'))) + it.dependencies.add(subProj.dependencyFactory.create(project(':dd-java-agent:agent-tooling'))) + it.dependencies.addLater(libs.bytebuddy) + } - dependencies { - // Main - annotationProcessor project(':dd-java-agent:instrumentation-annotation-processor') - annotationProcessor libs.autoservice.processor - compileOnly libs.autoservice.annotation + dependencies { + // Main + annotationProcessor project(':dd-java-agent:instrumentation-annotation-processor') + annotationProcessor libs.autoservice.processor + compileOnly libs.autoservice.annotation - // Apply common dependencies for instrumentation. - implementation project(':dd-trace-api') - implementation project(':dd-java-agent:agent-tooling') - implementation libs.bytebuddy + // Apply common dependencies for instrumentation. + implementation project(':dd-trace-api') + implementation project(':dd-java-agent:agent-tooling') + implementation libs.bytebuddy - // Tests - testAnnotationProcessor libs.autoservice.processor - testCompileOnly libs.autoservice.annotation + // Tests + testAnnotationProcessor libs.autoservice.processor + testCompileOnly libs.autoservice.annotation - // Include instrumentations instrumenting core JDK classes to ensure interoperability with other instrumentation - testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8') - testImplementation project(':dd-java-agent:instrumentation:java:java-lang:java-lang-classloading-1.8') + // Include instrumentations instrumenting core JDK classes to ensure interoperability with other instrumentation + testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8') + testImplementation project(':dd-java-agent:instrumentation:java:java-lang:java-lang-classloading-1.8') - testImplementation project(':dd-java-agent:instrumentation-testing') - } + testImplementation project(':dd-java-agent:instrumentation-testing') + } - subProj.tasks.withType(Test).configureEach { subTask -> - if (subTask.name in ['latestDepTest', 'latestDepForkedTest']) { - subTask.jvmArgs '-Dtest.dd.latestDepTest=true' + subProj.tasks.withType(Test).configureEach { subTask -> + if (subTask.name in ['latestDepTest', 'latestDepForkedTest']) { + subTask.jvmArgs '-Dtest.dd.latestDepTest=true' + } } - } - if (subProj.path != ':dd-java-agent:instrumentation:vertx:vertx-redis-client:vertx-redis-client-stubs') { - // don't include the redis RequestImpl stubs parent_project.dependencies { addProvider("implementation", providers.provider { project(subProj.path) }) } } } - - subProj.apply plugin: 'dd-trace-java.build-time-instrumentation' - subProj.apply plugin: 'dd-trace-java.muzzle' } dependencies { diff --git a/dd-java-agent/instrumentation/caffeine-1.0/build.gradle b/dd-java-agent/instrumentation/caffeine-1.0/build.gradle index 601a0c828bb..3cc42148304 100644 --- a/dd-java-agent/instrumentation/caffeine-1.0/build.gradle +++ b/dd-java-agent/instrumentation/caffeine-1.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { compileOnly group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '1.0.0' diff --git a/dd-java-agent/instrumentation/cdi-1.2/build.gradle b/dd-java-agent/instrumentation/cdi-1.2/build.gradle index 92aa53bef01..101b9c64efb 100644 --- a/dd-java-agent/instrumentation/cdi-1.2/build.gradle +++ b/dd-java-agent/instrumentation/cdi-1.2/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/cics-9.1/build.gradle b/dd-java-agent/instrumentation/cics-9.1/build.gradle index 41f3d89ebbc..893fc4bdcdc 100644 --- a/dd-java-agent/instrumentation/cics-9.1/build.gradle +++ b/dd-java-agent/instrumentation/cics-9.1/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.mass' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - // Configuration for downloading CICS SDK from IBM ext { cicsVersion = '9.1' diff --git a/dd-java-agent/instrumentation/commons-codec-1.1/build.gradle b/dd-java-agent/instrumentation/commons-codec-1.1/build.gradle index a21ca0888fc..b7a026a280b 100644 --- a/dd-java-agent/instrumentation/commons-codec-1.1/build.gradle +++ b/dd-java-agent/instrumentation/commons-codec-1.1/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { group = 'commons-codec' @@ -7,9 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/build.gradle b/dd-java-agent/instrumentation/commons-fileupload-1.5/build.gradle index e2216f88c81..02dd8d35b0a 100644 --- a/dd-java-agent/instrumentation/commons-fileupload-1.5/build.gradle +++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/build.gradle @@ -1,5 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} -apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/build.gradle b/dd-java-agent/instrumentation/commons-httpclient-2.0/build.gradle index b406619e198..4300ae70e71 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2.0/build.gradle +++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "commons-httpclient" @@ -18,8 +22,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/build.gradle b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/build.gradle index 983c41f9a73..48e571ae83a 100644 --- a/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/build.gradle +++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-2.1/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { group = 'commons-lang' @@ -7,9 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/build.gradle b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/build.gradle index dff44f2a85b..4b099aba33a 100644 --- a/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/build.gradle +++ b/dd-java-agent/instrumentation/commons-lang/commons-lang-3.5/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { group = 'org.apache.commons' @@ -7,9 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/commons-text-1.0/build.gradle b/dd-java-agent/instrumentation/commons-text-1.0/build.gradle index 9c43425a876..0e71c499566 100644 --- a/dd-java-agent/instrumentation/commons-text-1.0/build.gradle +++ b/dd-java-agent/instrumentation/commons-text-1.0/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { group = 'org.apache.commons' @@ -7,9 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/build.gradle b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/build.gradle index 20f539f5abf..f6f2fd4b47f 100644 --- a/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/build.gradle +++ b/dd-java-agent/instrumentation/confluent-schema-registry/confluent-schema-registry-4.1/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { extraRepository("confluent-releases", "https://packages.confluent.io/maven/") diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/build.gradle b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/build.gradle index 584e18f5227..b351d19deea 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/build.gradle +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/build.gradle b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/build.gradle index e76f258f6f6..679884d3833 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/build.gradle +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/build.gradle b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/build.gradle index 74e632a1c53..9be16049b71 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/build.gradle +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -10,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/build.gradle b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/build.gradle index eb9b838f185..60459d3f2b2 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/build.gradle +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -10,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/cucumber-5.4/build.gradle b/dd-java-agent/instrumentation/cucumber-5.4/build.gradle index c4d31fc8221..71e97c4a5a1 100644 --- a/dd-java-agent/instrumentation/cucumber-5.4/build.gradle +++ b/dd-java-agent/instrumentation/cucumber-5.4/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - muzzle { pass { group = 'io.cucumber' diff --git a/dd-java-agent/instrumentation/cxf-2.1/build.gradle b/dd-java-agent/instrumentation/cxf-2.1/build.gradle index 32f5d7c86a1..570751aaace 100644 --- a/dd-java-agent/instrumentation/cxf-2.1/build.gradle +++ b/dd-java-agent/instrumentation/cxf-2.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.cxf" @@ -14,8 +18,6 @@ muzzle { } } -apply from: "${rootDir}/gradle/java.gradle" - addTestSuite('latestDepTest') addTestSuiteForDir('cxf3LatestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/build.gradle b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/build.gradle index 9fe2827d46b..6c6946505b7 100644 --- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/build.gradle +++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/build.gradle @@ -1,10 +1,13 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/tries.gradle" addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/build.gradle b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/build.gradle index 55a24980e60..f89bcdb4e33 100644 --- a/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/build.gradle +++ b/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap') diff --git a/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/build.gradle b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/build.gradle index 36417cbdb8d..6d5503c6dfd 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/build.gradle +++ b/dd-java-agent/instrumentation/datadog/profiling/enable-wallclock-profiling/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle index 2c7775362f3..747c0318e09 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle +++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle @@ -1,5 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" -apply plugin: "idea" +plugins { + id 'dd-trace-java.module.instrumentation' + id 'idea' +} tracerJava { addSourceSetFor(JavaVersion.VERSION_11) { diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/build.gradle b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/build.gradle index 7066c6cc174..8f1382e66a2 100644 --- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/build.gradle +++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap') diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/build.gradle b/dd-java-agent/instrumentation/datanucleus-4.0.5/build.gradle index 4fb501a01ab..47095310cac 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/build.gradle +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/build.gradle @@ -19,6 +19,10 @@ buildscript { } } +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { // 2 libraries are instrumented. // Muzzle is tested by keeping one version fixed and modifying the other @@ -40,8 +44,6 @@ muzzle { } } -apply from: "${rootDir}/gradle/java.gradle" - def datanucleusVersion = '4.0.5' // Datanucleus modifies persistable objects with bytecode manipulation diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle index 0eba6eadd02..95086ac0a2e 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.datastax.cassandra" @@ -38,9 +42,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - - testJvmConstraints { // Test use Cassandra 3 which requires Java 8. (Currently incompatible with Java 9.) maxJavaVersion = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/build.gradle b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/build.gradle index caa9bd270e6..535c56510e1 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/build.gradle +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.datastax.cassandra" @@ -14,8 +18,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // Test use Cassandra 3 which requires Java 8. (Currently incompatible with Java 9.) maxJavaVersion = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/build.gradle b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/build.gradle index 540070f1560..595c7874922 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/build.gradle +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.datastax.oss" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // TODO Java 17: The embedded cassandra deadlocks on start every time on Java 17 // This can be changed to use test-containers diff --git a/dd-java-agent/instrumentation/drools/drools-6.0/build.gradle b/dd-java-agent/instrumentation/drools/drools-6.0/build.gradle index b1006d1450f..87b57b681d2 100644 --- a/dd-java-agent/instrumentation/drools/drools-6.0/build.gradle +++ b/dd-java-agent/instrumentation/drools/drools-6.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir("latest7Test", "test") addTestSuiteForDir("latest8Test", "test") diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/build.gradle b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/build.gradle index c5d82fd530e..765f38b0ba9 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/build.gradle +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} //addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/build.gradle b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/build.gradle index 07bb16cca68..7e677ce68ae 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/build.gradle +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'io.dropwizard' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'io.dropwizard', name: 'dropwizard-views', version: '0.7.0' diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/build.gradle b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/build.gradle index bba7ab8db6c..9d68b0f3e86 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0' diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/build.gradle b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/build.gradle index 9cd408b74f7..91bbae825ba 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.elasticsearch.client" @@ -15,8 +19,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // TODO Java 17: The embedded elastic search server doesn't work on Java 17 // This can be changed to use test-containers diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/build.gradle b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/build.gradle index b2740125ce3..e6e11fc89df 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.elasticsearch.client" @@ -14,8 +18,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('latestDepTest') dependencies { diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/build.gradle b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/build.gradle index b3d0dad4cf1..de4f34e6921 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.elasticsearch.client" @@ -14,8 +18,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/build.gradle b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/build.gradle index b7c5868215a..ce498bb993a 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.elasticsearch" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { maxJavaVersion = JavaVersion.VERSION_1_8 } diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/build.gradle b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/build.gradle index 3e909100fac..125b0808099 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.elasticsearch.client" @@ -15,8 +19,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // TODO Java 17: The embedded elastic search server doesn't work on Java 17 // This can be changed to use test-containers diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/build.gradle b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/build.gradle index e12edf95694..50895da86d7 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -16,8 +19,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/build.gradle b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/build.gradle index ddaf164efff..e95c04e131b 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -16,8 +19,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/build.gradle b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/build.gradle index 344b1e9d235..95f129cf6d6 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -16,8 +19,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/build.gradle b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/build.gradle index c66bf00f1cb..1c94bd8e6c6 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -16,8 +19,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '7.3.0' } diff --git a/dd-java-agent/instrumentation/finatra-2.9/build.gradle b/dd-java-agent/instrumentation/finatra-2.9/build.gradle index 1de84c34d4c..199489ec21e 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/build.gradle +++ b/dd-java-agent/instrumentation/finatra-2.9/build.gradle @@ -1,5 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle" // Up to 20.7 where the server structure changes diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/build.gradle b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/build.gradle index 9b67fe37a18..8a734bd499d 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/build.gradle +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.24/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { name = 'freemarker-2.3.24' @@ -8,9 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/build.gradle b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/build.gradle index c45c31ed02c..8f9b2320957 100644 --- a/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/build.gradle +++ b/dd-java-agent/instrumentation/freemarker/freemarker-2.3.9/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { fail { name = 'freemarker-2.3.9' @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir("version2_3_23Test", "test") dependencies { diff --git a/dd-java-agent/instrumentation/gax-1.4/build.gradle b/dd-java-agent/instrumentation/gax-1.4/build.gradle index 8e05bc27402..e685d81f214 100644 --- a/dd-java-agent/instrumentation/gax-1.4/build.gradle +++ b/dd-java-agent/instrumentation/gax-1.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.google.api" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/glassfish-3.0/build.gradle b/dd-java-agent/instrumentation/glassfish-3.0/build.gradle index d0b8809e048..25c054f8408 100644 --- a/dd-java-agent/instrumentation/glassfish-3.0/build.gradle +++ b/dd-java-agent/instrumentation/glassfish-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.glassfish.main.extras' @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { maxJavaVersion = JavaVersion.VERSION_1_8 } diff --git a/dd-java-agent/instrumentation/google-http-client-1.19/build.gradle b/dd-java-agent/instrumentation/google-http-client-1.19/build.gradle index 9a833a7f7a9..b0392179b59 100644 --- a/dd-java-agent/instrumentation/google-http-client-1.19/build.gradle +++ b/dd-java-agent/instrumentation/google-http-client-1.19/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.google.http-client" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/build.gradle b/dd-java-agent/instrumentation/google-pubsub-1.116/build.gradle index 6d0480e0680..03f919585a7 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/build.gradle +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.google.cloud" @@ -6,7 +10,6 @@ muzzle { excludeDependency 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' } } -apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/graal/build.gradle b/dd-java-agent/instrumentation/graal/build.gradle index 5e69c67bd78..3d48cbcff41 100644 --- a/dd-java-agent/instrumentation/graal/build.gradle +++ b/dd-java-agent/instrumentation/graal/build.gradle @@ -1 +1,3 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} diff --git a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/build.gradle b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/build.gradle index 26e3708a40d..5db591ec4ab 100644 --- a/dd-java-agent/instrumentation/graal/graal-native-image-20.0/build.gradle +++ b/dd-java-agent/instrumentation/graal/graal-native-image-20.0/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'idea' +} + muzzle { pass { group = "org.graalvm.nativeimage" @@ -6,9 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: "idea" - tracerJava { addSourceSetFor(JavaVersion.VERSION_11) } diff --git a/dd-java-agent/instrumentation/gradle-testing-5.1/build.gradle b/dd-java-agent/instrumentation/gradle-testing-5.1/build.gradle index d87d0e63c61..78ea83369a0 100644 --- a/dd-java-agent/instrumentation/gradle-testing-5.1/build.gradle +++ b/dd-java-agent/instrumentation/gradle-testing-5.1/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} repositories { maven { diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle b/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle index dd59affe950..4a1b37d7712 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle +++ b/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} repositories { maven { diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle b/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle index 22fa1b97ca4..2a3ab91ddb9 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle +++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} repositories { maven { diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/build.gradle b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/build.gradle index 24ba6081193..4fd67a85aa7 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/build.gradle +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.graphql-java" @@ -9,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle index dc042974710..8fa3644c77f 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + // there are a lot of invalid version using dates (i.e. com.graphql-java-graphql-java-2018-06-04T04-23-07) // so we limit by chunks muzzle { @@ -24,8 +28,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') addTestSuiteForDir('graphql20LatestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/build.gradle b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/build.gradle index 6da41ef0e0e..8b5d749e16d 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/build.gradle +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -8,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'com.graphql-java', name: 'graphql-java', version: '14.0' } diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle index 4dc46f8d760..53e994f53dd 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle +++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.glassfish.grizzly" @@ -10,8 +14,6 @@ muzzle { // https://mvnrepository.com/artifact/com.sun.grizzly/grizzly-http } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/build.gradle b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/build.gradle index 3c9cea01a95..049caebfa9f 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/build.gradle +++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -20,7 +23,6 @@ repositories { url = "https://repository.mulesoft.org/releases/" } } -apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') addTestSuiteForDir('latest5DepTest', 'test') diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/build.gradle b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/build.gradle index ea06fc0a58a..fc69d2ebb9c 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/build.gradle +++ b/dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.glassfish.grizzly" @@ -11,8 +15,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/grpc-1.5/build.gradle b/dd-java-agent/instrumentation/grpc-1.5/build.gradle index db6bd3ab1ce..c3f3600f9c4 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/build.gradle +++ b/dd-java-agent/instrumentation/grpc-1.5/build.gradle @@ -1,5 +1,7 @@ plugins { id 'com.google.protobuf' version '0.10.0' + id 'dd-trace-java.module.instrumentation' + id 'idea' } muzzle { @@ -10,9 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'idea' - // First version with Mac M1 support def grpcVersion = '1.42.2' protobuf { diff --git a/dd-java-agent/instrumentation/gson-1.6/build.gradle b/dd-java-agent/instrumentation/gson-1.6/build.gradle index c393cd38ba8..b61ee0b4f51 100644 --- a/dd-java-agent/instrumentation/gson-1.6/build.gradle +++ b/dd-java-agent/instrumentation/gson-1.6/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.google.code.gson' @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/guava-10.0/build.gradle b/dd-java-agent/instrumentation/guava-10.0/build.gradle index db51a7e8832..3a90d69d42c 100644 --- a/dd-java-agent/instrumentation/guava-10.0/build.gradle +++ b/dd-java-agent/instrumentation/guava-10.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.google.guava" @@ -10,8 +14,6 @@ muzzle { } } -apply from: "${rootDir}/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/build.gradle b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/build.gradle index ea625b30b2e..05e97314130 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/build.gradle +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.hazelcast" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/build.gradle b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/build.gradle index 0147c8d47dc..43ac520ddcc 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/build.gradle +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.hazelcast" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/build.gradle b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/build.gradle index badd8f3d367..f015d2d2b47 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/build.gradle +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -8,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/build.gradle b/dd-java-agent/instrumentation/hibernate/hibernate-common/build.gradle index 077f60a9693..4fe03f2589e 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-common/build.gradle +++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/build.gradle @@ -1,5 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + /* * Classes that are common to all versions of the Hibernate instrumentation. */ - -apply from: "$rootDir/gradle/java.gradle" diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/build.gradle b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/build.gradle index 0fd9d3ed7ee..665cc94ff03 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/build.gradle +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + /* * Integration for Hibernate between 3.5 and 4. * Has the same logic as the Hibernate 4+ integration, but is copied rather than sharing a codebase. This is because @@ -24,8 +28,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/build.gradle b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/build.gradle index 14200135495..de936e3fa97 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/build.gradle +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.hibernate" @@ -17,8 +21,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/build.gradle b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/build.gradle index 9e25f630827..0605cb10530 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/build.gradle +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.hibernate" @@ -17,8 +21,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/hystrix-1.4/build.gradle b/dd-java-agent/instrumentation/hystrix-1.4/build.gradle index ca8ed022d27..b17bcefbe2f 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/build.gradle +++ b/dd-java-agent/instrumentation/hystrix-1.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.netflix.hystrix" @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/ignite-2.0/build.gradle b/dd-java-agent/instrumentation/ignite-2.0/build.gradle index fa0b19807a4..cc2eae43493 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/build.gradle +++ b/dd-java-agent/instrumentation/ignite-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.apache.ignite' @@ -13,8 +17,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // See https://ignite.apache.org/docs/latest/quick-start/java#running-ignite-with-java-11-or-later // FIXME: Because of this condition, tests only run in Java 8, and latestDepTest never run, as they require Java 11+. diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/build.gradle b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/build.gradle index cd193f4c5cd..cf68cfdcba0 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/build.gradle +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-1.9.13/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.codehaus.jackson' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') final jacksonVersion = '1.9.13' diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/build.gradle b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/build.gradle index d3be1e87367..062f2c84b76 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/build.gradle +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.fasterxml.jackson.core' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') final jacksonVersion = '2.0.0' diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/build.gradle b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/build.gradle index efd10d501d3..e14a48a16fe 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/build.gradle +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.fasterxml.jackson.core' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') final jacksonVersion = '2.12.0' diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/build.gradle b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/build.gradle index 6afae303181..6a46dfb3b6f 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/build.gradle +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.fasterxml.jackson.core' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') final jacksonVersion = '2.16.0' diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/build.gradle b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/build.gradle index 4e25df16206..3d877d500d1 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/build.gradle +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.fasterxml.jackson.core' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') final jacksonVersion = '2.6.0' diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/build.gradle b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/build.gradle index ddf352eb161..bea459c3cac 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/build.gradle +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.fasterxml.jackson.core' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') final jacksonVersion = '2.8.0' diff --git a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/build.gradle b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/build.gradle index 8dd00de25fa..79b72bf6b31 100644 --- a/dd-java-agent/instrumentation/jackson-core/jackson-core-common/build.gradle +++ b/dd-java-agent/instrumentation/jackson-core/jackson-core-common/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.fasterxml.jackson.core' @@ -17,8 +21,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') final jacksonVersion = '2.14.0' diff --git a/dd-java-agent/instrumentation/jacoco-0.8.9/build.gradle b/dd-java-agent/instrumentation/jacoco-0.8.9/build.gradle index 61d225c5f91..a89ed5cd311 100644 --- a/dd-java-agent/instrumentation/jacoco-0.8.9/build.gradle +++ b/dd-java-agent/instrumentation/jacoco-0.8.9/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle index 83caaeb1324..81d66f38ddf 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle @@ -1,11 +1,13 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "${rootDir}/gradle/java.gradle" - tasks.named("compileJava") { configureCompiler(it, 8) } diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle index d2d9001f4b1..1611042b1c4 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle @@ -1,8 +1,8 @@ plugins { id 'idea' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" // Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI. apply from: "$rootDir/gradle/slf4j-simple.gradle" diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle index 25ab9e9485a..8c91a4851f8 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle @@ -1,8 +1,8 @@ plugins { id 'idea' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" // Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI. apply from: "$rootDir/gradle/slf4j-simple.gradle" diff --git a/dd-java-agent/instrumentation/java/java-io-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-io-1.8/build.gradle index c56f4f97d8b..bbc1994c37f 100644 --- a/dd-java-agent/instrumentation/java/java-io-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-io-1.8/build.gradle @@ -1,12 +1,14 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteForDir('java11Test', 'java11Test') diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle index 5f6b5874f77..ab9fd7f8aa8 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle @@ -1,12 +1,14 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle index fa728eb5175..cacd1e526ec 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle @@ -1,10 +1,9 @@ plugins { id 'idea' + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_11 } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle index 5805396a698..7b2fb449e7b 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle @@ -1,10 +1,9 @@ plugins { id 'idea' + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_15 } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle index 0fdc35f364d..e65e7d1a7ca 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle @@ -1,10 +1,9 @@ plugins { id 'idea' + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle index 97c18d0e083..53a46ed3706 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle @@ -1,8 +1,8 @@ plugins { id 'idea' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" // Use slf4j-simple as default; logback has a high chance of getting stuck in a deadlock on CI. apply from: "$rootDir/gradle/slf4j-simple.gradle" diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle index 3fb856dd9c1..27633a5d8e1 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle @@ -1,5 +1,6 @@ plugins { id 'idea' + id 'dd-trace-java.module.instrumentation' } muzzle { @@ -8,7 +9,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/slf4j-simple.gradle" tracerJava { diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle index 134382c1f24..a1737a6be91 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle @@ -1,10 +1,9 @@ plugins { id 'idea' + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_1_9 } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/build.gradle index 023c7074761..296966adb89 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-classloading-1.8/build.gradle @@ -1,11 +1,13 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('classloadingJbossTest') addTestSuite('classloadingTomcatTest') addTestSuiteExtendingForDir('classloadingTomcatLatestDepTest', 'classloadingTomcatTest', 'classloadingTomcatTest') diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle index f4b8045cd6d..82dbf59affa 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle @@ -1,12 +1,14 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle index 200d06ae197..e70884b595e 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle @@ -1,12 +1,14 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'idea' +} + muzzle { pass { coreJdk('11') } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: "idea" - tracerJava { addSourceSetFor(JavaVersion.VERSION_11) } diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle index 6801dc2bb7e..f32cb5c93ba 100644 --- a/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle @@ -1,12 +1,14 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'idea' +} + muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: "idea" - tracerJava { addSourceSetFor(JavaVersion.VERSION_11) } diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/build.gradle b/dd-java-agent/instrumentation/java/java-rmi-1.1/build.gradle index 5b1b5b01e5f..826905dc19d 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/build.gradle +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/build.gradle @@ -1,11 +1,13 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // TODO Java 17: The necessary packages are not opened on Java 17 maxJavaVersion = JavaVersion.VERSION_15 diff --git a/dd-java-agent/instrumentation/java/java-security-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-security-1.8/build.gradle index abf666fde8d..270c1e472c3 100644 --- a/dd-java-agent/instrumentation/java/java-security-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-security-1.8/build.gradle @@ -1,12 +1,14 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') tasks.withType(Test).configureEach { diff --git a/dd-java-agent/instrumentation/java/java-util-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-util-1.8/build.gradle index eb1ac83feba..0714cb5bb94 100644 --- a/dd-java-agent/instrumentation/java/java-util-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-util-1.8/build.gradle @@ -1,12 +1,14 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/javax-naming-1.0/build.gradle b/dd-java-agent/instrumentation/javax-naming-1.0/build.gradle index eb1ac83feba..0714cb5bb94 100644 --- a/dd-java-agent/instrumentation/javax-naming-1.0/build.gradle +++ b/dd-java-agent/instrumentation/javax-naming-1.0/build.gradle @@ -1,12 +1,14 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/javax-xml-1.4/build.gradle b/dd-java-agent/instrumentation/javax-xml-1.4/build.gradle index a2c17165560..55921f212de 100644 --- a/dd-java-agent/instrumentation/javax-xml-1.4/build.gradle +++ b/dd-java-agent/instrumentation/javax-xml-1.4/build.gradle @@ -1,12 +1,14 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - repositories { maven { name = 'WSO2-Dist' diff --git a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/build.gradle b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/build.gradle index 178cebdf642..8a6ac89d6ce 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/build.gradle +++ b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { // jboss-logmanager-embedded has been relocated to jboss-logmanager @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.jboss.logmanager', name: 'jboss-logmanager', version: '1.1.0.GA' } diff --git a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/build.gradle b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/build.gradle index 4b071a23ee4..4d72ed98ea3 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/build.gradle +++ b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.jboss.modules' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite("latestDepTest") dependencies { diff --git a/dd-java-agent/instrumentation/jdbc/build.gradle b/dd-java-agent/instrumentation/jdbc/build.gradle index 3f02f8a95b9..281b1b2741d 100644 --- a/dd-java-agent/instrumentation/jdbc/build.gradle +++ b/dd-java-agent/instrumentation/jdbc/build.gradle @@ -1,6 +1,8 @@ plugins { id 'java-test-fixtures' id 'me.champeau.jmh' + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' } muzzle { @@ -11,9 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('oldH2Test', 'test') addTestSuiteForDir('oldPostgresTest', 'test') addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/build.gradle b/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/build.gradle index 299ed4490e9..01f208a7075 100644 --- a/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/build.gradle +++ b/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} muzzle { pass { @@ -5,9 +9,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' - addTestSuiteForDir('latestDepTest', 'test') tasks.named("compileTestGroovy", GroovyCompile) { diff --git a/dd-java-agent/instrumentation/jedis/jedis-1.4/build.gradle b/dd-java-agent/instrumentation/jedis/jedis-1.4/build.gradle index e1ca8af38da..6445230cda5 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-1.4/build.gradle +++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "redis.clients" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/jedis/jedis-3.0/build.gradle b/dd-java-agent/instrumentation/jedis/jedis-3.0/build.gradle index b0adcf72ca6..aecb98b3f92 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-3.0/build.gradle +++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { fail { group = "redis.clients" @@ -13,8 +17,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/jedis/jedis-4.0/build.gradle b/dd-java-agent/instrumentation/jedis/jedis-4.0/build.gradle index b3166b4d5f4..ff8613201c5 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-4.0/build.gradle +++ b/dd-java-agent/instrumentation/jedis/jedis-4.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { fail { @@ -13,8 +16,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/jersey/jersey-2.0/build.gradle b/dd-java-agent/instrumentation/jersey/jersey-2.0/build.gradle index 079a5e09156..905f6fd57a2 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-2.0/build.gradle +++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.glassfish.jersey.core' @@ -9,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_11 } diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/build.gradle b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/build.gradle index 4bd297d5456..41fba61a7b9 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/build.gradle +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = 'jersey_2' @@ -29,8 +33,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - configurations.configureEach { resolutionStrategy.deactivateDependencyLocking() } diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/build.gradle b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/build.gradle index 8c4054d4391..16a93dbb237 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/build.gradle +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = 'common' @@ -22,8 +26,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_11 } diff --git a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/build.gradle b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/build.gradle index c3b805708af..6bf6562b975 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-client-2.0/build.gradle +++ b/dd-java-agent/instrumentation/jersey/jersey-client-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.glassfish.jersey.core" @@ -9,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.0' compileOnly project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-client:jax-rs-client-2.0') diff --git a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/build.gradle b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/build.gradle index 981b7681fde..0ef19f1dcfa 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/build.gradle +++ b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { // Cant assert fails because muzzle assumes all instrumentations will fail // Instrumentations in jax-rs-annotations-2 will pass @@ -7,7 +11,6 @@ muzzle { versions = "[2.0, 3.0.0)" // javax.ws -> jakarta.ws at 3.0.0 } } -apply from: "$rootDir/gradle/java.gradle" dependencies { compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/build.gradle index 4eaaee67246..9d3505b189e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-11.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.eclipse.jetty' @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly(group: 'org.eclipse.jetty', name: 'jetty-server', version: '11.0.26') { exclude group: 'org.slf4j', module: 'slf4j-api' diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/build.gradle index d82bfd97905..0764180fa2b 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.eclipse.jetty' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005' } diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/build.gradle index 70a700f8294..3f1a49a535c 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.eclipse.jetty' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.1.3.v20120416' testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.1.3.v20120416' diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/build.gradle index ffcf95ba27c..5d71a724076 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.eclipse.jetty' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428' diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/build.gradle index f7dbb028001..c5cc394f40c 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.eclipse.jetty' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428' diff --git a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/build.gradle index 10fc0a659a9..0d2b1b95c2e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = '9_series' @@ -22,8 +26,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.21.v20190926' diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle index 00ddd8c272a..bef5247722f 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.eclipse.jetty" @@ -18,8 +22,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - tracerJava { addSourceSetFor(JavaVersion.VERSION_11) } diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle index bcb1bd91020..a434c011fd2 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.eclipse.jetty" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - tracerJava { addSourceSetFor(JavaVersion.VERSION_17) } diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/build.gradle index df91fc1874a..e281a15e906 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { /** * Jetty Client 10+ passes if muzzle is run with Java 11 but fails otherwise because it @@ -43,7 +47,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/build.gradle index f8761d9d9cc..ad0cbfbbfad 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '9.1.0.v20131115' diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-common/build.gradle index b72b2c63300..af665f065a8 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-common/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-common/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle index aab0069cbcb..4059ba06fef 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'idea' +} + muzzle { pass { name = "10_series" @@ -27,9 +32,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: "idea" - tracerJava { addSourceSetFor(JavaVersion.VERSION_11) } diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle index ae74abe7d1b..5c47c00818e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle @@ -1,3 +1,9 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'idea' + id 'java-test-fixtures' +} + muzzle { pass { group = "org.eclipse.jetty" @@ -6,10 +12,6 @@ muzzle { } } -apply plugin: 'java-test-fixtures' -apply from: "$rootDir/gradle/java.gradle" -apply plugin: "idea" - tracerJava { addSourceSetFor(JavaVersion.VERSION_11) } diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle index 25b4cd11e3f..8e59c8f5849 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.eclipse.jetty" @@ -13,8 +17,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - tracerJava { addSourceSetFor(JavaVersion.VERSION_17) } diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle index a9b691b133b..92176cc9d52 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.eclipse.jetty" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepForkedTest', 'test') // Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure servlet 2.x instrumentation applies diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle index 0b34ae39684..d5a60ccda19 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.eclipse.jetty" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepForkedTest', 'test') // Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure servlet 2.x instrumentation applies diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/build.gradle index c341a6447fe..5ec47730e36 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.eclipse.jetty" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir("latestDepTest", "test") addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test") diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle index e61298681e1..0933dca87db 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'java-test-fixtures' +} + muzzle { pass { name = '9_full_series' @@ -15,9 +20,6 @@ muzzle { } } -apply plugin: 'java-test-fixtures' -apply from: "$rootDir/gradle/java.gradle" - // Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure servlet 2.x instrumentation applies configurations.testImplementation { exclude group: 'javax.servlet', module: 'javax.servlet-api' diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/build.gradle index 736630c640e..824c3bb1899 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.eclipse.jetty" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/build.gradle index 144358e05f5..e4710c69b83 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.4.21/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = 'between_9421_and_10' @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle index a12459484d7..b17029bcb14 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle @@ -1,10 +1,12 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { coreJdk() } } -apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/build.gradle b/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/build.gradle index 982b43523a2..3871c53b668 100644 --- a/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/build.gradle +++ b/dd-java-agent/instrumentation/jms/jakarta-jms-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = "jakarta.jms" @@ -9,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 } diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/build.gradle b/dd-java-agent/instrumentation/jms/javax-jms-1.1/build.gradle index 74b9d050a9a..d4459697078 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/build.gradle +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'java-test-fixtures' +} + muzzle { pass { name = "javax.jms" @@ -13,9 +18,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'java-test-fixtures' - repositories { maven { // only place that has org.jboss.naming:jnpserver:5.0.3.GA publicly accessible diff --git a/dd-java-agent/instrumentation/jose-jwt-4.0/build.gradle b/dd-java-agent/instrumentation/jose-jwt-4.0/build.gradle index 4afd7d1245d..945778555ed 100644 --- a/dd-java-agent/instrumentation/jose-jwt-4.0/build.gradle +++ b/dd-java-agent/instrumentation/jose-jwt-4.0/build.gradle @@ -1,12 +1,13 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { coreJdk() } } - -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/jsp-2.3/build.gradle b/dd-java-agent/instrumentation/jsp-2.3/build.gradle index 05687de2566..fc892add233 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/build.gradle +++ b/dd-java-agent/instrumentation/jsp-2.3/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/build.gradle b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/build.gradle index 79da4f104d0..4447a85117c 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-cucumber-5.4/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - muzzle { pass { group = 'io.cucumber' diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/build.gradle b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/build.gradle index c0b5b90a151..aca8653a90b 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4-munit-0.7.28/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' + id 'scala' } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' - muzzle { pass { group = 'org.scalameta' diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/build.gradle b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/build.gradle index 3abd9fe6cfa..ad6c2f982dd 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/build.gradle @@ -4,9 +4,9 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { id 'org.jetbrains.kotlin.jvm' id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/test-with-kotlin.gradle" muzzle { diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/build.gradle b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/build.gradle index d3c1efc47c7..10efc5f80c2 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - muzzle { pass { group = 'junit' diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/build.gradle b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/build.gradle index a6245277f19..a6773c4183a 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-cucumber-5.4/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - muzzle { pass { group = 'io.cucumber' diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/build.gradle b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/build.gradle index bb8e09d275f..afdb81fbd7b 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - def spockGroovyVersion = '3.0' muzzle { diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/build.gradle b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/build.gradle index 327e8a58a39..5d4f3d13327 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - // JUnit5 5.3.0+ version is needed because of the fix in the TestInheritance test suite names. // Previously at that version, the test suite name was the base class. def jupiterVersion = '5.3.0' diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/build.gradle b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/build.gradle index 3e25a7d7cf3..1b752c3cb5b 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - def jupiterVersion = '5.8.0' def platformVersion = '1.8.0' diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle index d1eb7ae1226..b7c5ce09cc0 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = "since-0.11" @@ -15,8 +19,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('latestDepTest') addTestSuite('iastLatestDepTest3') diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle index 1857bed17f1..5633f6c55cc 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.kafka" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - tracerJava { addSourceSetFor(JavaVersion.VERSION_17) } diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-common/build.gradle index bdcc0feaccc..64fad708b2f 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-common/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-common/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0' diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle index 57745940c19..16d39c5d770 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.kafka" @@ -49,8 +53,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.apache.kafka', name: 'connect-runtime', version: '0.11.0.0' diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/build.gradle index 0fdffd3d57d..cc5de57a67b 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.kafka" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('latestDepTest') dependencies { diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/build.gradle index ee29de38c05..2bc55183f88 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-1.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.kafka" @@ -6,9 +10,6 @@ muzzle { } } - -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('latestDepTest') dependencies { diff --git a/dd-java-agent/instrumentation/karate-1.0/build.gradle b/dd-java-agent/instrumentation/karate-1.0/build.gradle index f557d620147..316ba8d3f25 100644 --- a/dd-java-agent/instrumentation/karate-1.0/build.gradle +++ b/dd-java-agent/instrumentation/karate-1.0/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - muzzle { pass { group = 'com.intuit.karate' diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/build.gradle b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/build.gradle index 261c652bffc..2e0499bdab5 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/build.gradle +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/build.gradle @@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { id 'java-test-fixtures' id 'org.jetbrains.kotlin.jvm' + id 'dd-trace-java.module.instrumentation' } muzzle { @@ -25,7 +26,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/test-with-kotlin.gradle" kotlin { diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/build.gradle b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/build.gradle index 3eb173a4343..fc10c82ad81 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/build.gradle +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -8,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle index becb0a29ad7..f7da65550d8 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -8,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/liberty/liberty-20.0/build.gradle b/dd-java-agent/instrumentation/liberty/liberty-20.0/build.gradle index 6a549b0bd62..96eec5c67d4 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/build.gradle +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" def openlibertyHomeDir = project.layout.buildDirectory.dir("openliberty") String testWebAppDir = 'wlp/usr/servers/defaultServer/dropins/war/testapp' diff --git a/dd-java-agent/instrumentation/liberty/liberty-23.0/build.gradle b/dd-java-agent/instrumentation/liberty/liberty-23.0/build.gradle index f90c9eed237..048cf95f58f 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-23.0/build.gradle +++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/build.gradle @@ -3,8 +3,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'java-test-fixtures' id 'com.gradleup.shadow' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" def openlibertyHomeDir = project.layout.buildDirectory.dir("openliberty") String testWebAppDir = 'wlp/usr/servers/defaultServer/dropins/war/testapp' diff --git a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/build.gradle b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/build.gradle index 34d05cae255..0ef8c81ae6c 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-1.2.4/build.gradle +++ b/dd-java-agent/instrumentation/log4j/log4j-1.2.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'log4j' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - configurations { testImplementation.exclude group: 'org.slf4j', module: 'log4j-over-slf4j' testCompile.exclude group: 'org.slf4j', module: 'log4j-over-slf4j' diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.0/build.gradle b/dd-java-agent/instrumentation/log4j/log4j-2.0/build.gradle index dabb4684182..0de9620942a 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.0/build.gradle +++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} ext { log4jVersion = '2.0' diff --git a/dd-java-agent/instrumentation/log4j/log4j-2.7/build.gradle b/dd-java-agent/instrumentation/log4j/log4j-2.7/build.gradle index 3340664e742..f223f5c57f5 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.7/build.gradle +++ b/dd-java-agent/instrumentation/log4j/log4j-2.7/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/logback-1.0/build.gradle b/dd-java-agent/instrumentation/logback-1.0/build.gradle index 2b236f1c807..1d34234842a 100644 --- a/dd-java-agent/instrumentation/logback-1.0/build.gradle +++ b/dd-java-agent/instrumentation/logback-1.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/build.gradle b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/build.gradle index 9bedd56205d..20795f69fa6 100644 --- a/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/build.gradle +++ b/dd-java-agent/instrumentation/mail/jakarta-mail-2.0.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'jakarta.mail' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/build.gradle b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/build.gradle index d663304e94f..3514c50d778 100644 --- a/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/build.gradle +++ b/dd-java-agent/instrumentation/mail/javax-mail-1.4.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'javax.mail' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle b/dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle index 6afad36c487..a7773838c66 100644 --- a/dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle +++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/maven/maven-surefire-3.0/build.gradle b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/build.gradle index 8e5edcb7508..d70e6006052 100644 --- a/dd-java-agent/instrumentation/maven/maven-surefire-3.0/build.gradle +++ b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/build.gradle b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/build.gradle index a0747ac0162..5ab7d774af6 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "io.micronaut" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/build.gradle b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/build.gradle index fa51fcf53b9..9fb6978c9d0 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "io.micronaut" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/build.gradle b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/build.gradle index dfb8ecf594c..c2a120f861c 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "io.micronaut" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - tracerJava { addSourceSetFor(JavaVersion.VERSION_17) } diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/build.gradle b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/build.gradle index db3ce8e92cb..9fe44ca6089 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/build.gradle @@ -1,9 +1,11 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + /* * Classes that are common to all versions of the Micronaut instrumentation. */ -apply from: "$rootDir/gradle/java.gradle" - muzzle { pass { name = "micronaut-common" diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle index 9cdef640e2b..7e19b4edb4f 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-common/build.gradle @@ -1,9 +1,8 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/build.gradle index 72431e4eea4..e5110359df6 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = "driver-only" @@ -19,8 +23,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/build.gradle index b9d8fb54ce2..8822d596047 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.mongodb" @@ -25,8 +29,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/build.gradle index 4fa201cbd75..bbc11a5a13c 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.6/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.mongodb" @@ -25,8 +29,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/build.gradle index e6001a35fe8..71a55e33118 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-3/mongo-driver-3.8/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.mongodb" @@ -25,8 +29,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/build.gradle index 526a239351b..b4ee761702c 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-driver/mongo-driver-4.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -14,8 +17,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') addTestSuiteForDir('mongo43Test', 'test') diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/build.gradle index dadcb1afa34..9c87d0f1187 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-async-3.3/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/build.gradle index fafc53dd04c..ccf44f9650e 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.1/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/build.gradle index 75faf59a3f9..f436e6a8905 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-core-3.7/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/build.gradle b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/build.gradle index a0fe07f63d3..5a5b016f198 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/build.gradle +++ b/dd-java-agent/instrumentation/mongo/mongo-test/mongo-test-sync-3.10/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle index b25f5fe81f3..3e305f0dabb 100644 --- a/dd-java-agent/instrumentation/mule-4.5/build.gradle +++ b/dd-java-agent/instrumentation/mule-4.5/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'idea' +} + def muleVersion = '4.5.0' def appDir = "$projectDir/application" @@ -40,9 +45,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: "idea" - addTestSuiteForDir('mule46ForkedTest', 'test') addTestSuiteForDir('latestDepForkedTest', 'test') diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/build.gradle b/dd-java-agent/instrumentation/netty/netty-3.8/build.gradle index a720bebf57f..7aed55ef81e 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-3.8/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} testJvmConstraints { maxJavaVersion = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-4.0/build.gradle index e682fda1db6..b7d0217cfe7 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-4.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} testJvmConstraints { // asynchttpclient is not compatible with Java 11 diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/build.gradle b/dd-java-agent/instrumentation/netty/netty-4.1/build.gradle index d894c6cebbd..6e21cfafe98 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-4.1/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle index f9e79837f22..dee1d055cf1 100644 --- a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/netty/netty-common/build.gradle b/dd-java-agent/instrumentation/netty/netty-common/build.gradle index 119d5815109..7580017af4d 100644 --- a/dd-java-agent/instrumentation/netty/netty-common/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-common/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final' diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle index a9edc6abcae..afd2db5fd6a 100644 --- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle index 571f21ddfb5..5545816f318 100644 --- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/build.gradle b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/build.gradle index d602ab9c4ab..18e7aa925e1 100644 --- a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/build.gradle +++ b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'ognl' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'ognl', name: 'ognl', version: '3.3.2' testImplementation group: 'ognl', name: 'ognl', version: '3.3.2' diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle index 5f22c884db1..2bd3f1a5011 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + /* Note: The Interceptor class for OkHttp was not introduced until 2.2+, so we need to make sure the instrumentation is not loaded unless the dependency is 2.2+. @@ -17,8 +21,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle index 5ce7c997f99..46f6425aefd 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.squareup.okhttp3" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/build.gradle b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/build.gradle index ceda41c2804..1728cde9b91 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/build.gradle +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} def minVer = '3.0.1' diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-common/build.gradle b/dd-java-agent/instrumentation/opensearch/opensearch-common/build.gradle index de8cc79a792..f9585d17745 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-common/build.gradle +++ b/dd-java-agent/instrumentation/opensearch/opensearch-common/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-client', version: '1.0.0' diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/build.gradle b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/build.gradle index a821f4d3557..542e98a11d8 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/build.gradle +++ b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -8,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/build.gradle b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/build.gradle index 46487015b32..44034922256 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/build.gradle +++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -16,8 +19,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/opentelemetry/build.gradle b/dd-java-agent/instrumentation/opentelemetry/build.gradle index 5e69c67bd78..3d48cbcff41 100644 --- a/dd-java-agent/instrumentation/opentelemetry/build.gradle +++ b/dd-java-agent/instrumentation/opentelemetry/build.gradle @@ -1 +1,3 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/build.gradle b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/build.gradle index 40024727e01..f9a3a39f320 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/build.gradle +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + // Made this a variable so we can easily update to latest releases. def otelVersion = '0.3.0' @@ -11,8 +15,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/build.gradle b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/build.gradle index d11887584d0..65ea9fd5949 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/build.gradle +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + def openTelemetryVersion = '1.27.0' muzzle { @@ -10,8 +14,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/build.gradle b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/build.gradle index 05b71ae483f..88837de73ef 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/build.gradle +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + def openTelemetryVersion = '1.4.0' muzzle { @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/build.gradle b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/build.gradle index ebc3a17f87c..29fe37a90e3 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/build.gradle +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + def openTelemetryVersion = '1.47.0' muzzle { @@ -10,8 +14,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/build.gradle b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/build.gradle index f84949c26d3..3811b255e1e 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/build.gradle +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + def openTelemetryVersion = '1.20.0' muzzle { @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('latestDepTest') addTestSuiteForDir('latest1xDepTest', 'test') diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/build.gradle b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/build.gradle index 094cfbc7273..3ebcdbaa683 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/build.gradle +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + def openTelemetryVersion = '1.26.0' muzzle { @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/build.gradle b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/build.gradle index 7272bb5533b..d4fc87174fe 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/build.gradle +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { module = 'opentracing-util' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { implementation project(':dd-java-agent:instrumentation:opentracing:opentracing-common') diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/build.gradle b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/build.gradle index 5e115e3ab28..bece7580315 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/build.gradle +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { module = 'opentracing-util' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-common/build.gradle b/dd-java-agent/instrumentation/opentracing/opentracing-common/build.gradle index 8f7cad53ea7..8c672930ba8 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-common/build.gradle +++ b/dd-java-agent/instrumentation/opentracing/opentracing-common/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { compileOnly group: 'io.opentracing', name: 'opentracing-util', version: '0.31.0' diff --git a/dd-java-agent/instrumentation/org-json-20230227/build.gradle b/dd-java-agent/instrumentation/org-json-20230227/build.gradle index 1660c1f013f..0476a038fa4 100644 --- a/dd-java-agent/instrumentation/org-json-20230227/build.gradle +++ b/dd-java-agent/instrumentation/org-json-20230227/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = 'all' @@ -22,8 +26,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/osgi-4.3/build.gradle b/dd-java-agent/instrumentation/osgi-4.3/build.gradle index bdd779e33e9..290d07fd74b 100644 --- a/dd-java-agent/instrumentation/osgi-4.3/build.gradle +++ b/dd-java-agent/instrumentation/osgi-4.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { // old coordinates pass { @@ -14,8 +18,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.osgi', name: 'org.osgi.core', version: '4.3.0' } diff --git a/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle b/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle index d9ba9f90361..d9463124556 100644 --- a/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle +++ b/dd-java-agent/instrumentation/owasp-esapi-2.1/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { group = 'org.owasp.esapi' @@ -7,15 +12,12 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - configurations.configureEach { // shut up about broken xml-api pom relocation resolutionStrategy { force 'xml-apis:xml-apis:1.4.01' } } -apply plugin: 'dd-trace-java.call-site-instrumentation' addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle index f69a08031c1..482300dfd51 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + def pekkoVersion = '1.0.0' muzzle { @@ -18,7 +22,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle" addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle index 670814a6b77..651f31dc9a5 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle @@ -1,6 +1,8 @@ -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' -apply plugin: 'dd-trace-java.call-site-instrumentation' +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' + id 'dd-trace-java.call-site-instrumentation' +} // Since we are using different scala versions for different test sets, // we put the test classes in the baseTest test set so that the scala diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/build.gradle b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/build.gradle index c366188a5fc..7116949fbf6 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/build.gradle +++ b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') muzzle { diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/build.gradle b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/build.gradle index 479141c0875..e704f684ef4 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/build.gradle +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') muzzle { diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/build.gradle b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/build.gradle index d2df7ecd9dd..00b43ae594f 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/build.gradle +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-common/build.gradle b/dd-java-agent/instrumentation/play-ws/play-ws-common/build.gradle index 4ab1622c18a..1e54d757fb1 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-common/build.gradle +++ b/dd-java-agent/instrumentation/play-ws/play-ws-common/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} def scalaVersion = '2.12' diff --git a/dd-java-agent/instrumentation/play/play-2.3/build.gradle b/dd-java-agent/instrumentation/play/play-2.3/build.gradle index b6871bc0b14..8f4da297280 100644 --- a/dd-java-agent/instrumentation/play/play-2.3/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") @@ -19,8 +23,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // Play doesn't work with Java 9+ until 2.6.12 maxJavaVersion = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/play/play-2.4/build.gradle b/dd-java-agent/instrumentation/play/play-2.4/build.gradle index 7fef065ac1a..1560be1a6f5 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.4/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") @@ -19,8 +23,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // Play doesn't work with Java 9+ until 2.6.12 maxJavaVersion = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/play/play-2.6/build.gradle b/dd-java-agent/instrumentation/play/play-2.6/build.gradle index 472f5894c77..94a25f61a05 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.6/build.gradle @@ -1,3 +1,10 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' + id 'groovy' + id 'java-test-fixtures' +} + muzzle { extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") @@ -34,11 +41,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' -apply plugin: 'groovy' -apply plugin: 'java-test-fixtures' - testJvmConstraints { // Play doesn't work with Java 9+ until 2.6.12 maxJavaVersion = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle b/dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle index 63042d2515a..9969ff82256 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle +++ b/dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} + muzzle { extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") @@ -9,9 +14,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' - def configureRoutesCompilation(String sourceSetName) { def capitalizedName = sourceSetName.capitalize() def buildRoutesTask = tasks.register("build${capitalizedName}Routes", JavaExec) { diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.6/build.gradle b/dd-java-agent/instrumentation/play/play-appsec-2.6/build.gradle index 457c7ce58ba..1a9b2ecd168 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.6/build.gradle +++ b/dd-java-agent/instrumentation/play/play-appsec-2.6/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} + muzzle { extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") @@ -10,9 +15,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' - testJvmConstraints { // Play doesn't work with Java 9+ until 2.6.12 maxJavaVersion = JavaVersion.VERSION_1_8 diff --git a/dd-java-agent/instrumentation/play/play-appsec-2.7/build.gradle b/dd-java-agent/instrumentation/play/play-appsec-2.7/build.gradle index e03850f3a0b..bafe0738610 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-2.7/build.gradle +++ b/dd-java-agent/instrumentation/play/play-appsec-2.7/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} + muzzle { extraRepository("typesafe", "https://repo.typesafe.com/typesafe/maven-releases/") @@ -27,9 +32,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' - def configureRoutesCompilation(String sourceSetName) { def capitalizedName = sourceSetName.capitalize() def buildRoutesTask = tasks.register("build${capitalizedName}Routes", JavaExec) { diff --git a/dd-java-agent/instrumentation/play/play-appsec-common/build.gradle b/dd-java-agent/instrumentation/play/play-appsec-common/build.gradle index b1e219f2c52..3d48cbcff41 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-common/build.gradle +++ b/dd-java-agent/instrumentation/play/play-appsec-common/build.gradle @@ -1,3 +1,3 @@ -apply from: "$rootDir/gradle/java.gradle" - - +plugins { + id 'dd-trace-java.module.instrumentation' +} diff --git a/dd-java-agent/instrumentation/protobuf-3.0/build.gradle b/dd-java-agent/instrumentation/protobuf-3.0/build.gradle index cd5e818975f..697a9a67db8 100644 --- a/dd-java-agent/instrumentation/protobuf-3.0/build.gradle +++ b/dd-java-agent/instrumentation/protobuf-3.0/build.gradle @@ -2,10 +2,9 @@ import datadog.gradle.plugin.HostPlatform plugins { id 'com.google.protobuf' version '0.10.0' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - muzzle { pass { group = "com.google.protobuf" diff --git a/dd-java-agent/instrumentation/quartz-2.0/build.gradle b/dd-java-agent/instrumentation/quartz-2.0/build.gradle index dff4d59cd2c..a37d16741b6 100644 --- a/dd-java-agent/instrumentation/quartz-2.0/build.gradle +++ b/dd-java-agent/instrumentation/quartz-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.quartz-scheduler' @@ -9,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteForDir('version40Test', 'test') diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle index dcbc028a207..c7b17611d5b 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.rabbitmq" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteForDir('latestReactorTest', 'reactorTest') diff --git a/dd-java-agent/instrumentation/ratpack-1.5/build.gradle b/dd-java-agent/instrumentation/ratpack-1.5/build.gradle index e6572cbe135..723ae614a96 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/build.gradle +++ b/dd-java-agent/instrumentation/ratpack-1.5/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -9,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/build.gradle b/dd-java-agent/instrumentation/reactive-streams-1.0/build.gradle index f6a415a03fc..a76d54bd7a3 100644 --- a/dd-java-agent/instrumentation/reactive-streams-1.0/build.gradle +++ b/dd-java-agent/instrumentation/reactive-streams-1.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + def reactiveStreamsVersion = '1.0.0' muzzle { @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/build.gradle b/dd-java-agent/instrumentation/reactor-core-3.1/build.gradle index e40cffa6d79..e91500fb3e1 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/build.gradle +++ b/dd-java-agent/instrumentation/reactor-core-3.1/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -7,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('latestDepTest') dependencies { diff --git a/dd-java-agent/instrumentation/reactor-netty-1.0/build.gradle b/dd-java-agent/instrumentation/reactor-netty-1.0/build.gradle index 91bd12b705b..5c6b1c9e84f 100644 --- a/dd-java-agent/instrumentation/reactor-netty-1.0/build.gradle +++ b/dd-java-agent/instrumentation/reactor-netty-1.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { fail { @@ -13,8 +16,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('latestDepTest') dependencies { diff --git a/dd-java-agent/instrumentation/rediscala-1.8/build.gradle b/dd-java-agent/instrumentation/rediscala-1.8/build.gradle index 474f559cddb..1465b95593b 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8/build.gradle +++ b/dd-java-agent/instrumentation/rediscala-1.8/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -43,8 +46,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/build.gradle b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/build.gradle index 21825c7f7cc..3b79ecba0f6 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/build.gradle +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -9,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/build.gradle b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/build.gradle index c6ffc4b3669..8ac63db2bdb 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/build.gradle +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -9,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/build.gradle b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/build.gradle index 426b68fb77e..159330befa4 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/build.gradle +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -9,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/renaissance-0.7/build.gradle b/dd-java-agent/instrumentation/renaissance-0.7/build.gradle index 5e69c67bd78..3d48cbcff41 100644 --- a/dd-java-agent/instrumentation/renaissance-0.7/build.gradle +++ b/dd-java-agent/instrumentation/renaissance-0.7/build.gradle @@ -1 +1,3 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle index ff081421509..4a3343fa18f 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle @@ -1,5 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'idea' +plugins { + id 'dd-trace-java.module.instrumentation' + id 'idea' +} testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle index fe59287cbc2..be7d6cbf5f1 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle @@ -1,5 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'idea' +plugins { + id 'dd-trace-java.module.instrumentation' + id 'idea' +} testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/build.gradle b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/build.gradle index 6d47775ca26..46ee5708902 100644 --- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/build.gradle +++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { // Cant assert fails because muzzle assumes all instrumentations will fail // Instrumentations in jax-rs-annotations-2 will pass @@ -15,7 +19,6 @@ muzzle { versions = "[3.5.0.Final,)" } } -apply from: "$rootDir/gradle/java.gradle" dependencies { compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/build.gradle b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/build.gradle index 7dfbfdb744b..dd039c4a71e 100644 --- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/build.gradle +++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { // Cant assert fails because muzzle assumes all instrumentations will fail // Instrumentations in jax-rs-annotations-2 will pass @@ -9,7 +13,6 @@ muzzle { versions = "[3.1.0.Final,3.5.0.Final)" } } -apply from: "$rootDir/gradle/java.gradle" dependencies { compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/build.gradle b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/build.gradle index d62fde063d9..e13bbfaed94 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/build.gradle +++ b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.jboss.resteasy" @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.jboss.resteasy', name: 'resteasy-client', version: '3.0.0.Final' diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/build.gradle b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/build.gradle index 700d97ad611..c48d668049d 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/build.gradle +++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'java-test-fixtures' +} + muzzle { pass { name = 'jaxrs' @@ -13,9 +18,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'java-test-fixtures' - addTestSuite('nettyTest') addTestSuite('jettyAsyncTest') diff --git a/dd-java-agent/instrumentation/restlet-2.2/build.gradle b/dd-java-agent/instrumentation/restlet-2.2/build.gradle index 3ca1279062c..5a526257b83 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/build.gradle +++ b/dd-java-agent/instrumentation/restlet-2.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { extraRepository("restlet", "https://maven.restlet.talend.com/") @@ -9,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - repositories { maven { // only place that has 'org.restlet.jse:org.restlet' publicly accessible diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/build.gradle b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/build.gradle index f1ccdf7db98..516456dd2da 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/build.gradle +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -7,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepJava11Test', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/build.gradle b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/build.gradle index 2da2642f8c9..5f379813f4f 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/build.gradle +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "javax.ws.rs" @@ -11,8 +15,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1' diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/build.gradle b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/build.gradle index fecd82b8ae4..90d4658e363 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/build.gradle +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { fail { @@ -18,8 +21,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteForDir('resteasy31Test', 'test') addTestSuite('nestedTest') diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/build.gradle b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/build.gradle index 68b4b372590..565c3a76baa 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/build.gradle +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.sun.jersey" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/build.gradle b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/build.gradle index d815a85207e..f9a92752266 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/build.gradle +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "javax.ws.rs" @@ -14,8 +18,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/build.gradle b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/build.gradle index 868c732de6c..d4a7d35da53 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/build.gradle +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/build.gradle b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/build.gradle index 3cd3503b89c..69145bda5e4 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/build.gradle +++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -7,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/scala/scala-2.10.7/build.gradle b/dd-java-agent/instrumentation/scala/scala-2.10.7/build.gradle index 498efc5814a..f47607c5885 100644 --- a/dd-java-agent/instrumentation/scala/scala-2.10.7/build.gradle +++ b/dd-java-agent/instrumentation/scala/scala-2.10.7/build.gradle @@ -1,3 +1,9 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { group = 'org.scala-lang' @@ -7,10 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' -apply plugin: 'dd-trace-java.call-site-instrumentation' - dependencies { // First 2.10 version that accepts target 1.8 compileOnly group: 'org.scala-lang', name: 'scala-library', version: '2.10.7' diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/build.gradle b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/build.gradle index fbd8731f5e8..0b072f02eb7 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/build.gradle +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} muzzle { pass { @@ -8,9 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' // Don't use test-with-scala since we want to pick our own version. - /** * This project has instrumentation to support Scala's copy of ForkJoinPool which was added in 2.8 and removed in 2.11. * It also has additional generic tests for scala context propagation support beyond 2.11 which are covered in latest12Test and latestDepTest. diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/build.gradle b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/build.gradle index 6f35ebf59e6..540d69c4668 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/build.gradle +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.10/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} muzzle { pass { @@ -8,22 +12,16 @@ muzzle { } } -// We need to set up the spotless targets here before we apply the standard settings to avoid -// having all the scala files in the common test directories being added as well, making spotless -// fail because the files are outside this project directory -apply plugin: 'com.diffplug.spotless' +// Keep Spotless scoped to this project; shared source sets are pulled in from scala-promise-common. spotless { groovy { target('src/**/*.groovy') + excludeJava(false) } scala { target('src/**/*.scala') } } -project.ext.groovySkipJavaExclude = true - -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' // Don't use test-with-scala since we want to pick our own version. // Ensure the common project is evaluated before we access its source sets evaluationDependsOn(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-common') diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/build.gradle b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/build.gradle index d9e9c16f706..25311f9c209 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/build.gradle +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-2.13/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} muzzle { pass { @@ -8,22 +12,16 @@ muzzle { } } -// We need to set up the spotless targets here before we apply the standard settings to avoid -// having all the scala files in the common test directories being added as well, making spotless -// fail because the files are outside this project directory -apply plugin: 'com.diffplug.spotless' +// Keep Spotless scoped to this project; shared source sets are pulled in from scala-promise-common. spotless { groovy { target('src/**/*.groovy') + excludeJava(false) } scala { target('src/**/*.scala') } } -project.ext.groovySkipJavaExclude = true - -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' // Don't use test-with-scala since we want to pick our own version. // Ensure the common project is evaluated before we access its source sets evaluationDependsOn(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-common') diff --git a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/build.gradle b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/build.gradle index b87e40df348..14da6590439 100644 --- a/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/build.gradle +++ b/dd-java-agent/instrumentation/scala/scala-promise/scala-promise-common/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} + /* * Classes that are common to all versions of the Scala promise instrumentation. */ @@ -10,9 +15,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' - tasks.named("compileTestGroovy", GroovyCompile) { classpath += files(sourceSets.test.scala.classesDirectory) } diff --git a/dd-java-agent/instrumentation/scalatest-3.0.8/build.gradle b/dd-java-agent/instrumentation/scalatest-3.0.8/build.gradle index 26ede796857..e7fc69f2339 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/build.gradle +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' + id 'scala' } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' - muzzle { pass { group = 'org.scalatest' diff --git a/dd-java-agent/instrumentation/selenium-3.13/build.gradle b/dd-java-agent/instrumentation/selenium-3.13/build.gradle index ea944f04aa9..207604f68cd 100644 --- a/dd-java-agent/instrumentation/selenium-3.13/build.gradle +++ b/dd-java-agent/instrumentation/selenium-3.13/build.gradle @@ -1,10 +1,9 @@ plugins { id 'java-test-fixtures' id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - muzzle { pass { group = 'org.seleniumhq.selenium' diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/build.gradle b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/build.gradle index 2c7adbc93f1..3a244217554 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/build.gradle +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.instrumentation' } muzzle { @@ -15,8 +16,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - tracerJava { addSourceSetFor(JavaVersion.VERSION_11) } diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/build.gradle b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/build.gradle index d8daf9a0c5b..30d5f128b6f 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/build.gradle +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.instrumentation' } muzzle { @@ -16,8 +17,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_11 } diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle index 93ffdc1a131..7181926b0f7 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle @@ -2,6 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' } muzzle { @@ -12,9 +14,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - // jakarta.servlet-api dependencies are compiled with Java 11 and // the gradle muzzle tasks uses the JVM gradle is running with if (!JavaVersion.current().java11Compatible) { diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/build.gradle index c8c6bdd7200..c6c22cd0073 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/build.gradle +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = 'servlet-2.x' @@ -26,8 +30,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') // Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure IastServlet2Instrumentation applies (requires no javax.servlet.AsyncEvent) diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle index d41f00e0436..de2fb9ca8b0 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle @@ -1,5 +1,7 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' } muzzle { @@ -24,9 +26,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteForDir('latestDepForkedTest', 'test') diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle index 5cad75765a3..2e5ccb1485c 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { group = "javax.servlet" @@ -12,9 +17,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - // Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure servlet 2.x instrumentation applies configurations.testImplementation { exclude group: 'javax.servlet', module: 'javax.servlet-api' diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/build.gradle index 3739427a6fc..71e23bafe48 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/build.gradle +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.3' diff --git a/dd-java-agent/instrumentation/slick-3.2/build.gradle b/dd-java-agent/instrumentation/slick-3.2/build.gradle index a4134bd467d..84786e4014e 100644 --- a/dd-java-agent/instrumentation/slick-3.2/build.gradle +++ b/dd-java-agent/instrumentation/slick-3.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'scala' +} muzzle { pass { @@ -5,9 +9,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' - addTestSuiteForDir('latestDepTest', 'test') tasks.named("compileTestGroovy", GroovyCompile) { diff --git a/dd-java-agent/instrumentation/snakeyaml-1.33/build.gradle b/dd-java-agent/instrumentation/snakeyaml-1.33/build.gradle index 5decb514c66..fce2bae7fb7 100644 --- a/dd-java-agent/instrumentation/snakeyaml-1.33/build.gradle +++ b/dd-java-agent/instrumentation/snakeyaml-1.33/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = 'snakeyaml-1.x' @@ -13,7 +17,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle index 90385de3196..06056f919dd 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "com.alipay.sofa" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/spark/spark-common/build.gradle b/dd-java-agent/instrumentation/spark/spark-common/build.gradle index f19ebd38b4a..82c2ead44fd 100644 --- a/dd-java-agent/instrumentation/spark/spark-common/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark-common/build.gradle @@ -1,8 +1,8 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" configurations.configureEach { resolutionStrategy.deactivateDependencyLocking() } diff --git a/dd-java-agent/instrumentation/spark/spark-executor-common/build.gradle b/dd-java-agent/instrumentation/spark/spark-executor-common/build.gradle index 2bee9db2042..b9e0ff83bfb 100644 --- a/dd-java-agent/instrumentation/spark/spark-executor-common/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark-executor-common/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.spark" @@ -13,8 +17,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - // Since we are using different scala versions for different test sets, // we put the test classes in the baseTest test set so that the scala // version is not inherited diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle index ae08816c90f..a4398404da5 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.instrumentation' } def sparkVersion = '2.4.0' @@ -13,7 +14,6 @@ muzzle { assertInverse = true } } -apply from: "$rootDir/gradle/java.gradle" configurations.configureEach { resolutionStrategy.deactivateDependencyLocking() diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle index 4f5928c33f1..6c298eb9d49 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.instrumentation' } // Support for 2.13 added in 3.2.0 https://issues.apache.org/jira/browse/SPARK-25075 @@ -20,8 +21,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuite('test_spark32') diff --git a/dd-java-agent/instrumentation/spark/sparkjava-2.3/build.gradle b/dd-java-agent/instrumentation/spark/sparkjava-2.3/build.gradle index d2c1dabe2a2..94518606ef5 100644 --- a/dd-java-agent/instrumentation/spark/sparkjava-2.3/build.gradle +++ b/dd-java-agent/instrumentation/spark/sparkjava-2.3/build.gradle @@ -1,5 +1,9 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} // building against 2.3 and testing against 2.4 because JettyHandler is available since 2.4 only + muzzle { pass { group = "com.sparkjava" @@ -9,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/spray-1.3/build.gradle b/dd-java-agent/instrumentation/spray-1.3/build.gradle index d0249a9f8e9..0bac9cc8f76 100644 --- a/dd-java-agent/instrumentation/spray-1.3/build.gradle +++ b/dd-java-agent/instrumentation/spray-1.3/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} def scalaVersion = '2.11' @@ -9,7 +12,6 @@ muzzle { } } -apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/test-with-scala.gradle" dependencies { diff --git a/dd-java-agent/instrumentation/spring/spring-beans-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-beans-3.1/build.gradle index 053967c13fa..a075da3cd7a 100644 --- a/dd-java-agent/instrumentation/spring/spring-beans-3.1/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-beans-3.1/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -7,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.springframework', name: 'spring-beans', version: '3.1.0.RELEASE' } diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle b/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle index 63904ad24cc..c4ca210a38c 100644 --- a/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.springframework.boot' @@ -12,8 +16,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir("boot1LatestDepTest", "test") addTestSuiteForDir("boot2Test", "test") addTestSuiteForDir("boot2LatestDepTest", "test") diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle index 9636443e02c..455f73b2427 100644 --- a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -10,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - tasks.named("compileJava", JavaCompile) { // TODO // public class HeaderUtils { diff --git a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/build.gradle b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/build.gradle index 61399ab0426..1ee0528db9d 100644 --- a/dd-java-agent/instrumentation/spring/spring-core-3.2.2/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-core-3.2.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.springframework' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/build.gradle b/dd-java-agent/instrumentation/spring/spring-data-1.8/build.gradle index 12816958144..3499ad9a4be 100644 --- a/dd-java-agent/instrumentation/spring/spring-data-1.8/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + // This file includes software developed at SignalFx muzzle { @@ -20,8 +24,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // TODO Java 17: This version of spring-data doesn't support Java 17 maxJavaVersion = JavaVersion.VERSION_15 diff --git a/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle index 31461297975..11485873251 100644 --- a/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.springframework' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/build.gradle index c716d5b3d08..b60941adfcf 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/build.gradle @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion plugins { id 'org.jetbrains.kotlin.jvm' + id 'dd-trace-java.module.instrumentation' } muzzle { @@ -17,7 +18,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/test-with-kotlin.gradle" testJvmConstraints { diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/build.gradle b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/build.gradle index cfc3fc1facd..b1c9441a9e5 100644 --- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -8,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle index a90ff8163e2..640c5a60ee2 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.springframework' @@ -14,8 +18,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('latestDepTest') addTestSuiteExtendingForDir('latestDepForkedTest','latestDepTest', 'latestDepTest') addTestSuiteForDir('spring6Test', 'test') diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/build.gradle index ef32ea2025d..99be2ff8c06 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.springframework.security' @@ -6,7 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') final springSecurityVersion = '5.8.2' diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/build.gradle index e271c5ad55c..242a2581a61 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle index ae9f332895f..3e3af47ee95 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = "webflux_5.0.0+_with_netty_0.8.0" @@ -58,8 +62,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteForDir('latestBoot20Test', 'bootTest') addTestSuiteForDir('latestBoot24Test', 'bootTest') diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle index 862078e6661..4addf158bd6 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle index b78ba6edd6f..b6a2f9d9942 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.springframework' @@ -31,8 +35,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite("latestDepTest") addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "latestDepTest") diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle index 1fba7948298..03759b23606 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { group = 'org.springframework' @@ -7,9 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - dependencies { compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '5.3.23' compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1' diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle index 95fde4e327f..7eed02a9552 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.springframework' @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - tracerJava { addSourceSetFor(JavaVersion.VERSION_17) } diff --git a/dd-java-agent/instrumentation/spring/spring-ws-2.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-ws-2.0/build.gradle index afdecf0205d..2a40ae1a131 100644 --- a/dd-java-agent/instrumentation/spring/spring-ws-2.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-ws-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + def minVersion = '2.0.0.RELEASE' muzzle { @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle b/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle index 81a3331232b..6563b7c276d 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle +++ b/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "net.spy" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/synapse-3.0/build.gradle b/dd-java-agent/instrumentation/synapse-3.0/build.gradle index ff064a0e6c4..ea1d2aa4805 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/build.gradle +++ b/dd-java-agent/instrumentation/synapse-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "org.apache.synapse" @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') configurations.configureEach { // the version used by Synapse isn't available in a public repository - we don't need it, so exclude it diff --git a/dd-java-agent/instrumentation/testng/testng-6.4/build.gradle b/dd-java-agent/instrumentation/testng/testng-6.4/build.gradle index 31d3922a8c1..0d8bdb3439f 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/build.gradle +++ b/dd-java-agent/instrumentation/testng/testng-6.4/build.gradle @@ -1,10 +1,9 @@ plugins { id 'java-test-fixtures' id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - muzzle { pass { group = 'org.testng' diff --git a/dd-java-agent/instrumentation/testng/testng-7.0/build.gradle b/dd-java-agent/instrumentation/testng/testng-7.0/build.gradle index 249778894c1..c5b7aff705b 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/build.gradle +++ b/dd-java-agent/instrumentation/testng/testng-7.0/build.gradle @@ -1,10 +1,9 @@ plugins { id 'java-test-fixtures' id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - muzzle { pass { group = 'org.testng' diff --git a/dd-java-agent/instrumentation/testng/testng-common/build.gradle b/dd-java-agent/instrumentation/testng/testng-common/build.gradle index 99a6a8557d9..5e6e910b764 100644 --- a/dd-java-agent/instrumentation/testng/testng-common/build.gradle +++ b/dd-java-agent/instrumentation/testng/testng-common/build.gradle @@ -1,9 +1,8 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.instrumentation' } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.testng', name: 'testng', version: '6.4' diff --git a/dd-java-agent/instrumentation/thymeleaf-3.0/build.gradle b/dd-java-agent/instrumentation/thymeleaf-3.0/build.gradle index e3a1385d75d..978c79f75dd 100644 --- a/dd-java-agent/instrumentation/thymeleaf-3.0/build.gradle +++ b/dd-java-agent/instrumentation/thymeleaf-3.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'org.thymeleaf' @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/build.gradle b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/build.gradle index 1aec568bfae..415082ba4d1 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/build.gradle +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { compileOnly project(':dd-java-agent:instrumentation:tibco-businessworks:tibco-businessworks-stubs') diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/build.gradle b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/build.gradle index 1aec568bfae..415082ba4d1 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/build.gradle +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} dependencies { compileOnly project(':dd-java-agent:instrumentation:tibco-businessworks:tibco-businessworks-stubs') diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/build.gradle b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/build.gradle index 5e69c67bd78..3d48cbcff41 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/build.gradle +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/build.gradle @@ -1 +1,3 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} diff --git a/dd-java-agent/instrumentation/tinylog-2.0/build.gradle b/dd-java-agent/instrumentation/tinylog-2.0/build.gradle index b503a24a89d..162417d3363 100644 --- a/dd-java-agent/instrumentation/tinylog-2.0/build.gradle +++ b/dd-java-agent/instrumentation/tinylog-2.0/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle index 4df403c20df..29dbc60e491 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle +++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { // Catalina doesn't reliably depend on coyote, so we use a different dependency that does. pass { @@ -45,8 +49,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('latestDepTest') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'latestDepTest') diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/build.gradle index 2b3f2fc83aa..ac66999e617 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/build.gradle +++ b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + evaluationDependsOn ':dd-java-agent:instrumentation:tomcat:tomcat-5.5' muzzle { @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '9.0.0.M1' } diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/build.gradle index 5239d2d3148..b6e0a2007a1 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/build.gradle +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-5.5/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + evaluationDependsOn ':dd-java-agent:instrumentation:tomcat:tomcat-5.5' muzzle { @@ -47,8 +51,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'tomcat', name: 'tomcat-util', version: '5.5.23' compileOnly group: 'tomcat', name: 'tomcat-coyote', version: '5.5.23' diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/build.gradle index aff48d2fe45..67cb1a7ea40 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/build.gradle +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-6.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { // despite the name of module, this doesn't apply to tomcat < 6.0.35 or 7.0-7.0.22 pass { @@ -19,8 +23,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.apache.tomcat', name: 'coyote', version: '6.0.53' } diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/build.gradle index 46143d86080..b8967c0829e 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/build.gradle +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + evaluationDependsOn ':dd-java-agent:instrumentation:tomcat:tomcat-5.5' muzzle { @@ -24,8 +28,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '7.0.4' compileOnly group: 'org.apache.tomcat', name: 'tomcat-coyote', version: '7.0.4' diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle index bcc417844be..e6f844fb59f 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle +++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} configurations.configureEach { // shut up about broken xml-api pom relocation diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/build.gradle b/dd-java-agent/instrumentation/twilio-0.0.1/build.gradle index 8c48f908e26..7756ea7038d 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/build.gradle +++ b/dd-java-agent/instrumentation/twilio-0.0.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'com.twilio.sdk' @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuite('latestDepTest') dependencies { diff --git a/dd-java-agent/instrumentation/unbescape-1.1/build.gradle b/dd-java-agent/instrumentation/unbescape-1.1/build.gradle index f566ec1c04c..7af5d056fde 100644 --- a/dd-java-agent/instrumentation/unbescape-1.1/build.gradle +++ b/dd-java-agent/instrumentation/unbescape-1.1/build.gradle @@ -1,3 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} + muzzle { pass { group = 'org.unbescape' @@ -7,9 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/build.gradle b/dd-java-agent/instrumentation/undertow/undertow-2.0/build.gradle index 526251884d9..5cad56e536a 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/build.gradle +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "io.undertow" @@ -25,8 +29,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle b/dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle index f69efe8561e..32b34dc25b4 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle +++ b/dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "io.undertow" @@ -14,8 +18,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') addTestSuiteForDir('latest22Test', 'test') diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/build.gradle b/dd-java-agent/instrumentation/undertow/undertow-common/build.gradle index d5c30715b30..77235ef89b3 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-common/build.gradle +++ b/dd-java-agent/instrumentation/undertow/undertow-common/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "io.undertow" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'io.undertow', name: 'undertow-core', version: '2.0.0.Final' } diff --git a/dd-java-agent/instrumentation/valkey-java-5.3/build.gradle b/dd-java-agent/instrumentation/valkey-java-5.3/build.gradle index a3f013b59d3..11bdfce79e4 100644 --- a/dd-java-agent/instrumentation/valkey-java-5.3/build.gradle +++ b/dd-java-agent/instrumentation/valkey-java-5.3/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -7,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/velocity-1.5/build.gradle b/dd-java-agent/instrumentation/velocity-1.5/build.gradle index 2a15f1f5759..64629cae059 100644 --- a/dd-java-agent/instrumentation/velocity-1.5/build.gradle +++ b/dd-java-agent/instrumentation/velocity-1.5/build.gradle @@ -1,6 +1,8 @@ +plugins { + id 'dd-trace-java.module.instrumentation' + id 'dd-trace-java.call-site-instrumentation' +} -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'dd-trace-java.call-site-instrumentation' addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle index 47917d808bd..4485ea3aa32 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle index fcb046147b0..ecdd088f75a 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle index c87098d8a90..c8f457ac350 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle index 9f14f55f027..99a8aee5236 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle @@ -1,5 +1,6 @@ - -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle index 16e8f6d2ba8..bbb2bda1341 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/build.gradle index ed6c6a1ebba..77488806a6b 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = 'io.vertx' @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') addTestSuiteForDir('redis4xTest', 'test') diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/build.gradle index ad6648f1e2b..dcf9c400107 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.conventions.java' +} dependencies { compileOnly group: 'io.vertx', name: 'vertx-redis-client', version: '3.9.0' diff --git a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle index 7caeb34629d..4ef8163e366 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/build.gradle index 9dfcd4d305c..96c08e313ff 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle index 2344e2a0a81..e9470075356 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} testJvmConstraints { // TODO Java 17: This version of vertx-web doesn't support Java 17 diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle index 15fdca5ca49..08b8aad55db 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} testJvmConstraints { // TODO Java 17: This version of vertx-web doesn't support Java 17 diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle index 0a08edcc355..95d00861678 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} testJvmConstraints { // TODO Java 17: This version of vertx-web doesn't support Java 17 diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle index ee305e1e172..3ec0f980f0e 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} testJvmConstraints { // vertx-web doesn't support Java 17 until v4.2 diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle index fb61a90836b..443976e9750 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} tracerJava { addSourceSetFor(JavaVersion.VERSION_11) diff --git a/dd-java-agent/instrumentation/weaver-0.9/build.gradle b/dd-java-agent/instrumentation/weaver-0.9/build.gradle index 84b50e91755..d32c4a77959 100644 --- a/dd-java-agent/instrumentation/weaver-0.9/build.gradle +++ b/dd-java-agent/instrumentation/weaver-0.9/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.instrumentation.testing-framework-tests' + id 'dd-trace-java.module.instrumentation' + id 'scala' } -apply from: "$rootDir/gradle/java.gradle" -apply plugin: 'scala' - muzzle { pass { group = 'com.disneystreaming' diff --git a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle index 8b3bacba81f..921e8706994 100644 --- a/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle +++ b/dd-java-agent/instrumentation/websocket/jakarta-websocket-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = "jakarta-websocket" @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_11 } diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/build.gradle b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/build.gradle index ed48fb2bb34..6864854e19e 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/build.gradle +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = "javax-websocket" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir("latestDepTest", "test") dependencies { diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/build.gradle index 200313e411c..521412046f5 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/build.gradle +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = 'jetty-websocket-10' @@ -9,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - tracerJava { addSourceSetFor(JavaVersion.VERSION_11) } diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/build.gradle index b293712a862..0c0c869337a 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/build.gradle +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = 'jetty-websocket-11' @@ -9,8 +13,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_11 } diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/build.gradle index 610757328b0..49d2812714e 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/build.gradle +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { name = 'jetty-websocket-12ee8' @@ -22,8 +26,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 } diff --git a/dd-java-agent/instrumentation/websphere-jmx-8.5/build.gradle b/dd-java-agent/instrumentation/websphere-jmx-8.5/build.gradle index 5e69c67bd78..3d48cbcff41 100644 --- a/dd-java-agent/instrumentation/websphere-jmx-8.5/build.gradle +++ b/dd-java-agent/instrumentation/websphere-jmx-8.5/build.gradle @@ -1 +1,3 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.instrumentation' +} diff --git a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle index 8b7656a1c8b..9b98b4234f5 100644 --- a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle +++ b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { extraRepository('redhat-ga', 'https://maven.repository.redhat.com/ga/') pass { @@ -8,8 +12,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - repositories { // Declared after java.gradle so Maven Central is tried first; this repo only acts as a // fallback for WildFly / JBoss artifacts not published to Central. The content filter diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/build.gradle b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/build.gradle index 50d4514d644..9a8419d5225 100644 --- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/build.gradle +++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/build.gradle @@ -1,3 +1,6 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} muzzle { pass { @@ -7,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/build.gradle b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/build.gradle index 0a15a4eaee2..267e6b8bcc0 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/build.gradle +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "javax.jws" @@ -6,8 +10,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - dependencies { compileOnly group: 'javax.jws', name: 'javax.jws-api', version: '1.1' diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/build.gradle b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/build.gradle index d4106589bbe..9aa4dca3cd8 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/build.gradle +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + muzzle { pass { group = "javax.xml.ws" @@ -7,8 +11,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/zio/zio-2.0/build.gradle b/dd-java-agent/instrumentation/zio/zio-2.0/build.gradle index 1ad5abb5fae..9ced0584557 100644 --- a/dd-java-agent/instrumentation/zio/zio-2.0/build.gradle +++ b/dd-java-agent/instrumentation/zio/zio-2.0/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'dd-trace-java.module.instrumentation' +} + def zioVersion = '2.0.0' def scalaVersion = '2.12' @@ -25,7 +29,6 @@ muzzle { } } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle" addTestSuiteForDir('latestDepTest', 'test') diff --git a/dd-java-agent/testing/build.gradle b/dd-java-agent/testing/build.gradle index 02d83f9db62..7fb35a08d6b 100644 --- a/dd-java-agent/testing/build.gradle +++ b/dd-java-agent/testing/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.testing-support' } -apply from: "$rootDir/gradle/java.gradle" - tasks.withType(JavaCompile).configureEach { configureCompiler(it, 8, JavaVersion.VERSION_1_8, "Need access to sun.misc package") } diff --git a/dd-smoke-tests/apm-tracing-disabled/build.gradle b/dd-smoke-tests/apm-tracing-disabled/build.gradle index d1a5504043a..70cfa763036 100644 --- a/dd-smoke-tests/apm-tracing-disabled/build.gradle +++ b/dd-smoke-tests/apm-tracing-disabled/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - description = 'ASM Standalone Billing Tests.' smokeTestApp { diff --git a/dd-smoke-tests/appsec/build.gradle b/dd-smoke-tests/appsec/build.gradle index 78b188094d8..ab36faedf0e 100644 --- a/dd-smoke-tests/appsec/build.gradle +++ b/dd-smoke-tests/appsec/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} description = 'appsec-smoke-tests' diff --git a/dd-smoke-tests/appsec/spring-tomcat7/build.gradle b/dd-smoke-tests/appsec/spring-tomcat7/build.gradle index 1bf1332ee95..986125c5e09 100644 --- a/dd-smoke-tests/appsec/spring-tomcat7/build.gradle +++ b/dd-smoke-tests/appsec/spring-tomcat7/build.gradle @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Spring Tomcat7 Smoke Tests.' jar { diff --git a/dd-smoke-tests/appsec/springboot-graphql/build.gradle b/dd-smoke-tests/appsec/springboot-graphql/build.gradle index 78ce91a23ca..6312506b9a6 100644 --- a/dd-smoke-tests/appsec/springboot-graphql/build.gradle +++ b/dd-smoke-tests/appsec/springboot-graphql/build.gradle @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot GraphQL Smoke Tests.' // The standard spring-boot plugin doesn't play nice with our project diff --git a/dd-smoke-tests/appsec/springboot-grpc/build.gradle b/dd-smoke-tests/appsec/springboot-grpc/build.gradle index 2bf39be910c..054af586fcb 100644 --- a/dd-smoke-tests/appsec/springboot-grpc/build.gradle +++ b/dd-smoke-tests/appsec/springboot-grpc/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // TODO Java 17: This version of spring-boot doesn't support Java 17 maxJavaVersion = JavaVersion.VERSION_15 diff --git a/dd-smoke-tests/appsec/springboot-security/build.gradle b/dd-smoke-tests/appsec/springboot-security/build.gradle index c052baef04d..492303c4704 100644 --- a/dd-smoke-tests/appsec/springboot-security/build.gradle +++ b/dd-smoke-tests/appsec/springboot-security/build.gradle @@ -3,9 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'java' id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Smoke Tests.' // The standard spring-boot plugin doesn't play nice with our project diff --git a/dd-smoke-tests/appsec/springboot/build.gradle b/dd-smoke-tests/appsec/springboot/build.gradle index 94c44259a45..45fcaa5a9d1 100644 --- a/dd-smoke-tests/appsec/springboot/build.gradle +++ b/dd-smoke-tests/appsec/springboot/build.gradle @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Smoke Tests.' // The standard spring-boot plugin doesn't play nice with our project diff --git a/dd-smoke-tests/armeria-grpc/build.gradle b/dd-smoke-tests/armeria-grpc/build.gradle index 835d07ca040..ec2467fbcdf 100644 --- a/dd-smoke-tests/armeria-grpc/build.gradle +++ b/dd-smoke-tests/armeria-grpc/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'com.google.protobuf' version '0.10.0' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 } diff --git a/dd-smoke-tests/backend-mock/build.gradle b/dd-smoke-tests/backend-mock/build.gradle index 096c944c0f2..afe720dfb26 100644 --- a/dd-smoke-tests/backend-mock/build.gradle +++ b/dd-smoke-tests/backend-mock/build.gradle @@ -1,4 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} + description = 'Mock Datadog backend used by smoke tests.' dependencies { diff --git a/dd-smoke-tests/build.gradle b/dd-smoke-tests/build.gradle index 15e070ea84d..9af814bc880 100644 --- a/dd-smoke-tests/build.gradle +++ b/dd-smoke-tests/build.gradle @@ -1,6 +1,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} description = 'dd-smoke-tests' diff --git a/dd-smoke-tests/cli/build.gradle b/dd-smoke-tests/cli/build.gradle index 60f90d36104..05d3a662386 100644 --- a/dd-smoke-tests/cli/build.gradle +++ b/dd-smoke-tests/cli/build.gradle @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Command Line Application Smoke Tests.' tasks.named("jar", Jar) { diff --git a/dd-smoke-tests/concurrent/java-21/build.gradle b/dd-smoke-tests/concurrent/java-21/build.gradle index 70c18a22517..2ee34666fbd 100644 --- a/dd-smoke-tests/concurrent/java-21/build.gradle +++ b/dd-smoke-tests/concurrent/java-21/build.gradle @@ -3,10 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'application' id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_21 maxJavaVersion = JavaVersion.VERSION_25 diff --git a/dd-smoke-tests/concurrent/java-25/build.gradle b/dd-smoke-tests/concurrent/java-25/build.gradle index 9a9e9c1b858..0ec1e0ab902 100644 --- a/dd-smoke-tests/concurrent/java-25/build.gradle +++ b/dd-smoke-tests/concurrent/java-25/build.gradle @@ -3,10 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'application' id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // This smoke test should be limited to Java 25 and above // But the groovy testing framework cannot run on Java 25 diff --git a/dd-smoke-tests/concurrent/java-8/build.gradle b/dd-smoke-tests/concurrent/java-8/build.gradle index 270fb38f81d..3a99f7d6a1e 100644 --- a/dd-smoke-tests/concurrent/java-8/build.gradle +++ b/dd-smoke-tests/concurrent/java-8/build.gradle @@ -3,10 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'application' id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - description = 'JDK 8 Concurrent Integration Tests' application { diff --git a/dd-smoke-tests/crashtracking/build.gradle b/dd-smoke-tests/crashtracking/build.gradle index c0b11b56fa8..f24d72d2e0a 100644 --- a/dd-smoke-tests/crashtracking/build.gradle +++ b/dd-smoke-tests/crashtracking/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { excludeJdk = ['IBM8'] } diff --git a/dd-smoke-tests/custom-systemloader/build.gradle b/dd-smoke-tests/custom-systemloader/build.gradle index b9d1d63caf3..d5133108a62 100644 --- a/dd-smoke-tests/custom-systemloader/build.gradle +++ b/dd-smoke-tests/custom-systemloader/build.gradle @@ -2,10 +2,10 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } description = 'Check classes loaded by custom system class-loader are transformed' -apply from: "$rootDir/gradle/java.gradle" tasks.named("jar", Jar) { manifest { diff --git a/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle b/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle index 502d39ba6f7..8a054204631 100644 --- a/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle +++ b/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle @@ -3,9 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'java' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Kafka Smoke Tests.' tasks.named("jar", Jar) { diff --git a/dd-smoke-tests/debugger-integration-tests/build.gradle b/dd-smoke-tests/debugger-integration-tests/build.gradle index da0000bcfee..80f7715598c 100644 --- a/dd-smoke-tests/debugger-integration-tests/build.gradle +++ b/dd-smoke-tests/debugger-integration-tests/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - description = 'Debugger Integration Tests.' dependencies { diff --git a/dd-smoke-tests/dynamic-config/build.gradle b/dd-smoke-tests/dynamic-config/build.gradle index 2efcbc9e971..413e805517d 100644 --- a/dd-smoke-tests/dynamic-config/build.gradle +++ b/dd-smoke-tests/dynamic-config/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - dependencies { implementation project(':dd-trace-api') implementation group: 'io.opentracing', name: 'opentracing-api', version: '0.32.0' diff --git a/dd-smoke-tests/field-injection/build.gradle b/dd-smoke-tests/field-injection/build.gradle index 2117c2e056b..b9fb56ae9e8 100644 --- a/dd-smoke-tests/field-injection/build.gradle +++ b/dd-smoke-tests/field-injection/build.gradle @@ -2,10 +2,10 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } description = 'Check fields get injected where expected' -apply from: "$rootDir/gradle/java.gradle" tasks.named("jar", Jar) { manifest { diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle index 76ebc34b6cb..eba0c53c514 100644 --- a/dd-smoke-tests/gradle/build.gradle +++ b/dd-smoke-tests/gradle/build.gradle @@ -3,9 +3,9 @@ import java.time.temporal.ChronoUnit plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Gradle Daemon Instrumentation Smoke Tests.' dependencies { diff --git a/dd-smoke-tests/grpc-1.5/build.gradle b/dd-smoke-tests/grpc-1.5/build.gradle index 4babb64d12c..a5f1ab937d6 100644 --- a/dd-smoke-tests/grpc-1.5/build.gradle +++ b/dd-smoke-tests/grpc-1.5/build.gradle @@ -6,10 +6,9 @@ plugins { id 'java-test-fixtures' id 'com.google.protobuf' version '0.10.0' id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - def grpcVersion = '1.58.0' def protobufVersion = '3.24.0' def protocVersion = protobufVersion diff --git a/dd-smoke-tests/iast-propagation/build.gradle b/dd-smoke-tests/iast-propagation/build.gradle index 89a7fd287dc..6d89bb2df56 100644 --- a/dd-smoke-tests/iast-propagation/build.gradle +++ b/dd-smoke-tests/iast-propagation/build.gradle @@ -8,9 +8,9 @@ plugins { id 'org.jetbrains.kotlin.jvm' id 'scala' id 'groovy' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'IAST propagation Smoke Tests.' kotlin { diff --git a/dd-smoke-tests/iast-util/build.gradle b/dd-smoke-tests/iast-util/build.gradle index 4219698314c..caf8075acf3 100644 --- a/dd-smoke-tests/iast-util/build.gradle +++ b/dd-smoke-tests/iast-util/build.gradle @@ -1,9 +1,8 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - description = 'iast-smoke-tests-utils' dependencies { diff --git a/dd-smoke-tests/iast-util/iast-util-11/build.gradle b/dd-smoke-tests/iast-util/iast-util-11/build.gradle index 3c8d8a503a5..641408114ba 100644 --- a/dd-smoke-tests/iast-util/iast-util-11/build.gradle +++ b/dd-smoke-tests/iast-util/iast-util-11/build.gradle @@ -1,11 +1,9 @@ plugins { id 'idea' id 'java-test-fixtures' + id 'dd-trace-java.module.smoke-test' } - -apply from: "$rootDir/gradle/java.gradle" - description = 'iast-smoke-tests-utils-java-11' idea { diff --git a/dd-smoke-tests/iast-util/iast-util-17/build.gradle b/dd-smoke-tests/iast-util/iast-util-17/build.gradle index eeffddf8c24..d25fb286b95 100644 --- a/dd-smoke-tests/iast-util/iast-util-17/build.gradle +++ b/dd-smoke-tests/iast-util/iast-util-17/build.gradle @@ -1,11 +1,9 @@ plugins { id 'idea' id 'java-test-fixtures' + id 'dd-trace-java.module.smoke-test' } - -apply from: "$rootDir/gradle/java.gradle" - description = 'iast-smoke-tests-utils-java-17' idea { diff --git a/dd-smoke-tests/java9-modules/build.gradle b/dd-smoke-tests/java9-modules/build.gradle index 70e1c0d78fd..2de05e2874f 100644 --- a/dd-smoke-tests/java9-modules/build.gradle +++ b/dd-smoke-tests/java9-modules/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} tracerJava { addSourceSetFor(JavaVersion.VERSION_11) diff --git a/dd-smoke-tests/jboss-modules/build.gradle b/dd-smoke-tests/jboss-modules/build.gradle index e8c85649ab1..83bc36caa31 100644 --- a/dd-smoke-tests/jboss-modules/build.gradle +++ b/dd-smoke-tests/jboss-modules/build.gradle @@ -1,4 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} + description = 'JBoss Modules Smoke Tests.' testJvmConstraints { diff --git a/dd-smoke-tests/jdk-tool-abort/build.gradle b/dd-smoke-tests/jdk-tool-abort/build.gradle index 81d57f36d80..a264d9bfaad 100644 --- a/dd-smoke-tests/jdk-tool-abort/build.gradle +++ b/dd-smoke-tests/jdk-tool-abort/build.gradle @@ -1,4 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} + description = 'JDK Tool Abort Smoke Tests' dependencies { diff --git a/dd-smoke-tests/jersey-2/build.gradle b/dd-smoke-tests/jersey-2/build.gradle index 2a5b32ab50a..35bb21792c9 100644 --- a/dd-smoke-tests/jersey-2/build.gradle +++ b/dd-smoke-tests/jersey-2/build.gradle @@ -3,9 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'java-test-fixtures' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Jersey 2 Smoke Tests.' tasks.named("jar", Jar) { diff --git a/dd-smoke-tests/jersey-3/build.gradle b/dd-smoke-tests/jersey-3/build.gradle index 8cec778f8ba..8fa9b177929 100644 --- a/dd-smoke-tests/jersey-3/build.gradle +++ b/dd-smoke-tests/jersey-3/build.gradle @@ -3,9 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'java-test-fixtures' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Jersey 3 Smoke Tests.' tasks.named("jar", Jar) { diff --git a/dd-smoke-tests/junit-console/build.gradle b/dd-smoke-tests/junit-console/build.gradle index 56d6b58233d..4ca541e2331 100644 --- a/dd-smoke-tests/junit-console/build.gradle +++ b/dd-smoke-tests/junit-console/build.gradle @@ -1,4 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} + description = 'JUnit Console Smoke Tests.' dependencies { diff --git a/dd-smoke-tests/kafka-2/build.gradle b/dd-smoke-tests/kafka-2/build.gradle index ec1e85d52e3..3da5e63bd78 100644 --- a/dd-smoke-tests/kafka-2/build.gradle +++ b/dd-smoke-tests/kafka-2/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - description = 'Kafka 2.x Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/kafka-3/build.gradle b/dd-smoke-tests/kafka-3/build.gradle index b21a187b8f2..38a7c15c7a1 100644 --- a/dd-smoke-tests/kafka-3/build.gradle +++ b/dd-smoke-tests/kafka-3/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 } diff --git a/dd-smoke-tests/lib-injection/build.gradle b/dd-smoke-tests/lib-injection/build.gradle index 2736457d742..359140927df 100644 --- a/dd-smoke-tests/lib-injection/build.gradle +++ b/dd-smoke-tests/lib-injection/build.gradle @@ -3,9 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'application' id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Lib-injection Smoke Tests' application { diff --git a/dd-smoke-tests/log-injection/build.gradle b/dd-smoke-tests/log-injection/build.gradle index e4e86df74ed..b8f97e9b885 100644 --- a/dd-smoke-tests/log-injection/build.gradle +++ b/dd-smoke-tests/log-injection/build.gradle @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Log injection Smoke Tests.' configurations { diff --git a/dd-smoke-tests/maven/build.gradle b/dd-smoke-tests/maven/build.gradle index 2d0855df367..353370b4dbc 100644 --- a/dd-smoke-tests/maven/build.gradle +++ b/dd-smoke-tests/maven/build.gradle @@ -4,9 +4,9 @@ import java.time.temporal.ChronoUnit plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Maven Instrumentation Smoke Tests.' dependencies { diff --git a/dd-smoke-tests/openfeature/build.gradle b/dd-smoke-tests/openfeature/build.gradle index fb3a68a2638..726b6068fe9 100644 --- a/dd-smoke-tests/openfeature/build.gradle +++ b/dd-smoke-tests/openfeature/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - description = 'Open Feature provider Smoke Tests.' testJvmConstraints { diff --git a/dd-smoke-tests/opentelemetry/build.gradle b/dd-smoke-tests/opentelemetry/build.gradle index 26b9c62c717..7dd3b472950 100644 --- a/dd-smoke-tests/opentelemetry/build.gradle +++ b/dd-smoke-tests/opentelemetry/build.gradle @@ -3,10 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'application' id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - application { mainClass = 'datadog.smoketest.opentelemetry.Application' } diff --git a/dd-smoke-tests/opentracing/build.gradle b/dd-smoke-tests/opentracing/build.gradle index cfb079fe39a..171c9bbf889 100644 --- a/dd-smoke-tests/opentracing/build.gradle +++ b/dd-smoke-tests/opentracing/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - dependencies { implementation project(path: ':dd-trace-ot', configuration: 'shadow') implementation project(':dd-trace-api') diff --git a/dd-smoke-tests/osgi/build.gradle b/dd-smoke-tests/osgi/build.gradle index ab5752613ce..12ce09dc457 100644 --- a/dd-smoke-tests/osgi/build.gradle +++ b/dd-smoke-tests/osgi/build.gradle @@ -2,6 +2,7 @@ import aQute.bnd.gradle.Bundle plugins { id 'biz.aQute.bnd.builder' version '7.2.3' apply true + id 'dd-trace-java.module.smoke-test' } repositories { @@ -16,7 +17,6 @@ repositories { } } -apply from: "$rootDir/gradle/java.gradle" description = 'OSGi Application Smoke Tests.' configurations { diff --git a/dd-smoke-tests/play-2.4/build.gradle b/dd-smoke-tests/play-2.4/build.gradle index d035365979a..eb8b222197b 100644 --- a/dd-smoke-tests/play-2.4/build.gradle +++ b/dd-smoke-tests/play-2.4/build.gradle @@ -1,9 +1,8 @@ plugins { id 'org.gradle.playframework' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // TODO Java 17: This version of play doesn't support Java 17 maxJavaVersion = JavaVersion.VERSION_15 diff --git a/dd-smoke-tests/play-2.5/build.gradle b/dd-smoke-tests/play-2.5/build.gradle index d1084044680..81eccfced43 100644 --- a/dd-smoke-tests/play-2.5/build.gradle +++ b/dd-smoke-tests/play-2.5/build.gradle @@ -1,8 +1,8 @@ plugins { id 'org.gradle.playframework' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-routes.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-linux-arm64.gradle" diff --git a/dd-smoke-tests/play-2.6/build.gradle b/dd-smoke-tests/play-2.6/build.gradle index 54272256723..e5780282862 100644 --- a/dd-smoke-tests/play-2.6/build.gradle +++ b/dd-smoke-tests/play-2.6/build.gradle @@ -1,8 +1,8 @@ plugins { id 'org.gradle.playframework' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-routes.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-linux-arm64.gradle" diff --git a/dd-smoke-tests/play-2.7/build.gradle b/dd-smoke-tests/play-2.7/build.gradle index a4a6c127de4..c2528c87053 100644 --- a/dd-smoke-tests/play-2.7/build.gradle +++ b/dd-smoke-tests/play-2.7/build.gradle @@ -1,8 +1,8 @@ plugins { id 'org.gradle.playframework' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-routes.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-linux-arm64.gradle" diff --git a/dd-smoke-tests/play-2.8-otel/build.gradle b/dd-smoke-tests/play-2.8-otel/build.gradle index 420e60e2899..5a635b5db6d 100644 --- a/dd-smoke-tests/play-2.8-otel/build.gradle +++ b/dd-smoke-tests/play-2.8-otel/build.gradle @@ -1,8 +1,8 @@ plugins { id 'org.gradle.playframework' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-routes.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-linux-arm64.gradle" diff --git a/dd-smoke-tests/play-2.8-split-routes/build.gradle b/dd-smoke-tests/play-2.8-split-routes/build.gradle index 2721c99b3e0..e5cbe054500 100644 --- a/dd-smoke-tests/play-2.8-split-routes/build.gradle +++ b/dd-smoke-tests/play-2.8-split-routes/build.gradle @@ -1,8 +1,8 @@ plugins { id 'org.gradle.playframework' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-routes.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-linux-arm64.gradle" diff --git a/dd-smoke-tests/play-2.8/build.gradle b/dd-smoke-tests/play-2.8/build.gradle index 95cf5e8c82d..574cb4f7920 100644 --- a/dd-smoke-tests/play-2.8/build.gradle +++ b/dd-smoke-tests/play-2.8/build.gradle @@ -1,8 +1,8 @@ plugins { id 'org.gradle.playframework' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-routes.gradle" apply from: "$rootDir/dd-smoke-tests/play-common/fix-play-linux-arm64.gradle" diff --git a/dd-smoke-tests/profiling-integration-tests/build.gradle b/dd-smoke-tests/profiling-integration-tests/build.gradle index 74fe60e6b82..46910db10f5 100644 --- a/dd-smoke-tests/profiling-integration-tests/build.gradle +++ b/dd-smoke-tests/profiling-integration-tests/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { excludeJdk = ['IBM8'] } diff --git a/dd-smoke-tests/quarkus-native/build.gradle b/dd-smoke-tests/quarkus-native/build.gradle index d06e823c2d1..271050d6898 100644 --- a/dd-smoke-tests/quarkus-native/build.gradle +++ b/dd-smoke-tests/quarkus-native/build.gradle @@ -3,10 +3,9 @@ import java.util.regex.Pattern plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - description = 'Quarkus Native Smoke Tests.' dependencies { diff --git a/dd-smoke-tests/quarkus/build.gradle b/dd-smoke-tests/quarkus/build.gradle index f9967bbd48f..9497d7a71bc 100644 --- a/dd-smoke-tests/quarkus/build.gradle +++ b/dd-smoke-tests/quarkus/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // Quarkus is only supported up to Java 21: https://github.com/quarkusio/quarkus maxJavaVersion = JavaVersion.VERSION_21 diff --git a/dd-smoke-tests/ratpack-1.5/build.gradle b/dd-smoke-tests/ratpack-1.5/build.gradle index c9d6bf2dbaa..d86f8804e22 100644 --- a/dd-smoke-tests/ratpack-1.5/build.gradle +++ b/dd-smoke-tests/ratpack-1.5/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id "com.gradleup.shadow" + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - tasks.named("jar", Jar) { manifest { attributes('Main-Class': 'datadog.smoketest.ratpack.RatpackApp') diff --git a/dd-smoke-tests/resteasy/build.gradle b/dd-smoke-tests/resteasy/build.gradle index 10cdb2c2886..342cffe53bd 100644 --- a/dd-smoke-tests/resteasy/build.gradle +++ b/dd-smoke-tests/resteasy/build.gradle @@ -3,9 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'java-test-fixtures' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'RestEasy Smoke Test.' tasks.named("jar", Jar) { diff --git a/dd-smoke-tests/rum/build.gradle b/dd-smoke-tests/rum/build.gradle index 78b188094d8..ab36faedf0e 100644 --- a/dd-smoke-tests/rum/build.gradle +++ b/dd-smoke-tests/rum/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} description = 'appsec-smoke-tests' diff --git a/dd-smoke-tests/rum/tomcat-10/build.gradle b/dd-smoke-tests/rum/tomcat-10/build.gradle index 4c4202f65de..8342f1fe8a5 100644 --- a/dd-smoke-tests/rum/tomcat-10/build.gradle +++ b/dd-smoke-tests/rum/tomcat-10/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_11 } diff --git a/dd-smoke-tests/rum/tomcat-11/build.gradle b/dd-smoke-tests/rum/tomcat-11/build.gradle index 6db96af2a51..f7506f6b259 100644 --- a/dd-smoke-tests/rum/tomcat-11/build.gradle +++ b/dd-smoke-tests/rum/tomcat-11/build.gradle @@ -2,10 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 } diff --git a/dd-smoke-tests/rum/tomcat-9/build.gradle b/dd-smoke-tests/rum/tomcat-9/build.gradle index c96dfb2ab12..399ee74a8d0 100644 --- a/dd-smoke-tests/rum/tomcat-9/build.gradle +++ b/dd-smoke-tests/rum/tomcat-9/build.gradle @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'RUM Tomcat 9 Smoke Tests' dependencies { diff --git a/dd-smoke-tests/rum/wildfly-15/build.gradle b/dd-smoke-tests/rum/wildfly-15/build.gradle index 2be56770cd8..4dd772bd308 100644 --- a/dd-smoke-tests/rum/wildfly-15/build.gradle +++ b/dd-smoke-tests/rum/wildfly-15/build.gradle @@ -2,6 +2,7 @@ import datadog.buildlogic.smoketest.NestedGradleBuild plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'dd-trace-java.mass' } @@ -33,8 +34,6 @@ repositories { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { maxJavaVersion = JavaVersion.VERSION_11 } diff --git a/dd-smoke-tests/sample-trace/build.gradle b/dd-smoke-tests/sample-trace/build.gradle index 6093dc8a820..2c45f2a1497 100644 --- a/dd-smoke-tests/sample-trace/build.gradle +++ b/dd-smoke-tests/sample-trace/build.gradle @@ -1,4 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} + description = 'Sample Trace CLI Smoke Tests.' dependencies { diff --git a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle index 40289a9b80f..5a23afb113d 100644 --- a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle +++ b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle @@ -1,11 +1,11 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer + plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer - -apply from: "$rootDir/gradle/java.gradle" description = 'Spring Boot 2.3 Jetty Smoke Tests.' // The standard spring-boot plugin doesn't play nice with our project diff --git a/dd-smoke-tests/spring-boot-2.4-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.4-webflux/build.gradle index bef36cc4224..bd3f7cfd840 100644 --- a/dd-smoke-tests/spring-boot-2.4-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-2.4-webflux/build.gradle @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Spring Boot 2.4 Webflux Smoke Tests.' // The standard spring-boot plugin doesn't play nice with our project diff --git a/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle index 39212e8f4ae..06278e32ac3 100644 --- a/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Spring Boot 2.5 Webflux Smoke Tests.' // The standard spring-boot plugin doesn't play nice with our project diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle index 516a2b79890..80890cc6a8c 100644 --- a/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle @@ -3,9 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTra plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'Spring Boot 2.6 Webflux Smoke Tests.' // The standard spring-boot plugin doesn't play nice with our project diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle b/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle index e1526a84512..c2112607314 100644 --- a/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle +++ b/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle @@ -1,12 +1,12 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer + plugins { id 'com.gradleup.shadow' id 'java-test-fixtures' + id 'dd-trace-java.module.smoke-test' } -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer - -apply from: "$rootDir/gradle/java.gradle" description = 'Spring Boot 2.6 Webmvc Smoke Tests.' // The standard spring-boot plugin doesn't play nice with our project diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle index adae38e89e8..f45d3a0089a 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - description = 'Spring Boot 2.7 Webflux Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/spring-boot-3.0-native/build.gradle b/dd-smoke-tests/spring-boot-3.0-native/build.gradle index c986996bfd3..595ca3f0012 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-native/build.gradle @@ -3,10 +3,9 @@ import java.util.regex.Pattern plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - description = 'Spring Boot 3.0 Native Smoke Tests.' dependencies { diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle index 2479e28ac89..a6b5fe85c1b 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 } diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle index 07e850c365a..ca46c109f87 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 } diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle index 188088ad129..278a7c6e739 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { minJavaVersion = JavaVersion.VERSION_17 } diff --git a/dd-smoke-tests/spring-boot-rabbit/build.gradle b/dd-smoke-tests/spring-boot-rabbit/build.gradle index 6e260acb8fa..7d53f3598e0 100644 --- a/dd-smoke-tests/spring-boot-rabbit/build.gradle +++ b/dd-smoke-tests/spring-boot-rabbit/build.gradle @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot RabbitMQ Smoke Tests.' // The standard spring-boot plugin doesn't play nice with our project diff --git a/dd-smoke-tests/spring-security/build.gradle b/dd-smoke-tests/spring-security/build.gradle index 2ebd9a22b5f..3ec5bbf3f49 100644 --- a/dd-smoke-tests/spring-security/build.gradle +++ b/dd-smoke-tests/spring-security/build.gradle @@ -1,9 +1,8 @@ plugins { id 'java-test-fixtures' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { maxJavaVersion = JavaVersion.VERSION_15 } diff --git a/dd-smoke-tests/springboot-freemarker/build.gradle b/dd-smoke-tests/springboot-freemarker/build.gradle index 3094e88112b..452af3cdad9 100644 --- a/dd-smoke-tests/springboot-freemarker/build.gradle +++ b/dd-smoke-tests/springboot-freemarker/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - description = 'SpringBoot Freemarker Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/springboot-grpc/build.gradle b/dd-smoke-tests/springboot-grpc/build.gradle index 2968ee2ae4a..9b5a5e1b023 100644 --- a/dd-smoke-tests/springboot-grpc/build.gradle +++ b/dd-smoke-tests/springboot-grpc/build.gradle @@ -3,10 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'com.google.protobuf' version '0.10.0' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { // TODO Java 17: This version of spring-boot doesn't support Java 17 maxJavaVersion = JavaVersion.VERSION_15 diff --git a/dd-smoke-tests/springboot-java-11/build.gradle b/dd-smoke-tests/springboot-java-11/build.gradle index 3d1d775edaa..3267c7abb98 100644 --- a/dd-smoke-tests/springboot-java-11/build.gradle +++ b/dd-smoke-tests/springboot-java-11/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - description = 'SpringBoot Java 11 Smoke Tests.' testJvmConstraints { diff --git a/dd-smoke-tests/springboot-java-17/build.gradle b/dd-smoke-tests/springboot-java-17/build.gradle index ca3a160449d..75dbc261845 100644 --- a/dd-smoke-tests/springboot-java-17/build.gradle +++ b/dd-smoke-tests/springboot-java-17/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - description = 'SpringBoot Java 17 Smoke Tests.' testJvmConstraints { diff --git a/dd-smoke-tests/springboot-jetty-jsp/build.gradle b/dd-smoke-tests/springboot-jetty-jsp/build.gradle index 09dbde5de64..972ed0a1432 100644 --- a/dd-smoke-tests/springboot-jetty-jsp/build.gradle +++ b/dd-smoke-tests/springboot-jetty-jsp/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - description = 'SpringBoot Jetty JSP Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/springboot-jpa/build.gradle b/dd-smoke-tests/springboot-jpa/build.gradle index 130752d60fc..8f5ade01659 100644 --- a/dd-smoke-tests/springboot-jpa/build.gradle +++ b/dd-smoke-tests/springboot-jpa/build.gradle @@ -1,9 +1,8 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - description = 'SpringBoot JPA Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/springboot-mongo/build.gradle b/dd-smoke-tests/springboot-mongo/build.gradle index f5aeec45530..87acb275868 100644 --- a/dd-smoke-tests/springboot-mongo/build.gradle +++ b/dd-smoke-tests/springboot-mongo/build.gradle @@ -2,9 +2,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Spring-Data-Mongo Smoke Tests.' // The standard spring-boot plugin doesn't play nice with our project diff --git a/dd-smoke-tests/springboot-openliberty-20/build.gradle b/dd-smoke-tests/springboot-openliberty-20/build.gradle index a277ba1ec49..c58422d9c70 100644 --- a/dd-smoke-tests/springboot-openliberty-20/build.gradle +++ b/dd-smoke-tests/springboot-openliberty-20/build.gradle @@ -1,8 +1,8 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Open Liberty 20-22 Smoke Tests' dependencies { diff --git a/dd-smoke-tests/springboot-openliberty-23/build.gradle b/dd-smoke-tests/springboot-openliberty-23/build.gradle index 73e290faf2e..821a5f96b0b 100644 --- a/dd-smoke-tests/springboot-openliberty-23/build.gradle +++ b/dd-smoke-tests/springboot-openliberty-23/build.gradle @@ -1,8 +1,8 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" description = 'SpringBoot Open Liberty Smoke Tests' dependencies { diff --git a/dd-smoke-tests/springboot-thymeleaf/build.gradle b/dd-smoke-tests/springboot-thymeleaf/build.gradle index a92caa4098b..f457d505135 100644 --- a/dd-smoke-tests/springboot-thymeleaf/build.gradle +++ b/dd-smoke-tests/springboot-thymeleaf/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - description = 'SpringBoot thymeleaf 3 Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/springboot-tomcat-jsp/build.gradle b/dd-smoke-tests/springboot-tomcat-jsp/build.gradle index b82c8fcdda7..6435d6201d9 100644 --- a/dd-smoke-tests/springboot-tomcat-jsp/build.gradle +++ b/dd-smoke-tests/springboot-tomcat-jsp/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - description = 'SpringBoot Tomcat JSP Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/springboot-tomcat/build.gradle b/dd-smoke-tests/springboot-tomcat/build.gradle index 5c506614081..db73c6126c7 100644 --- a/dd-smoke-tests/springboot-tomcat/build.gradle +++ b/dd-smoke-tests/springboot-tomcat/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'dd-trace-java.mass' } -apply from: "$rootDir/gradle/java.gradle" - description = 'SpringBoot Tomcat Smoke Tests.' def serverName = 'tomcat' diff --git a/dd-smoke-tests/springboot-velocity/build.gradle b/dd-smoke-tests/springboot-velocity/build.gradle index 7e18918b074..1e4d9224b6a 100644 --- a/dd-smoke-tests/springboot-velocity/build.gradle +++ b/dd-smoke-tests/springboot-velocity/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - description = 'SpringBoot Velocity Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/springboot/build.gradle b/dd-smoke-tests/springboot/build.gradle index c19aa169476..19809df90b6 100644 --- a/dd-smoke-tests/springboot/build.gradle +++ b/dd-smoke-tests/springboot/build.gradle @@ -3,10 +3,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id 'com.gradleup.shadow' id 'java-test-fixtures' + id 'dd-trace-java.module.smoke-test' } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { maxJavaVersion = JavaVersion.VERSION_15 } diff --git a/dd-smoke-tests/tracer-flare/build.gradle b/dd-smoke-tests/tracer-flare/build.gradle index fc2cacd4c1a..4f0cba4e877 100644 --- a/dd-smoke-tests/tracer-flare/build.gradle +++ b/dd-smoke-tests/tracer-flare/build.gradle @@ -1,4 +1,7 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} + description = 'Tracer Flare Smoke Tests.' tasks.named("jar", Jar) { diff --git a/dd-smoke-tests/vertx-3.4/build.gradle b/dd-smoke-tests/vertx-3.4/build.gradle index 3f268d856b6..a2f900c3c61 100644 --- a/dd-smoke-tests/vertx-3.4/build.gradle +++ b/dd-smoke-tests/vertx-3.4/build.gradle @@ -1,11 +1,10 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'idea' id 'java-test-fixtures' } -apply from: "$rootDir/gradle/java.gradle" - description = 'Vert.x 3.4 Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/vertx-3.9-resteasy/build.gradle b/dd-smoke-tests/vertx-3.9-resteasy/build.gradle index b99c1f8ac74..cec001ad620 100644 --- a/dd-smoke-tests/vertx-3.9-resteasy/build.gradle +++ b/dd-smoke-tests/vertx-3.9-resteasy/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'idea' } -apply from: "$rootDir/gradle/java.gradle" - description = 'Vert.x 3.9 RestEasy Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/vertx-3.9/build.gradle b/dd-smoke-tests/vertx-3.9/build.gradle index 0747b1f6c35..1ec45904cea 100644 --- a/dd-smoke-tests/vertx-3.9/build.gradle +++ b/dd-smoke-tests/vertx-3.9/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'idea' } -apply from: "$rootDir/gradle/java.gradle" - description = 'Vert.x 3.9 Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/vertx-4.2/build.gradle b/dd-smoke-tests/vertx-4.2/build.gradle index 57cba56c827..b36ab24d335 100644 --- a/dd-smoke-tests/vertx-4.2/build.gradle +++ b/dd-smoke-tests/vertx-4.2/build.gradle @@ -1,10 +1,9 @@ plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'idea' } -apply from: "$rootDir/gradle/java.gradle" - description = 'Vert.x 4.2 Smoke Tests.' smokeTestApp { diff --git a/dd-smoke-tests/websphere-jmx/build.gradle b/dd-smoke-tests/websphere-jmx/build.gradle index 3cafe416fb6..33a96fb8465 100644 --- a/dd-smoke-tests/websphere-jmx/build.gradle +++ b/dd-smoke-tests/websphere-jmx/build.gradle @@ -1,4 +1,6 @@ -apply from: "$rootDir/gradle/java.gradle" +plugins { + id 'dd-trace-java.module.smoke-test' +} dependencies { testImplementation project(':dd-smoke-tests') diff --git a/dd-smoke-tests/wildfly/build.gradle b/dd-smoke-tests/wildfly/build.gradle index cc8d48bf5a9..ef5b9c9c317 100644 --- a/dd-smoke-tests/wildfly/build.gradle +++ b/dd-smoke-tests/wildfly/build.gradle @@ -2,6 +2,7 @@ import datadog.buildlogic.smoketest.NestedGradleBuild plugins { id 'dd-trace-java.smoke-test-app' + id 'dd-trace-java.module.smoke-test' id 'dd-trace-java.mass' } @@ -33,8 +34,6 @@ repositories { } } -apply from: "$rootDir/gradle/java.gradle" - testJvmConstraints { maxJavaVersion = JavaVersion.VERSION_11 } diff --git a/dd-trace-api/build.gradle.kts b/dd-trace-api/build.gradle.kts index 5382eeeb019..ec1252d0be9 100644 --- a/dd-trace-api/build.gradle.kts +++ b/dd-trace-api/build.gradle.kts @@ -1,11 +1,8 @@ plugins { - `java-library` + id("dd-trace-java.module.distributable.api") } -apply(from = "$rootDir/gradle/java.gradle") -apply(from = "$rootDir/gradle/publish.gradle") - -extra["minimumBranchCoverage"] = 0.8 +val minimumBranchCoverage by extra(0.8) // These are tested outside of this module since this module mainly just defines 'API' extra["excludedClassesCoverage"] = listOf( diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle index 3df31b0388f..0e1d725d0c9 100644 --- a/dd-trace-core/build.gradle +++ b/dd-trace-core/build.gradle @@ -1,12 +1,11 @@ plugins { + id 'dd-trace-java.module.agent-product' id 'me.champeau.jmh' id 'dd-trace-java.version-file' } description = 'dd-trace-core' -apply from: "$rootDir/gradle/java.gradle" - minimumBranchCoverage = 0.5 minimumInstructionCoverage = 0.6 excludedClassesCoverage += [ diff --git a/dd-trace-ot/build.gradle.kts b/dd-trace-ot/build.gradle.kts index e21d6100b02..dbf10a0ed62 100644 --- a/dd-trace-ot/build.gradle.kts +++ b/dd-trace-ot/build.gradle.kts @@ -1,16 +1,13 @@ import groovy.lang.Closure plugins { - `java-library` id("com.gradleup.shadow") + id("dd-trace-java.module.distributable.api") id("me.champeau.jmh") } description = "dd-trace-ot" -apply(from = rootDir.resolve("gradle/java.gradle")) -apply(from = rootDir.resolve("gradle/publish.gradle")) - // TODO raise these when equals() and hashCode() are excluded extra["minimumBranchCoverage"] = 0.5 extra["minimumInstructionCoverage"] = 0.5 diff --git a/dd-trace-ot/correlation-id-injection/build.gradle.kts b/dd-trace-ot/correlation-id-injection/build.gradle.kts index ad70a7334f9..d92b4ca5baf 100644 --- a/dd-trace-ot/correlation-id-injection/build.gradle.kts +++ b/dd-trace-ot/correlation-id-injection/build.gradle.kts @@ -1,10 +1,8 @@ plugins { - `java-library` + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - -extra["minimumBranchCoverage"] = 0.8 +val minimumBranchCoverage by extra(0.8) extra["excludedClassesCoverage"] = listOf( "datadog.trace.correlation.CorrelationIdInjectors", diff --git a/docs/add_new_instrumentation.md b/docs/add_new_instrumentation.md index 609890e335e..bdb03d93d44 100644 --- a/docs/add_new_instrumentation.md +++ b/docs/add_new_instrumentation.md @@ -31,6 +31,30 @@ we [added](https://github.com/DataDog/dd-trace-java/blob/297b575f0f265c1dc78f995 include ':dd-java-agent:instrumentation:google-http-client' ``` +Create the instrumentation `build.gradle` with the instrumentation module convention plugin: + +```groovy +plugins { + id 'dd-trace-java.module.instrumentation' +} + +muzzle { + pass { + group = "com.google.http-client" + module = "google-http-client" + versions = "[1.19.0,)" + } +} + +dependencies { + compileOnly group: 'com.google.http-client', name: 'google-http-client', version: '1.19.0' +} +``` + +> [!WARN] +> Do not apply `gradle/java.gradle` directly in new instrumentation modules. Use the module plugin so shared +> instrumentation setup stays centralized. + ## Create the Instrumentation class 1. Choose an appropriate package name for the instrumentation diff --git a/docs/how_instrumentations_work.md b/docs/how_instrumentations_work.md index 3c4aa7a9053..e86aeb94eff 100644 --- a/docs/how_instrumentations_work.md +++ b/docs/how_instrumentations_work.md @@ -53,6 +53,30 @@ Dependencies specific to a particular instrumentation are added to the `build.gr directory. Declare necessary dependencies under `compileOnly` configuration so they do not leak into the agent jar. +Instrumentation build files should apply the instrumentation module convention plugin instead of applying +`gradle/java.gradle` directly: + +```groovy +plugins { + id 'dd-trace-java.module.instrumentation' +} + +muzzle { + pass { + group = "com.example" + module = "example-library" + versions = "[1.0,)" + } +} + +dependencies { + compileOnly group: 'com.example', name: 'example-library', version: '1.0.0' +} +``` + +The module plugin is the supported entry point for instrumentation projects. It keeps the project shape consistent while +the shared build logic continues to evolve behind the plugin. + ## Muzzle Muzzle directives are applied at build time from the `build.gradle` file. diff --git a/docs/how_to_work_with_gradle.md b/docs/how_to_work_with_gradle.md index df0bfc4f7b0..4f66d9190d9 100644 --- a/docs/how_to_work_with_gradle.md +++ b/docs/how_to_work_with_gradle.md @@ -977,7 +977,9 @@ Manages multi-version Java source sets, allowing a single project to compile cod ```Gradle Kotlin DSL // In build.gradle.kts -apply(from = "$rootDir/gradle/java.gradle") +plugins { + id("dd-trace-java.module.internal-library") +} tracerJava { addSourceSetFor(JavaVersion.VERSION_11) { @@ -1089,12 +1091,56 @@ tasks.withType().configureEach { Apply it in any subproject: ```Gradle Kotlin DSL -// dd-java-agent/instrumentation/some-integration/build.gradle.kts +// some/build.gradle.kts plugins { id("dd-trace-java.configure-tests") } ``` +### Module Convention Plugins + +Module convention plugins are the preferred entry points for module build files. They are a stable facade over shared +project setup: consumers use a plugin ID, while the implementation can keep delegating to existing script plugins until +that build logic is migrated. + +Use the most specific module plugin instead of applying `gradle/java.gradle` directly: + +| Module kind | Plugin ID | +|---------------------------------|------------------------------------------| +| Agent product modules | `dd-trace-java.module.agent-product` | +| Annotation processors | `dd-trace-java.module.annotation-processor` | +| Bootstrap components | `dd-trace-java.module.bootstrap-component` | +| Published APIs | `dd-trace-java.module.distributable.api` | +| Instrumentation modules | `dd-trace-java.module.instrumentation` | +| Internal API modules | `dd-trace-java.module.internal-api` | +| Internal implementation libraries | `dd-trace-java.module.internal-library` | +| Internal platform components | `dd-trace-java.module.internal-platform-component` | +| Smoke-test modules | `dd-trace-java.module.smoke-test` | +| Testing support modules | `dd-trace-java.module.testing-support` | + +Use `internal-api` for internal API surfaces such as product `*-api` modules or `remote-config-api`. Use +`internal-library` for internal implementation modules such as product `*-lib` modules, `:communication`, `:telemetry`, +`:utils:*`, and similar shared libraries. Use `internal-platform-component` only for platform modules under +`:components`; those modules are kept separate because they can grow stricter dependency and testing constraints than +general internal libraries. + +For example: + +```Gradle +plugins { + id 'dd-trace-java.module.instrumentation' +} +``` + +Avoid adding new direct uses of: + +```Gradle +apply from: "$rootDir/gradle/java.gradle" +``` + +`spotlessCheck` enforces this for Gradle build scripts, with temporary exceptions only for modules that still need to be +migrated separately. + Other convention plugins in this project include: - `dd-trace-java.gradle-debug` - Debugging utilities for build diagnostics - `dd-trace-java.dependency-locking` - Dependency locking configuration @@ -1133,7 +1179,8 @@ As warned, don't wrtite new ones, use convention plugins instead ! - **No caching**: Script plugins are re-evaluated on every build There's an ongoing effort to **migrate all of them to convention plugins** for better -maintainability and performance. +maintainability and performance. For module build files, use a `dd-trace-java.module.*` plugin instead of applying +`gradle/java.gradle` directly. ## Gradle Lazy API @@ -1576,4 +1623,3 @@ The report shows exactly which code paths capture disallowed references. # Validate build logic without running tasks ./gradlew help --scan ``` - diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle index 93a817e6452..0bf4ee95eed 100644 --- a/gradle/spotless.gradle +++ b/gradle/spotless.gradle @@ -7,6 +7,35 @@ boolean groovySkipJavaExclude = project.hasProperty('groovySkipJavaExclude') ? g def buildDirectoryFiles = project.layout.buildDirectory.asFileTree +// Temporary exclusions as conventions are properly setup for these projects. +def javaGradleApplyExceptions = [ + ':dd-java-agent', + ':dd-java-agent:benchmark', + ':dd-java-agent:benchmark-integration', + ':dd-java-agent:load-generator', +] as Set +boolean forbidJavaGradleApply = project.rootProject.name == 'dd-trace-java' && !javaGradleApplyExceptions.contains(project.path) +def javaGradleApplyLinePattern = ~/^\s*(?:\w+\.)?apply(?:\s+from\s*:|\s*\(\s*from\s*=).*/ +// Script plugins that must be applied through a 'dd-trace-java.module.*' convention plugin instead. +def forbiddenScriptApplies = [ + 'gradle/java.gradle' : 'Apply a \'dd-trace-java.module.*\' convention plugin instead of applying the script plugin \'gradle/java.gradle\' directly.', + 'gradle/publish.gradle': 'Apply the \'dd-trace-java.module.distributable.*\' convention plugin instead of applying the script plugin \'gradle/publish.gradle\' directly.', +] +def forbidJavaGradleApplyStep = { String text -> + if (forbidJavaGradleApply) { + text.readLines().each { line -> + if (javaGradleApplyLinePattern.matcher(line).matches()) { + forbiddenScriptApplies.each { script, message -> + if (line.contains(script)) { + throw new AssertionError(message) + } + } + } + } + } + text +} + spotless { if (rootProject.hasProperty('skipSpotless')) { project.logger.quiet("Retiring 'skipSpotless' property, prefer '-x spotlessCheck' or '-x spotlessApply' to exclude spotless tasks.") @@ -39,6 +68,7 @@ spotless { target '*.gradle' } greclipse().configFile(configPath + '/enforcement/spotless-groovy.properties') + custom 'forbidGradleJavaScriptPlugin', forbidJavaGradleApplyStep } kotlinGradle { @@ -50,6 +80,7 @@ spotless { 'ktlint_standard_trailing-comma-on-call-site': 'disabled', 'ktlint_standard_trailing-comma-on-declaration-site': 'disabled' ]) + custom 'forbidGradleJavaScriptPlugin', forbidJavaGradleApplyStep } project.pluginManager.withPlugin('groovy') { diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index 305dead4459..57d4178c513 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -4,10 +4,9 @@ import groovy.lang.Closure plugins { `java-library` id("me.champeau.jmh") + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - java { toolchain { languageVersion = JavaLanguageVersion.of(8) diff --git a/internal-api/internal-api-9/build.gradle.kts b/internal-api/internal-api-9/build.gradle.kts index 07683371538..f17b8b90106 100644 --- a/internal-api/internal-api-9/build.gradle.kts +++ b/internal-api/internal-api-9/build.gradle.kts @@ -6,10 +6,9 @@ plugins { id("de.thetaphi.forbiddenapis") version "3.10" id("me.champeau.jmh") idea + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - extensions.getByName("tracerJava").withGroovyBuilder { invokeMethod("addSourceSetFor", JavaVersion.VERSION_17) } diff --git a/products/feature-flagging/feature-flagging-agent/build.gradle.kts b/products/feature-flagging/feature-flagging-agent/build.gradle.kts index 902ae5a6023..2bd577d5d16 100644 --- a/products/feature-flagging/feature-flagging-agent/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-agent/build.gradle.kts @@ -5,10 +5,9 @@ plugins { `java-library` id("com.gradleup.shadow") id("dd-trace-java.version-file") + id("dd-trace-java.module.agent-product") } -apply(from = "$rootDir/gradle/java.gradle") - description = "Feature flagging agent system" dependencies { diff --git a/products/feature-flagging/feature-flagging-api/build.gradle.kts b/products/feature-flagging/feature-flagging-api/build.gradle.kts index 1c368d51b51..765a3ff30fe 100644 --- a/products/feature-flagging/feature-flagging-api/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-api/build.gradle.kts @@ -4,12 +4,9 @@ import groovy.lang.Closure plugins { `java-library` idea - `maven-publish` + id("dd-trace-java.module.distributable.api") } -apply(from = "$rootDir/gradle/java.gradle") -apply(from = "$rootDir/gradle/publish.gradle") - configure { minJavaVersion.set(JavaVersion.VERSION_11) } diff --git a/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts b/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts index d2d68b59ddf..c6a02b5fb5e 100644 --- a/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts @@ -1,10 +1,9 @@ plugins { `java-library` id("dd-trace-java.version-file") + id("dd-trace-java.module.bootstrap-component") } -apply(from = "$rootDir/gradle/java.gradle") - description = "Feature flagging remote common module (bootstrap classloader)" extra["excludedClassesCoverage"] = listOf( diff --git a/products/feature-flagging/feature-flagging-lib/build.gradle.kts b/products/feature-flagging/feature-flagging-lib/build.gradle.kts index 3291e239d40..bc02f7afa23 100644 --- a/products/feature-flagging/feature-flagging-lib/build.gradle.kts +++ b/products/feature-flagging/feature-flagging-lib/build.gradle.kts @@ -1,10 +1,9 @@ plugins { `java-library` id("dd-trace-java.version-file") + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - description = "Feature flagging remote config and exposure handling" extra["excludedClassesCoverage"] = listOf( diff --git a/products/metrics/metrics-agent/build.gradle.kts b/products/metrics/metrics-agent/build.gradle.kts index 3f180e02f7a..6fcb10a855f 100644 --- a/products/metrics/metrics-agent/build.gradle.kts +++ b/products/metrics/metrics-agent/build.gradle.kts @@ -1,11 +1,10 @@ plugins { `java-library` + id("dd-trace-java.module.internal-library") } description = "Metrics agent" -apply(from = rootDir.resolve("gradle/java.gradle")) - dependencies { api(project(":products:metrics:metrics-api")) } diff --git a/products/metrics/metrics-api/build.gradle.kts b/products/metrics/metrics-api/build.gradle.kts index dc802fd7cec..bc995a5c87d 100644 --- a/products/metrics/metrics-api/build.gradle.kts +++ b/products/metrics/metrics-api/build.gradle.kts @@ -1,11 +1,10 @@ plugins { `java-library` + id("dd-trace-java.module.internal-api") } description = "Metrics API" -apply(from = rootDir.resolve("gradle/java.gradle")) - dependencies { implementation(libs.slf4j) } diff --git a/products/metrics/metrics-lib/build.gradle.kts b/products/metrics/metrics-lib/build.gradle.kts index ae38432669a..3c72acac853 100644 --- a/products/metrics/metrics-lib/build.gradle.kts +++ b/products/metrics/metrics-lib/build.gradle.kts @@ -3,12 +3,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { `java-library` id("com.gradleup.shadow") + id("dd-trace-java.module.agent-product") } description = "StatsD client" -apply(from = rootDir.resolve("gradle/java.gradle")) - dependencies { api(project(":products:metrics:metrics-api")) implementation(libs.slf4j) diff --git a/remote-config/remote-config-api/build.gradle.kts b/remote-config/remote-config-api/build.gradle.kts index 5a5a77442b3..6ec5abad98b 100644 --- a/remote-config/remote-config-api/build.gradle.kts +++ b/remote-config/remote-config-api/build.gradle.kts @@ -1,3 +1,5 @@ -apply(from = "$rootDir/gradle/java.gradle") +plugins { + id("dd-trace-java.module.internal-api") +} extra["excludedClassesBranchCoverage"] = listOf("datadog.remoteconfig.ConfigurationChangesListener.PollingHinterNoop") diff --git a/remote-config/remote-config-core/build.gradle.kts b/remote-config/remote-config-core/build.gradle.kts index f55284f2085..53bb00bf021 100644 --- a/remote-config/remote-config-core/build.gradle.kts +++ b/remote-config/remote-config-core/build.gradle.kts @@ -1,19 +1,20 @@ plugins { `java-library` + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - -extra["minimumBranchCoverage"] = 0.6 -extra["minimumInstructionCoverage"] = 0.8 -extra["excludedClassesCoverage"] = listOf( - // not used yet - "datadog.remoteconfig.tuf.RemoteConfigRequest.ClientInfo.AgentInfo", - // only half the adapter interface used - "datadog.remoteconfig.tuf.InstantJsonAdapter", - // idem - "datadog.remoteconfig.tuf.RawJsonAdapter", - "datadog.remoteconfig.ExceptionHelper", +val minimumBranchCoverage by extra(0.6) +val minimumInstructionCoverage by extra(0.8) +val excludedClassesCoverage by extra( + listOf( + // not used yet + "datadog.remoteconfig.tuf.RemoteConfigRequest.ClientInfo.AgentInfo", + // only half the adapter interface used + "datadog.remoteconfig.tuf.InstantJsonAdapter", + // idem + "datadog.remoteconfig.tuf.RawJsonAdapter", + "datadog.remoteconfig.ExceptionHelper", + ) ) extra["excludedClassesBranchCoverage"] = listOf( "datadog.remoteconfig.tuf.FeaturesConfig", diff --git a/telemetry/build.gradle.kts b/telemetry/build.gradle.kts index 9484dedc0a1..80946ca23e0 100644 --- a/telemetry/build.gradle.kts +++ b/telemetry/build.gradle.kts @@ -1,23 +1,24 @@ plugins { id("me.champeau.jmh") id("java-library") + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - -extra["minimumBranchCoverage"] = 0.6 -extra["minimumInstructionCoverage"] = 0.8 -extra["excludedClassesCoverage"] = listOf( - "datadog.telemetry.TelemetryRunnable.ThreadSleeperImpl", - "datadog.telemetry.HostInfo", - "datadog.telemetry.HostInfo.Os", - "datadog.telemetry.dependency.LocationsCollectingTransformer", - "datadog.telemetry.dependency.JbossVirtualFileHelper", - "datadog.telemetry.RequestBuilder.NumberJsonAdapter", - "datadog.telemetry.RequestBuilderSupplier", - "datadog.telemetry.TelemetrySystem", - "datadog.telemetry.api.*", - "datadog.telemetry.metric.CiVisibilityMetricPeriodicAction" +val minimumBranchCoverage by extra(0.6) +val minimumInstructionCoverage by extra(0.8) +val excludedClassesCoverage by extra( + listOf( + "datadog.telemetry.TelemetryRunnable.ThreadSleeperImpl", + "datadog.telemetry.HostInfo", + "datadog.telemetry.HostInfo.Os", + "datadog.telemetry.dependency.LocationsCollectingTransformer", + "datadog.telemetry.dependency.JbossVirtualFileHelper", + "datadog.telemetry.RequestBuilder.NumberJsonAdapter", + "datadog.telemetry.RequestBuilderSupplier", + "datadog.telemetry.TelemetrySystem", + "datadog.telemetry.api.*", + "datadog.telemetry.metric.CiVisibilityMetricPeriodicAction" + ) ) extra["excludedClassesBranchCoverage"] = listOf( "datadog.telemetry.PolymorphicAdapterFactory.1", diff --git a/utils/config-utils/build.gradle.kts b/utils/config-utils/build.gradle.kts index 2891dc3845b..d8a4617ffe6 100644 --- a/utils/config-utils/build.gradle.kts +++ b/utils/config-utils/build.gradle.kts @@ -2,12 +2,11 @@ plugins { `java-library` `java-test-fixtures` id("dd-trace-java.supported-config-generator") + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - -extra["minimumBranchCoverage"] = 0.7 -extra["minimumInstructionCoverage"] = 0.7 +val minimumBranchCoverage by extra(0.7) +val minimumInstructionCoverage by extra(0.7) extra["excludedClassesCoverage"] = listOf( "datadog.trace.api.ConfigCollector", diff --git a/utils/container-utils/build.gradle.kts b/utils/container-utils/build.gradle.kts index 2e1d0bce92f..f4b3ff6e862 100644 --- a/utils/container-utils/build.gradle.kts +++ b/utils/container-utils/build.gradle.kts @@ -1,9 +1,8 @@ plugins { `java-library` + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - dependencies { implementation(project(":utils:config-utils")) implementation(libs.slf4j) diff --git a/utils/filesystem-utils/build.gradle.kts b/utils/filesystem-utils/build.gradle.kts index de9fc636dd9..67577b7aad2 100644 --- a/utils/filesystem-utils/build.gradle.kts +++ b/utils/filesystem-utils/build.gradle.kts @@ -1,9 +1,8 @@ plugins { `java-library` + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - dependencies { testImplementation(project(":utils:test-utils")) } diff --git a/utils/flare-utils/build.gradle.kts b/utils/flare-utils/build.gradle.kts index f718826c226..b82b35fb79d 100644 --- a/utils/flare-utils/build.gradle.kts +++ b/utils/flare-utils/build.gradle.kts @@ -1,9 +1,8 @@ plugins { id("java-library") + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - dependencies { api(libs.okhttp) api(libs.moshi) diff --git a/utils/junit-utils/build.gradle.kts b/utils/junit-utils/build.gradle.kts index f8ec71577bb..294985edcce 100644 --- a/utils/junit-utils/build.gradle.kts +++ b/utils/junit-utils/build.gradle.kts @@ -1,9 +1,8 @@ plugins { `java-library` + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - dependencies { api(libs.forbiddenapis) api(project(":components:environment")) diff --git a/utils/logging-utils/build.gradle.kts b/utils/logging-utils/build.gradle.kts index f999e72d516..5a5ed3f2b88 100644 --- a/utils/logging-utils/build.gradle.kts +++ b/utils/logging-utils/build.gradle.kts @@ -3,10 +3,9 @@ import org.gradle.kotlin.dsl.extra plugins { `java-library` + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - dependencies { implementation(libs.slf4j) implementation(project(":internal-api")) diff --git a/utils/queue-utils/build.gradle.kts b/utils/queue-utils/build.gradle.kts index 8060b9229f5..6b72ab9e6a0 100644 --- a/utils/queue-utils/build.gradle.kts +++ b/utils/queue-utils/build.gradle.kts @@ -3,10 +3,9 @@ import org.gradle.jvm.toolchain.JavaLanguageVersion plugins { `java-library` + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - dependencies { api(project(":internal-api")) api(libs.jctools) diff --git a/utils/socket-utils/build.gradle.kts b/utils/socket-utils/build.gradle.kts index 89228bb1c4d..80055d2b62d 100644 --- a/utils/socket-utils/build.gradle.kts +++ b/utils/socket-utils/build.gradle.kts @@ -4,10 +4,9 @@ import org.gradle.kotlin.dsl.extra plugins { `java-library` idea + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - extensions.getByName("tracerJava").withGroovyBuilder { invokeMethod("addSourceSetFor", arrayOf(JavaVersion.VERSION_17, mapOf("compileOnly" to true))) } diff --git a/utils/test-agent-utils/decoder/build.gradle.kts b/utils/test-agent-utils/decoder/build.gradle.kts index be1d8f5df49..0698f1e7439 100644 --- a/utils/test-agent-utils/decoder/build.gradle.kts +++ b/utils/test-agent-utils/decoder/build.gradle.kts @@ -1,13 +1,14 @@ plugins { `java-library` + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - -extra["minimumInstructionCoverage"] = 0.8 -extra["excludedClassesCoverage"] = listOf( - "datadog.trace.test.agent.decoder.v04.raw.*", - "datadog.trace.test.agent.decoder.v05.raw.*", +val minimumInstructionCoverage by extra(0.8) +val excludedClassesCoverage by extra( + listOf( + "datadog.trace.test.agent.decoder.v04.raw.*", + "datadog.trace.test.agent.decoder.v05.raw.*", + ) ) dependencies { diff --git a/utils/test-utils/build.gradle.kts b/utils/test-utils/build.gradle.kts index 4481b0cbbba..b9c98b2a1fd 100644 --- a/utils/test-utils/build.gradle.kts +++ b/utils/test-utils/build.gradle.kts @@ -1,9 +1,8 @@ plugins { `java-library` + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - dependencies { api(libs.bytebuddy) api(libs.bytebuddyagent) diff --git a/utils/time-utils/build.gradle.kts b/utils/time-utils/build.gradle.kts index 842cf61170f..afe7febe6ba 100644 --- a/utils/time-utils/build.gradle.kts +++ b/utils/time-utils/build.gradle.kts @@ -1,12 +1,13 @@ plugins { `java-library` + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - -extra["excludedClassesCoverage"] = listOf( - "datadog.trace.api.time.ControllableTimeSource:", - "datadog.trace.api.time.SystemTimeSource" +val excludedClassesCoverage by extra( + listOf( + "datadog.trace.api.time.ControllableTimeSource:", + "datadog.trace.api.time.SystemTimeSource" + ) ) dependencies { diff --git a/utils/version-utils/build.gradle.kts b/utils/version-utils/build.gradle.kts index ff6517cc687..1e3b4faed28 100644 --- a/utils/version-utils/build.gradle.kts +++ b/utils/version-utils/build.gradle.kts @@ -1,10 +1,9 @@ plugins { `java-library` id("dd-trace-java.version-file") + id("dd-trace-java.module.internal-library") } -apply(from = "$rootDir/gradle/java.gradle") - dependencies { implementation(libs.slf4j) }