Skip query sanitization for prepared statements under stable semconv flag #15855
Conversation
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
github-actions
bot
added
the
test native
trask
changed the title
trask
changed the title
trask
force-pushed
the
prepared-statement-no-sanitization
branch
2 times, most recently
from
5c413eb to
52c940f
Compare
31 tasks
trask
force-pushed
the
prepared-statement-no-sanitization
branch
4 times, most recently
from
09a4532 to
aca641d
Compare
laurit
reviewed
Jan 13, 2026
| Long batchSize = getter.getBatchSize(request); | ||
| boolean isBatch = batchSize != null && batchSize > 1; | ||
| boolean parameterizedQuery = getter.isParameterizedQuery(request); | ||
| boolean shouldSanitize = statementSanitizationEnabled && !parameterizedQuery; |
Contributor
There was a problem hiding this comment.
Can we do this right now or should this be done along with switching to the stable semconv? Maybe
statementSanitizationEnabled && (!SemconvStability.emitStableDatabaseSemconv() || !parameterizedQuery)? Or maybe we should introduce a flag for future defaults so we could implement the planned changes for 3.0 straight away but have them disabled for now.
Member
Author
There was a problem hiding this comment.
oh, it's only used in the experimental semconv block, I moved it down inside that block make it more clear now
trask
force-pushed
the
prepared-statement-no-sanitization
branch
from
1885a18 to
dbdf02d
Compare
trask
force-pushed
the
prepared-statement-no-sanitization
branch
from
fa17edf to
1e97c5b
Compare
PreparedStatement queries use placeholders and are already parameterized, so they don't need sanitization. This change adds an isPreparedStatement flag to DbRequest and SqlClientAttributesGetter to skip sanitization for prepared statements while still sanitizing regular Statement queries.
trask
force-pushed
the
prepared-statement-no-sanitization
branch
from
1e97c5b to
b6bcd8b
Compare
laurit
reviewed
Jan 16, 2026
| * of db.query.text</a>. | ||
| */ | ||
| // TODO: make this required to implement | ||
| default boolean isParameterizedQuery(REQUEST request) { |
Contributor
There was a problem hiding this comment.
wondering whether it would be better to name this method based on what it is used for e.g. IsQuerySanitizationNeeded
Member
Author
There was a problem hiding this comment.
I think it makes sense, I'll send a follow-up PR to consider
laurit
approved these changes
Jan 16, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
https://github.com/open-telemetry/semantic-conventions/blob/main/docs/db/database-spans.md#sanitization-of-dbquerytext
TODO add opt-in to sanitize anyways?