Migrate dd-trace-core groovy files to java part 9 by jpbempel · Pull Request #11488 · DataDog/dd-trace-java

jpbempel · 2026-05-28T12:21:45Z

What Does This Do

we migrate 20 tests from the propagation package:

TagKeyTest
TagValueTest
B3HttpExtractorTest
B3HttpInjectorPaddedTest
B3HttpInjectorTest
DatadogHttpExtractorTest
DatadogHttpInjectorTest
DatadogPropagationTagsTest
HaystackHttpExtractorTest
HaystackHttpInjectorTest
HttpExtractorTest
HttpInjectorB3PaddingTest
HttpInjectorTest
NoneHttpExtractorTest
TracingPropagatorTest
W3CHttpExtractorTest
W3CHttpInjectorTest
W3CPropagationTagsTest
XRayHttpExtractorTest
XRayHttpInjectorTest

Motivation

this is part of the effort to migrate groovy tests to Java/JUnit
part1: #11053
part2: #11062
part3: #11085
part4: #11146
part5: #11217
part6: #11362
part7: #11374
part8: #11437

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
- Get more information in this doc

Jira ticket: [PROJ-IDENT]

dd-octo-sts · 2026-05-28T12:21:58Z

Hi! 👋 Thanks for your pull request! 🎉

To help us review it, please make sure to:

Add at least one type, and one component or instrumentation label to the pull request

If you need help, please check our contributing guidelines.

bric3

Conversion-specific Mockito comments.

bric3 · 2026-05-28T14:02:58Z

+ singletonMap("k", "v"));
+ Map<String, String> carrier = mock(Map.class);
+
+ mockedContext.beginEndToEnd();


The Groovy test verified both time-source calls before 0 * _, but this conversion only checks the carrier. Suggested fix: clear the stubbing/build noise before beginEndToEnd(), then verify the two time-source calls too.
clearInvocations(timeSource); mockedContext.beginEndToEnd(); injector.inject(mockedContext, carrier, MapSetter.INSTANCE); verify(timeSource).getCurrentTimeNanos(); verify(timeSource).getNanoTicks(); verify(carrier) .put( "X-Amzn-Trace-Id", "Root=1-633c7675-000000000000000000000001;Parent=0000000000000002;_dd.origin=fakeOrigin;t0=1664906869195;k=v"); verifyNoMoreInteractions(timeSource, carrier);
That keeps the Mockito version as strict as the original Spock interaction block.

bric3 · 2026-05-28T14:02:59Z

+
+ propagator.inject(span, carrier, setter);
+
+ verify(injector).inject(any(DDSpanContext.class), same(carrier), any());


The Spock assertion matched span.context() specifically. Suggested fix: keep that exact-context check in the Mockito verify instead of accepting any DDSpanContext.
verify(injector).inject(same((DDSpanContext) span.context()), same(carrier), any());
same is already statically imported here, so this keeps the conversion tight without adding much noise.

bric3 · 2026-05-28T14:02:59Z

+
+ propagator.inject(span, carrier, setter);
+
+ verify(injector, times(injected)).inject(any(DDSpanContext.class), same(carrier), any());


Same conversion concern here: the original interaction was tied to span.context(). Suggested fix: keep the times(injected) behavior, but match the same context instance.
verify(injector, times(injected)) .inject(same((DDSpanContext) span.context()), same(carrier), any());
That preserves the old assertion while keeping the converted table-test flow.

dd-octo-sts · 2026-05-28T17:28:51Z

🟢 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

Startup Time

Scenario	This PR	master	Change
insecure-bank / iast	13,887 ms	14,023 ms	-1.0%
insecure-bank / tracing	12,985 ms	13,009 ms	-0.2%
petclinic / appsec	16,569 ms	15,330 ms	+8.1%
petclinic / iast	16,493 ms	15,733 ms	+4.8%
petclinic / profiling	16,413 ms	16,514 ms	-0.6%
petclinic / tracing	15,784 ms	15,902 ms	-0.7%

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

amarziali

looks good. left minor comments

amarziali · 2026-05-29T07:39:05Z

+ verify(carrier).put(OT_BAGGAGE_PREFIX + "k1", "v1");
+ verify(carrier).put(OT_BAGGAGE_PREFIX + "k2", "v2");
+ verify(carrier).put("SOME_CUSTOM_HEADER", "some-value");
+ verify(carrier).put(DD_PARENT_ID_BAGGAGE_KEY, "0");


Suggested change
verify(carrier).put(DD_PARENT_ID_BAGGAGE_KEY, "0");
verify(carrier).put(DD_PARENT_ID_BAGGAGE_KEY, "0");
verifyNoMoreInteractions(carrier);

amarziali · 2026-05-29T07:40:12Z

+ verify(carrier).put(SPAN_ID_KEY, spanUuid);
+ verify(carrier).put(DD_SPAN_ID_BAGGAGE_KEY, spanId);
+ verify(carrier).put(OT_BAGGAGE_PREFIX + "k1", "v1");
+ verify(carrier).put(OT_BAGGAGE_PREFIX + "k2", "v2");


Suggested change
verify(carrier).put(OT_BAGGAGE_PREFIX + "k2", "v2");
verify(carrier).put(OT_BAGGAGE_PREFIX + "k2", "v2");
verifyNoMoreInteractions(carrier);

this is not what is done in groovy, and does not work

amarziali · 2026-05-29T07:46:33Z

+ private static final CarrierSetter<Map<String, String>> MAP_SETTER = Map::put;
+
+ private final HttpCodec.Injector injector =
+ HaystackHttpCodec.newInjector(singletonMap("some-baggage-key", "SOME_CUSTOM_HEADER"));


minor: the groovy test closed the injector on cleanup

we migrate 20 tests from the propagation package: - TagKeyTest - TagValueTest - B3HttpExtractorTest - B3HttpInjectorPaddedTest - B3HttpInjectorTest - DatadogHttpExtractorTest - DatadogHttpInjectorTest - DatadogPropagationTagsTest - HaystackHttpExtractorTest - HaystackHttpInjectorTest - HttpExtractorTest - HttpInjectorB3PaddingTest - HttpInjectorTest - NoneHttpExtractorTest - TracingPropagatorTest - W3CHttpExtractorTest - W3CHttpInjectorTest - W3CPropagationTagsTest - XRayHttpExtractorTest - XRayHttpInjectorTest

dd-octo-sts · 2026-05-29T11:08:49Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-05-29T11:08:54Z

View all feedbacks in Devflow UI.

2026-05-29 11:08:54 UTC ℹ️ Start processing command /merge

2026-05-29 11:08:58 UTC ℹ️ MergeQueue: pull request added to the queue

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

2026-05-29 12:16:47 UTC ℹ️ MergeQueue: This merge request was merged

jpbempel requested review from a team as code owners May 28, 2026 12:21

jpbempel requested review from mcculls and mtoffl01 and removed request for a teamMay 28, 2026 12:21

This comment has been minimized.
Sign in to view

jpbempel added comp: testing Testing tag: no release notes Changes to exclude from release notes labels May 28, 2026

bric3 reviewed May 28, 2026
View reviewed changes

jpbempel force-pushed the jpbempel/g2j-core-pt9 branch from 952a80e to 588ea9bCompare May 28, 2026 17:09

amarziali mentioned this pull request May 28, 2026
Migrate dd-trace-ot tests to JUnit 5 #11483
Merged

amarziali approved these changes May 29, 2026
View reviewed changes

jpbempel enabled auto-merge May 29, 2026 07:54

jpbempel added 5 commits May 29, 2026 12:19

fix mockito conversion issues
fcd47fa

spotless
cfe4d94

address coments
d4fb4d8

fix interactions
be578af

jpbempel force-pushed the jpbempel/g2j-core-pt9 branch from f8b5091 to be578afCompare May 29, 2026 10:19

jpbempel added this pull request to the merge queue May 29, 2026

github-merge-queueBot removed this pull request from the merge queue due to failed status checks May 29, 2026

gh-worker-dd-mergequeue-cf854dBot merged commit 50466f1 into masterMay 29, 2026
572 checks passed

gh-worker-dd-mergequeue-cf854dBot deleted the jpbempel/g2j-core-pt9 branch May 29, 2026 12:16

github-actionsBot added this to the 1.63.0 milestone May 29, 2026

This was referenced Jun 3, 2026
Migrate dd-trace-core groovy files to java part 10 #11543
Merged
Migrate dd-trace-core groovy files to java part 11 #11566
Merged

This was referenced Jun 10, 2026
Migrate dd-trace-core groovy files to java part 12 #11619
Open
Migrate dd-trace-core groovy files to java part 12 #11662
Open


		propagator.inject(span, carrier, setter);

		verify(injector).inject(any(DDSpanContext.class), same(carrier), any());


		propagator.inject(span, carrier, setter);

		verify(injector, times(injected)).inject(any(DDSpanContext.class), same(carrier), any());

	verify(carrier).put(DD_PARENT_ID_BAGGAGE_KEY, "0");
	verify(carrier).put(DD_PARENT_ID_BAGGAGE_KEY, "0");
	verifyNoMoreInteractions(carrier);

	verify(carrier).put(OT_BAGGAGE_PREFIX + "k2", "v2");
	verify(carrier).put(OT_BAGGAGE_PREFIX + "k2", "v2");
	verifyNoMoreInteractions(carrier);

Uh oh!

Conversation

jpbempel commented May 28, 2026

What Does This Do

Motivation

Additional Notes

Contributor Checklist

Uh oh!

dd-octo-stsBot commented May 28, 2026

Uh oh!

This comment has been minimized.

bric3 left a comment

Choose a reason for hiding this comment

Uh oh!

bric3May 28, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jpbempelMay 28, 2026

Choose a reason for hiding this comment

Uh oh!

bric3May 28, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jpbempelMay 28, 2026

Choose a reason for hiding this comment

Uh oh!

bric3May 28, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jpbempelMay 28, 2026

Choose a reason for hiding this comment

Uh oh!

dd-octo-stsBot commented May 28, 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!

amarziali left a comment

Choose a reason for hiding this comment

Uh oh!

amarzialiMay 29, 2026

Choose a reason for hiding this comment

Uh oh!

amarzialiMay 29, 2026

Choose a reason for hiding this comment

Uh oh!

jpbempelMay 29, 2026

Choose a reason for hiding this comment

Uh oh!

amarzialiMay 29, 2026

Choose a reason for hiding this comment

Uh oh!

dd-octo-stsBot commented May 29, 2026

Uh oh!

gh-worker-devflow-routing-ef8351Bot commented May 29, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

bric3May 28, 2026•
edited
Loading

bric3May 28, 2026•
edited
Loading

bric3May 28, 2026•
edited
Loading

dd-octo-stsBot commented May 28, 2026•
edited
Loading

gh-worker-devflow-routing-ef8351Bot commented May 29, 2026•
edited
Loading