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.

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

Sanitize SQL in Apache Camel instrumentation #3683

Merged
merged 4 commits into from
Jul 29, 2021

Conversation

anosek-an
Copy link
Contributor

Related to #1499

  • DB statement span attributes generated by Apache Camel instrumentation are now sanitized using SqlStatementSanitizer
  • Mongo statement attribute is no longer added by Camel instrumentation - sanitizing it here would be cumbersome (and mongo instrumentation should handle it anyway)
  • Disclaimer: cql case will be handled in a separate PR as the way we're retrieving statements from URI in the current implementation needs to be properly tested

@breedx-splk
Copy link
Contributor

@Enkelian Thanks! Looks like the build is failing due to checkstyle violations in the DBSpanDecorator.

You can run these yourself with ./gradlew checkstyleMain but if it's just a minor formatting thing you can often just quick fix it with ./gradlew spotlessApply

@anosek-an
Copy link
Contributor Author

@breedx-splk
Turns out there's some inconsistency with spotlessApply and checkstyleMain when TODO is right above case: line. spotlessApply adds indents, which causes checkstyleMain to fail 🤔
Ended up just moving the line.

@mateuszrzeszutek
Copy link
Member

Turns out there's some inconsistency with spotlessApply and checkstyleMain when TODO is right above case: line. spotlessApply adds indents, which causes checkstyleMain to fail 🤔

🤯
Can you create an issue (bug) for that? And add an example that makes those two plugins conflict with each other.

Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

thx!

@trask trask merged commit 15a40a0 into open-telemetry:main Jul 29, 2021
@anosek-an anosek-an deleted the camel-mask-db-values branch September 14, 2021 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants