Make Java convention the composition root - #12333
Make Java convention the composition root#12333gh-worker-dd-mergequeue-cf854d[bot] merged 6 commits into
Conversation
Keep shared Kotlin and default Groovy test wiring behind plugin callbacks.
Cover JVM test suites and test fixtures through Gradle source-set APIs.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
More details
The Java convention keeps the deleted aggregator's plugin and script order. No build script still refers to the deleted file.
🤖 Datadog Autotest · Commit ebc24bc · What is Autotest? · @DataDog review to ask questions · Any feedback? Reach out in #autotest
🟢 Java Benchmark SLOs — All performance SLOs passed
PR vs. master results
Commit: Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion. |
|
/merge |
|
View all feedbacks in Devflow UI.
It will be processed automatically as soon as GitHub reports it as mergeable. View in MergeQueue UI.
The expected merge time in
Build pipeline has failing jobs for cdda3f6: What to do next?
DetailsSince those jobs are not marked as being allowed to fail, the pipeline will most likely fail. |
|
/merge |
|
View all feedbacks in Devflow UI.
PR already in the queue with status waiting |
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
Build pipeline has failing jobs for 5b9a957: What to do next?
DetailsSince those jobs are not marked as being allowed to fail, the pipeline will most likely fail. |
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
The merge request has been interrupted because the build 6729387127231966687 took longer than expected. The current limit for the base branch 'master' is 120 minutes. |
|
/merge |
|
View all feedbacks in Devflow UI.
PR already in the queue with status in_progress |
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
Build pipeline has failing jobs for e5983b5: What to do next?
DetailsSince those jobs are not marked as being allowed to fail, the pipeline will most likely fail. |
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
Build pipeline has failing jobs for 8c6b801: What to do next?
DetailsSince those jobs are not marked as being allowed to fail, the pipeline will most likely fail. |
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
Build pipeline has failing jobs for 6905847: What to do next?
DetailsSince those jobs are not marked as being allowed to fail, the pipeline will most likely fail. |
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
Build pipeline has failing jobs for 4cd21c0: What to do next?
DetailsSince those jobs are not marked as being allowed to fail, the pipeline will most likely fail. |
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
Build pipeline has failing jobs for e521e42: What to do next?
DetailsSince those jobs are not marked as being allowed to fail, the pipeline will most likely fail. |
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
Build pipeline has failing jobs for 87bf222: What to do next?
DetailsSince those jobs are not marked as being allowed to fail, the pipeline will most likely fail. |
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
|
|
16 attempts to I checked the failed jobs afterward. None was related to this PR's changes:
The unchanged PR head ultimately passed and merged. |
gradle/java.gradle was removed from master by "Make Java convention the composition root" (#12333) — the dd-trace-java.module.instrumentation plugin id (restored in the previous commit) already covers this setup, so the apply from line was both redundant and pointing at a deleted file. Rebased this branch onto current origin/master to pick up that refactor. Verified: ./gradlew :dd-java-agent:instrumentation:grpc-1.5:compileJava now succeeds.
What Does This Do
Move dependency locking and the remaining
java_deps.gradleandjava_no_deps.gradlecomposition intodd-trace-java.conventions.java.Delete the now-unreferenced
gradle/java.gradlecompatibility aggregator and retain the Spotless regression guard with guidance toward the Java convention.Motivation
After #12331 migrates the remaining direct consumers, the Java convention can become the composition root and own the incremental extraction of its remaining legacy internals.
See #12258.
Contributor Checklist
type:and (comp:orinst:) labels in addition to any other useful labelsclose,fix, or any linking keywords when referencing an issueUse
solvesinstead, and assign the PR milestone to the issue