refactor: refine module convention kinds

bric3 · bric3 · commit b5b937b30493 · 2026-06-11T15:40:43.000+02:00
Rename the `sub-agent` module kind to `agent-product` and reserve it for
shipped agent products.
Add `bootstrap-component` and `testing-support` module kinds.
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
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
@@ -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
@@ -0,0 +1,3 @@
+plugins {
+  id("dd-trace-java.conventions.java")
+}
diff --git a/components/environment/build.gradle.kts b/components/environment/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   `java-library`
   id("com.gradleup.shadow")
-  id("dd-trace-java.module.internal-component")
+  id("dd-trace-java.module.bootstrap-component")
 }
 
 dependencies {
diff --git a/dd-java-agent/agent-aiguard/build.gradle b/dd-java-agent/agent-aiguard/build.gradle
@@ -3,7 +3,7 @@ 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.sub-agent'
+  id 'dd-trace-java.module.agent-product'
 }
 
 java {
@@ -33,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
@@ -1,7 +1,7 @@
 plugins {
   id 'com.gradleup.shadow'
   id 'me.champeau.jmh'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.bootstrap-component'
   id 'idea'
 }
 
diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle
@@ -6,7 +6,7 @@ plugins {
   id 'com.gradleup.shadow'
   id 'org.jetbrains.kotlin.jvm'
   id 'dd-trace-java.version-file'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.agent-product'
 }
 
 apply from: "$rootDir/gradle/test-with-kotlin.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
@@ -1,6 +1,6 @@
 plugins {
   id 'dd-trace-java.version-file'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.testing-support'
 }
 
 dependencies {
@@ -10,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
@@ -1,6 +1,6 @@
 plugins {
   id 'dd-trace-java.version-file'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.testing-support'
 }
 
 dependencies {
@@ -21,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
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 // The functionality is tested in dd-smoke-tests/crashtracking
@@ -33,4 +33,3 @@ dependencies {
   testImplementation libs.testcontainers
   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
@@ -4,7 +4,7 @@ plugins {
   id 'com.gradleup.shadow'
   id 'dd-trace-java.version-file'
   id 'java-test-fixtures'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.agent-product'
 }
 
 minimumInstructionCoverage = 0.1
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle b/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'dd-trace-java.version-file'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.bootstrap-component'
 }
 
 // Most of the classes are just object model
diff --git a/dd-java-agent/agent-debugger/debugger-el/build.gradle b/dd-java-agent/agent-debugger/debugger-el/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'dd-trace-java.version-file'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 minimumInstructionCoverage = 0.1
diff --git a/dd-java-agent/agent-debugger/debugger-test-scala/build.gradle b/dd-java-agent/agent-debugger/debugger-test-scala/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'scala'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 dependencies {
diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle
@@ -7,7 +7,7 @@ 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.sub-agent'
+  id 'dd-trace-java.module.agent-product'
 }
 
 tasks.withType(AbstractCompile).configureEach {
diff --git a/dd-java-agent/agent-iast/iast-test-fixtures/build.gradle b/dd-java-agent/agent-iast/iast-test-fixtures/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'dd-trace-java.version-file'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.testing-support'
 }
 
 dependencies {
diff --git a/dd-java-agent/agent-installer/build.gradle b/dd-java-agent/agent-installer/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
   id 'idea'
 }
 
diff --git a/dd-java-agent/agent-jmxfetch/build.gradle b/dd-java-agent/agent-jmxfetch/build.gradle
@@ -9,7 +9,7 @@ import static java.nio.file.StandardOpenOption.CREATE
 
 plugins {
   id 'com.gradleup.shadow'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.agent-product'
 }
 
 dependencies {
diff --git a/dd-java-agent/agent-llmobs/build.gradle b/dd-java-agent/agent-llmobs/build.gradle
@@ -3,7 +3,7 @@ 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.sub-agent'
+  id 'dd-trace-java.module.agent-product'
 }
 
 minimumBranchCoverage = 0.0
diff --git a/dd-java-agent/agent-logging/build.gradle b/dd-java-agent/agent-logging/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 excludedClassesCoverage += [
diff --git a/dd-java-agent/agent-logs-intake/build.gradle b/dd-java-agent/agent-logs-intake/build.gradle
@@ -3,7 +3,7 @@ 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.sub-agent'
+  id 'dd-trace-java.module.agent-product'
 }
 
 excludedClassesCoverage += [
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/build.gradle b/dd-java-agent/agent-otel/otel-bootstrap/build.gradle
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
   id 'com.gradleup.shadow'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.bootstrap-component'
   id 'dd-trace-java.build-time-instrumentation'
 }
 
diff --git a/dd-java-agent/agent-otel/otel-shim/build.gradle b/dd-java-agent/agent-otel/otel-shim/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.bootstrap-component'
 }
 
 minimumInstructionCoverage = 0.0
diff --git a/dd-java-agent/agent-otel/otel-tooling/build.gradle b/dd-java-agent/agent-otel/otel-tooling/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 minimumInstructionCoverage = 0.0
diff --git a/dd-java-agent/agent-profiling/build.gradle b/dd-java-agent/agent-profiling/build.gradle
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
   id 'com.gradleup.shadow'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.agent-product'
 }
 
 excludedClassesCoverage += [
diff --git 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,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
   id 'idea'
 }
 
diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java-test-fixtures'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
   id 'idea'
 }
 
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
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
   id 'idea'
 }
 
diff --git 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,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
   id 'idea'
 }
 
diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 tracerJava {
diff --git a/dd-java-agent/agent-profiling/profiling-controller/build.gradle b/dd-java-agent/agent-profiling/profiling-controller/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 // We have some general logging paths that are hard to test
@@ -29,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
@@ -1,6 +1,6 @@
 plugins {
   id 'com.gradleup.shadow'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
   id 'idea'
 }
 
diff --git a/dd-java-agent/agent-profiling/profiling-scrubber/build.gradle b/dd-java-agent/agent-profiling/profiling-scrubber/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 minimumInstructionCoverage = 0.0
diff --git a/dd-java-agent/agent-profiling/profiling-testing/build.gradle b/dd-java-agent/agent-profiling/profiling-testing/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.testing-support'
 }
 
 excludedClassesCoverage += [// These classes are using only for testing
@@ -12,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
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 // Set properties before any plugins get loaded
@@ -43,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
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 // Set properties before any plugins get loaded
diff --git a/dd-java-agent/agent-tooling/build.gradle b/dd-java-agent/agent-tooling/build.gradle
@@ -1,7 +1,7 @@
 plugins {
   id 'me.champeau.jmh'
   id 'java-test-fixtures'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 apply from: "$rootDir/gradle/tries.gradle"
diff --git a/dd-java-agent/appsec/appsec-test-fixtures/build.gradle b/dd-java-agent/appsec/appsec-test-fixtures/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'dd-trace-java.version-file'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.testing-support'
 }
 
 dependencies {
diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle
@@ -4,7 +4,7 @@ plugins {
   id 'com.gradleup.shadow'
   id 'me.champeau.jmh'
   id 'dd-trace-java.version-file'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.agent-product'
 }
 
 apply from: "$rootDir/gradle/tries.gradle"
diff --git a/dd-java-agent/cws-tls/build.gradle b/dd-java-agent/cws-tls/build.gradle
@@ -4,7 +4,7 @@ import org.apache.maven.model.License
 plugins {
   id 'com.gradleup.shadow'
   id 'dd-trace-java.version-file'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.agent-product'
 }
 
 excludedClassesCoverage += ['datadog.cws.erpc.*', 'datadog.cws.tls.*',]
diff --git a/dd-java-agent/ddprof-lib/build.gradle b/dd-java-agent/ddprof-lib/build.gradle
@@ -3,7 +3,7 @@ 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.sub-agent'
+  id 'dd-trace-java.module.internal-component'
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation-testing/build.gradle b/dd-java-agent/instrumentation-testing/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.testing-support'
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle
@@ -7,10 +7,9 @@ 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)
 
diff --git a/dd-java-agent/testing/build.gradle b/dd-java-agent/testing/build.gradle
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
   id 'com.gradleup.shadow'
-  id 'dd-trace-java.module.sub-agent'
+  id 'dd-trace-java.module.testing-support'
 }
 
 tasks.withType(JavaCompile).configureEach {
diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'dd-trace-java.module.internal-component'
+  id 'dd-trace-java.module.agent-product'
   id 'me.champeau.jmh'
   id 'dd-trace-java.version-file'
 }
diff --git a/products/feature-flagging/feature-flagging-agent/build.gradle.kts b/products/feature-flagging/feature-flagging-agent/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
   `java-library`
   id("com.gradleup.shadow")
   id("dd-trace-java.version-file")
-  id("dd-trace-java.module.internal-component")
+  id("dd-trace-java.module.agent-product")
 }
 
 description = "Feature flagging agent system"
diff --git a/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts b/products/feature-flagging/feature-flagging-bootstrap/build.gradle.kts
diff --git a/products/metrics/metrics-lib/build.gradle.kts b/products/metrics/metrics-lib/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+plugins {`
	`2`	`+ id("dd-trace-java.conventions.java")`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`java-library`
`3`	`3`	`id("com.gradleup.shadow")`
`4`		`- id("dd-trace-java.module.internal-component")`
	`4`	`+ id("dd-trace-java.module.bootstrap-component")`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar`
`3`	`3`	`plugins {`
`4`	`4`	`id 'com.gradleup.shadow'`
`5`	`5`	`id 'dd-trace-java.version-file'`
`6`		`- id 'dd-trace-java.module.sub-agent'`
	`6`	`+ id 'dd-trace-java.module.agent-product'`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`java {`
`@@ -33,4 +33,3 @@ tasks.named("shadowJar", ShadowJar) {`
`33`	`33`	`tasks.named("jar", Jar) {`
`34`	`34`	`archiveClassifier = 'unbundled'`
`35`	`35`	`}`
`36`		`-`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`id 'com.gradleup.shadow'`
`7`	`7`	`id 'org.jetbrains.kotlin.jvm'`
`8`	`8`	`id 'dd-trace-java.version-file'`
`9`		`- id 'dd-trace-java.module.sub-agent'`
	`9`	`+ id 'dd-trace-java.module.agent-product'`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`apply from: "$rootDir/gradle/test-with-kotlin.gradle"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'dd-trace-java.version-file'`
`3`		`- id 'dd-trace-java.module.sub-agent'`
	`3`	`+ id 'dd-trace-java.module.testing-support'`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`
`@@ -10,4 +10,3 @@ dependencies {`
`10`	`10`	`compileOnly(libs.bundles.groovy)`
`11`	`11`	`compileOnly(libs.bundles.spock)`
`12`	`12`	`}`
`13`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id 'dd-trace-java.module.sub-agent'`
	`2`	`+ id 'dd-trace-java.module.internal-component'`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`// The functionality is tested in dd-smoke-tests/crashtracking`
`@@ -33,4 +33,3 @@ dependencies {`
`33`	`33`	`testImplementation libs.testcontainers`
`34`	`34`	`testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()`
`35`	`35`	`}`
`36`		`-`