[Fix] Prevent panic when sanitizing read-only traces with multiple exporters #7245
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
![graphite-app[bot]](https://avatars.githubusercontent.com/in/158384?s=60&v=4){kind=small}
victornguen
force-pushed
the
fix/7221
branch
2 times, most recently
from
e00cbae to
c771901
Compare
yurishkuro
reviewed
Jun 23, 2025
|
|
||
| var workingTraces ptrace.Traces | ||
|
|
||
| canModify := true |
Member
There was a problem hiding this comment.
there is IsReadOnly function, why do we need to test via panic?
Contributor
Author
There was a problem hiding this comment.
my bad, I've refactored it
yurishkuro
reviewed
Jun 23, 2025
| span := spans.At(k) | ||
| if spanNeedsDurationSanitization(span) { | ||
| needsModification = true | ||
| break |
Member
There was a problem hiding this comment.
this only breaks out of the inner loop, you need to use a label at the outer loop and break outerloop. Or move the check to a function and return true
yurishkuro
reviewed
Jun 24, 2025
Comment on lines
58
to
60
| workingResourceSpans := workingTraces.ResourceSpans() | ||
| for i := 0; i < workingResourceSpans.Len(); i++ { | ||
| resourceSpan := workingResourceSpans.At(i) |
Member
There was a problem hiding this comment.
I think you can simplify using iterators
Suggested change
| workingResourceSpans := workingTraces.ResourceSpans() | |
| for i := 0; i < workingResourceSpans.Len(); i++ { | |
| resourceSpan := workingResourceSpans.At(i) | |
| for resourceSpan := range workingTraces.ResourceSpans().All() { |
yurishkuro
reviewed
Jun 24, 2025
internal/jptrace/sanitizer/utf8.go
Outdated
|
|
||
| func attributesNeedUTF8Sanitization(attributes pcommon.Map) bool { | ||
| needsSanitization := false | ||
| attributes.Range(func(k string, v pcommon.Value) bool { |
Member
There was a problem hiding this comment.
could you use iterator here?
for k, v := attributes.All()
yurishkuro
approved these changes
Jun 28, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #7245 +/- ##
==========================================
- Coverage 96.20% 96.17% -0.04%
==========================================
Files 369 370 +1
Lines 22098 22290 +192
==========================================
+ Hits 21260 21437 +177
- Misses 626 638 +12
- Partials 212 215 +3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Member
|
Both DCO checks are failing. My recommendation is to squash all commits into one and make sure it is signed correctly. See CONTRIBUTING for help. |
…porters Implement copy-on-write approach for all sanitizers: - Check if modifications are needed before attempting changes - Return original traces if no sanitization required - Test mutability and create a copy if data is read-only - Apply modifications to the working copy instead of original data --------- Signed-off-by: Victor Nguen <nguen-victor@yandex.ru>
Contributor
Author
|
Thanks, I squashed the commits. DCO passed. |
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.
Which problem is this PR solving?
Description of the changes
Implement copy-on-write approach for all sanitizers:
How was this change tested?
Checklist
jaeger:make lint testjaeger-ui:npm run lintandnpm run test