Introduce module-kind convention plugins

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")
-

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"))

buildSrc/src/main/kotlin/dd-trace-java.module.agent-product.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("dd-trace-java.conventions.java")
+}

buildSrc/src/main/kotlin/dd-trace-java.module.annotation-processor.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("dd-trace-java.conventions.java")
+}

buildSrc/src/main/kotlin/dd-trace-java.module.bootstrap-component.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("dd-trace-java.conventions.java")
+}

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"))

buildSrc/src/main/kotlin/dd-trace-java.module.instrumentation.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("dd-trace-java.conventions.java")
+}

buildSrc/src/main/kotlin/dd-trace-java.module.internal-api.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("dd-trace-java.conventions.java")
+}

buildSrc/src/main/kotlin/dd-trace-java.module.internal-library.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("dd-trace-java.conventions.java")
+}

buildSrc/src/main/kotlin/dd-trace-java.module.internal-platform-component.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("dd-trace-java.conventions.java")
+}

buildSrc/src/main/kotlin/dd-trace-java.module.smoke-test.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("dd-trace-java.conventions.java")
+}

buildSrc/src/main/kotlin/dd-trace-java.module.testing-support.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("dd-trace-java.conventions.java")
+}

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)
 

components/annotations/build.gradle.kts

@@ -1 +1,3 @@
-apply(from = "$rootDir/gradle/java.gradle")
+plugins {
+  id("dd-trace-java.module.internal-platform-component")
+}

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

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"))
 }

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

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()
 }

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"))
 }

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'
 }
-

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")

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"
 

dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/build.gradle

@@ -1,14 +1,12 @@
 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')
 
   compileOnly(libs.bundles.groovy)
   compileOnly(libs.bundles.spock)
 }
-

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 }
-

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()
 }
-

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 += [

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

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
 

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'
 }

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")
 }

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')

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.*']

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') {

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
 

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

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",

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

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

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

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',

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) {

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 ¯\_(ツ)_/¯