Skip to content

Update Gradle to 9.6.0#11682

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 5 commits into
masterfrom
bdu/bump-gradle-9.6-rc.1
Jun 19, 2026
Merged

Update Gradle to 9.6.0#11682
gh-worker-dd-mergequeue-cf854d[bot] merged 5 commits into
masterfrom
bdu/bump-gradle-9.6-rc.1

Conversation

@bric3

@bric3 bric3 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

What Does This Do

This pull request updates the project to use Gradle 9.6.0 and implements fixes to address compatibility issues introduced by this version. Specifically, it includes the following changes:

Motivation

Gradle 9.6.0 introduces new features and deprecations that necessitate updating the project to maintain compatibility. This update ensures a smooth transition to the newer Gradle version and resolves specific issues arising from dependency conflicts and regression changes.

One thing we are looking for in particular in this release is the probable performance improvement in the CI environment thanks to melioration related to fingeprinting (gradle/gradle#37406) and its btree cache storage gradle/gradle#37386 (the PR now grows the file by 64KiB chunks, instead of calling file.setLength, which results in ftruncate syscall , this syscall is expensive on cloud storage as it triggers metadata journal commits). There are other details in there, but that appears to be the main explanation. (According to the gradle PR, the cost of ftruncate depends on the underlying storage, so it may also depend on what we run the CI on).

Additional Notes

Contributor Checklist

  • Format the title according to the contribution guidelines
  • Assign the type: and (comp: or inst:) labels in addition to any other useful labels
  • Avoid using close, fix, or any linking keywords when referencing an issue
    Use solves instead, and assign the PR milestone to the issue
  • Update the CODEOWNERS file on source file addition, migration, or deletion
  • Update public documentation with any new configuration flags or behaviors
  • Add your completed PR to the merge queue by commenting /merge. You can also:
    • Customize the commit message associated with the merge with /merge --commit-message "..."
    • Remove your PR from the merge queue with /merge -c
    • Skip all merge queue checks with /merge -f --reason "reason"; please use this judiciously, as some checks do not run at the PR-level (note: the PR still needs to be mergeable, this will only skip the pre-merge build)
    • Get more information in this doc

Jira ticket: [PROJ-IDENT]

@bric3 bric3 requested a review from a team as a code owner June 19, 2026 13:00
@bric3 bric3 requested a review from AlexeyKuznetsov-DD June 19, 2026 13:00
@bric3 bric3 requested review from a team as code owners June 19, 2026 13:00
@bric3 bric3 requested review from leoromanovsky and typotter and removed request for a team June 19, 2026 13:00
@bric3 bric3 added tag: no release notes Changes to exclude from release notes comp: tooling Build & Tooling labels Jun 19, 2026
@bric3 bric3 requested review from mcculls and vandonr and removed request for a team June 19, 2026 13:00
bric3 added 2 commits June 19, 2026 15:02
…t path quoting

Gradle 9.6 wraps project paths in single quotes in the dependencies report
output: `project ':dd-java-agent:agent-bootstrap'` instead of the previous
`project :dd-java-agent:agent-bootstrap`. Drop the `project` prefix from
the assertion so the check matches both formats.
@datadog-prod-us1-3

This comment has been minimized.

@bric3 bric3 force-pushed the bdu/bump-gradle-9.6-rc.1 branch from 787f7c7 to f29c9b7 Compare June 19, 2026 13:02

@chatgpt-codex-connector chatgpt-codex-connector 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.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 787f7c75f9

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle Outdated
@dd-octo-sts

dd-octo-sts Bot commented Jun 19, 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.04 s 13.92 s [+0.2%; +1.6%] (maybe worse)
startup:insecure-bank:tracing:Agent 13.00 s 12.98 s [-0.6%; +0.9%] (no difference)
startup:petclinic:appsec:Agent 16.87 s 16.57 s [+0.7%; +2.9%] (maybe worse)
startup:petclinic:iast:Agent 16.79 s 16.91 s [-1.6%; +0.1%] (no difference)
startup:petclinic:profiling:Agent 16.75 s 16.84 s [-1.3%; +0.3%] (no difference)
startup:petclinic:sca:Agent 16.92 s 16.79 s [-0.3%; +1.8%] (no difference)
startup:petclinic:tracing:Agent 16.07 s 15.98 s [-0.3%; +1.3%] (no difference)

Commit: c55ce4bd · 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.

@bric3 bric3 requested a review from a team as a code owner June 19, 2026 13:30
@bric3 bric3 requested review from erikayasuda and removed request for a team June 19, 2026 13:30

@AlexeyKuznetsov-DD AlexeyKuznetsov-DD left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM.
Left couple of comments.

Comment thread dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle Outdated
Comment thread dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle Outdated
Comment thread .gitlab-ci.yml
bric3 added 3 commits June 19, 2026 17:52
… under Gradle 9.6

The `sofa-rpc-all:5.14.2` brings `netty-all:4.1.44.Final`, which is a
fat jar, while `grpc-netty:1.53.0` brings individual
`netty-*:4.1.79.Final` modules. Gradle 9.6.0 introduced a regression in
the classpath ordering, as they are working on revamping the dependency
traversal. The result is that the `4.1.44` fat jar classes appears
earlier and its classes are loaded from it ; This produces a
`NoSuchMethodError` at runtime in netty's
`AbstractReferenceCountedByteBuf`.

The workaround is to force `netty-all` to `4.1.79` so the fat jar and
the individual modules are aligned on the same version. This should be
fixed in 9.7.0 and consequently removed from the `resolutionStrategy`.

See gradle/gradle#38057
@bric3 bric3 force-pushed the bdu/bump-gradle-9.6-rc.1 branch from 8d1b63c to c55ce4b Compare June 19, 2026 15:53
@bric3

bric3 commented Jun 19, 2026

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Jun 19, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-06-19 15:55:53 UTC ℹ️ Start processing command /merge


2026-06-19 15:55:59 UTC ℹ️ MergeQueue: waiting for PR to be ready

This pull request is not mergeable according to GitHub. Common reasons include pending required checks, missing approvals, or merge conflicts — but it could also be blocked by other repository rules or settings.
It will be added to the queue as soon as checks pass and/or get approvals. View in MergeQueue UI.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.


2026-06-19 16:52:07 UTC ℹ️ MergeQueue: merge request added to the queue

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


2026-06-19 17:52:37 UTC ℹ️ MergeQueue: This merge request was merged

@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit 0fdd9c2 into master Jun 19, 2026
582 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the bdu/bump-gradle-9.6-rc.1 branch June 19, 2026 17:52
@github-actions github-actions Bot added this to the 1.64.0 milestone Jun 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: tooling Build & Tooling tag: no release notes Changes to exclude from release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants