Skip to content

Make Java convention the composition root - #12333

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 6 commits into
masterfrom
bdu/java-convention-composition-root
Sep 6, 2026
Merged

Make Java convention the composition root#12333
gh-worker-dd-mergequeue-cf854d[bot] merged 6 commits into
masterfrom
bdu/java-convention-composition-root

Conversation

@bric3

@bric3 bric3 commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

What Does This Do

Move dependency locking and the remaining java_deps.gradle and java_no_deps.gradle composition into dd-trace-java.conventions.java.

Delete the now-unreferenced gradle/java.gradle compatibility 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

bric3 added 4 commits August 25, 2026 14:19
Keep shared Kotlin and default Groovy test wiring behind plugin callbacks.
Cover JVM test suites and test fixtures through Gradle source-set APIs.
@bric3 bric3 added tag: no release notes Changes to exclude from release notes type: refactoring comp: tooling Build & Tooling tag: ai generated Largely based on code generated by an AI or LLM labels Aug 28, 2026
@bric3
bric3 marked this pull request as ready for review August 28, 2026 13:59
@bric3
bric3 requested a review from a team as a code owner August 28, 2026 13:59
@bric3
bric3 requested review from amarziali and removed request for a team August 28, 2026 13:59
@datadog-prod-us1-6

This comment has been minimized.

@datadog-prod-us1-6 datadog-prod-us1-6 Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Datadog Autotest: PASS

More details

The Java convention keeps the deleted aggregator's plugin and script order. No build script still refers to the deleted file.

Was this helpful? React 👍 or 👎

Open Bits AI session

🤖 Datadog Autotest · Commit ebc24bc · What is Autotest? · @DataDog review to ask questions · Any feedback? Reach out in #autotest

@dd-octo-sts

dd-octo-sts Bot commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

🟢 Java Benchmark SLOs — All performance SLOs passed

Suite Status
Startup 🟢 pass

SLO thresholds are defined here based on automatically generated metrics. A warning is raised when results are within 5% of the threshold.

PR vs. master results
Scenario Candidate master Δ (95% CI of mean)
startup:insecure-bank:iast:Agent 14.82 s 14.59 s [+0.7%; +2.5%] (maybe worse)
startup:insecure-bank:tracing:Agent 13.68 s 13.74 s [-1.4%; +0.5%] (no difference)
startup:petclinic:appsec:Agent 16.98 s 16.81 s [+0.1%; +2.0%] (maybe worse)
startup:petclinic:iast:Agent 16.25 s 17.00 s [-8.5%; -0.3%] (maybe better)
startup:petclinic:profiling:Agent 16.71 s 16.74 s [-1.4%; +0.9%] (no difference)
startup:petclinic:sca:Agent 16.86 s 16.78 s [-0.4%; +1.4%] (no difference)
startup:petclinic:tracing:Agent 16.10 s 16.20 s [-1.4%; +0.2%] (no difference)

Commit: e7dc50d5 · CI Pipeline · Benchmarking Platform UI


Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion.

Base automatically changed from refactor/apply-java-convention-remaining-projects to master September 4, 2026 09:38
@bric3

bric3 commented Sep 4, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 4, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-04 10:18:53 UTC ℹ️ Start processing command /merge


2026-09-04 10:19:02 UTC ℹ️ MergeQueue: Pull request is not mergeable yet

It will be processed automatically as soon as GitHub reports it as mergeable. View in MergeQueue UI.

  • Run /code blockers to see what is blocking it.
  • Run /remove to cancel it.

2026-09-04 11:20:28 UTC ℹ️ MergeQueue: merge request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-09-04 11:36:33 UTCMergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for cdda3f6:

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
  • Any question, go check the FAQ.
Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

@bric3

bric3 commented Sep 4, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 4, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-04 10:32:04 UTC ℹ️ Start processing command /merge


2026-09-04 10:32:07 UTC ❌ MergeQueue

PR already in the queue with status waiting

@bric3

bric3 commented Sep 4, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 4, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-04 12:51:32 UTC ℹ️ Start processing command /merge


2026-09-04 12:51:38 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-09-04 13:40:56 UTCMergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for 5b9a957:

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
  • Any question, go check the FAQ.
Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

@bric3

bric3 commented Sep 4, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 4, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-04 13:46:41 UTC ℹ️ Start processing command /merge


2026-09-04 13:46:48 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-09-04 15:47:32 UTCMergeQueue: The build pipeline has timeout

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.

@bric3

bric3 commented Sep 4, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 4, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-04 16:03:52 UTC ℹ️ Start processing command /merge


2026-09-04 16:03:55 UTC ❌ MergeQueue

PR already in the queue with status in_progress

@bric3

bric3 commented Sep 5, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 5, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-05 09:22:04 UTC ℹ️ Start processing command /merge


2026-09-05 09:22:10 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-09-05 10:51:04 UTCMergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for e5983b5:

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
  • Any question, go check the FAQ.
Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

@bric3

bric3 commented Sep 5, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 5, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-05 15:34:22 UTC ℹ️ Start processing command /merge


2026-09-05 15:34:27 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-09-05 16:08:11 UTCMergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for 8c6b801:

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
  • Any question, go check the FAQ.
Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

@bric3

bric3 commented Sep 5, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 5, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-05 17:09:46 UTC ℹ️ Start processing command /merge


2026-09-05 17:09:51 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-09-05 18:02:00 UTCMergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for 6905847:

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
  • Any question, go check the FAQ.
Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

@bric3

bric3 commented Sep 5, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 5, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-05 22:13:56 UTC ℹ️ Start processing command /merge


2026-09-05 22:14:02 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-09-05 22:22:48 UTCMergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for 4cd21c0:

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
  • Any question, go check the FAQ.
Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

@bric3

bric3 commented Sep 6, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 6, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-06 13:23:29 UTC ℹ️ Start processing command /merge


2026-09-06 13:23:35 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-09-06 13:40:19 UTCMergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for e521e42:

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
  • Any question, go check the FAQ.
Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

@bric3

bric3 commented Sep 6, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 6, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-06 15:20:52 UTC ℹ️ Start processing command /merge


2026-09-06 15:20:57 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-09-06 15:29:41 UTCMergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for 87bf222:

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

  • Investigate the failures and when ready, re-add your pull request to the queue!
  • If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
  • Any question, go check the FAQ.
Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

@bric3

bric3 commented Sep 6, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Sep 6, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-09-06 17:44:30 UTC ℹ️ Start processing command /merge


2026-09-06 17:44:37 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).


2026-09-06 18:34:34 UTC ℹ️ MergeQueue: This merge request was merged

@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854d Bot merged commit 8014b9c into master Sep 6, 2026
600 checks passed
@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854d Bot deleted the bdu/java-convention-composition-root branch September 6, 2026 18:34
@github-actions github-actions Bot added this to the 1.66.0 milestone Sep 6, 2026
@bric3

bric3 commented Sep 6, 2026

Copy link
Copy Markdown
Contributor Author

16 attempts to /merge !


I checked the failed jobs afterward. None was related to this PR's changes:

  • 5 smoke-build failures: Maven Central or the Depot proxy returned HTTP 429/503 while the nested Armeria build resolved dependencies.
  • 1 Semeru 17 failure: the SQL Server Testcontainers container did not start.
  • 3 ARM SSI failures: Ubuntu package mirrors returned HTTP 503 during VM provisioning.
  • Other red jobs were allowed failures caused by a missing benchmark baseline artifact or ARM timeouts without test failures.

The unchanged PR head ultimately passed and merged.

jordan-wong added a commit that referenced this pull request Sep 8, 2026
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: tooling Build & Tooling tag: ai generated Largely based on code generated by an AI or LLM tag: no release notes Changes to exclude from release notes type: refactoring

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants