Repository navigation
Align R2DBC instrumentation minimum with SPI 1.0 - #20902
Merged
Merged
Conversation
Pull request dashboard statusMerged · refreshed 2026-10-26 07:59 UTC Status above doesn't look right?
|
Co-authored-by: trask <218610+trask@users.noreply.github.com>
Co-authored-by: trask <218610+trask@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Update R2DBC instrumentation minimum supported SPI version to 1.0.0.RELEASE
Require R2DBC SPI 1.0 for instrumentation 3.0
Oct 23, 2026
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The catalog edit conflicts with the explicit repository rule reserving that file for the nightly metadata workflow.
1 open issue
What changed in this PR
Raises the R2DBC instrumentation baseline to SPI 1.0 for the 3.0 release, covering both javaagent and standalone-library users.
Changes:
- Updates all three SPI dependencies and the Muzzle range, retaining inverse checks with explicit 0.9 exclusions.
- Adds filtered-update coverage for
Longcounts and removes obsolete compatibility commentary without changing proxy behavior. - Documents the breaking change and updates the supported-version catalog.
| File | Description |
|---|---|
| instrumentation/r2dbc-1.0/testing/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/AbstractR2dbcStatementTest.java | Tests filtered update counts and query-span completion. |
| instrumentation/r2dbc-1.0/testing/build.gradle.kts | Raises the shared testing SPI dependency to 1.0. |
| instrumentation/r2dbc-1.0/library/src/main/java/io/opentelemetry/instrumentation/r2dbc/v1_0/internal/FilterAwareProxyFactory.java | Removes obsolete SPI 0.9 commentary only. |
| instrumentation/r2dbc-1.0/library/build.gradle.kts | Raises the library SPI baseline to 1.0. |
| instrumentation/r2dbc-1.0/javaagent/build.gradle.kts | Updates the agent baseline and Muzzle compatibility checks. |
| docs/instrumentation-list.yaml | Updates the generated supported-version entry. |
| CHANGELOG.md | Records removal of SPI 0.9 support. |
Review effort: Balanced
trask
reviewed
Oct 23, 2026
Co-authored-by: trask <218610+trask@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The scoped dependency and compatibility changes are consistent, shared regression coverage exercises the affected result path, and no unresolved issues remain.
No open issues 🎉
1 resolved since last review
Review effort: Balanced
trask
reviewed
Oct 23, 2026
Co-authored-by: trask <218610+trask@users.noreply.github.com>
trask
changed the title
trask
reviewed
Oct 23, 2026
Co-authored-by: trask <218610+trask@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The dependency exclusion, isolated compatibility suites, and documentation consistently support the retained SPI 0.9 minimum, with no blocking issues identified.
No open issues 🎉
3 resolved since last review
Review effort: Balanced
Remove SPI 0.9 compatibility suites and restore the small SPI 1.0-only change, including its focused filtered-update regression. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Contributor
|
trask
changed the title
Keep SPI 0.9 in the reference-matching range without inverse skips while documenting the supported SPI 1.0 minimum. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
trask
reviewed
Oct 23, 2026
Co-authored-by: trask <218610+trask@users.noreply.github.com>
trask
marked this pull request as ready for review
October 23, 2026 23:30
trask
approved these changes
Oct 23, 2026
laurit
approved these changes
Oct 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #20800.
Align the R2DBC SPI dependency declarations with the documented 1.0 minimum.
The javaagent and Spring Boot starter bundle R2DBC Proxy
1.1.7.RELEASE, whose declared SPI dependency is 1.0. The existing driver fixtures also resolve SPI 1.0. Supporting 0.9 would require isolated older-driver suites and dependency exclusions, rather than simply retaining the lower dependency declaration.Muzzle's range still starts at 0.9 because the referenced API signatures are identical after generic erasure. This reflects reference matching, not the supported and tested minimum; no runtime version gate is added.