Hibernate query span naming #3106
Merged
Conversation
This file contains 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
laurit
requested review from
anuraaga,
iNikem,
jkwatson,
mateuszrzeszutek,
pavolloffay,
trask and
tylerbenson
as code owners
mateuszrzeszutek
approved these changes
May 27, 2021
Comment on lines
63
to
67
| // query might be hql or jpql query where select is optional, prepend select so we can use | ||
| // sql sanitizer to extract entity/table name | ||
| if (queryString.trim().toUpperCase(Locale.ROOT).startsWith("FROM ")) { | ||
| queryString = "SELECT * " + query; | ||
| } |
There was a problem hiding this comment.
Another idea: we could change the AutoSqlSanitizer so that it uses Select operation if we encountered FROM and there's no operation set.
There was a problem hiding this comment.
Nice. Can you add some tests to SqlStatementSanitizerTest?
.../hibernate/hibernate-4.3/javaagent/src/hibernate6Test/java/spring/jpa/PersistenceConfig.java
Outdated
Show resolved
Hide resolved
trask
reviewed
May 27, 2021
There was a problem hiding this comment.
Additionally tests that were not present for hibernate 4.3 were copied from 4.0.
hibernate-4.0 instrumentation applies to 4.0+ (no upper bound), what do you think about moving the hibernate 6 tests to the hibernate-4.0 module, and rename the hibernate-4.3 module to hibernate-procedure-call-4.3 (and only have tests for hibernate ProcedureCall in that module)?
mateuszrzeszutek
approved these changes
May 28, 2021
robododge
pushed a commit
to robododge/opentelemetry-java-instrumentation
that referenced
this pull request
Jun 17, 2021
* Hibernate query span naming * remove commented out code * modify query sanitizer to accept queries that start with from clause * add sql sanitizer test for queries starting with from * rename hibernate-4.3 to hibernate-procedure-call-4.3
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.
Currently the span name for hibernate queries created with
createQueryandcreateSQLQueryis the query itself. This query can contain high cardinality components and unsanitized info. This pr changes span name for hibernate queries to follow the same pattern as jdbc queries operation + entity/table name.Additionally tests that were not present for hibernate 4.3 were copied from 4.0. Hibernate 6 tests were moved to a separate directory as there are some api changes due to which most of the tests won't work on hibernate 6.