Skip to content

Bump Gradle daemon JDK to 25 - #11570

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 4 commits into
masterfrom
bdu/bump-daemon-jdk-25
Jun 5, 2026
Merged

Bump Gradle daemon JDK to 25#11570
gh-worker-dd-mergequeue-cf854d[bot] merged 4 commits into
masterfrom
bdu/bump-daemon-jdk-25

Conversation

@bric3

@bric3bric3 commented Jun 4, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

What Does This Do

Bumps the Gradle daemon JDK from 21 to 25 via ./gradlew updateDaemonJvm --jvm-version=25.

It's possible because Gradle 9.0 is the first version to support Java 25 for the Daemon JVM.

Related

Motivation

Keep the build daemon on the latest JDK release.

Additional Notes

  • Kotlin Gradle plugin bumped from 2.0.21 to 2.1.20, Kotlin 2.1.x is the first to support running on Java 25
  • javadoc task now explicitly uses the JDK 8 toolchain, the JDK 25 javadoc treats HTTP redirects as hard errors, and it happens that the Oracle Java 8 API link appears to be broken; running with JDK 8's own tool avoids this.

jardiff checks

jardiff -c classdata --include '**/*.class,**/*.classdata' \
dd-trace-java/dd-java-agent/build/libs/dd-java-agent-1.64.0-SNAPSHOT.jar \
../bump-daemon-jdk-25/dd-java-agent/build/libs/dd-java-agent-1.64.0-SNAPSHOT.jar
  • Class-file version: unchanged
  • No added/deleted classes
  • Observed some synthetic renumbering which affect internals only
  • StackMapTable / FRAME changes those are narrower: Object -> String, Map -> HashMap, TagValue -> concrete tag enum/class.
  • Constructor and synthetic accessor descriptor changes are limited to compiler-generated scaffolding, for example captured-local plumbing in nested anonymous classes and access$... / lambda$... bridge renumbering in AdviceAppliesOnScanner, DefaultDataStreamsMonitoring, CoreTracer, and JvmOtlpRuntimeMetrics.

@bric3@claude
chore: bump Gradle daemon JDK to 25
ca571fa
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
@bric3bric3 added comp: core Tracer core tag: no release notes Changes to exclude from release notes type: refactoring labels Jun 4, 2026
@datadog-datadog-prod-us1-2

This comment has been minimized.

Sign in to view
@dd-octo-sts

dd-octo-stsBot commented Jun 4, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

🟢 Java Benchmark SLOs — All performance SLOs passed

SuiteStatus
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
ScenarioCandidatemasterΔ (95% CI of mean)
startup:insecure-bank:iast:Agent13.98 s13.96 s[-1.3%; +1.4%] (no difference)
startup:insecure-bank:tracing:Agent12.94 s12.93 s[-0.8%; +0.9%] (no difference)
startup:petclinic:appsec:Agent16.64 s16.37 s[+0.5%; +2.8%] (maybe worse)
startup:petclinic:iast:Agent16.55 s16.60 s[-1.3%; +0.7%] (no difference)
startup:petclinic:profiling:Agent16.51 s16.57 s[-1.5%; +0.7%] (no difference)
startup:petclinic:tracing:Agent15.89 s16.04 s[-2.2%; +0.3%] (no difference)

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

bric3and others added 2 commits June 4, 2026 21:44
@bric3@claude
fix: upgrade Kotlin plugin to 2.1.20 and fix javadoc link for JDK 25
dcb0910
Kotlin 2.0.21 fails to parse JDK 25 version strings (IllegalArgumentException
in JavaVersion.parse). Kotlin 2.1.20 resolves this.
JDK 25 javadoc rejects the old Oracle Java 8 docs URL which now redirects;
replace with the stable canonical URL.
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
@bric3@claude
fix: run javadoc task with JDK 8 toolchain
f4d61fd
JDK 25 javadoc treats HTTP redirects as hard errors; Oracle's Java 8
API URL now redirects. Running javadoc with the JDK 8 tool is
semantically correct (source=8) and avoids the redirect restriction.
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
@bric3bric3 added comp: tooling Build & Tooling tag: ai generated Largely based on code generated by an AI or LLM and removed comp: core Tracer core type: refactoring labels Jun 4, 2026
@bric3
bric3 marked this pull request as ready for review June 4, 2026 21:31
@bric3
bric3 requested a review from a team as a code ownerJune 4, 2026 21:31
chatgpt-codex-connector[bot]
chatgpt-codex-connectorBot reviewed Jun 4, 2026
View reviewed changes

@chatgpt-codex-connectorchatgpt-codex-connectorBot 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:f4d61fdbe6

ℹ️ 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 threadgradle/libs.versions.toml
@bric3
bric3 added this pull request to the merge queueJun 5, 2026
@dd-octo-sts

dd-octo-stsBot commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351Bot commented Jun 5, 2026•
edited
Loading

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-06-05 15:55:02 UTC ℹ️ Start processing command /merge

2026-06-05 15:55:07 UTC ℹ️ MergeQueue: pull request added to the queue

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

2026-06-05 16:53:53 UTC ℹ️ MergeQueue: This merge request was merged

@github-merge-queue
github-merge-queueBot removed this pull request from the merge queue due to failed status checks Jun 5, 2026
PerfectSlayer
PerfectSlayer approved these changes Jun 5, 2026
View reviewed changes

@PerfectSlayerPerfectSlayer left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

👏 praise: ‏Nice to have the impact using your jardiff too!

@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854dBot merged commit f037b93 into masterJun 5, 2026
578 checks passed
@gh-worker-dd-mergequeue-cf854d
gh-worker-dd-mergequeue-cf854dBot deleted the bdu/bump-daemon-jdk-25 branch June 5, 2026 16:53
@github-actionsgithub-actionsBot added this to the 1.64.0 milestone Jun 5, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chatgpt-codex-connectorchatgpt-codex-connector[bot]chatgpt-codex-connector[bot] left review comments
@mccullsmccullsmcculls approved these changes
@PerfectSlayerPerfectSlayerPerfectSlayer approved these changes
@manuel-alvarez-alvarezmanuel-alvarez-alvarezAwaiting requested review from manuel-alvarez-alvarezmanuel-alvarez-alvarez is a code owner automatically assigned from DataDog/apm-java
@AlexeyKuznetsov-DDAlexeyKuznetsov-DDAwaiting requested review from AlexeyKuznetsov-DD

Assignees

No one assigned

Labels

comp: toolingBuild & Toolingtag: ai generatedLargely based on code generated by an AI or LLMtag: no release notesChanges to exclude from release notes

Projects

None yet

Milestone

1.64.0

Development

Successfully merging this pull request may close these issues.

3 participants

@bric3@mcculls@PerfectSlayer