Migrate utils module Groovy tests to Java tests by sarahchen6 · Pull Request #11569 · DataDog/dd-trace-java

sarahchen6 · 2026-06-04T18:23:17Z

What Does This Do

Migrate Groovy tests in the utils module to Java without changing any functionality

Introduce TableTest converter for boxed values

Motivation

This is part of a broader initiative to migrate all testing in this repo to JUnit

Additional Notes

Confirmation that we did not lose tests (note that a few tests were combined in this PR):

TestOpt dashboard for relevant modules in this PR
TestOpt dashboard for the same modules on master

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]

dd-octo-sts · 2026-06-04T18:40:01Z

🟢 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.66 s	14.73 s	[-1.5%; +0.6%] (no difference)
startup:insecure-bank:tracing:Agent	13.65 s	13.72 s	[-1.8%; +0.8%] (no difference)
startup:petclinic:appsec:Agent	16.56 s	16.41 s	[-0.6%; +2.4%] (no difference)
startup:petclinic:iast:Agent	16.48 s	16.57 s	[-1.7%; +0.6%] (no difference)
startup:petclinic:profiling:Agent	16.48 s	16.54 s	[-1.9%; +1.2%] (no difference)
startup:petclinic:tracing:Agent	15.61 s	15.58 s	[-1.2%; +1.5%] (no difference)

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

sarahchen6 · 2026-06-04T19:16:12Z

+      StableConfigSource stableConfigSource =
+          new StableConfigSource(filePath.toString(), ConfigOrigin.LOCAL_STABLE_CONFIG);
+
+      // Create ConfigProvider via reflection (constructor is private)


the alternative was having this test file a stableconfig subfolder so that package-private safeToString() can be accessed 🤔

sarahchen6 · 2026-06-04T19:35:02Z

+  // spotless:on
+
+  @ParameterizedTest
+  @MethodSource("containerInfoParsedFromFileContentArguments")


This MethodSource was kept for readability -- TableTest requires inputs to be on one line

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 54ccc2aa75

ℹ️ 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".

AlexeyKuznetsov-DD

LGTM, left minor comments about code style

AlexeyKuznetsov-DD

LGTM in general, left couple of comments.
A general notice: consider to review tests one more time and probably collapse more of them to TableTest format. TableTest supports various collections OOTB, like Map, List, Array,...

sarahchen6 · 2026-06-05T20:14:18Z

consider to review tests one more time and probably collapse more of them to TableTest format. TableTest supports various collections OOTB, like Map, List, Array,...

Sure I was mainly transferring the tests as close to 1:1 as possible, but I can squash more into TableTests. Thanks for the reviews!

AlexeyKuznetsov-DD · 2026-06-05T20:48:48Z

+  @TableTest({
+    "scenario           | sunJavaCommand                          | envVars                                                    | expectedServiceName                                             ",
+    "null command       | null                                    | [:]                                                        |                                                                 ",
+    "empty command      | ''                                      | [:]                                                        |                                                                 ",
+    "all blanks         | ' '                                     | [:]                                                        |                                                                 ",
+    "class in command   | org.example.App -Dfoo=bar arg2 arg3     | [:]                                                        | org.example.App                                                 ",
+    "jar in command     | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [:]                                                        | example                                                         ",
+    "real sun command   |                                         | [:]                                                        | datadog.trace.api.env.CapturedEnvironmentTest$ServiceNamePrinter",
+    "azure site name    | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [DD_AZURE_APP_SERVICES: 1, WEBSITE_SITE_NAME: siteService] | siteService                                                     ",
+    "site name no azure | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [WEBSITE_SITE_NAME: siteService]                           | example                                                         ",
+    "azure flag no site | foo/bar/example.jar -Dfoo=bar arg2 arg3 | [DD_AZURE_APP_SERVICES: true]                              | example                                                         "
+  })
+  void capturesServiceName(
+      String sunJavaCommand, Map<String, String> envVars, String expectedServiceName)
+      throws IOException, InterruptedException {
+    assertEquals(expectedServiceName, forkAndRunProperties(sunJavaCommand, envVars));
+  }


sarahchen6 · 2026-06-05T21:40:43Z

/merge --commit-message "Migrate utils module Groovy tests to Java tests"

gh-worker-devflow-routing-ef8351 · 2026-06-05T21:40:47Z

View all feedbacks in Devflow UI.

2026-06-05 21:40:47 UTC ℹ️ Start processing command /merge --commit-message "Migrate utils module Groovy tests to Java tests"

2026-06-05 21:40:52 UTC ℹ️ MergeQueue: pull request added to the queue

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

2026-06-05 22:40:22 UTC ℹ️ MergeQueue: This merge request was merged

sarahchen6 added 2 commits June 4, 2026 11:34

Migrate utils module Groovy to Java tests

5674e0a

Use TableTest

11e019d

sarahchen6 added comp: testing Testing tag: no release notes Changes to exclude from release notes tag: ai generated Largely based on code generated by an AI or LLM labels Jun 4, 2026

Move StableConfigMappingExceptionTest

aa40b74

sarahchen6 commented Jun 4, 2026

View reviewed changes

Comment thread utils/config-utils/src/test/java/datadog/trace/api/ConfigSettingTest.java Outdated

Convert time-utils and container-utils

c2d3578

sarahchen6 commented Jun 4, 2026

View reviewed changes

Clean up

ff836e0

sarahchen6 commented Jun 4, 2026

View reviewed changes

Use Collections.emptyMap instead of empty LinkedHashMap

54ccc2a

This comment has been minimized.

Sign in to view

sarahchen6 marked this pull request as ready for review June 4, 2026 20:55

sarahchen6 requested review from a team as code owners June 4, 2026 20:55

sarahchen6 requested a review from mhlidd June 4, 2026 20:55

chatgpt-codex-connector Bot reviewed Jun 4, 2026

View reviewed changes

Comment thread ...nfig-utils/src/test/java/datadog/trace/bootstrap/config/provider/StableConfigSourceTest.java

AlexeyKuznetsov-DD reviewed Jun 4, 2026

View reviewed changes

sarahchen6 added 4 commits June 5, 2026 12:23

Use TableTest for ConfigSettingTest and add converter

400ddf2

Address review comments

fd31f27

Avoid forbiddenutils and add safeguard

819696f

Merge branch 'master' into sarahchen6/migrate-utils-tests

f3b0dda

sarahchen6 requested a review from AlexeyKuznetsov-DD June 5, 2026 19:50

AlexeyKuznetsov-DD reviewed Jun 5, 2026

View reviewed changes

AlexeyKuznetsov-DD approved these changes Jun 5, 2026

View reviewed changes

sarahchen6 added 2 commits June 5, 2026 16:41

Incorporate more TableTests and imports

5fb35f1

Clean up comment

1af32f4

AlexeyKuznetsov-DD reviewed Jun 5, 2026

View reviewed changes

gh-worker-dd-mergequeue-cf854d Bot merged commit 3db6cc5 into master Jun 5, 2026
572 checks passed

gh-worker-dd-mergequeue-cf854d Bot deleted the sarahchen6/migrate-utils-tests branch June 5, 2026 22:40

github-actions Bot added this to the 1.64.0 milestone Jun 5, 2026

Conversation

sarahchen6 commented Jun 4, 2026 • edited 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!

Uh oh!

dd-octo-sts Bot commented Jun 4, 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!

sarahchen6 Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

sarahchen6 Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

AlexeyKuznetsov-DD left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexeyKuznetsov-DD left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sarahchen6 commented Jun 5, 2026

Uh oh!

AlexeyKuznetsov-DD Jun 5, 2026

Choose a reason for hiding this comment

Uh oh!

sarahchen6 commented Jun 5, 2026

Uh oh!

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

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sarahchen6 commented Jun 4, 2026 •

edited

Loading

dd-octo-sts Bot commented Jun 4, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Jun 5, 2026 •

edited

Loading