[SqlClient] Skip N from unicode strings when sanitizing queries#3662
Merged
alanwest merged 4 commits intoopen-telemetry:mainfrom Jan 7, 2026
Merged
[SqlClient] Skip N from unicode strings when sanitizing queries#3662alanwest merged 4 commits intoopen-telemetry:mainfrom
alanwest merged 4 commits intoopen-telemetry:mainfrom
Conversation
Skip leading `N` in values of the form `N'foo'`. Resolves open-telemetry#3659.
martincostello
had a problem deploying
to
external
GitHub Actions
Failure
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #3662 +/- ##
==========================================
+ Coverage 71.55% 71.62% +0.06%
==========================================
Files 455 455
Lines 17639 17642 +3
==========================================
+ Hits 12622 12636 +14
+ Misses 5017 5006 -11 Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
Add changes to EFCore and SqlClient CHANGELOGs.
Use a constant for the prefix and expand on the comment.
martincostello
had a problem deploying
to
external
GitHub Actions
Failure
github-actions
Bot
added
comp:instrumentation.entityframeworkcore
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request fixes SQL query sanitization to properly handle Unicode string literals in T-SQL. Previously, when sanitizing queries containing Unicode strings of the form N'text', the leading N prefix was retained, resulting in N? instead of ?. This change ensures the Unicode prefix is removed during sanitization.
Key Changes:
- Added detection logic to identify Unicode string literals (prefixed with
N) - Implemented buffer position adjustment to remove the Unicode prefix when sanitizing
- Updated test case expectations to reflect correct sanitization behavior without the
Nprefix
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/Shared/SqlProcessor.cs | Added Unicode prefix detection and buffer position adjustment in string literal sanitization logic |
| test/OpenTelemetry.Contrib.Shared.Tests/SqlProcessorAdditionalTestCases.json | Updated existing test case expectation and added new test case for Unicode string literals |
| src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md | Documented the Unicode string literal sanitization improvement |
| src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md | Documented the Unicode string literal sanitization improvement |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Kielek
approved these changes
Jan 7, 2026
rajkumar-rangaraj
approved these changes
Jan 7, 2026
alanwest
approved these changes
Jan 7, 2026
github-merge-queue
Bot
removed this pull request from the merge queue due to a conflict with the base branch
Merged
via the queue into
open-telemetry:main
with commit Jan 7, 2026
ccfe01c
320 of 321 checks passed
This was referenced Apr 22, 2026
This was referenced Apr 22, 2026
Open
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.
Resolves #3659.
Changes
Skip leading
Nin values of the formN'foo'to avoid sanitized queries containingN?values.Merge requirement checklist
CHANGELOG.mdfiles updated for non-trivial changesChanges in public API reviewed (if applicable)