Fix unfinished R2DBC query spans after filtering results by amarziali · Pull Request #12767 · DataDog/dd-trace-java

amarziali · 2026-10-07T08:17:26Z

What Does This Do

Keep filtered R2DBC results attached to the original query execution context so consuming them completes the query span.

Use the bundled proxy’s factory extension point without modifying the dependency.

Motivation

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: [PROJ-IDENT]

chatgpt-codex-connector · 2026-10-07T08:17:45Z

Codex Review Summary

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

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-10-07T08:22:10.089230Z	`bf89508`	PR opened
🔒 Security Review	✅ Completed 2026-10-07T08:21:09.241850Z	`bf89508`	PR opened

ℹ️ 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-2

More details

Source inspection supports that filtered-result consumption stays connected to the original query’s span-completion lifecycle. Runtime behavior remains unverified because tests were not run and CI status could not be read.

Was this helpful? React 👍 or 👎

_{Open Bits AI session}

_{🤖 Bits Code Review · Commit bf89508 · @DataDog review to ask questions}

datadog-datadog-prod-us1-2 · 2026-10-07T08:36:00Z

🎯 Code Coverage (details)
• Patch Coverage: 100.00%
• Overall Coverage: 68.82% (+9.49%)

_{This comment will be updated automatically if new data arrives.

🔗 Commit SHA: 0c52541 | Docs | Give us feedback!}

dd-octo-sts · 2026-10-07T08:39:41Z

🟡 Java Benchmark SLOs — Performance SLO warning (near threshold)

Suite	Status
Startup	🟡 warning

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.69 s	14.63 s	[-0.6%; +1.5%] (no difference)
startup:insecure-bank:tracing:Agent	13.51 s	13.65 s	[-1.8%; -0.2%] (maybe better)
startup:petclinic:appsec:Agent	17.73 s	17.59 s	[-0.1%; +1.6%] (no difference)
startup:petclinic:iast:Agent	17.41 s	17.54 s	[-1.4%; -0.1%] (maybe better)
startup:petclinic:profiling:Agent	17.47 s	17.46 s	[-1.2%; +1.2%] (no difference)
startup:petclinic:sca:Agent	17.78 s	17.59 s	[+0.2%; +2.0%] (maybe worse)
startup:petclinic:tracing:Agent	16.63 s	16.68 s	[-1.2%; +0.7%] (no difference)

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

mcculls

Nice find!

dd-octo-sts · 2026-10-07T20:27:50Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-10-07T20:27:54Z

View all feedbacks in Devflow UI.

2026-10-07 20:27:53 UTC ℹ️ Start processing command /merge

2026-10-07 20:27:58 UTC ℹ️ MergeQueue: pull request added to the queue

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

2026-10-07 21:29:17 UTC ❌ MergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for 0585d80:

test_inst: [27, 5/8]

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

Investigate the failures and when ready, re-add your pull request to the queue!
If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
Any question, go check the FAQ.

Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

amarziali · 2026-10-07T21:37:45Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-10-07T21:37:49Z

View all feedbacks in Devflow UI.

2026-10-07 21:37:48 UTC ℹ️ Start processing command /merge

2026-10-07 21:37:53 UTC ℹ️ MergeQueue: pull request added to the queue

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

2026-10-07 23:38:33 UTC ❌ MergeQueue: The build pipeline has timeout

The merge request has been interrupted because the build 3975588011093473674 took longer than expected. The current limit for the base branch 'master' is 120 minutes.

amarziali · 2026-10-08T07:15:16Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-10-08T07:15:20Z

View all feedbacks in Devflow UI.

2026-10-08 07:15:20 UTC ℹ️ Start processing command /merge

2026-10-08 07:15:24 UTC ℹ️ MergeQueue: pull request added to the queue

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

2026-10-08 07:32:10 UTC ❌ MergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for f8e6859:

check_build_src

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

Investigate the failures and when ready, re-add your pull request to the queue!
If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
Any question, go check the FAQ.

Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

dd-octo-sts · 2026-10-08T20:15:57Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-10-08T20:16:03Z

View all feedbacks in Devflow UI.

2026-10-08 20:16:02 UTC ℹ️ Start processing command /merge

2026-10-08 20:16:08 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-10-08 20:54:19 UTC ℹ️ MergeQueue: merge request added to the queue

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

2026-10-08 21:50:56 UTC ℹ️ MergeQueue: This merge request was merged

Fix unfinished R2DBC query spans after filtering results

bf89508

amarziali requested a review from a team as a code owner October 7, 2026 08:17

amarziali requested review from jordan-wong and removed request for a team October 7, 2026 08:17

amarziali added type: bug fix Bug fix inst: others All other instrumentations labels Oct 7, 2026

amarziali requested a review from mcculls October 7, 2026 08:17

datadog-datadog-prod-us1-2 Bot reviewed Oct 7, 2026

View reviewed changes

mcculls approved these changes Oct 7, 2026

View reviewed changes

amarziali added this pull request to the merge queue Oct 7, 2026

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 7, 2026

amarziali mentioned this pull request Oct 7, 2026

Fix query completion callbacks after filtering results r2dbc/r2dbc-proxy#160

Merged

jordan-wong approved these changes Oct 7, 2026

View reviewed changes

Merge branch 'master' into andrea.marziali/r2dbc-filter-fix

0c52541

amarziali added this pull request to the merge queue Oct 8, 2026

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 8, 2026

gh-worker-dd-mergequeue-cf854d Bot merged commit 1c373d5 into master Oct 8, 2026
608 checks passed

gh-worker-dd-mergequeue-cf854d Bot deleted the andrea.marziali/r2dbc-filter-fix branch October 8, 2026 21:50

github-actions Bot added this to the 1.68.0 milestone Oct 8, 2026

Conversation

amarziali commented Oct 7, 2026

What Does This Do

Motivation

Additional Notes

Contributor Checklist

Uh oh!

chatgpt-codex-connector Bot commented Oct 7, 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-2 Bot left a comment

Choose a reason for hiding this comment

Uh oh!

datadog-datadog-prod-us1-2 Bot commented Oct 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

🟡 Java Benchmark SLOs — Performance SLO warning (near threshold)

Uh oh!

mcculls left a comment

Choose a reason for hiding this comment

Uh oh!

dd-octo-sts Bot commented Oct 7, 2026

Uh oh!

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

Uh oh!

What to do next?

Uh oh!

Uh oh!

amarziali commented Oct 7, 2026

Uh oh!

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

Uh oh!

Uh oh!

amarziali commented Oct 8, 2026

Uh oh!

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

Uh oh!

What to do next?

Uh oh!

dd-octo-sts Bot commented Oct 8, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Oct 8, 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

chatgpt-codex-connector Bot commented Oct 7, 2026 •

edited

Loading

datadog-datadog-prod-us1-2 Bot commented Oct 7, 2026 •

edited

Loading

dd-octo-sts Bot commented Oct 7, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Oct 7, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Oct 7, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Oct 8, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Oct 8, 2026 •

edited

Loading