fix(sveltekit): Handle server-only and shared load functions#7581
Merged
fix(sveltekit): Handle server-only and shared load functions#7581
Conversation
AbhiPrasad
reviewed
Mar 23, 2023
| if (isServerOnlyLoad(event)) { | ||
| const sentryTraceHeader = event.request.headers.get('sentry-trace'); | ||
| const baggageHeader = event.request.headers.get('baggage'); | ||
| const traceparentData = sentryTraceHeader ? extractTraceparentData(sentryTraceHeader) : undefined; |
Contributor
There was a problem hiding this comment.
m: This conditional branching is a little confusing to me. Can we do it like the following?
Could we extract the request.headers logic into a separate function that conditionally returns the traceparentData and dynamicSamplingContext?
We can then just reference those directly like trace function used to.
Member
Author
There was a problem hiding this comment.
Done! Also removed the domain (will update the PR description for future refrerence)
Contributor
size-limit report 📦
|
4bc2407 to
62dd95d
Compare
AbhiPrasad
approved these changes
Mar 23, 2023
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
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.
Previously, our server
wrapLoadWithSentryassumed thatloadin+page.tsand+page.server.tswork identically. Unfortunately, the loadeventarg has different contents for both, namely that the server-only load event contains arequestobject while the shared (client and server) load event doesn't. This PR fixes that by distinguishing between the two load types within the wrapper. Users can still use the same wrapper for both cases.Furthermore, this PR removes the usage of domains in the load wrapper, as on the server-side, we're already in a domain when
handleSentryis used. Creating another domain here, caused the creation of a new transaction instead of adding the span to the transaction that was created byhandleSentry.ref #7403