feat(nextjs): Add cloudflare waitUntil detection - #18336

Merged
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush
Nov 26, 2025
Merged

feat(nextjs): Add cloudflare waitUntil detection#18336
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush

Conversation

@logaretm

@logaretmlogaretm commented Nov 26, 2025

Copy link
Copy Markdown
Member

This is part of the work done for supporting Next.js on cloudflare workers in #14931, one of the issues is our flusher didn't take cloudflare into account and the events were being cut off due to early shutdowns by the worker environment.

We cannot use our core's flushIfServerless because it requires explicit cloudflareWaitUntil to be passed down to it.

Also The symbol we are grabbing here is specific to opennext and isn't something that is globally available on the worker environment. I had initially created #18330 because I mistook it for a worker environment API thing.

So this PR adds that detection to Next.js since it is relevant here and will use it if available, local tests show flushing is done correctly and events aren't being cut off.

@JPeer264JPeer264 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To verify. This would only work with OpenNext, right?

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super-l: Since this is Opennext specific we could theoretically rename it to make it more obvious.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I though the comments would suffice, but you are right, it should be clearer with the naming. I will do that 👍

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Do you think it would be possible to add this Symbol somehow in our Cloudflare SDK so we don't have to rely 100% on opennext?

@logaretmlogaretmNov 26, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think our SDK can do something similar by putting the context on the global scope, so that we don't have to toss it around. But yes this is 100% opennext specific.

Will be very useful for SDKs that do use cloudflare SDK setup I suppose, but not necessarily the Next.js one at its current state with Opennext adapters.

@chargomechargome left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@logaretm
logaretm merged commit b306a35 into developNov 26, 2025
67 checks passed
@logaretm
logaretm deleted the awad/nextjs-cloudflare-flush branch November 26, 2025 16:51
logaretm added a commit to getsentry/sentry-docs that referenced this pull request Dec 2, 2025
I won't merge this yet as it partially needs
getsentry/sentry-javascript#18336 to be
released, but I wanted some initial opinions.
This PR adds new information about supporting Next.js deployments on
Cloudflare Workers via Cloudflare's official [OpenNext
adapter](https://opennext.js.org/cloudflare).
During [my
investigation](getsentry/sentry-javascript#14931 (comment))
of Cloudflare Workers not sending any errors or traces for Next.js apps,
I found out that it was because Cloudflare workers didn't support
`https.request` module [until
recently](cloudflare/workerd#3820) which
would've prevented the SDK from sending anything. Setting the compat
date alone fixes most of the sending issues.
So I wanted to document this information so users are able to find it
more easily.
My findings can be verified by checking out [this
repo](https://github.com/logaretm/nextjs-cloudflare-demo) and try
setting the `compat` date to anything below August 16th. You don't need
a cloudflare account, just `wranger dev` should give you a similar
environment locally to verify that.
---
**Question for reviewers**: Should this live in special guides like I
did here? or maybe add it to the manual setup?
---------
Co-authored-by: Sarah Mischinger <sarah@codingwriter.com>
Doridian pushed a commit to foxCaves/foxCaves that referenced this pull request Dec 3, 2025
This PR contains the following updates:
| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [@sentry/react](https://github.com/getsentry/sentry-javascript/tree/master/packages/react) ([source](https://github.com/getsentry/sentry-javascript)) | [`10.27.0` -> `10.28.0`](https://renovatebot.com/diffs/npm/@sentry%2freact/10.27.0/10.28.0) | ![age](https://developer.mend.io/api/mc/badges/age/npm/@sentry%2freact/10.28.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@sentry%2freact/10.27.0/10.28.0?slim=true) |
---
### Release Notes
<details>
<summary>getsentry/sentry-javascript (@&#8203;sentry/react)</summary>
### [`v10.28.0`](https://github.com/getsentry/sentry-javascript/releases/tag/10.28.0)
[Compare Source](getsentry/sentry-javascript@10.27.0...10.28.0)
##### Important Changes
- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#&#8203;10798](getsentry/sentry-javascript#10798
The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
**Before:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport } from '@&#8203;sentry/browser';
const EXTRA_KEY = 'ROUTE_TO';
const transport = makeMultiplexedTransport(makeFetchTransport, args => {
const event = args.getEvent();
if (event?.extra?.[EXTRA_KEY] && Array.isArray(event.extra[EXTRA_KEY])) {
return event.extra[EXTRA_KEY];
}
return [];
});
Sentry.init({
transport,
// ... other options
});
// Capture events with routing info
Sentry.captureException(error, {
extra: {
[EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
**After:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '@&#8203;sentry/browser';
// Just pass the transport generator - the default matcher handles the rest!
Sentry.init({
transport: makeMultiplexedTransport(makeFetchTransport),
// ... other options
});
// Capture events with routing info using the exported constant
Sentry.captureException(error, {
extra: {
[MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
The default matcher looks for routing information in `event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]`. You can still provide a custom matcher function for advanced use cases.
- **feat(nextjs): Support cacheComponents on turbopack ([#&#8203;18304](getsentry/sentry-javascript#18304
This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
##### Other Changes
- feat: Publish AWS Lambda Layer for Node 24 ([#&#8203;18327](getsentry/sentry-javascript#18327))
- feat(browser): Expose langchain instrumentation ([#&#8203;18342](getsentry/sentry-javascript#18342))
- feat(browser): Expose langgraph instrumentation ([#&#8203;18345](getsentry/sentry-javascript#18345))
- feat(cloudflare): Allow specifying a custom fetch in Cloudflare transport options ([#&#8203;18335](getsentry/sentry-javascript#18335))
- feat(core): Add `isolateTrace` option to `Sentry.withMonitor()` ([#&#8203;18079](getsentry/sentry-javascript#18079))
- feat(deps): bump [@&#8203;sentry/webpack-plugin](https://github.com/sentry/webpack-plugin) from 4.3.0 to 4.6.1 ([#&#8203;18272](getsentry/sentry-javascript#18272))
- feat(nextjs): Add cloudflare `waitUntil` detection ([#&#8203;18336](getsentry/sentry-javascript#18336))
- feat(node): Add LangChain v1 support ([#&#8203;18306](getsentry/sentry-javascript#18306))
- feat(remix): Add parameterized transaction naming for routes ([#&#8203;17951](getsentry/sentry-javascript#17951))
- fix(cloudflare): Keep http root span alive until streaming responses are consumed ([#&#8203;18087](getsentry/sentry-javascript#18087))
- fix(cloudflare): Wait for async events to finish ([#&#8203;18334](getsentry/sentry-javascript#18334))
- fix(core): `continueTrace` doesn't propagate given trace ID if active span exists ([#&#8203;18328](getsentry/sentry-javascript#18328))
- fix(node-core): Handle custom scope in log messages without parameters ([#&#8203;18322](getsentry/sentry-javascript#18322))
- fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#&#8203;18337](getsentry/sentry-javascript#18337))
- fix(react-router): Use underscores in trace origin values ([#&#8203;18351](getsentry/sentry-javascript#18351))
- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#&#8203;18369](getsentry/sentry-javascript#18369))
- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#&#8203;18338](getsentry/sentry-javascript#18338))
<details>
<summary><strong>Internal Changes</strong></summary>
- chore: Allow URLs as issue ([#&#8203;18372](getsentry/sentry-javascript#18372))
- chore(changelog): Add entry for [#&#8203;18304](getsentry/sentry-javascript#18304) ([#&#8203;18329](getsentry/sentry-javascript#18329))
- chore(ci): Add action to track all PRs as issues ([#&#8203;18363](getsentry/sentry-javascript#18363))
- chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#&#8203;18352](getsentry/sentry-javascript#18352))
- ci: Add action to create issue on gitflow merge conflicts ([#&#8203;18319](getsentry/sentry-javascript#18319))
- ci(deps): bump actions/checkout from 5 to 6 ([#&#8203;18268](getsentry/sentry-javascript#18268))
- ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#&#8203;18361](getsentry/sentry-javascript#18361))
- test(cloudflare): Add typechecks for cloudflare-worker e2e test ([#&#8203;18321](getsentry/sentry-javascript#18321))
</details>
#### Bundle size 📦
| Path | Size |
| ----------------------------------------------------------------------------------------------------- | --------- |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) | 24.22 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) - with treeshaking flags | 22.76 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing) | 40.57 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Profiling) | 45.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) | 78.08 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) - with treeshaking flags | 68.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay with Canvas) | 82.65 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay, Feedback) | 94.61 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Feedback) | 40.51 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. sendFeedback) | 28.8 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. FeedbackAsync) | 33.66 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) | 25.9 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) (incl. Tracing) | 42.72 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) | 28.56 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) (incl. Tracing) | 42.32 KB |
| [@&#8203;sentry/svelte](https://github.com/sentry/svelte) | 24.24 KB |
| CDN Bundle | 26.57 KB |
| CDN Bundle (incl. Tracing) | 41.22 KB |
| CDN Bundle (incl. Tracing, Replay) | 76.9 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) | 82.23 KB |
| CDN Bundle - uncompressed | 78.09 KB |
| CDN Bundle (incl. Tracing) - uncompressed | 122.4 KB |
| CDN Bundle (incl. Tracing, Replay) - uncompressed | 235.71 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed | 248.17 KB |
| [@&#8203;sentry/nextjs](https://github.com/sentry/nextjs) (client) | 44.88 KB |
| [@&#8203;sentry/sveltekit](https://github.com/sentry/sveltekit) (client) | 40.92 KB |
| [@&#8203;sentry/node-core](https://github.com/sentry/node-core) | 50.06 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) | 155.7 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) - without tracing | 90.67 KB |
| [@&#8203;sentry/aws-serverless](https://github.com/sentry/aws-serverless) | 105.61 KB |
</details>
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
---
This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4yNy4xIiwidXBkYXRlZEluVmVyIjoiNDIuMjcuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
Reviewed-on: https://git.foxden.network/foxCaves/foxCaves/pulls/12
Co-authored-by: Renovate <renovate@foxden.network>
Co-committed-by: Renovate <renovate@foxden.network>
hideokamoto pushed a commit to hideokamoto/hidetaka.dev.2023 that referenced this pull request Jan 25, 2026
BREAKING CHANGE: Replace @sentry/browser and @sentry/cloudflare with unified @sentry/nextjs SDK
Key Changes:
- Install @sentry/nextjs@10.34.0 (replaces @sentry/browser and @sentry/cloudflare)
- Add Next.js instrumentation for automatic Sentry initialization
- src/instrumentation.ts: Main entry point with onRequestError hook
- src/sentry.edge.config.ts: Edge runtime config (Cloudflare Workers)
- src/sentry.server.config.ts: Node.js runtime config (local dev)
- Update server.ts and client.ts to use @sentry/nextjs imports
- Update all tests to mock @sentry/nextjs instead of individual SDKs
Benefits:
- ✅ Automatic error flushing on Cloudflare Workers (v10.28.0+)
- No manual flush() calls needed
- Detects OpenNext's waitUntil context automatically
- See: getsentry/sentry-javascript#18336
- ✅ onRequestError hook captures Server Component/middleware errors
- ✅ Unified SDK reduces bundle size and complexity
- ✅ Official Next.js + Cloudflare Workers support
Documentation:
- Updated docs/SENTRY_SETUP.md with new architecture
- Added references to v10.28.0 flushing fixes
- Documented instrumentation.ts initialization flow
Testing:
- ✅ All 353 unit tests passing
- ✅ Build successful (Next.js + Cloudflare)
- ✅ Lint checks passing
Resolves: getsentry/sentry-javascript#14931
Implements: getsentry/sentry-javascript#18336
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@logaretm@JPeer264@chargome
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

feat(nextjs): Add cloudflare waitUntil detection - #18336

Merged
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush
Nov 26, 2025
Merged

feat(nextjs): Add cloudflare waitUntil detection#18336
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush

Conversation

@logaretm

@logaretmlogaretm commented Nov 26, 2025

Copy link
Copy Markdown
Member

This is part of the work done for supporting Next.js on cloudflare workers in #14931, one of the issues is our flusher didn't take cloudflare into account and the events were being cut off due to early shutdowns by the worker environment.

We cannot use our core's flushIfServerless because it requires explicit cloudflareWaitUntil to be passed down to it.

Also The symbol we are grabbing here is specific to opennext and isn't something that is globally available on the worker environment. I had initially created #18330 because I mistook it for a worker environment API thing.

So this PR adds that detection to Next.js since it is relevant here and will use it if available, local tests show flushing is done correctly and events aren't being cut off.

@JPeer264JPeer264 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To verify. This would only work with OpenNext, right?

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super-l: Since this is Opennext specific we could theoretically rename it to make it more obvious.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I though the comments would suffice, but you are right, it should be clearer with the naming. I will do that 👍

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Do you think it would be possible to add this Symbol somehow in our Cloudflare SDK so we don't have to rely 100% on opennext?

@logaretmlogaretmNov 26, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think our SDK can do something similar by putting the context on the global scope, so that we don't have to toss it around. But yes this is 100% opennext specific.

Will be very useful for SDKs that do use cloudflare SDK setup I suppose, but not necessarily the Next.js one at its current state with Opennext adapters.

@chargomechargome left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@logaretm
logaretm merged commit b306a35 into developNov 26, 2025
67 checks passed
@logaretm
logaretm deleted the awad/nextjs-cloudflare-flush branch November 26, 2025 16:51
logaretm added a commit to getsentry/sentry-docs that referenced this pull request Dec 2, 2025
I won't merge this yet as it partially needs
getsentry/sentry-javascript#18336 to be
released, but I wanted some initial opinions.
This PR adds new information about supporting Next.js deployments on
Cloudflare Workers via Cloudflare's official [OpenNext
adapter](https://opennext.js.org/cloudflare).
During [my
investigation](getsentry/sentry-javascript#14931 (comment))
of Cloudflare Workers not sending any errors or traces for Next.js apps,
I found out that it was because Cloudflare workers didn't support
`https.request` module [until
recently](cloudflare/workerd#3820) which
would've prevented the SDK from sending anything. Setting the compat
date alone fixes most of the sending issues.
So I wanted to document this information so users are able to find it
more easily.
My findings can be verified by checking out [this
repo](https://github.com/logaretm/nextjs-cloudflare-demo) and try
setting the `compat` date to anything below August 16th. You don't need
a cloudflare account, just `wranger dev` should give you a similar
environment locally to verify that.
---
**Question for reviewers**: Should this live in special guides like I
did here? or maybe add it to the manual setup?
---------
Co-authored-by: Sarah Mischinger <sarah@codingwriter.com>
Doridian pushed a commit to foxCaves/foxCaves that referenced this pull request Dec 3, 2025
This PR contains the following updates:
| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [@sentry/react](https://github.com/getsentry/sentry-javascript/tree/master/packages/react) ([source](https://github.com/getsentry/sentry-javascript)) | [`10.27.0` -> `10.28.0`](https://renovatebot.com/diffs/npm/@sentry%2freact/10.27.0/10.28.0) | ![age](https://developer.mend.io/api/mc/badges/age/npm/@sentry%2freact/10.28.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@sentry%2freact/10.27.0/10.28.0?slim=true) |
---
### Release Notes
<details>
<summary>getsentry/sentry-javascript (@&#8203;sentry/react)</summary>
### [`v10.28.0`](https://github.com/getsentry/sentry-javascript/releases/tag/10.28.0)
[Compare Source](getsentry/sentry-javascript@10.27.0...10.28.0)
##### Important Changes
- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#&#8203;10798](getsentry/sentry-javascript#10798
The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
**Before:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport } from '@&#8203;sentry/browser';
const EXTRA_KEY = 'ROUTE_TO';
const transport = makeMultiplexedTransport(makeFetchTransport, args => {
const event = args.getEvent();
if (event?.extra?.[EXTRA_KEY] && Array.isArray(event.extra[EXTRA_KEY])) {
return event.extra[EXTRA_KEY];
}
return [];
});
Sentry.init({
transport,
// ... other options
});
// Capture events with routing info
Sentry.captureException(error, {
extra: {
[EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
**After:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '@&#8203;sentry/browser';
// Just pass the transport generator - the default matcher handles the rest!
Sentry.init({
transport: makeMultiplexedTransport(makeFetchTransport),
// ... other options
});
// Capture events with routing info using the exported constant
Sentry.captureException(error, {
extra: {
[MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
The default matcher looks for routing information in `event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]`. You can still provide a custom matcher function for advanced use cases.
- **feat(nextjs): Support cacheComponents on turbopack ([#&#8203;18304](getsentry/sentry-javascript#18304
This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
##### Other Changes
- feat: Publish AWS Lambda Layer for Node 24 ([#&#8203;18327](getsentry/sentry-javascript#18327))
- feat(browser): Expose langchain instrumentation ([#&#8203;18342](getsentry/sentry-javascript#18342))
- feat(browser): Expose langgraph instrumentation ([#&#8203;18345](getsentry/sentry-javascript#18345))
- feat(cloudflare): Allow specifying a custom fetch in Cloudflare transport options ([#&#8203;18335](getsentry/sentry-javascript#18335))
- feat(core): Add `isolateTrace` option to `Sentry.withMonitor()` ([#&#8203;18079](getsentry/sentry-javascript#18079))
- feat(deps): bump [@&#8203;sentry/webpack-plugin](https://github.com/sentry/webpack-plugin) from 4.3.0 to 4.6.1 ([#&#8203;18272](getsentry/sentry-javascript#18272))
- feat(nextjs): Add cloudflare `waitUntil` detection ([#&#8203;18336](getsentry/sentry-javascript#18336))
- feat(node): Add LangChain v1 support ([#&#8203;18306](getsentry/sentry-javascript#18306))
- feat(remix): Add parameterized transaction naming for routes ([#&#8203;17951](getsentry/sentry-javascript#17951))
- fix(cloudflare): Keep http root span alive until streaming responses are consumed ([#&#8203;18087](getsentry/sentry-javascript#18087))
- fix(cloudflare): Wait for async events to finish ([#&#8203;18334](getsentry/sentry-javascript#18334))
- fix(core): `continueTrace` doesn't propagate given trace ID if active span exists ([#&#8203;18328](getsentry/sentry-javascript#18328))
- fix(node-core): Handle custom scope in log messages without parameters ([#&#8203;18322](getsentry/sentry-javascript#18322))
- fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#&#8203;18337](getsentry/sentry-javascript#18337))
- fix(react-router): Use underscores in trace origin values ([#&#8203;18351](getsentry/sentry-javascript#18351))
- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#&#8203;18369](getsentry/sentry-javascript#18369))
- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#&#8203;18338](getsentry/sentry-javascript#18338))
<details>
<summary><strong>Internal Changes</strong></summary>
- chore: Allow URLs as issue ([#&#8203;18372](getsentry/sentry-javascript#18372))
- chore(changelog): Add entry for [#&#8203;18304](getsentry/sentry-javascript#18304) ([#&#8203;18329](getsentry/sentry-javascript#18329))
- chore(ci): Add action to track all PRs as issues ([#&#8203;18363](getsentry/sentry-javascript#18363))
- chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#&#8203;18352](getsentry/sentry-javascript#18352))
- ci: Add action to create issue on gitflow merge conflicts ([#&#8203;18319](getsentry/sentry-javascript#18319))
- ci(deps): bump actions/checkout from 5 to 6 ([#&#8203;18268](getsentry/sentry-javascript#18268))
- ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#&#8203;18361](getsentry/sentry-javascript#18361))
- test(cloudflare): Add typechecks for cloudflare-worker e2e test ([#&#8203;18321](getsentry/sentry-javascript#18321))
</details>
#### Bundle size 📦
| Path | Size |
| ----------------------------------------------------------------------------------------------------- | --------- |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) | 24.22 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) - with treeshaking flags | 22.76 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing) | 40.57 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Profiling) | 45.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) | 78.08 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) - with treeshaking flags | 68.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay with Canvas) | 82.65 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay, Feedback) | 94.61 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Feedback) | 40.51 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. sendFeedback) | 28.8 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. FeedbackAsync) | 33.66 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) | 25.9 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) (incl. Tracing) | 42.72 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) | 28.56 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) (incl. Tracing) | 42.32 KB |
| [@&#8203;sentry/svelte](https://github.com/sentry/svelte) | 24.24 KB |
| CDN Bundle | 26.57 KB |
| CDN Bundle (incl. Tracing) | 41.22 KB |
| CDN Bundle (incl. Tracing, Replay) | 76.9 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) | 82.23 KB |
| CDN Bundle - uncompressed | 78.09 KB |
| CDN Bundle (incl. Tracing) - uncompressed | 122.4 KB |
| CDN Bundle (incl. Tracing, Replay) - uncompressed | 235.71 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed | 248.17 KB |
| [@&#8203;sentry/nextjs](https://github.com/sentry/nextjs) (client) | 44.88 KB |
| [@&#8203;sentry/sveltekit](https://github.com/sentry/sveltekit) (client) | 40.92 KB |
| [@&#8203;sentry/node-core](https://github.com/sentry/node-core) | 50.06 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) | 155.7 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) - without tracing | 90.67 KB |
| [@&#8203;sentry/aws-serverless](https://github.com/sentry/aws-serverless) | 105.61 KB |
</details>
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
---
This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4yNy4xIiwidXBkYXRlZEluVmVyIjoiNDIuMjcuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
Reviewed-on: https://git.foxden.network/foxCaves/foxCaves/pulls/12
Co-authored-by: Renovate <renovate@foxden.network>
Co-committed-by: Renovate <renovate@foxden.network>
hideokamoto pushed a commit to hideokamoto/hidetaka.dev.2023 that referenced this pull request Jan 25, 2026
BREAKING CHANGE: Replace @sentry/browser and @sentry/cloudflare with unified @sentry/nextjs SDK
Key Changes:
- Install @sentry/nextjs@10.34.0 (replaces @sentry/browser and @sentry/cloudflare)
- Add Next.js instrumentation for automatic Sentry initialization
- src/instrumentation.ts: Main entry point with onRequestError hook
- src/sentry.edge.config.ts: Edge runtime config (Cloudflare Workers)
- src/sentry.server.config.ts: Node.js runtime config (local dev)
- Update server.ts and client.ts to use @sentry/nextjs imports
- Update all tests to mock @sentry/nextjs instead of individual SDKs
Benefits:
- ✅ Automatic error flushing on Cloudflare Workers (v10.28.0+)
- No manual flush() calls needed
- Detects OpenNext's waitUntil context automatically
- See: getsentry/sentry-javascript#18336
- ✅ onRequestError hook captures Server Component/middleware errors
- ✅ Unified SDK reduces bundle size and complexity
- ✅ Official Next.js + Cloudflare Workers support
Documentation:
- Updated docs/SENTRY_SETUP.md with new architecture
- Added references to v10.28.0 flushing fixes
- Documented instrumentation.ts initialization flow
Testing:
- ✅ All 353 unit tests passing
- ✅ Build successful (Next.js + Cloudflare)
- ✅ Lint checks passing
Resolves: getsentry/sentry-javascript#14931
Implements: getsentry/sentry-javascript#18336
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@logaretm@JPeer264@chargome
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(nextjs): Add cloudflare waitUntil detection - #18336

Merged
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush
Nov 26, 2025
Merged

feat(nextjs): Add cloudflare waitUntil detection#18336
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush

Conversation

@logaretm

@logaretmlogaretm commented Nov 26, 2025

Copy link
Copy Markdown
Member

This is part of the work done for supporting Next.js on cloudflare workers in #14931, one of the issues is our flusher didn't take cloudflare into account and the events were being cut off due to early shutdowns by the worker environment.

We cannot use our core's flushIfServerless because it requires explicit cloudflareWaitUntil to be passed down to it.

Also The symbol we are grabbing here is specific to opennext and isn't something that is globally available on the worker environment. I had initially created #18330 because I mistook it for a worker environment API thing.

So this PR adds that detection to Next.js since it is relevant here and will use it if available, local tests show flushing is done correctly and events aren't being cut off.

@JPeer264JPeer264 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To verify. This would only work with OpenNext, right?

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super-l: Since this is Opennext specific we could theoretically rename it to make it more obvious.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I though the comments would suffice, but you are right, it should be clearer with the naming. I will do that 👍

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Do you think it would be possible to add this Symbol somehow in our Cloudflare SDK so we don't have to rely 100% on opennext?

@logaretmlogaretmNov 26, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think our SDK can do something similar by putting the context on the global scope, so that we don't have to toss it around. But yes this is 100% opennext specific.

Will be very useful for SDKs that do use cloudflare SDK setup I suppose, but not necessarily the Next.js one at its current state with Opennext adapters.

@chargomechargome left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@logaretm
logaretm merged commit b306a35 into developNov 26, 2025
67 checks passed
@logaretm
logaretm deleted the awad/nextjs-cloudflare-flush branch November 26, 2025 16:51
logaretm added a commit to getsentry/sentry-docs that referenced this pull request Dec 2, 2025
I won't merge this yet as it partially needs
getsentry/sentry-javascript#18336 to be
released, but I wanted some initial opinions.
This PR adds new information about supporting Next.js deployments on
Cloudflare Workers via Cloudflare's official [OpenNext
adapter](https://opennext.js.org/cloudflare).
During [my
investigation](getsentry/sentry-javascript#14931 (comment))
of Cloudflare Workers not sending any errors or traces for Next.js apps,
I found out that it was because Cloudflare workers didn't support
`https.request` module [until
recently](cloudflare/workerd#3820) which
would've prevented the SDK from sending anything. Setting the compat
date alone fixes most of the sending issues.
So I wanted to document this information so users are able to find it
more easily.
My findings can be verified by checking out [this
repo](https://github.com/logaretm/nextjs-cloudflare-demo) and try
setting the `compat` date to anything below August 16th. You don't need
a cloudflare account, just `wranger dev` should give you a similar
environment locally to verify that.
---
**Question for reviewers**: Should this live in special guides like I
did here? or maybe add it to the manual setup?
---------
Co-authored-by: Sarah Mischinger <sarah@codingwriter.com>
Doridian pushed a commit to foxCaves/foxCaves that referenced this pull request Dec 3, 2025
This PR contains the following updates:
| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [@sentry/react](https://github.com/getsentry/sentry-javascript/tree/master/packages/react) ([source](https://github.com/getsentry/sentry-javascript)) | [`10.27.0` -> `10.28.0`](https://renovatebot.com/diffs/npm/@sentry%2freact/10.27.0/10.28.0) | ![age](https://developer.mend.io/api/mc/badges/age/npm/@sentry%2freact/10.28.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@sentry%2freact/10.27.0/10.28.0?slim=true) |
---
### Release Notes
<details>
<summary>getsentry/sentry-javascript (@&#8203;sentry/react)</summary>
### [`v10.28.0`](https://github.com/getsentry/sentry-javascript/releases/tag/10.28.0)
[Compare Source](getsentry/sentry-javascript@10.27.0...10.28.0)
##### Important Changes
- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#&#8203;10798](getsentry/sentry-javascript#10798
The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
**Before:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport } from '@&#8203;sentry/browser';
const EXTRA_KEY = 'ROUTE_TO';
const transport = makeMultiplexedTransport(makeFetchTransport, args => {
const event = args.getEvent();
if (event?.extra?.[EXTRA_KEY] && Array.isArray(event.extra[EXTRA_KEY])) {
return event.extra[EXTRA_KEY];
}
return [];
});
Sentry.init({
transport,
// ... other options
});
// Capture events with routing info
Sentry.captureException(error, {
extra: {
[EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
**After:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '@&#8203;sentry/browser';
// Just pass the transport generator - the default matcher handles the rest!
Sentry.init({
transport: makeMultiplexedTransport(makeFetchTransport),
// ... other options
});
// Capture events with routing info using the exported constant
Sentry.captureException(error, {
extra: {
[MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
The default matcher looks for routing information in `event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]`. You can still provide a custom matcher function for advanced use cases.
- **feat(nextjs): Support cacheComponents on turbopack ([#&#8203;18304](getsentry/sentry-javascript#18304
This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
##### Other Changes
- feat: Publish AWS Lambda Layer for Node 24 ([#&#8203;18327](getsentry/sentry-javascript#18327))
- feat(browser): Expose langchain instrumentation ([#&#8203;18342](getsentry/sentry-javascript#18342))
- feat(browser): Expose langgraph instrumentation ([#&#8203;18345](getsentry/sentry-javascript#18345))
- feat(cloudflare): Allow specifying a custom fetch in Cloudflare transport options ([#&#8203;18335](getsentry/sentry-javascript#18335))
- feat(core): Add `isolateTrace` option to `Sentry.withMonitor()` ([#&#8203;18079](getsentry/sentry-javascript#18079))
- feat(deps): bump [@&#8203;sentry/webpack-plugin](https://github.com/sentry/webpack-plugin) from 4.3.0 to 4.6.1 ([#&#8203;18272](getsentry/sentry-javascript#18272))
- feat(nextjs): Add cloudflare `waitUntil` detection ([#&#8203;18336](getsentry/sentry-javascript#18336))
- feat(node): Add LangChain v1 support ([#&#8203;18306](getsentry/sentry-javascript#18306))
- feat(remix): Add parameterized transaction naming for routes ([#&#8203;17951](getsentry/sentry-javascript#17951))
- fix(cloudflare): Keep http root span alive until streaming responses are consumed ([#&#8203;18087](getsentry/sentry-javascript#18087))
- fix(cloudflare): Wait for async events to finish ([#&#8203;18334](getsentry/sentry-javascript#18334))
- fix(core): `continueTrace` doesn't propagate given trace ID if active span exists ([#&#8203;18328](getsentry/sentry-javascript#18328))
- fix(node-core): Handle custom scope in log messages without parameters ([#&#8203;18322](getsentry/sentry-javascript#18322))
- fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#&#8203;18337](getsentry/sentry-javascript#18337))
- fix(react-router): Use underscores in trace origin values ([#&#8203;18351](getsentry/sentry-javascript#18351))
- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#&#8203;18369](getsentry/sentry-javascript#18369))
- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#&#8203;18338](getsentry/sentry-javascript#18338))
<details>
<summary><strong>Internal Changes</strong></summary>
- chore: Allow URLs as issue ([#&#8203;18372](getsentry/sentry-javascript#18372))
- chore(changelog): Add entry for [#&#8203;18304](getsentry/sentry-javascript#18304) ([#&#8203;18329](getsentry/sentry-javascript#18329))
- chore(ci): Add action to track all PRs as issues ([#&#8203;18363](getsentry/sentry-javascript#18363))
- chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#&#8203;18352](getsentry/sentry-javascript#18352))
- ci: Add action to create issue on gitflow merge conflicts ([#&#8203;18319](getsentry/sentry-javascript#18319))
- ci(deps): bump actions/checkout from 5 to 6 ([#&#8203;18268](getsentry/sentry-javascript#18268))
- ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#&#8203;18361](getsentry/sentry-javascript#18361))
- test(cloudflare): Add typechecks for cloudflare-worker e2e test ([#&#8203;18321](getsentry/sentry-javascript#18321))
</details>
#### Bundle size 📦
| Path | Size |
| ----------------------------------------------------------------------------------------------------- | --------- |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) | 24.22 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) - with treeshaking flags | 22.76 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing) | 40.57 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Profiling) | 45.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) | 78.08 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) - with treeshaking flags | 68.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay with Canvas) | 82.65 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay, Feedback) | 94.61 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Feedback) | 40.51 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. sendFeedback) | 28.8 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. FeedbackAsync) | 33.66 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) | 25.9 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) (incl. Tracing) | 42.72 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) | 28.56 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) (incl. Tracing) | 42.32 KB |
| [@&#8203;sentry/svelte](https://github.com/sentry/svelte) | 24.24 KB |
| CDN Bundle | 26.57 KB |
| CDN Bundle (incl. Tracing) | 41.22 KB |
| CDN Bundle (incl. Tracing, Replay) | 76.9 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) | 82.23 KB |
| CDN Bundle - uncompressed | 78.09 KB |
| CDN Bundle (incl. Tracing) - uncompressed | 122.4 KB |
| CDN Bundle (incl. Tracing, Replay) - uncompressed | 235.71 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed | 248.17 KB |
| [@&#8203;sentry/nextjs](https://github.com/sentry/nextjs) (client) | 44.88 KB |
| [@&#8203;sentry/sveltekit](https://github.com/sentry/sveltekit) (client) | 40.92 KB |
| [@&#8203;sentry/node-core](https://github.com/sentry/node-core) | 50.06 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) | 155.7 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) - without tracing | 90.67 KB |
| [@&#8203;sentry/aws-serverless](https://github.com/sentry/aws-serverless) | 105.61 KB |
</details>
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
---
This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4yNy4xIiwidXBkYXRlZEluVmVyIjoiNDIuMjcuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
Reviewed-on: https://git.foxden.network/foxCaves/foxCaves/pulls/12
Co-authored-by: Renovate <renovate@foxden.network>
Co-committed-by: Renovate <renovate@foxden.network>
hideokamoto pushed a commit to hideokamoto/hidetaka.dev.2023 that referenced this pull request Jan 25, 2026
BREAKING CHANGE: Replace @sentry/browser and @sentry/cloudflare with unified @sentry/nextjs SDK
Key Changes:
- Install @sentry/nextjs@10.34.0 (replaces @sentry/browser and @sentry/cloudflare)
- Add Next.js instrumentation for automatic Sentry initialization
- src/instrumentation.ts: Main entry point with onRequestError hook
- src/sentry.edge.config.ts: Edge runtime config (Cloudflare Workers)
- src/sentry.server.config.ts: Node.js runtime config (local dev)
- Update server.ts and client.ts to use @sentry/nextjs imports
- Update all tests to mock @sentry/nextjs instead of individual SDKs
Benefits:
- ✅ Automatic error flushing on Cloudflare Workers (v10.28.0+)
- No manual flush() calls needed
- Detects OpenNext's waitUntil context automatically
- See: getsentry/sentry-javascript#18336
- ✅ onRequestError hook captures Server Component/middleware errors
- ✅ Unified SDK reduces bundle size and complexity
- ✅ Official Next.js + Cloudflare Workers support
Documentation:
- Updated docs/SENTRY_SETUP.md with new architecture
- Added references to v10.28.0 flushing fixes
- Documented instrumentation.ts initialization flow
Testing:
- ✅ All 353 unit tests passing
- ✅ Build successful (Next.js + Cloudflare)
- ✅ Lint checks passing
Resolves: getsentry/sentry-javascript#14931
Implements: getsentry/sentry-javascript#18336
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@logaretm@JPeer264@chargome
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(nextjs): Add cloudflare waitUntil detection - #18336

Merged
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush
Nov 26, 2025
Merged

feat(nextjs): Add cloudflare waitUntil detection#18336
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush

Conversation

@logaretm

@logaretmlogaretm commented Nov 26, 2025

Copy link
Copy Markdown
Member

This is part of the work done for supporting Next.js on cloudflare workers in #14931, one of the issues is our flusher didn't take cloudflare into account and the events were being cut off due to early shutdowns by the worker environment.

We cannot use our core's flushIfServerless because it requires explicit cloudflareWaitUntil to be passed down to it.

Also The symbol we are grabbing here is specific to opennext and isn't something that is globally available on the worker environment. I had initially created #18330 because I mistook it for a worker environment API thing.

So this PR adds that detection to Next.js since it is relevant here and will use it if available, local tests show flushing is done correctly and events aren't being cut off.

@JPeer264JPeer264 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To verify. This would only work with OpenNext, right?

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super-l: Since this is Opennext specific we could theoretically rename it to make it more obvious.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I though the comments would suffice, but you are right, it should be clearer with the naming. I will do that 👍

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Do you think it would be possible to add this Symbol somehow in our Cloudflare SDK so we don't have to rely 100% on opennext?

@logaretmlogaretmNov 26, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think our SDK can do something similar by putting the context on the global scope, so that we don't have to toss it around. But yes this is 100% opennext specific.

Will be very useful for SDKs that do use cloudflare SDK setup I suppose, but not necessarily the Next.js one at its current state with Opennext adapters.

@chargomechargome left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@logaretm
logaretm merged commit b306a35 into developNov 26, 2025
67 checks passed
@logaretm
logaretm deleted the awad/nextjs-cloudflare-flush branch November 26, 2025 16:51
logaretm added a commit to getsentry/sentry-docs that referenced this pull request Dec 2, 2025
I won't merge this yet as it partially needs
getsentry/sentry-javascript#18336 to be
released, but I wanted some initial opinions.
This PR adds new information about supporting Next.js deployments on
Cloudflare Workers via Cloudflare's official [OpenNext
adapter](https://opennext.js.org/cloudflare).
During [my
investigation](getsentry/sentry-javascript#14931 (comment))
of Cloudflare Workers not sending any errors or traces for Next.js apps,
I found out that it was because Cloudflare workers didn't support
`https.request` module [until
recently](cloudflare/workerd#3820) which
would've prevented the SDK from sending anything. Setting the compat
date alone fixes most of the sending issues.
So I wanted to document this information so users are able to find it
more easily.
My findings can be verified by checking out [this
repo](https://github.com/logaretm/nextjs-cloudflare-demo) and try
setting the `compat` date to anything below August 16th. You don't need
a cloudflare account, just `wranger dev` should give you a similar
environment locally to verify that.
---
**Question for reviewers**: Should this live in special guides like I
did here? or maybe add it to the manual setup?
---------
Co-authored-by: Sarah Mischinger <sarah@codingwriter.com>
Doridian pushed a commit to foxCaves/foxCaves that referenced this pull request Dec 3, 2025
This PR contains the following updates:
| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [@sentry/react](https://github.com/getsentry/sentry-javascript/tree/master/packages/react) ([source](https://github.com/getsentry/sentry-javascript)) | [`10.27.0` -> `10.28.0`](https://renovatebot.com/diffs/npm/@sentry%2freact/10.27.0/10.28.0) | ![age](https://developer.mend.io/api/mc/badges/age/npm/@sentry%2freact/10.28.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@sentry%2freact/10.27.0/10.28.0?slim=true) |
---
### Release Notes
<details>
<summary>getsentry/sentry-javascript (@&#8203;sentry/react)</summary>
### [`v10.28.0`](https://github.com/getsentry/sentry-javascript/releases/tag/10.28.0)
[Compare Source](getsentry/sentry-javascript@10.27.0...10.28.0)
##### Important Changes
- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#&#8203;10798](getsentry/sentry-javascript#10798
The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
**Before:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport } from '@&#8203;sentry/browser';
const EXTRA_KEY = 'ROUTE_TO';
const transport = makeMultiplexedTransport(makeFetchTransport, args => {
const event = args.getEvent();
if (event?.extra?.[EXTRA_KEY] && Array.isArray(event.extra[EXTRA_KEY])) {
return event.extra[EXTRA_KEY];
}
return [];
});
Sentry.init({
transport,
// ... other options
});
// Capture events with routing info
Sentry.captureException(error, {
extra: {
[EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
**After:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '@&#8203;sentry/browser';
// Just pass the transport generator - the default matcher handles the rest!
Sentry.init({
transport: makeMultiplexedTransport(makeFetchTransport),
// ... other options
});
// Capture events with routing info using the exported constant
Sentry.captureException(error, {
extra: {
[MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
The default matcher looks for routing information in `event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]`. You can still provide a custom matcher function for advanced use cases.
- **feat(nextjs): Support cacheComponents on turbopack ([#&#8203;18304](getsentry/sentry-javascript#18304
This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
##### Other Changes
- feat: Publish AWS Lambda Layer for Node 24 ([#&#8203;18327](getsentry/sentry-javascript#18327))
- feat(browser): Expose langchain instrumentation ([#&#8203;18342](getsentry/sentry-javascript#18342))
- feat(browser): Expose langgraph instrumentation ([#&#8203;18345](getsentry/sentry-javascript#18345))
- feat(cloudflare): Allow specifying a custom fetch in Cloudflare transport options ([#&#8203;18335](getsentry/sentry-javascript#18335))
- feat(core): Add `isolateTrace` option to `Sentry.withMonitor()` ([#&#8203;18079](getsentry/sentry-javascript#18079))
- feat(deps): bump [@&#8203;sentry/webpack-plugin](https://github.com/sentry/webpack-plugin) from 4.3.0 to 4.6.1 ([#&#8203;18272](getsentry/sentry-javascript#18272))
- feat(nextjs): Add cloudflare `waitUntil` detection ([#&#8203;18336](getsentry/sentry-javascript#18336))
- feat(node): Add LangChain v1 support ([#&#8203;18306](getsentry/sentry-javascript#18306))
- feat(remix): Add parameterized transaction naming for routes ([#&#8203;17951](getsentry/sentry-javascript#17951))
- fix(cloudflare): Keep http root span alive until streaming responses are consumed ([#&#8203;18087](getsentry/sentry-javascript#18087))
- fix(cloudflare): Wait for async events to finish ([#&#8203;18334](getsentry/sentry-javascript#18334))
- fix(core): `continueTrace` doesn't propagate given trace ID if active span exists ([#&#8203;18328](getsentry/sentry-javascript#18328))
- fix(node-core): Handle custom scope in log messages without parameters ([#&#8203;18322](getsentry/sentry-javascript#18322))
- fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#&#8203;18337](getsentry/sentry-javascript#18337))
- fix(react-router): Use underscores in trace origin values ([#&#8203;18351](getsentry/sentry-javascript#18351))
- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#&#8203;18369](getsentry/sentry-javascript#18369))
- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#&#8203;18338](getsentry/sentry-javascript#18338))
<details>
<summary><strong>Internal Changes</strong></summary>
- chore: Allow URLs as issue ([#&#8203;18372](getsentry/sentry-javascript#18372))
- chore(changelog): Add entry for [#&#8203;18304](getsentry/sentry-javascript#18304) ([#&#8203;18329](getsentry/sentry-javascript#18329))
- chore(ci): Add action to track all PRs as issues ([#&#8203;18363](getsentry/sentry-javascript#18363))
- chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#&#8203;18352](getsentry/sentry-javascript#18352))
- ci: Add action to create issue on gitflow merge conflicts ([#&#8203;18319](getsentry/sentry-javascript#18319))
- ci(deps): bump actions/checkout from 5 to 6 ([#&#8203;18268](getsentry/sentry-javascript#18268))
- ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#&#8203;18361](getsentry/sentry-javascript#18361))
- test(cloudflare): Add typechecks for cloudflare-worker e2e test ([#&#8203;18321](getsentry/sentry-javascript#18321))
</details>
#### Bundle size 📦
| Path | Size |
| ----------------------------------------------------------------------------------------------------- | --------- |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) | 24.22 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) - with treeshaking flags | 22.76 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing) | 40.57 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Profiling) | 45.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) | 78.08 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) - with treeshaking flags | 68.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay with Canvas) | 82.65 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay, Feedback) | 94.61 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Feedback) | 40.51 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. sendFeedback) | 28.8 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. FeedbackAsync) | 33.66 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) | 25.9 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) (incl. Tracing) | 42.72 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) | 28.56 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) (incl. Tracing) | 42.32 KB |
| [@&#8203;sentry/svelte](https://github.com/sentry/svelte) | 24.24 KB |
| CDN Bundle | 26.57 KB |
| CDN Bundle (incl. Tracing) | 41.22 KB |
| CDN Bundle (incl. Tracing, Replay) | 76.9 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) | 82.23 KB |
| CDN Bundle - uncompressed | 78.09 KB |
| CDN Bundle (incl. Tracing) - uncompressed | 122.4 KB |
| CDN Bundle (incl. Tracing, Replay) - uncompressed | 235.71 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed | 248.17 KB |
| [@&#8203;sentry/nextjs](https://github.com/sentry/nextjs) (client) | 44.88 KB |
| [@&#8203;sentry/sveltekit](https://github.com/sentry/sveltekit) (client) | 40.92 KB |
| [@&#8203;sentry/node-core](https://github.com/sentry/node-core) | 50.06 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) | 155.7 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) - without tracing | 90.67 KB |
| [@&#8203;sentry/aws-serverless](https://github.com/sentry/aws-serverless) | 105.61 KB |
</details>
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
---
This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4yNy4xIiwidXBkYXRlZEluVmVyIjoiNDIuMjcuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
Reviewed-on: https://git.foxden.network/foxCaves/foxCaves/pulls/12
Co-authored-by: Renovate <renovate@foxden.network>
Co-committed-by: Renovate <renovate@foxden.network>
hideokamoto pushed a commit to hideokamoto/hidetaka.dev.2023 that referenced this pull request Jan 25, 2026
BREAKING CHANGE: Replace @sentry/browser and @sentry/cloudflare with unified @sentry/nextjs SDK
Key Changes:
- Install @sentry/nextjs@10.34.0 (replaces @sentry/browser and @sentry/cloudflare)
- Add Next.js instrumentation for automatic Sentry initialization
- src/instrumentation.ts: Main entry point with onRequestError hook
- src/sentry.edge.config.ts: Edge runtime config (Cloudflare Workers)
- src/sentry.server.config.ts: Node.js runtime config (local dev)
- Update server.ts and client.ts to use @sentry/nextjs imports
- Update all tests to mock @sentry/nextjs instead of individual SDKs
Benefits:
- ✅ Automatic error flushing on Cloudflare Workers (v10.28.0+)
- No manual flush() calls needed
- Detects OpenNext's waitUntil context automatically
- See: getsentry/sentry-javascript#18336
- ✅ onRequestError hook captures Server Component/middleware errors
- ✅ Unified SDK reduces bundle size and complexity
- ✅ Official Next.js + Cloudflare Workers support
Documentation:
- Updated docs/SENTRY_SETUP.md with new architecture
- Added references to v10.28.0 flushing fixes
- Documented instrumentation.ts initialization flow
Testing:
- ✅ All 353 unit tests passing
- ✅ Build successful (Next.js + Cloudflare)
- ✅ Lint checks passing
Resolves: getsentry/sentry-javascript#14931
Implements: getsentry/sentry-javascript#18336
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@logaretm@JPeer264@chargome
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

feat(nextjs): Add cloudflare waitUntil detection - #18336

Merged
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush
Nov 26, 2025
Merged

feat(nextjs): Add cloudflare waitUntil detection#18336
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush

Conversation

@logaretm

@logaretmlogaretm commented Nov 26, 2025

Copy link
Copy Markdown
Member

This is part of the work done for supporting Next.js on cloudflare workers in #14931, one of the issues is our flusher didn't take cloudflare into account and the events were being cut off due to early shutdowns by the worker environment.

We cannot use our core's flushIfServerless because it requires explicit cloudflareWaitUntil to be passed down to it.

Also The symbol we are grabbing here is specific to opennext and isn't something that is globally available on the worker environment. I had initially created #18330 because I mistook it for a worker environment API thing.

So this PR adds that detection to Next.js since it is relevant here and will use it if available, local tests show flushing is done correctly and events aren't being cut off.

@JPeer264JPeer264 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To verify. This would only work with OpenNext, right?

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super-l: Since this is Opennext specific we could theoretically rename it to make it more obvious.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I though the comments would suffice, but you are right, it should be clearer with the naming. I will do that 👍

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Do you think it would be possible to add this Symbol somehow in our Cloudflare SDK so we don't have to rely 100% on opennext?

@logaretmlogaretmNov 26, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think our SDK can do something similar by putting the context on the global scope, so that we don't have to toss it around. But yes this is 100% opennext specific.

Will be very useful for SDKs that do use cloudflare SDK setup I suppose, but not necessarily the Next.js one at its current state with Opennext adapters.

@chargomechargome left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@logaretm
logaretm merged commit b306a35 into developNov 26, 2025
67 checks passed
@logaretm
logaretm deleted the awad/nextjs-cloudflare-flush branch November 26, 2025 16:51
logaretm added a commit to getsentry/sentry-docs that referenced this pull request Dec 2, 2025
I won't merge this yet as it partially needs
getsentry/sentry-javascript#18336 to be
released, but I wanted some initial opinions.
This PR adds new information about supporting Next.js deployments on
Cloudflare Workers via Cloudflare's official [OpenNext
adapter](https://opennext.js.org/cloudflare).
During [my
investigation](getsentry/sentry-javascript#14931 (comment))
of Cloudflare Workers not sending any errors or traces for Next.js apps,
I found out that it was because Cloudflare workers didn't support
`https.request` module [until
recently](cloudflare/workerd#3820) which
would've prevented the SDK from sending anything. Setting the compat
date alone fixes most of the sending issues.
So I wanted to document this information so users are able to find it
more easily.
My findings can be verified by checking out [this
repo](https://github.com/logaretm/nextjs-cloudflare-demo) and try
setting the `compat` date to anything below August 16th. You don't need
a cloudflare account, just `wranger dev` should give you a similar
environment locally to verify that.
---
**Question for reviewers**: Should this live in special guides like I
did here? or maybe add it to the manual setup?
---------
Co-authored-by: Sarah Mischinger <sarah@codingwriter.com>
Doridian pushed a commit to foxCaves/foxCaves that referenced this pull request Dec 3, 2025
This PR contains the following updates:
| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [@sentry/react](https://github.com/getsentry/sentry-javascript/tree/master/packages/react) ([source](https://github.com/getsentry/sentry-javascript)) | [`10.27.0` -> `10.28.0`](https://renovatebot.com/diffs/npm/@sentry%2freact/10.27.0/10.28.0) | ![age](https://developer.mend.io/api/mc/badges/age/npm/@sentry%2freact/10.28.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@sentry%2freact/10.27.0/10.28.0?slim=true) |
---
### Release Notes
<details>
<summary>getsentry/sentry-javascript (@&#8203;sentry/react)</summary>
### [`v10.28.0`](https://github.com/getsentry/sentry-javascript/releases/tag/10.28.0)
[Compare Source](getsentry/sentry-javascript@10.27.0...10.28.0)
##### Important Changes
- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#&#8203;10798](getsentry/sentry-javascript#10798
The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
**Before:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport } from '@&#8203;sentry/browser';
const EXTRA_KEY = 'ROUTE_TO';
const transport = makeMultiplexedTransport(makeFetchTransport, args => {
const event = args.getEvent();
if (event?.extra?.[EXTRA_KEY] && Array.isArray(event.extra[EXTRA_KEY])) {
return event.extra[EXTRA_KEY];
}
return [];
});
Sentry.init({
transport,
// ... other options
});
// Capture events with routing info
Sentry.captureException(error, {
extra: {
[EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
**After:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '@&#8203;sentry/browser';
// Just pass the transport generator - the default matcher handles the rest!
Sentry.init({
transport: makeMultiplexedTransport(makeFetchTransport),
// ... other options
});
// Capture events with routing info using the exported constant
Sentry.captureException(error, {
extra: {
[MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
The default matcher looks for routing information in `event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]`. You can still provide a custom matcher function for advanced use cases.
- **feat(nextjs): Support cacheComponents on turbopack ([#&#8203;18304](getsentry/sentry-javascript#18304
This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
##### Other Changes
- feat: Publish AWS Lambda Layer for Node 24 ([#&#8203;18327](getsentry/sentry-javascript#18327))
- feat(browser): Expose langchain instrumentation ([#&#8203;18342](getsentry/sentry-javascript#18342))
- feat(browser): Expose langgraph instrumentation ([#&#8203;18345](getsentry/sentry-javascript#18345))
- feat(cloudflare): Allow specifying a custom fetch in Cloudflare transport options ([#&#8203;18335](getsentry/sentry-javascript#18335))
- feat(core): Add `isolateTrace` option to `Sentry.withMonitor()` ([#&#8203;18079](getsentry/sentry-javascript#18079))
- feat(deps): bump [@&#8203;sentry/webpack-plugin](https://github.com/sentry/webpack-plugin) from 4.3.0 to 4.6.1 ([#&#8203;18272](getsentry/sentry-javascript#18272))
- feat(nextjs): Add cloudflare `waitUntil` detection ([#&#8203;18336](getsentry/sentry-javascript#18336))
- feat(node): Add LangChain v1 support ([#&#8203;18306](getsentry/sentry-javascript#18306))
- feat(remix): Add parameterized transaction naming for routes ([#&#8203;17951](getsentry/sentry-javascript#17951))
- fix(cloudflare): Keep http root span alive until streaming responses are consumed ([#&#8203;18087](getsentry/sentry-javascript#18087))
- fix(cloudflare): Wait for async events to finish ([#&#8203;18334](getsentry/sentry-javascript#18334))
- fix(core): `continueTrace` doesn't propagate given trace ID if active span exists ([#&#8203;18328](getsentry/sentry-javascript#18328))
- fix(node-core): Handle custom scope in log messages without parameters ([#&#8203;18322](getsentry/sentry-javascript#18322))
- fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#&#8203;18337](getsentry/sentry-javascript#18337))
- fix(react-router): Use underscores in trace origin values ([#&#8203;18351](getsentry/sentry-javascript#18351))
- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#&#8203;18369](getsentry/sentry-javascript#18369))
- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#&#8203;18338](getsentry/sentry-javascript#18338))
<details>
<summary><strong>Internal Changes</strong></summary>
- chore: Allow URLs as issue ([#&#8203;18372](getsentry/sentry-javascript#18372))
- chore(changelog): Add entry for [#&#8203;18304](getsentry/sentry-javascript#18304) ([#&#8203;18329](getsentry/sentry-javascript#18329))
- chore(ci): Add action to track all PRs as issues ([#&#8203;18363](getsentry/sentry-javascript#18363))
- chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#&#8203;18352](getsentry/sentry-javascript#18352))
- ci: Add action to create issue on gitflow merge conflicts ([#&#8203;18319](getsentry/sentry-javascript#18319))
- ci(deps): bump actions/checkout from 5 to 6 ([#&#8203;18268](getsentry/sentry-javascript#18268))
- ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#&#8203;18361](getsentry/sentry-javascript#18361))
- test(cloudflare): Add typechecks for cloudflare-worker e2e test ([#&#8203;18321](getsentry/sentry-javascript#18321))
</details>
#### Bundle size 📦
| Path | Size |
| ----------------------------------------------------------------------------------------------------- | --------- |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) | 24.22 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) - with treeshaking flags | 22.76 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing) | 40.57 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Profiling) | 45.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) | 78.08 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) - with treeshaking flags | 68.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay with Canvas) | 82.65 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay, Feedback) | 94.61 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Feedback) | 40.51 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. sendFeedback) | 28.8 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. FeedbackAsync) | 33.66 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) | 25.9 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) (incl. Tracing) | 42.72 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) | 28.56 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) (incl. Tracing) | 42.32 KB |
| [@&#8203;sentry/svelte](https://github.com/sentry/svelte) | 24.24 KB |
| CDN Bundle | 26.57 KB |
| CDN Bundle (incl. Tracing) | 41.22 KB |
| CDN Bundle (incl. Tracing, Replay) | 76.9 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) | 82.23 KB |
| CDN Bundle - uncompressed | 78.09 KB |
| CDN Bundle (incl. Tracing) - uncompressed | 122.4 KB |
| CDN Bundle (incl. Tracing, Replay) - uncompressed | 235.71 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed | 248.17 KB |
| [@&#8203;sentry/nextjs](https://github.com/sentry/nextjs) (client) | 44.88 KB |
| [@&#8203;sentry/sveltekit](https://github.com/sentry/sveltekit) (client) | 40.92 KB |
| [@&#8203;sentry/node-core](https://github.com/sentry/node-core) | 50.06 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) | 155.7 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) - without tracing | 90.67 KB |
| [@&#8203;sentry/aws-serverless](https://github.com/sentry/aws-serverless) | 105.61 KB |
</details>
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
---
This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4yNy4xIiwidXBkYXRlZEluVmVyIjoiNDIuMjcuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
Reviewed-on: https://git.foxden.network/foxCaves/foxCaves/pulls/12
Co-authored-by: Renovate <renovate@foxden.network>
Co-committed-by: Renovate <renovate@foxden.network>
hideokamoto pushed a commit to hideokamoto/hidetaka.dev.2023 that referenced this pull request Jan 25, 2026
BREAKING CHANGE: Replace @sentry/browser and @sentry/cloudflare with unified @sentry/nextjs SDK
Key Changes:
- Install @sentry/nextjs@10.34.0 (replaces @sentry/browser and @sentry/cloudflare)
- Add Next.js instrumentation for automatic Sentry initialization
- src/instrumentation.ts: Main entry point with onRequestError hook
- src/sentry.edge.config.ts: Edge runtime config (Cloudflare Workers)
- src/sentry.server.config.ts: Node.js runtime config (local dev)
- Update server.ts and client.ts to use @sentry/nextjs imports
- Update all tests to mock @sentry/nextjs instead of individual SDKs
Benefits:
- ✅ Automatic error flushing on Cloudflare Workers (v10.28.0+)
- No manual flush() calls needed
- Detects OpenNext's waitUntil context automatically
- See: getsentry/sentry-javascript#18336
- ✅ onRequestError hook captures Server Component/middleware errors
- ✅ Unified SDK reduces bundle size and complexity
- ✅ Official Next.js + Cloudflare Workers support
Documentation:
- Updated docs/SENTRY_SETUP.md with new architecture
- Added references to v10.28.0 flushing fixes
- Documented instrumentation.ts initialization flow
Testing:
- ✅ All 353 unit tests passing
- ✅ Build successful (Next.js + Cloudflare)
- ✅ Lint checks passing
Resolves: getsentry/sentry-javascript#14931
Implements: getsentry/sentry-javascript#18336
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@logaretm@JPeer264@chargome
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(nextjs): Add cloudflare waitUntil detection - #18336

Merged
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush
Nov 26, 2025
Merged

feat(nextjs): Add cloudflare waitUntil detection#18336
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush

Conversation

@logaretm

@logaretmlogaretm commented Nov 26, 2025

Copy link
Copy Markdown
Member

This is part of the work done for supporting Next.js on cloudflare workers in #14931, one of the issues is our flusher didn't take cloudflare into account and the events were being cut off due to early shutdowns by the worker environment.

We cannot use our core's flushIfServerless because it requires explicit cloudflareWaitUntil to be passed down to it.

Also The symbol we are grabbing here is specific to opennext and isn't something that is globally available on the worker environment. I had initially created #18330 because I mistook it for a worker environment API thing.

So this PR adds that detection to Next.js since it is relevant here and will use it if available, local tests show flushing is done correctly and events aren't being cut off.

@JPeer264JPeer264 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To verify. This would only work with OpenNext, right?

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super-l: Since this is Opennext specific we could theoretically rename it to make it more obvious.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I though the comments would suffice, but you are right, it should be clearer with the naming. I will do that 👍

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Do you think it would be possible to add this Symbol somehow in our Cloudflare SDK so we don't have to rely 100% on opennext?

@logaretmlogaretmNov 26, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think our SDK can do something similar by putting the context on the global scope, so that we don't have to toss it around. But yes this is 100% opennext specific.

Will be very useful for SDKs that do use cloudflare SDK setup I suppose, but not necessarily the Next.js one at its current state with Opennext adapters.

@chargomechargome left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@logaretm
logaretm merged commit b306a35 into developNov 26, 2025
67 checks passed
@logaretm
logaretm deleted the awad/nextjs-cloudflare-flush branch November 26, 2025 16:51
logaretm added a commit to getsentry/sentry-docs that referenced this pull request Dec 2, 2025
I won't merge this yet as it partially needs
getsentry/sentry-javascript#18336 to be
released, but I wanted some initial opinions.
This PR adds new information about supporting Next.js deployments on
Cloudflare Workers via Cloudflare's official [OpenNext
adapter](https://opennext.js.org/cloudflare).
During [my
investigation](getsentry/sentry-javascript#14931 (comment))
of Cloudflare Workers not sending any errors or traces for Next.js apps,
I found out that it was because Cloudflare workers didn't support
`https.request` module [until
recently](cloudflare/workerd#3820) which
would've prevented the SDK from sending anything. Setting the compat
date alone fixes most of the sending issues.
So I wanted to document this information so users are able to find it
more easily.
My findings can be verified by checking out [this
repo](https://github.com/logaretm/nextjs-cloudflare-demo) and try
setting the `compat` date to anything below August 16th. You don't need
a cloudflare account, just `wranger dev` should give you a similar
environment locally to verify that.
---
**Question for reviewers**: Should this live in special guides like I
did here? or maybe add it to the manual setup?
---------
Co-authored-by: Sarah Mischinger <sarah@codingwriter.com>
Doridian pushed a commit to foxCaves/foxCaves that referenced this pull request Dec 3, 2025
This PR contains the following updates:
| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [@sentry/react](https://github.com/getsentry/sentry-javascript/tree/master/packages/react) ([source](https://github.com/getsentry/sentry-javascript)) | [`10.27.0` -> `10.28.0`](https://renovatebot.com/diffs/npm/@sentry%2freact/10.27.0/10.28.0) | ![age](https://developer.mend.io/api/mc/badges/age/npm/@sentry%2freact/10.28.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@sentry%2freact/10.27.0/10.28.0?slim=true) |
---
### Release Notes
<details>
<summary>getsentry/sentry-javascript (@&#8203;sentry/react)</summary>
### [`v10.28.0`](https://github.com/getsentry/sentry-javascript/releases/tag/10.28.0)
[Compare Source](getsentry/sentry-javascript@10.27.0...10.28.0)
##### Important Changes
- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#&#8203;10798](getsentry/sentry-javascript#10798
The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
**Before:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport } from '@&#8203;sentry/browser';
const EXTRA_KEY = 'ROUTE_TO';
const transport = makeMultiplexedTransport(makeFetchTransport, args => {
const event = args.getEvent();
if (event?.extra?.[EXTRA_KEY] && Array.isArray(event.extra[EXTRA_KEY])) {
return event.extra[EXTRA_KEY];
}
return [];
});
Sentry.init({
transport,
// ... other options
});
// Capture events with routing info
Sentry.captureException(error, {
extra: {
[EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
**After:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '@&#8203;sentry/browser';
// Just pass the transport generator - the default matcher handles the rest!
Sentry.init({
transport: makeMultiplexedTransport(makeFetchTransport),
// ... other options
});
// Capture events with routing info using the exported constant
Sentry.captureException(error, {
extra: {
[MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
The default matcher looks for routing information in `event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]`. You can still provide a custom matcher function for advanced use cases.
- **feat(nextjs): Support cacheComponents on turbopack ([#&#8203;18304](getsentry/sentry-javascript#18304
This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
##### Other Changes
- feat: Publish AWS Lambda Layer for Node 24 ([#&#8203;18327](getsentry/sentry-javascript#18327))
- feat(browser): Expose langchain instrumentation ([#&#8203;18342](getsentry/sentry-javascript#18342))
- feat(browser): Expose langgraph instrumentation ([#&#8203;18345](getsentry/sentry-javascript#18345))
- feat(cloudflare): Allow specifying a custom fetch in Cloudflare transport options ([#&#8203;18335](getsentry/sentry-javascript#18335))
- feat(core): Add `isolateTrace` option to `Sentry.withMonitor()` ([#&#8203;18079](getsentry/sentry-javascript#18079))
- feat(deps): bump [@&#8203;sentry/webpack-plugin](https://github.com/sentry/webpack-plugin) from 4.3.0 to 4.6.1 ([#&#8203;18272](getsentry/sentry-javascript#18272))
- feat(nextjs): Add cloudflare `waitUntil` detection ([#&#8203;18336](getsentry/sentry-javascript#18336))
- feat(node): Add LangChain v1 support ([#&#8203;18306](getsentry/sentry-javascript#18306))
- feat(remix): Add parameterized transaction naming for routes ([#&#8203;17951](getsentry/sentry-javascript#17951))
- fix(cloudflare): Keep http root span alive until streaming responses are consumed ([#&#8203;18087](getsentry/sentry-javascript#18087))
- fix(cloudflare): Wait for async events to finish ([#&#8203;18334](getsentry/sentry-javascript#18334))
- fix(core): `continueTrace` doesn't propagate given trace ID if active span exists ([#&#8203;18328](getsentry/sentry-javascript#18328))
- fix(node-core): Handle custom scope in log messages without parameters ([#&#8203;18322](getsentry/sentry-javascript#18322))
- fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#&#8203;18337](getsentry/sentry-javascript#18337))
- fix(react-router): Use underscores in trace origin values ([#&#8203;18351](getsentry/sentry-javascript#18351))
- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#&#8203;18369](getsentry/sentry-javascript#18369))
- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#&#8203;18338](getsentry/sentry-javascript#18338))
<details>
<summary><strong>Internal Changes</strong></summary>
- chore: Allow URLs as issue ([#&#8203;18372](getsentry/sentry-javascript#18372))
- chore(changelog): Add entry for [#&#8203;18304](getsentry/sentry-javascript#18304) ([#&#8203;18329](getsentry/sentry-javascript#18329))
- chore(ci): Add action to track all PRs as issues ([#&#8203;18363](getsentry/sentry-javascript#18363))
- chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#&#8203;18352](getsentry/sentry-javascript#18352))
- ci: Add action to create issue on gitflow merge conflicts ([#&#8203;18319](getsentry/sentry-javascript#18319))
- ci(deps): bump actions/checkout from 5 to 6 ([#&#8203;18268](getsentry/sentry-javascript#18268))
- ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#&#8203;18361](getsentry/sentry-javascript#18361))
- test(cloudflare): Add typechecks for cloudflare-worker e2e test ([#&#8203;18321](getsentry/sentry-javascript#18321))
</details>
#### Bundle size 📦
| Path | Size |
| ----------------------------------------------------------------------------------------------------- | --------- |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) | 24.22 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) - with treeshaking flags | 22.76 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing) | 40.57 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Profiling) | 45.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) | 78.08 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) - with treeshaking flags | 68.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay with Canvas) | 82.65 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay, Feedback) | 94.61 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Feedback) | 40.51 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. sendFeedback) | 28.8 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. FeedbackAsync) | 33.66 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) | 25.9 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) (incl. Tracing) | 42.72 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) | 28.56 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) (incl. Tracing) | 42.32 KB |
| [@&#8203;sentry/svelte](https://github.com/sentry/svelte) | 24.24 KB |
| CDN Bundle | 26.57 KB |
| CDN Bundle (incl. Tracing) | 41.22 KB |
| CDN Bundle (incl. Tracing, Replay) | 76.9 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) | 82.23 KB |
| CDN Bundle - uncompressed | 78.09 KB |
| CDN Bundle (incl. Tracing) - uncompressed | 122.4 KB |
| CDN Bundle (incl. Tracing, Replay) - uncompressed | 235.71 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed | 248.17 KB |
| [@&#8203;sentry/nextjs](https://github.com/sentry/nextjs) (client) | 44.88 KB |
| [@&#8203;sentry/sveltekit](https://github.com/sentry/sveltekit) (client) | 40.92 KB |
| [@&#8203;sentry/node-core](https://github.com/sentry/node-core) | 50.06 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) | 155.7 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) - without tracing | 90.67 KB |
| [@&#8203;sentry/aws-serverless](https://github.com/sentry/aws-serverless) | 105.61 KB |
</details>
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
---
This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4yNy4xIiwidXBkYXRlZEluVmVyIjoiNDIuMjcuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
Reviewed-on: https://git.foxden.network/foxCaves/foxCaves/pulls/12
Co-authored-by: Renovate <renovate@foxden.network>
Co-committed-by: Renovate <renovate@foxden.network>
hideokamoto pushed a commit to hideokamoto/hidetaka.dev.2023 that referenced this pull request Jan 25, 2026
BREAKING CHANGE: Replace @sentry/browser and @sentry/cloudflare with unified @sentry/nextjs SDK
Key Changes:
- Install @sentry/nextjs@10.34.0 (replaces @sentry/browser and @sentry/cloudflare)
- Add Next.js instrumentation for automatic Sentry initialization
- src/instrumentation.ts: Main entry point with onRequestError hook
- src/sentry.edge.config.ts: Edge runtime config (Cloudflare Workers)
- src/sentry.server.config.ts: Node.js runtime config (local dev)
- Update server.ts and client.ts to use @sentry/nextjs imports
- Update all tests to mock @sentry/nextjs instead of individual SDKs
Benefits:
- ✅ Automatic error flushing on Cloudflare Workers (v10.28.0+)
- No manual flush() calls needed
- Detects OpenNext's waitUntil context automatically
- See: getsentry/sentry-javascript#18336
- ✅ onRequestError hook captures Server Component/middleware errors
- ✅ Unified SDK reduces bundle size and complexity
- ✅ Official Next.js + Cloudflare Workers support
Documentation:
- Updated docs/SENTRY_SETUP.md with new architecture
- Added references to v10.28.0 flushing fixes
- Documented instrumentation.ts initialization flow
Testing:
- ✅ All 353 unit tests passing
- ✅ Build successful (Next.js + Cloudflare)
- ✅ Lint checks passing
Resolves: getsentry/sentry-javascript#14931
Implements: getsentry/sentry-javascript#18336
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@logaretm@JPeer264@chargome
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(nextjs): Add cloudflare waitUntil detection - #18336

Merged
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush
Nov 26, 2025
Merged

feat(nextjs): Add cloudflare waitUntil detection#18336
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush

Conversation

@logaretm

@logaretmlogaretm commented Nov 26, 2025

Copy link
Copy Markdown
Member

This is part of the work done for supporting Next.js on cloudflare workers in #14931, one of the issues is our flusher didn't take cloudflare into account and the events were being cut off due to early shutdowns by the worker environment.

We cannot use our core's flushIfServerless because it requires explicit cloudflareWaitUntil to be passed down to it.

Also The symbol we are grabbing here is specific to opennext and isn't something that is globally available on the worker environment. I had initially created #18330 because I mistook it for a worker environment API thing.

So this PR adds that detection to Next.js since it is relevant here and will use it if available, local tests show flushing is done correctly and events aren't being cut off.

@JPeer264JPeer264 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To verify. This would only work with OpenNext, right?

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super-l: Since this is Opennext specific we could theoretically rename it to make it more obvious.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I though the comments would suffice, but you are right, it should be clearer with the naming. I will do that 👍

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Do you think it would be possible to add this Symbol somehow in our Cloudflare SDK so we don't have to rely 100% on opennext?

@logaretmlogaretmNov 26, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think our SDK can do something similar by putting the context on the global scope, so that we don't have to toss it around. But yes this is 100% opennext specific.

Will be very useful for SDKs that do use cloudflare SDK setup I suppose, but not necessarily the Next.js one at its current state with Opennext adapters.

@chargomechargome left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@logaretm
logaretm merged commit b306a35 into developNov 26, 2025
67 checks passed
@logaretm
logaretm deleted the awad/nextjs-cloudflare-flush branch November 26, 2025 16:51
logaretm added a commit to getsentry/sentry-docs that referenced this pull request Dec 2, 2025
I won't merge this yet as it partially needs
getsentry/sentry-javascript#18336 to be
released, but I wanted some initial opinions.
This PR adds new information about supporting Next.js deployments on
Cloudflare Workers via Cloudflare's official [OpenNext
adapter](https://opennext.js.org/cloudflare).
During [my
investigation](getsentry/sentry-javascript#14931 (comment))
of Cloudflare Workers not sending any errors or traces for Next.js apps,
I found out that it was because Cloudflare workers didn't support
`https.request` module [until
recently](cloudflare/workerd#3820) which
would've prevented the SDK from sending anything. Setting the compat
date alone fixes most of the sending issues.
So I wanted to document this information so users are able to find it
more easily.
My findings can be verified by checking out [this
repo](https://github.com/logaretm/nextjs-cloudflare-demo) and try
setting the `compat` date to anything below August 16th. You don't need
a cloudflare account, just `wranger dev` should give you a similar
environment locally to verify that.
---
**Question for reviewers**: Should this live in special guides like I
did here? or maybe add it to the manual setup?
---------
Co-authored-by: Sarah Mischinger <sarah@codingwriter.com>
Doridian pushed a commit to foxCaves/foxCaves that referenced this pull request Dec 3, 2025
This PR contains the following updates:
| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [@sentry/react](https://github.com/getsentry/sentry-javascript/tree/master/packages/react) ([source](https://github.com/getsentry/sentry-javascript)) | [`10.27.0` -> `10.28.0`](https://renovatebot.com/diffs/npm/@sentry%2freact/10.27.0/10.28.0) | ![age](https://developer.mend.io/api/mc/badges/age/npm/@sentry%2freact/10.28.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@sentry%2freact/10.27.0/10.28.0?slim=true) |
---
### Release Notes
<details>
<summary>getsentry/sentry-javascript (@&#8203;sentry/react)</summary>
### [`v10.28.0`](https://github.com/getsentry/sentry-javascript/releases/tag/10.28.0)
[Compare Source](getsentry/sentry-javascript@10.27.0...10.28.0)
##### Important Changes
- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#&#8203;10798](getsentry/sentry-javascript#10798
The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
**Before:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport } from '@&#8203;sentry/browser';
const EXTRA_KEY = 'ROUTE_TO';
const transport = makeMultiplexedTransport(makeFetchTransport, args => {
const event = args.getEvent();
if (event?.extra?.[EXTRA_KEY] && Array.isArray(event.extra[EXTRA_KEY])) {
return event.extra[EXTRA_KEY];
}
return [];
});
Sentry.init({
transport,
// ... other options
});
// Capture events with routing info
Sentry.captureException(error, {
extra: {
[EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
**After:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '@&#8203;sentry/browser';
// Just pass the transport generator - the default matcher handles the rest!
Sentry.init({
transport: makeMultiplexedTransport(makeFetchTransport),
// ... other options
});
// Capture events with routing info using the exported constant
Sentry.captureException(error, {
extra: {
[MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
The default matcher looks for routing information in `event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]`. You can still provide a custom matcher function for advanced use cases.
- **feat(nextjs): Support cacheComponents on turbopack ([#&#8203;18304](getsentry/sentry-javascript#18304
This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
##### Other Changes
- feat: Publish AWS Lambda Layer for Node 24 ([#&#8203;18327](getsentry/sentry-javascript#18327))
- feat(browser): Expose langchain instrumentation ([#&#8203;18342](getsentry/sentry-javascript#18342))
- feat(browser): Expose langgraph instrumentation ([#&#8203;18345](getsentry/sentry-javascript#18345))
- feat(cloudflare): Allow specifying a custom fetch in Cloudflare transport options ([#&#8203;18335](getsentry/sentry-javascript#18335))
- feat(core): Add `isolateTrace` option to `Sentry.withMonitor()` ([#&#8203;18079](getsentry/sentry-javascript#18079))
- feat(deps): bump [@&#8203;sentry/webpack-plugin](https://github.com/sentry/webpack-plugin) from 4.3.0 to 4.6.1 ([#&#8203;18272](getsentry/sentry-javascript#18272))
- feat(nextjs): Add cloudflare `waitUntil` detection ([#&#8203;18336](getsentry/sentry-javascript#18336))
- feat(node): Add LangChain v1 support ([#&#8203;18306](getsentry/sentry-javascript#18306))
- feat(remix): Add parameterized transaction naming for routes ([#&#8203;17951](getsentry/sentry-javascript#17951))
- fix(cloudflare): Keep http root span alive until streaming responses are consumed ([#&#8203;18087](getsentry/sentry-javascript#18087))
- fix(cloudflare): Wait for async events to finish ([#&#8203;18334](getsentry/sentry-javascript#18334))
- fix(core): `continueTrace` doesn't propagate given trace ID if active span exists ([#&#8203;18328](getsentry/sentry-javascript#18328))
- fix(node-core): Handle custom scope in log messages without parameters ([#&#8203;18322](getsentry/sentry-javascript#18322))
- fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#&#8203;18337](getsentry/sentry-javascript#18337))
- fix(react-router): Use underscores in trace origin values ([#&#8203;18351](getsentry/sentry-javascript#18351))
- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#&#8203;18369](getsentry/sentry-javascript#18369))
- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#&#8203;18338](getsentry/sentry-javascript#18338))
<details>
<summary><strong>Internal Changes</strong></summary>
- chore: Allow URLs as issue ([#&#8203;18372](getsentry/sentry-javascript#18372))
- chore(changelog): Add entry for [#&#8203;18304](getsentry/sentry-javascript#18304) ([#&#8203;18329](getsentry/sentry-javascript#18329))
- chore(ci): Add action to track all PRs as issues ([#&#8203;18363](getsentry/sentry-javascript#18363))
- chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#&#8203;18352](getsentry/sentry-javascript#18352))
- ci: Add action to create issue on gitflow merge conflicts ([#&#8203;18319](getsentry/sentry-javascript#18319))
- ci(deps): bump actions/checkout from 5 to 6 ([#&#8203;18268](getsentry/sentry-javascript#18268))
- ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#&#8203;18361](getsentry/sentry-javascript#18361))
- test(cloudflare): Add typechecks for cloudflare-worker e2e test ([#&#8203;18321](getsentry/sentry-javascript#18321))
</details>
#### Bundle size 📦
| Path | Size |
| ----------------------------------------------------------------------------------------------------- | --------- |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) | 24.22 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) - with treeshaking flags | 22.76 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing) | 40.57 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Profiling) | 45.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) | 78.08 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) - with treeshaking flags | 68.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay with Canvas) | 82.65 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay, Feedback) | 94.61 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Feedback) | 40.51 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. sendFeedback) | 28.8 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. FeedbackAsync) | 33.66 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) | 25.9 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) (incl. Tracing) | 42.72 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) | 28.56 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) (incl. Tracing) | 42.32 KB |
| [@&#8203;sentry/svelte](https://github.com/sentry/svelte) | 24.24 KB |
| CDN Bundle | 26.57 KB |
| CDN Bundle (incl. Tracing) | 41.22 KB |
| CDN Bundle (incl. Tracing, Replay) | 76.9 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) | 82.23 KB |
| CDN Bundle - uncompressed | 78.09 KB |
| CDN Bundle (incl. Tracing) - uncompressed | 122.4 KB |
| CDN Bundle (incl. Tracing, Replay) - uncompressed | 235.71 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed | 248.17 KB |
| [@&#8203;sentry/nextjs](https://github.com/sentry/nextjs) (client) | 44.88 KB |
| [@&#8203;sentry/sveltekit](https://github.com/sentry/sveltekit) (client) | 40.92 KB |
| [@&#8203;sentry/node-core](https://github.com/sentry/node-core) | 50.06 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) | 155.7 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) - without tracing | 90.67 KB |
| [@&#8203;sentry/aws-serverless](https://github.com/sentry/aws-serverless) | 105.61 KB |
</details>
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
---
This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4yNy4xIiwidXBkYXRlZEluVmVyIjoiNDIuMjcuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
Reviewed-on: https://git.foxden.network/foxCaves/foxCaves/pulls/12
Co-authored-by: Renovate <renovate@foxden.network>
Co-committed-by: Renovate <renovate@foxden.network>
hideokamoto pushed a commit to hideokamoto/hidetaka.dev.2023 that referenced this pull request Jan 25, 2026
BREAKING CHANGE: Replace @sentry/browser and @sentry/cloudflare with unified @sentry/nextjs SDK
Key Changes:
- Install @sentry/nextjs@10.34.0 (replaces @sentry/browser and @sentry/cloudflare)
- Add Next.js instrumentation for automatic Sentry initialization
- src/instrumentation.ts: Main entry point with onRequestError hook
- src/sentry.edge.config.ts: Edge runtime config (Cloudflare Workers)
- src/sentry.server.config.ts: Node.js runtime config (local dev)
- Update server.ts and client.ts to use @sentry/nextjs imports
- Update all tests to mock @sentry/nextjs instead of individual SDKs
Benefits:
- ✅ Automatic error flushing on Cloudflare Workers (v10.28.0+)
- No manual flush() calls needed
- Detects OpenNext's waitUntil context automatically
- See: getsentry/sentry-javascript#18336
- ✅ onRequestError hook captures Server Component/middleware errors
- ✅ Unified SDK reduces bundle size and complexity
- ✅ Official Next.js + Cloudflare Workers support
Documentation:
- Updated docs/SENTRY_SETUP.md with new architecture
- Added references to v10.28.0 flushing fixes
- Documented instrumentation.ts initialization flow
Testing:
- ✅ All 353 unit tests passing
- ✅ Build successful (Next.js + Cloudflare)
- ✅ Lint checks passing
Resolves: getsentry/sentry-javascript#14931
Implements: getsentry/sentry-javascript#18336
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@logaretm@JPeer264@chargome
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

feat(nextjs): Add cloudflare waitUntil detection - #18336

Merged
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush
Nov 26, 2025
Merged

feat(nextjs): Add cloudflare waitUntil detection#18336
logaretm merged 3 commits into
developfrom
awad/nextjs-cloudflare-flush

Conversation

@logaretm

@logaretmlogaretm commented Nov 26, 2025

Copy link
Copy Markdown
Member

This is part of the work done for supporting Next.js on cloudflare workers in #14931, one of the issues is our flusher didn't take cloudflare into account and the events were being cut off due to early shutdowns by the worker environment.

We cannot use our core's flushIfServerless because it requires explicit cloudflareWaitUntil to be passed down to it.

Also The symbol we are grabbing here is specific to opennext and isn't something that is globally available on the worker environment. I had initially created #18330 because I mistook it for a worker environment API thing.

So this PR adds that detection to Next.js since it is relevant here and will use it if available, local tests show flushing is done correctly and events aren't being cut off.

@JPeer264JPeer264 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To verify. This would only work with OpenNext, right?

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super-l: Since this is Opennext specific we could theoretically rename it to make it more obvious.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I though the comments would suffice, but you are right, it should be clearer with the naming. I will do that 👍

* https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
*/
function _getCloudflareContext(): MinimalCloudflareContext | undefined {
const cfContextSymbol = Symbol.for('__cloudflare-context__');

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Do you think it would be possible to add this Symbol somehow in our Cloudflare SDK so we don't have to rely 100% on opennext?

@logaretmlogaretmNov 26, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think our SDK can do something similar by putting the context on the global scope, so that we don't have to toss it around. But yes this is 100% opennext specific.

Will be very useful for SDKs that do use cloudflare SDK setup I suppose, but not necessarily the Next.js one at its current state with Opennext adapters.

@chargomechargome left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@logaretm
logaretm merged commit b306a35 into developNov 26, 2025
67 checks passed
@logaretm
logaretm deleted the awad/nextjs-cloudflare-flush branch November 26, 2025 16:51
logaretm added a commit to getsentry/sentry-docs that referenced this pull request Dec 2, 2025
I won't merge this yet as it partially needs
getsentry/sentry-javascript#18336 to be
released, but I wanted some initial opinions.
This PR adds new information about supporting Next.js deployments on
Cloudflare Workers via Cloudflare's official [OpenNext
adapter](https://opennext.js.org/cloudflare).
During [my
investigation](getsentry/sentry-javascript#14931 (comment))
of Cloudflare Workers not sending any errors or traces for Next.js apps,
I found out that it was because Cloudflare workers didn't support
`https.request` module [until
recently](cloudflare/workerd#3820) which
would've prevented the SDK from sending anything. Setting the compat
date alone fixes most of the sending issues.
So I wanted to document this information so users are able to find it
more easily.
My findings can be verified by checking out [this
repo](https://github.com/logaretm/nextjs-cloudflare-demo) and try
setting the `compat` date to anything below August 16th. You don't need
a cloudflare account, just `wranger dev` should give you a similar
environment locally to verify that.
---
**Question for reviewers**: Should this live in special guides like I
did here? or maybe add it to the manual setup?
---------
Co-authored-by: Sarah Mischinger <sarah@codingwriter.com>
Doridian pushed a commit to foxCaves/foxCaves that referenced this pull request Dec 3, 2025
This PR contains the following updates:
| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [@sentry/react](https://github.com/getsentry/sentry-javascript/tree/master/packages/react) ([source](https://github.com/getsentry/sentry-javascript)) | [`10.27.0` -> `10.28.0`](https://renovatebot.com/diffs/npm/@sentry%2freact/10.27.0/10.28.0) | ![age](https://developer.mend.io/api/mc/badges/age/npm/@sentry%2freact/10.28.0?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@sentry%2freact/10.27.0/10.28.0?slim=true) |
---
### Release Notes
<details>
<summary>getsentry/sentry-javascript (@&#8203;sentry/react)</summary>
### [`v10.28.0`](https://github.com/getsentry/sentry-javascript/releases/tag/10.28.0)
[Compare Source](getsentry/sentry-javascript@10.27.0...10.28.0)
##### Important Changes
- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#&#8203;10798](getsentry/sentry-javascript#10798
The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
**Before:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport } from '@&#8203;sentry/browser';
const EXTRA_KEY = 'ROUTE_TO';
const transport = makeMultiplexedTransport(makeFetchTransport, args => {
const event = args.getEvent();
if (event?.extra?.[EXTRA_KEY] && Array.isArray(event.extra[EXTRA_KEY])) {
return event.extra[EXTRA_KEY];
}
return [];
});
Sentry.init({
transport,
// ... other options
});
// Capture events with routing info
Sentry.captureException(error, {
extra: {
[EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
**After:**
```javascript
import { makeFetchTransport, makeMultiplexedTransport, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '@&#8203;sentry/browser';
// Just pass the transport generator - the default matcher handles the rest!
Sentry.init({
transport: makeMultiplexedTransport(makeFetchTransport),
// ... other options
});
// Capture events with routing info using the exported constant
Sentry.captureException(error, {
extra: {
[MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [
{ dsn: 'https://key1@&#8203;sentry.io/project1', release: 'v1.0.0' },
{ dsn: 'https://key2@&#8203;sentry.io/project2' },
],
},
});
```
The default matcher looks for routing information in `event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]`. You can still provide a custom matcher function for advanced use cases.
- **feat(nextjs): Support cacheComponents on turbopack ([#&#8203;18304](getsentry/sentry-javascript#18304
This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
##### Other Changes
- feat: Publish AWS Lambda Layer for Node 24 ([#&#8203;18327](getsentry/sentry-javascript#18327))
- feat(browser): Expose langchain instrumentation ([#&#8203;18342](getsentry/sentry-javascript#18342))
- feat(browser): Expose langgraph instrumentation ([#&#8203;18345](getsentry/sentry-javascript#18345))
- feat(cloudflare): Allow specifying a custom fetch in Cloudflare transport options ([#&#8203;18335](getsentry/sentry-javascript#18335))
- feat(core): Add `isolateTrace` option to `Sentry.withMonitor()` ([#&#8203;18079](getsentry/sentry-javascript#18079))
- feat(deps): bump [@&#8203;sentry/webpack-plugin](https://github.com/sentry/webpack-plugin) from 4.3.0 to 4.6.1 ([#&#8203;18272](getsentry/sentry-javascript#18272))
- feat(nextjs): Add cloudflare `waitUntil` detection ([#&#8203;18336](getsentry/sentry-javascript#18336))
- feat(node): Add LangChain v1 support ([#&#8203;18306](getsentry/sentry-javascript#18306))
- feat(remix): Add parameterized transaction naming for routes ([#&#8203;17951](getsentry/sentry-javascript#17951))
- fix(cloudflare): Keep http root span alive until streaming responses are consumed ([#&#8203;18087](getsentry/sentry-javascript#18087))
- fix(cloudflare): Wait for async events to finish ([#&#8203;18334](getsentry/sentry-javascript#18334))
- fix(core): `continueTrace` doesn't propagate given trace ID if active span exists ([#&#8203;18328](getsentry/sentry-javascript#18328))
- fix(node-core): Handle custom scope in log messages without parameters ([#&#8203;18322](getsentry/sentry-javascript#18322))
- fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#&#8203;18337](getsentry/sentry-javascript#18337))
- fix(react-router): Use underscores in trace origin values ([#&#8203;18351](getsentry/sentry-javascript#18351))
- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#&#8203;18369](getsentry/sentry-javascript#18369))
- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#&#8203;18338](getsentry/sentry-javascript#18338))
<details>
<summary><strong>Internal Changes</strong></summary>
- chore: Allow URLs as issue ([#&#8203;18372](getsentry/sentry-javascript#18372))
- chore(changelog): Add entry for [#&#8203;18304](getsentry/sentry-javascript#18304) ([#&#8203;18329](getsentry/sentry-javascript#18329))
- chore(ci): Add action to track all PRs as issues ([#&#8203;18363](getsentry/sentry-javascript#18363))
- chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#&#8203;18352](getsentry/sentry-javascript#18352))
- ci: Add action to create issue on gitflow merge conflicts ([#&#8203;18319](getsentry/sentry-javascript#18319))
- ci(deps): bump actions/checkout from 5 to 6 ([#&#8203;18268](getsentry/sentry-javascript#18268))
- ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#&#8203;18361](getsentry/sentry-javascript#18361))
- test(cloudflare): Add typechecks for cloudflare-worker e2e test ([#&#8203;18321](getsentry/sentry-javascript#18321))
</details>
#### Bundle size 📦
| Path | Size |
| ----------------------------------------------------------------------------------------------------- | --------- |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) | 24.22 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) - with treeshaking flags | 22.76 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing) | 40.57 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Profiling) | 45.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) | 78.08 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay) - with treeshaking flags | 68.05 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay with Canvas) | 82.65 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Tracing, Replay, Feedback) | 94.61 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. Feedback) | 40.51 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. sendFeedback) | 28.8 KB |
| [@&#8203;sentry/browser](https://github.com/sentry/browser) (incl. FeedbackAsync) | 33.66 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) | 25.9 KB |
| [@&#8203;sentry/react](https://github.com/sentry/react) (incl. Tracing) | 42.72 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) | 28.56 KB |
| [@&#8203;sentry/vue](https://github.com/sentry/vue) (incl. Tracing) | 42.32 KB |
| [@&#8203;sentry/svelte](https://github.com/sentry/svelte) | 24.24 KB |
| CDN Bundle | 26.57 KB |
| CDN Bundle (incl. Tracing) | 41.22 KB |
| CDN Bundle (incl. Tracing, Replay) | 76.9 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) | 82.23 KB |
| CDN Bundle - uncompressed | 78.09 KB |
| CDN Bundle (incl. Tracing) - uncompressed | 122.4 KB |
| CDN Bundle (incl. Tracing, Replay) - uncompressed | 235.71 KB |
| CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed | 248.17 KB |
| [@&#8203;sentry/nextjs](https://github.com/sentry/nextjs) (client) | 44.88 KB |
| [@&#8203;sentry/sveltekit](https://github.com/sentry/sveltekit) (client) | 40.92 KB |
| [@&#8203;sentry/node-core](https://github.com/sentry/node-core) | 50.06 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) | 155.7 KB |
| [@&#8203;sentry/node](https://github.com/sentry/node) - without tracing | 90.67 KB |
| [@&#8203;sentry/aws-serverless](https://github.com/sentry/aws-serverless) | 105.61 KB |
</details>
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
---
This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0Mi4yNy4xIiwidXBkYXRlZEluVmVyIjoiNDIuMjcuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
Reviewed-on: https://git.foxden.network/foxCaves/foxCaves/pulls/12
Co-authored-by: Renovate <renovate@foxden.network>
Co-committed-by: Renovate <renovate@foxden.network>
hideokamoto pushed a commit to hideokamoto/hidetaka.dev.2023 that referenced this pull request Jan 25, 2026
BREAKING CHANGE: Replace @sentry/browser and @sentry/cloudflare with unified @sentry/nextjs SDK
Key Changes:
- Install @sentry/nextjs@10.34.0 (replaces @sentry/browser and @sentry/cloudflare)
- Add Next.js instrumentation for automatic Sentry initialization
- src/instrumentation.ts: Main entry point with onRequestError hook
- src/sentry.edge.config.ts: Edge runtime config (Cloudflare Workers)
- src/sentry.server.config.ts: Node.js runtime config (local dev)
- Update server.ts and client.ts to use @sentry/nextjs imports
- Update all tests to mock @sentry/nextjs instead of individual SDKs
Benefits:
- ✅ Automatic error flushing on Cloudflare Workers (v10.28.0+)
- No manual flush() calls needed
- Detects OpenNext's waitUntil context automatically
- See: getsentry/sentry-javascript#18336
- ✅ onRequestError hook captures Server Component/middleware errors
- ✅ Unified SDK reduces bundle size and complexity
- ✅ Official Next.js + Cloudflare Workers support
Documentation:
- Updated docs/SENTRY_SETUP.md with new architecture
- Added references to v10.28.0 flushing fixes
- Documented instrumentation.ts initialization flow
Testing:
- ✅ All 353 unit tests passing
- ✅ Build successful (Next.js + Cloudflare)
- ✅ Lint checks passing
Resolves: getsentry/sentry-javascript#14931
Implements: getsentry/sentry-javascript#18336
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@logaretm@JPeer264@chargome