Migrate Spring Boot RabbitMQ smoke test to JUnit by PerfectSlayer · Pull Request #12128 · DataDog/dd-trace-java

PerfectSlayer · 2026-08-03T13:52:54Z

What Does This Do

This PR migrates the Spring Boot RabbitMQ smoke tests to the new JUnit smoke test framework.

Motivation

The new tests checks the whole trace structures and span values, in addition to trace payload validity and invariants.
It also check that three round-trips are present (no only one) and the trace is fully-connected.

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
Once approved, use merge queue to merge the PR

Jira ticket: APMLP-1247

datadog-datadog-us1-prod

The migrated test changes RabbitMQ's known teardown-error allowlist from the actual client text occured to occurred. When either app is stopped, that disconnect log is treated as an unexpected error and the smoke test fails in teardown; restore the original spelling.

_{Open Bits AI session}

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:1201890609

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

chatgpt-codex-connector · 2026-08-03T13:59:19Z

+ return trace(
+ SORT_BY_ANCESTRY,
+ sp("spring-rabbit-0", "servlet.request", "GET /roundtrip/{message}").root(),


Match received chunks instead of one cross-JVM trace
When a round trip crosses the sender and receiver JVMs, each tracer flushes its own trace chunk to the backend; TestAgentBackend.fetchTraces() only decodes /test/session/traces and does not coalesce chunks sharing a trace ID. Consequently, no received DecodedTrace contains all 12 spans required here, so this assertion times out even when propagation is correct. Match the per-JVM chunks separately and compare their trace/parent IDs, or explicitly merge chunks by trace ID before applying this matcher.
Useful? React with 👍 / 👎.

dd-octo-sts · 2026-08-03T14:19:14Z

🟢 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.73 s	14.71 s	[-0.9%; +1.1%] (no difference)
startup:insecure-bank:tracing:Agent	13.49 s	13.70 s	[-2.4%; -0.6%] (maybe better)
startup:petclinic:appsec:Agent	17.58 s	17.43 s	[+0.0%; +1.7%] (maybe worse)
startup:petclinic:iast:Agent	17.56 s	17.61 s	[-1.4%; +0.8%] (no difference)
startup:petclinic:profiling:Agent	17.56 s	17.15 s	[+1.1%; +3.7%] (significantly worse)
startup:petclinic:sca:Agent	17.48 s	17.17 s	[+0.9%; +2.8%] (maybe worse)
startup:petclinic:tracing:Agent	16.70 s	16.37 s	[-2.5%; +6.4%] (no difference)

Commit:2f155a28 · 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-08-13T16:40:59Z

+ void roundTripsProduceFullAmqpTraceStructure() throws IOException {
+ // Drive 3 round-trips through the sender; each travels
+ // sender -> otherqueue -> receiver -> queue -> sender.
+ String[] MESSAGES = {"foo", "bar", "baz"};


small nit for MESSAGES to be lowercase since it's a local variable, but not a big deal

sarahchen6

Nice the new test covers much more 👍

AlexeyKuznetsov-DD · 2026-08-14T00:18:32Z

+ return trace(sp(service, "amqp.command", command).root());
+ }
+
+ private static SpanMatcher sp(String service, String operation, String resource) {


nit: maybe spm would be a bit better name?

Or simply a method local span method (eventually using a qualified SpanMatcher.span())

bric3

LGTM, a few tidbits though.

bric3 · 2026-08-14T13:32:08Z

+ return trace(sp(service, "amqp.command", command).root());
+ }
+
+ private static SpanMatcher sp(String service, String operation, String resource) {


Or simply a method local span method (eventually using a qualified SpanMatcher.span())

bric3 · 2026-08-14T13:35:55Z

+class SpringBootRabbitSmokeTest {
+ private static final int TIMEOUT_SECONDS = 60;
+ private static final int RABBIT_AMQP_PORT = 5672;
+ private static final OkHttpClient CLIENT = new OkHttpClient();


question: Is there a reason to make this static rather than an instance variable ?

PerfectSlayer added type: feature Enhancements and improvements tag: no release notes Changes to exclude from release notes labels Aug 3, 2026

PerfectSlayer requested a review from a team as a code owner August 3, 2026 13:52

PerfectSlayer added the inst: rabbitmq RabbitMQ instrumentation label Aug 3, 2026

PerfectSlayer requested review from vandonr and removed request for a teamAugust 3, 2026 13:52

PerfectSlayer added the inst: spring Spring instrumentation label Aug 3, 2026

datadog-datadog-us1-prodBot reviewed Aug 3, 2026
View reviewed changes

Comment thread...moke-tests/spring-boot-rabbit/src/test/java/datadog/smoketest/SpringBootRabbitSmokeTest.java Outdated

chatgpt-codex-connectorBot reviewed Aug 3, 2026
View reviewed changes

PerfectSlayer requested review from a team as code owners August 4, 2026 11:30

PerfectSlayer requested review from mcculls and removed request for a teamAugust 4, 2026 11:30

PerfectSlayer force-pushed the bbujon/smoke-tests-spring-boot-rabbit branch from 1201890 to 979b3f4Compare August 5, 2026 05:28

This comment has been minimized.
Sign in to view

PerfectSlayer force-pushed the bbujon/smoke-tests-spring-boot-rabbit branch from 979b3f4 to 353ea51Compare August 5, 2026 15:48

PerfectSlayer mentioned this pull request Aug 5, 2026
Improving smoke test capabilities #12051
Draft

PerfectSlayer force-pushed the bbujon/smoke-tests-spring-boot-rabbit branch 2 times, most recently from 3b1d4ed to bb468daCompare August 6, 2026 11:47

PerfectSlayer force-pushed the bbujon/smoke-tests-spring-boot-rabbit branch from bb468da to 2cb3514Compare August 7, 2026 08:13

PerfectSlayer force-pushed the bbujon/smoke-tests-spring-boot-rabbit branch from 2cb3514 to 3053afcCompare August 11, 2026 09:55

PerfectSlayer removed the tag: no release notes Changes to exclude from release notes label Aug 12, 2026

PerfectSlayer added the tag: no release notes Changes to exclude from release notes label Aug 12, 2026

PerfectSlayer force-pushed the bbujon/smoke-tests-spring-boot-rabbit branch from 3053afc to 4d018c9Compare August 13, 2026 12:33

sarahchen6 reviewed Aug 13, 2026
View reviewed changes

sarahchen6 approved these changes Aug 13, 2026
View reviewed changes

AlexeyKuznetsov-DD approved these changes Aug 14, 2026
View reviewed changes

bric3 approved these changes Aug 14, 2026
View reviewed changes

feat(spring-boot): Migrate smoke test to JUnit
2f155a2

PerfectSlayer force-pushed the bbujon/smoke-tests-spring-boot-rabbit branch from 4d018c9 to 2f155a2Compare August 20, 2026 16:15

Navigation Menu

Uh oh!

Migrate Spring Boot RabbitMQ smoke test to JUnit - #12128

Migrate Spring Boot RabbitMQ smoke test to JUnit#12128
PerfectSlayer wants to merge 1 commit into
bbujon/smoke-tests-opentelemetryfrom
bbujon/smoke-tests-spring-boot-rabbit

PerfectSlayer commented Aug 3, 2026•
edited by atlassian Bot
Loading

Uh oh!

datadog-datadog-us1-prodBot left a comment

Uh oh!

Uh oh!

chatgpt-codex-connectorBot left a comment

Uh oh!

Uh oh!

chatgpt-codex-connectorBotAug 3, 2026

Uh oh!

Uh oh!

dd-octo-stsBot commented Aug 3, 2026•
edited
Loading

Uh oh!

This comment has been minimized.

sarahchen6Aug 13, 2026

Uh oh!

sarahchen6 left a comment •
edited
Loading

Uh oh!

AlexeyKuznetsov-DDAug 14, 2026

Uh oh!

bric3Aug 14, 2026

Uh oh!

bric3 left a comment

Uh oh!

bric3Aug 14, 2026

Uh oh!

bric3Aug 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

PerfectSlayer commented Aug 3, 2026• edited by atlassian BotLoading 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!

datadog-datadog-us1-prodBot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

chatgpt-codex-connectorBot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connectorBotAug 3, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dd-octo-stsBot commented Aug 3, 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!

This comment has been minimized.

sarahchen6Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

sarahchen6 left a comment • 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!

AlexeyKuznetsov-DDAug 14, 2026

Choose a reason for hiding this comment

Uh oh!

bric3Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

bric3 left a comment

Choose a reason for hiding this comment

Uh oh!

bric3Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

bric3Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

PerfectSlayer commented Aug 3, 2026•
edited by atlassian Bot
Loading

dd-octo-stsBot commented Aug 3, 2026•
edited
Loading

sarahchen6 left a comment •
edited
Loading