Support latest Robolectric 4.17 by AlexeyKuznetsov-DD · Pull Request #12478 · DataDog/dd-trace-java

AlexeyKuznetsov-DD · 2026-09-13T02:47:59Z

What Does This Do

Updates Robolectric test metadata collection for Robolectric 4.17 by reading the Android release and API level from android.os.Build.
Adds the Robolectric Android 14 SDK artifact as a compile-time and muzzle dependency.
Updates the Gradle daemon smoke fixture and expected events to test the pinned 4.16 version and the latest one (4.17).

Motivation

Robolectric 4.17 removed org.robolectric.versioning.AndroidVersions. Because the instrumentation's muzzle range is open-ended, validation began resolving 4.17 and failed deterministically:

FAILED MUZZLE VALIDATION: RobolectricInstrumentation mismatches:
-- RobolectricTestAnnotator: Missing class org.robolectric.versioning.AndroidVersions

Using the Android SDK classes that Robolectric exposes avoids the removed internal API while preserving the existing CI Visibility metadata values.

Additional Notes

Validation:

./gradlew :dd-java-agent:instrumentation:robolectric-4.13:muzzle :dd-java-agent:instrumentation:robolectric-4.13:spotlessCheck
./gradlew :dd-smoke-tests:gradle:spotlessCheck
./gradlew :dd-smoke-tests:gradle:test --tests datadog.smoketest.GradleDaemonSmokeTest.testRobolectric (the existing JDK 17-21 guard skipped the scenario on JDK 25)

Relevant precedent: #11852

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

Jira ticket: N/A

dd-octo-sts · 2026-09-13T03:10:20Z

🟢 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.76 s	14.61 s	[+0.2%; +1.8%] (maybe worse)
startup:insecure-bank:tracing:Agent	13.67 s	13.70 s	[-1.1%; +0.5%] (no difference)
startup:petclinic:appsec:Agent	17.06 s	16.92 s	[-0.1%; +1.7%] (no difference)
startup:petclinic:iast:Agent	16.43 s	16.90 s	[-7.1%; +1.5%] (no difference)
startup:petclinic:profiling:Agent	16.03 s	16.80 s	[-8.8%; -0.4%] (maybe better)
startup:petclinic:sca:Agent	16.39 s	16.79 s	[-6.6%; +1.8%] (no difference)
startup:petclinic:tracing:Agent	16.02 s	16.19 s	[-2.1%; -0.0%] (maybe better)

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

chatgpt-codex-connector · 2026-09-13T03:14:20Z

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-09-13T03:16:38.805981Z	`c2221fc`	Draft marked ready
🔒 Security Review	✅ Completed 2026-09-13T03:17:51.398558Z	`c2221fc`	Draft marked ready

ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

datadog-datadog-prod-us1

The new codename mapping changes API 25, 27, and 32 to N, O, and S. The old values are NMR1, OMR1, and Sv2.

_{Open Bits AI session}

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

daniel-mohedano

Changed the approach for the codename resolution, but overall LGTM! I also added a smoke test case so that we also test the latest version instead of just a fixed one. Thanks for taking the initiative of creating the PR with the fixes 🚀

cit-pr-commenter-54b7da · 2026-09-14T14:11:05Z

CI Visibility Test Environment - sbt-scalatest

Job Status: 🟢 success

Scenario	This PR (%)	7d median	Δ 7d	30d median	Δ 30d	runs (7d/30d)
agent	54.64	55.43	$\color{green}{\blacktriangledown}$ -0.79	55.43	$\color{green}{\blacktriangledown}$ -0.79	59/207
agentEvpProxy	54.38	n/a	n/a	n/a	n/a	-

Baseline: median of @test.tracer_overhead on main (gitlab) over the last 7/30 days, per OSS project & scenario. Δ = this PR − baseline median; red ▲ = more overhead, green ▽ = less overhead than baseline.

Tests run to verify that CI Visibility behavior has not regressed in the current PR.

cit-pr-commenter-54b7da · 2026-09-14T14:31:35Z

CI Visibility Test Environment - okhttp

Job Status: 🟢 success

Scenario	This PR (%)	7d median	Δ 7d	30d median	Δ 30d	runs (7d/30d)
agent	16.43	19.59	$\color{green}{\blacktriangledown}$ -3.16	19.99	$\color{green}{\blacktriangledown}$ -3.56	33/106
agentless	16.81	19.20	$\color{green}{\blacktriangledown}$ -2.39	19.20	$\color{green}{\blacktriangledown}$ -2.39	31/103
agentlessCodeCoverage	20.18	22.54	$\color{green}{\blacktriangledown}$ -2.36	22.54	$\color{green}{\blacktriangledown}$ -2.36	32/104
agentlessLineCoverage	36.08	38.67	$\color{green}{\blacktriangledown}$ -2.59	38.67	$\color{green}{\blacktriangledown}$ -2.59	32/105

Baseline: median of @test.tracer_overhead on main (gitlab) over the last 7/30 days, per OSS project & scenario. Δ = this PR − baseline median; red ▲ = more overhead, green ▽ = less overhead than baseline.

Tests run to verify that CI Visibility behavior has not regressed in the current PR.

cit-pr-commenter-54b7da · 2026-09-14T14:39:44Z

CI Visibility Test Environment - spring_boot

Job Status: 🟢 success

Scenario	This PR (%)	7d median	Δ 7d	30d median	Δ 30d	runs (7d/30d)
agent	16.14	16.04	$\color{red}{\blacktriangle}$ +0.10	16.36	$\color{green}{\blacktriangledown}$ -0.22	34/106
agentless	9.61	9.92	$\color{green}{\blacktriangledown}$ -0.31	9.92	$\color{green}{\blacktriangledown}$ -0.31	32/104
agentlessCodeCoverage	13.70	13.40	$\color{red}{\blacktriangle}$ +0.30	13.40	$\color{red}{\blacktriangle}$ +0.30	33/104
agentlessLineCoverage	22.31	22.54	$\color{green}{\blacktriangledown}$ -0.23	22.09	$\color{red}{\blacktriangle}$ +0.22	33/103

Baseline: median of @test.tracer_overhead on main (gitlab) over the last 7/30 days, per OSS project & scenario. Δ = this PR − baseline median; red ▲ = more overhead, green ▽ = less overhead than baseline.

Tests run to verify that CI Visibility behavior has not regressed in the current PR.

cit-pr-commenter-54b7da · 2026-09-14T14:53:12Z

CI Visibility Test Environment - sonar-java

Job Status: 🟢 success

Scenario	This PR (%)	7d median	Δ 7d	30d median	Δ 30d	runs (7d/30d)
agent	12.97	11.65	$\color{red}{\blacktriangle}$ +1.32	12.12	$\color{red}{\blacktriangle}$ +0.85	38/117
agentless	30.16	8.98	$\color{red}{\blacktriangle}$ +21.18	11.65	$\color{red}{\blacktriangle}$ +18.51	38/117
agentlessCodeCoverage	99.06	74.82	$\color{red}{\blacktriangle}$ +24.24	74.82	$\color{red}{\blacktriangle}$ +24.24	38/117
agentlessLineCoverage	95.87	111.62	$\color{green}{\blacktriangledown}$ -15.75	111.62	$\color{green}{\blacktriangledown}$ -15.75	37/114

Baseline: median of @test.tracer_overhead on main (gitlab) over the last 7/30 days, per OSS project & scenario. Δ = this PR − baseline median; red ▲ = more overhead, green ▽ = less overhead than baseline.

Tests run to verify that CI Visibility behavior has not regressed in the current PR.

AlexeyKuznetsov-DD · 2026-09-14T15:28:09Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-09-14T15:28:13Z

View all feedbacks in Devflow UI.

2026-09-14 15:28:13 UTC ℹ️ Start processing command /merge

2026-09-14 15:28:23 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-14 15:29:19 UTC ⚠️ MergeQueue: This merge request was unqueued

[email protected] unqueued this merge request

AlexeyKuznetsov-DD · 2026-09-14T15:29:09Z

/merge -c

gh-worker-devflow-routing-ef8351 · 2026-09-14T15:29:13Z

View all feedbacks in Devflow UI.

2026-09-14 15:29:13 UTC ℹ️ Start processing command /merge -c

AlexeyKuznetsov-DD · 2026-09-15T01:00:15Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-09-15T01:00:18Z

View all feedbacks in Devflow UI.

2026-09-15 01:00:18 UTC ℹ️ Start processing command /merge

2026-09-15 01:00:28 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-15 05:04:22 UTC ⚠️ MergeQueue: This merge request was unqueued

devflow unqueued this merge request: It did not become mergeable within the expected time

AlexeyKuznetsov-DD · 2026-09-15T15:02:29Z

/code blockers

gh-worker-devflow-routing-ef8351 · 2026-09-15T15:02:32Z

View all feedbacks in Devflow UI.

2026-09-15 15:02:31 UTC ℹ️ Start processing command /code blockers

2026-09-15 15:02:32 UTC ℹ️ Devflow:

Checking merge blockers for #12478...

2026-09-15 15:02:42 UTC ℹ️ Devflow: /code blockers

Detected 1 merge blocker(s) to address:

🟠 Pending

Merge gate rule reviewers-approval is running: 2 approvals missing
All required reviewers must approve this pull request before it can be merged. Learn more in our FAQ.
- Needs approval from Team: apm-lang-platform-java
- Needs approval from Team: apm-idm-java
Hint: Questions about this check? Reach out in #dx-source-code-management on Slack.

AlexeyKuznetsov-DD · 2026-09-15T15:18:51Z

/code blockers

gh-worker-devflow-routing-ef8351 · 2026-09-15T15:18:55Z

View all feedbacks in Devflow UI.

2026-09-15 15:18:55 UTC ℹ️ Start processing command /code blockers

2026-09-15 15:18:55 UTC ℹ️ Devflow:

Checking merge blockers for #12478...

2026-09-15 15:19:05 UTC ℹ️ Devflow: /code blockers

Detected 1 merge blocker(s) to address:

🟠 Pending

Merge gate rule reviewers-approval is running: 1 approval missing
All required reviewers must approve this pull request before it can be merged. Learn more in our FAQ.
- Needs approval from Team: apm-idm-java
Hint: Questions about this check? Reach out in #dx-source-code-management on Slack.

ygree

IDM approved

AlexeyKuznetsov-DD · 2026-09-16T13:22:14Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-09-16T13:22:19Z

View all feedbacks in Devflow UI.

2026-09-16 13:22:19 UTC ℹ️ Start processing command /merge

2026-09-16 13:22:24 UTC ℹ️ MergeQueue: pull request added to the queue

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

2026-09-16 14:17:18 UTC ℹ️ MergeQueue: This merge request was merged

Fix Robolectric 4.17 muzzle validation

c2221fc

AlexeyKuznetsov-DD added type: bug fix Bug fix tag: no release notes Changes to exclude from release notes comp: ci visibility Continuous Integration Visibility tag: ai generated Largely based on code generated by an AI or LLM labels Sep 13, 2026

This comment has been minimized.

Sign in to view

AlexeyKuznetsov-DD marked this pull request as ready for review September 13, 2026 03:14

AlexeyKuznetsov-DD requested review from a team as code owners September 13, 2026 03:14

AlexeyKuznetsov-DD requested review from amarziali and ygree and removed request for a team September 13, 2026 03:14

AlexeyKuznetsov-DD self-assigned this Sep 13, 2026

AlexeyKuznetsov-DD requested a review from daniel-mohedano September 13, 2026 03:14

datadog-datadog-prod-us1 Bot reviewed Sep 13, 2026

View reviewed changes

Comment thread ...c-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricTestAnnotator.java Outdated

AlexeyKuznetsov-DD added 2 commits September 13, 2026 11:08

Preserve Robolectric minor release codenames

7e275d7

Convert Robolectric codename test to JUnit

0c0fbfd

amarziali reviewed Sep 14, 2026

View reviewed changes

Comment thread ...c-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricTestAnnotator.java Outdated

mcculls mentioned this pull request Sep 14, 2026

refactor(propagation): Parse OpenTelemetry tracestate member #12405

Merged

3 tasks

daniel-mohedano added 2 commits September 14, 2026 14:57

fix: avoid reflection for Robolectric Android codenames

ee6e311

test: cover fixed and latest Robolectric versions

3a1adeb

daniel-mohedano approved these changes Sep 14, 2026

View reviewed changes

fix: smoke test version resolution

4b4b845

DataDog deleted a comment from cit-pr-commenter-54b7da Bot Sep 14, 2026

AlexeyKuznetsov-DD added 3 commits September 14, 2026 11:29

Merge branch 'master' into alexeyk/fix-robolectric-4-17-muzzle

f54190d

Rollback temporarey fix.

6cd6bbc

Merge branch 'master' into alexeyk/fix-robolectric-4-17-muzzle

c57fe3f

AlexeyKuznetsov-DD changed the title ~~Support Robolectric 4.17 test metadata~~ Support lates Robolectric 4.17 Sep 15, 2026

AlexeyKuznetsov-DD removed the tag: no release notes Changes to exclude from release notes label Sep 15, 2026

sarahchen6 approved these changes Sep 15, 2026

View reviewed changes

ygree reviewed Sep 15, 2026

View reviewed changes

Comment thread ...ectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/AndroidVersionUtils.java Outdated

ygree reviewed Sep 15, 2026

View reviewed changes

Comment thread ...ectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/AndroidVersionUtils.java Outdated

ygree requested changes Sep 15, 2026

View reviewed changes

bric3 changed the title ~~Support lates Robolectric 4.17~~ Support latest Robolectric 4.17 Sep 15, 2026

ygree approved these changes Sep 16, 2026

View reviewed changes

refactor: simplify Robolectric codename mapping

7543acc

gh-worker-dd-mergequeue-cf854d Bot merged commit 224bf8a into master Sep 16, 2026
601 checks passed

gh-worker-dd-mergequeue-cf854d Bot deleted the alexeyk/fix-robolectric-4-17-muzzle branch September 16, 2026 14:17

github-actions Bot added this to the 1.67.0 milestone Sep 16, 2026

Conversation

AlexeyKuznetsov-DD commented Sep 13, 2026 • edited by daniel-mohedano Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Does This Do

Motivation

Additional Notes

Contributor Checklist

Uh oh!

This comment has been minimized.

dd-octo-sts Bot commented Sep 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🟢 Java Benchmark SLOs — All performance SLOs passed

Uh oh!

chatgpt-codex-connector Bot commented Sep 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codex Review Summary

Uh oh!

datadog-datadog-prod-us1 Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

daniel-mohedano left a comment

Choose a reason for hiding this comment

Uh oh!

cit-pr-commenter-54b7da Bot commented Sep 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CI Visibility Test Environment - sbt-scalatest

Uh oh!

cit-pr-commenter-54b7da Bot commented Sep 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CI Visibility Test Environment - okhttp

Uh oh!

cit-pr-commenter-54b7da Bot commented Sep 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CI Visibility Test Environment - spring_boot

Uh oh!

cit-pr-commenter-54b7da Bot commented Sep 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CI Visibility Test Environment - sonar-java

Uh oh!

AlexeyKuznetsov-DD commented Sep 14, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AlexeyKuznetsov-DD commented Sep 14, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AlexeyKuznetsov-DD commented Sep 15, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AlexeyKuznetsov-DD commented Sep 15, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🟠 Pending

Uh oh!

AlexeyKuznetsov-DD commented Sep 15, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🟠 Pending

Uh oh!

Uh oh!

Uh oh!

ygree left a comment

Choose a reason for hiding this comment

Uh oh!

AlexeyKuznetsov-DD commented Sep 16, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

AlexeyKuznetsov-DD commented Sep 13, 2026 •

edited by daniel-mohedano

Loading

dd-octo-sts Bot commented Sep 13, 2026 •

edited

Loading

chatgpt-codex-connector Bot commented Sep 13, 2026 •

edited

Loading

cit-pr-commenter-54b7da Bot commented Sep 14, 2026 •

edited

Loading

cit-pr-commenter-54b7da Bot commented Sep 14, 2026 •

edited

Loading

cit-pr-commenter-54b7da Bot commented Sep 14, 2026 •

edited

Loading

cit-pr-commenter-54b7da Bot commented Sep 14, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 14, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 14, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 15, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 16, 2026 •

edited

Loading