Uh oh!
There was an error while loading. Please reload this page.
feat(core): Apply request data to segment spans in span streaming - #20654
Merged
Conversation
Contributor
size-limit report 📦
|
JPeer264
approved these changes
May 5, 2026
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit fd48621. Configure here.
Uh oh!
There was an error while loading. Please reload this page.
chargome
marked this pull request as draft
May 5, 2026 13:26
chargome
marked this pull request as ready for review
May 6, 2026 07:53
nicohrubec
self-requested a review
May 6, 2026 11:13
| function applyScopeToSegmentSpan(_segmentSpanJSON: StreamedSpanJSON, _scopeData: ScopeData): void { | ||
| // TODO: Apply all scope and request data from auto instrumentation (contexts, request) to segment span | ||
| // TODO: Apply contexts data from auto instrumentation to segment span |
Member
There was a problem hiding this comment.
l: are the changes here just leftovers or intentional?
| if (include.headers) { | ||
| requestData.headers = headers; | ||
| // Remove the Cookie header in case cookie data should not be included in the event |
| if (include.ip) { | ||
| const ip = (normalizedRequest.headers && getClientIPAddress(normalizedRequest.headers)) || ipAddress || undefined; | ||
| if (ip) { | ||
| safeSetSpanJSONAttributes(span, { [SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS]: ip }); |
Member
There was a problem hiding this comment.
l: any reason not to aggregate all attributes and then call safeSetSpanJSONAttributes once instead of splitting this up?
MemberAuthor
There was a problem hiding this comment.
To set cookies before headers for precedence
| return event; | ||
| }, | ||
| processSegmentSpan(span, client) { | ||
| const { sdkProcessingMetadata } = getIsolationScope().getScopeData(); |
Member
There was a problem hiding this comment.
l: could sdkProcessingMetadata ever be undefined? in the event processing path we use a default here to be safe
nicohrubec
approved these changes
May 6, 2026
nicohrubec
left a comment
Member
There was a problem hiding this comment.
have a few minor comments, but else good to go 🚀
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Implements the span-streaming counterpart of the
requestDataIntegration.processEventhook.Request data from the scope's
sdkProcessingMetadatais mapped to span attributes following sentry-conventions, reusinghttpHeadersToSpanAttributesfor sensitivity filtering and gating IP extraction behindsendDefaultPii.Note: The logic is also guarded by
client.getIntegrationByName('RequestData')so users who opt out of the integration don't get request data on streamed spans either.This approach was chosen over adding a
processSegmentSpanhook to the integration because captureSpan is tree-shakeable for non-streaming users, keeping the request data code out of bundles that don't need it (see linked ticket).Closes#20380