Repository navigation
feat(nextjs): Wait for the resumed part of a document before starting the pageload - #25142
Draft
chargome wants to merge 4 commits into
Draft
chargome wants to merge 4 commits into
chargome wants to merge 4 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
chargome
added this pull request to stack #25143
October 7, 2026 14:59
Copy link
Copy Markdown
Member
Author
|
bugbot run |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
size-limit report 📦⚠️ Warning: Base artifact is not the latest one, because the latest workflow run is not done yet. This may lead to incorrect results. Try to re-run all tests to get up to date results.
|
Sorry, something went wrong.
chargome
force-pushed
the
chargome/feat/nextjs-deferred-pageload-start
branch
from
217546f to
fa2f4e1
Compare
October 7, 2026 15:19
Copy link
Copy Markdown
Member
Author
|
bugbot run |
Sorry, something went wrong.
Copy link
Copy Markdown
There was a problem hiding this comment.
Stale Bugbot comment from a previous run.
Sorry, something went wrong.
Comment thread
packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
Outdated
chargome
force-pushed
the
chargome/feat/nextjs-deferred-pageload-start
branch
from
fa2f4e1 to
c617c75
Compare
October 8, 2026 07:55
Copy link
Copy Markdown
Member
Author
|
bugbot run |
Sorry, something went wrong.
chargome
force-pushed
the
chargome/feat/nextjs-deferred-pageload-start
branch
from
c617c75 to
ecb46df
Compare
October 8, 2026 07:59
Copy link
Copy Markdown
Member
Author
|
bugbot run |
Sorry, something went wrong.
chargome
force-pushed
the
chargome/feat/nextjs-deferred-pageload-start
branch
from
ecb46df to
8ead4b1
Compare
October 8, 2026 08:02
Copy link
Copy Markdown
Member
Author
|
bugbot run |
Sorry, something went wrong.
Copy link
Copy Markdown
There was a problem hiding this comment.
Stale Bugbot comment from a previous run.
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
|
bugbot run |
Sorry, something went wrong.
Copy link
Copy Markdown
There was a problem hiding this comment.
Stale Bugbot comment from a previous run.
Sorry, something went wrong.
… the pageload A document that resumes a prerendered shell gets its sentry-trace tag with the resumed chunk, which lands in <body> after the SDK has usually already run. A pageload created at that point can only link the server trace. Continue whatever tag is in the document, last one wins, and when there is no tag, no Server-Timing trace and the document is still streaming, wait for the tag before creating the pageload span, bounded by DOMContentLoaded and a 10 second cap. The span's start is backdated to the time origin and its children come from the performance timeline, so it looks the same as before, only inside the server's trace. A client-side navigation during the wait starts the pageload with a fresh trace first, so the navigation is filed as its redirect instead of being the only record of the visit. Fixes #24944 Refs JS-3863 Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…a navigation A pageload that waits for its trace meta tag can be settled by a navigation, and a `popstate` has already changed the location by then. The browser SDK reads the location when the span starts, so the pageload got the URL of the navigation. Capture the document URL when the instrumentation sets up and put it on the span and the request data instead. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…ntions constants in the test Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
chargome
force-pushed
the
chargome/feat/nextjs-deferred-pageload-start
branch
from
d3fd241 to
1ae9f0e
Compare
October 9, 2026 14:25
Copy link
Copy Markdown
Member
Author
|
bugbot run |
Sorry, something went wrong.
Copy link
Copy Markdown
There was a problem hiding this comment.
Stale Bugbot comment from a previous run.
Sorry, something went wrong.
Comment thread
packages/nextjs/src/client/browserTracingIntegration.ts
The Next.js routing instrumentation never flags a navigation as a redirect, so a navigation during the wait ends the pageload like any pageload it interrupts and starts its own trace, as it does today. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Copy link
Copy Markdown
Member
Author
|
bugbot run |
Sorry, something went wrong.
Copy link
Copy Markdown
There was a problem hiding this comment.
✅ Bugbot reviewed your changes and found no new issues!
Comment @cursor review or bugbot run to trigger another review on this PR
Reviewed by Cursor Bugbot for commit 2ac1063. Configure here.
Sorry, something went wrong.
This branch has not been deployed
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
Reviewers
At least 1 approving review is required to merge this pull request.
Assignees
1 participant
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.
Builds on #25141.
When a document resumes a prerendered shell, its sentry-trace tag sits at the start of the resumed part, which arrives after the SDK has started. In a local demo six of seven visits found no tag at init, so the pageload could only link the server trace instead of joining it.
The app router pageload now continues whatever tag is in the document, last one wins. If there is no tag, no Server-Timing trace and the document is still streaming, it waits for the tag before creating the pageload span. The wait ends at DOMContentLoaded or after 10 seconds. The span still starts at the time origin and gets its children from the performance timeline, so it looks the same as before, only inside the server's trace. No tag by the end of parsing means a fresh trace, which is the fully static case.
A client-side navigation during the wait starts the pageload with a fresh trace first, so the navigation ends it like any pageload it interrupts, as today. Started later, the pageload would end the navigation span instead. The pageload keeps the URL the document was loaded with, even if the navigation already changed it.
Waiting was chosen over moving a started span to another trace. That needs core changes and does not work with span streaming once children are flushed. The cost: fetches, errors and clicks between SDK start and the resumed part are not attached to the pageload. The Server-Timing follow-ups (JS-3864, JS-3866) remove that window where the header can be set.
Fixes #24944
🤖 Generated with Claude Code