Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add spring starter r2dbc support #11221

Merged
merged 9 commits into from
May 10, 2024
Merged

add spring starter r2dbc support #11221

merged 9 commits into from
May 10, 2024

Conversation

zeitlinger
Copy link
Member

@zeitlinger zeitlinger commented Apr 24, 2024 •
edited
Loading

Fixes #r2dbc

@zeitlinger zeitlinger self-assigned this Apr 24, 2024
@github-actions github-actions bot added the test native This label can be applied to PRs to trigger them to run native tests label Apr 24, 2024
@zeitlinger zeitlinger marked this pull request as ready for review April 25, 2024 12:45
@zeitlinger zeitlinger requested a review from a team April 25, 2024 12:45
@zeitlinger
Copy link
Member Author

zeitlinger commented Apr 25, 2024 •
edited
Loading

Options

  • the user has to include the r2dbc instrumentation library manually
  • find a way to disable R2dbcAutoConfiguration - maybe exclude io.r2dbc.spi.ConnectionFactoryProvider

@zeitlinger zeitlinger marked this pull request as draft April 26, 2024 12:10
@zeitlinger zeitlinger force-pushed the spring-r2dbc branch 2 times, most recently from d2cc50c to a23a8ba Compare April 30, 2024 13:35
@zeitlinger zeitlinger marked this pull request as ready for review April 30, 2024 14:17
@zeitlinger zeitlinger force-pushed the spring-r2dbc branch 3 times, most recently from 72e7b97 to d6ca89b Compare May 2, 2024 14:59
@laurit
Copy link
Contributor

laurit commented May 10, 2024

@zeitlinger could you rebase so this could be merged

laurit
laurit reviewed May 10, 2024
View reviewed changes
...boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
Comment on lines +277 to +280
"name": "otel.instrumentation.common.db-statement-sanitizer.enabled",
"type": "java.lang.Boolean",
"description": "Enables the DB statement sanitization for R2DBC.",
"defaultValue": true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is weird that this applies only to r2dbc, I'd assume that this would also apply to jdbc. I'd make the description more generic.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, this feature is missing for JDBC currently - but I'm happy to add that in a follow up PR 😄

@laurit laurit merged commit ebc38b4 into open-telemetry:main May 10, 2024
53 checks passed
@zeitlinger zeitlinger deleted the spring-r2dbc branch May 10, 2024 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeanbisutti jeanbisutti jeanbisutti left review comments

@laurit laurit laurit approved these changes

Assignees

@zeitlinger zeitlinger

Labels
test native This label can be applied to PRs to trigger them to run native tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

support r2dbc in spring starter
3 participants
@zeitlinger @laurit @jeanbisutti