Skip to content

fix(nextjs): Populate __SENTRY_SERVER_MODULES__ in Turbopack#19231

Merged
RulaKhaled merged 6 commits into
developfrom
resolve-cache-issue-in-turbo
Feb 9, 2026
Merged

fix(nextjs): Populate __SENTRY_SERVER_MODULES__ in Turbopack#19231
RulaKhaled merged 6 commits into
developfrom
resolve-cache-issue-in-turbo

Conversation

@RulaKhaled
Copy link
Copy Markdown
Contributor

@RulaKhaled RulaKhaled commented Feb 8, 2026

Turbopack was missing __SENTRY_SERVER_MODULES__ injection, causing modulesIntegration to return empty in Next.js v16. This broke auto detection for integrations that check module availability.

Changes matche webpack's existing behavior by reading package.json at build time and injecting dependencies into the bundle.

closes: #19147

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Feb 8, 2026

Codecov Results 📊


Generated by Codecov Action

@RulaKhaled RulaKhaled requested review from chargome and logaretm and removed request for logaretm February 9, 2026 10:28
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Feb 9, 2026

node-overhead report 🧳

Note: This is a synthetic benchmark with a minimal express app and does not necessarily reflect the real-world performance impact in an application.

Scenario Requests/s % of Baseline Prev. Requests/s Change %
GET Baseline 8,780 - 8,968 -2%
GET With Sentry 1,680 19% 1,736 -3%
GET With Sentry (error only) 6,152 70% 6,029 +2%
POST Baseline 1,182 - 1,202 -2%
POST With Sentry 569 48% 585 -3%
POST With Sentry (error only) 1,058 90% 1,062 -0%
MYSQL Baseline 3,356 - 3,277 +2%
MYSQL With Sentry 443 13% 500 -11%
MYSQL With Sentry (error only) 2,738 82% 2,659 +3%

View base workflow run

@RulaKhaled RulaKhaled marked this pull request as ready for review February 9, 2026 11:58
Comment thread packages/nextjs/src/config/turbopack/generateValueInjectionRules.ts Outdated
Copy link
Copy Markdown
Member

@logaretm logaretm left a comment

Choose a reason for hiding this comment

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

Nice find and fix! Just a minor nitpick

Comment thread packages/nextjs/src/config/util.ts Outdated
/**
* Extract modules from project directory's package.json
*/
export function _getModules(projectDir: string): Record<string, string> {
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.

very l: nice extracting it but can we rename it to getPackageModules since it's no longer a private function.

Comment thread packages/nextjs/src/config/turbopack/generateValueInjectionRules.ts
}
// Inject server modules (matching webpack's __SENTRY_SERVER_MODULES__ behavior)
// Use process.cwd() to get the project directory at build time
serverValues.__SENTRY_SERVER_MODULES__ = getPackageModules(process.cwd());
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Wrong package.json chosen in monorepos

Medium Severity

generateValueInjectionRules uses getPackageModules(process.cwd()) to populate __SENTRY_SERVER_MODULES__, which can read the wrong package.json when next runs from a different working directory (common in monorepos/workspaces). This can inject an unrelated dependency map, breaking module auto-detection or producing misleading module availability.

Fix in Cursor Fix in Web

Comment thread packages/nextjs/src/config/turbopack/generateValueInjectionRules.ts
Copy link
Copy Markdown

@cursor cursor Bot left a comment

Choose a reason for hiding this comment

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

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix is OFF. To automatically fix reported issues with Cloud Agents, enable Autofix in the Cursor dashboard.

}
// Inject server modules (matching webpack's __SENTRY_SERVER_MODULES__ behavior)
// Use process.cwd() to get the project directory at build time
serverValues.__SENTRY_SERVER_MODULES__ = getPackageModules(process.cwd());
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Turbopack value injection incompatible with bare identifier access

High Severity

The __SENTRY_SERVER_MODULES__ value is injected onto globalThis by the valueInjectionLoader, but the consumer code in modules.ts accesses it as a bare identifier rather than via globalThis. In ES modules with strict mode, properties on globalThis aren't accessible as bare identifiers, causing the typeof check to evaluate as 'undefined' and fall back to an empty object. This breaks module detection for Turbopack builds, defeating the entire purpose of this PR.

Fix in Cursor Fix in Web

@RulaKhaled RulaKhaled merged commit 952dae3 into develop Feb 9, 2026
68 checks passed
@RulaKhaled RulaKhaled deleted the resolve-cache-issue-in-turbo branch February 9, 2026 21:19
sergical added a commit that referenced this pull request Jun 8, 2026
…injection is honored (#21339)

## Summary

Fixes the root cause behind #19147. On **Next.js 16 / Turbopack
production builds** (e.g. Vercel), `modulesIntegration` returns no
injected modules, which silently disables every module-detection-based
auto integration — `vercelAIIntegration`, `openAIIntegration`,
`anthropicAIIntegration`, `googleGenAIIntegration`,
`langChainIntegration`, `langGraphIntegration` — and leaves
`event.modules` missing server dependencies. The result users see: raw
`ai.*` spans (`op: default`) instead of `gen_ai.*`.

## Root cause

`packages/node-core/src/integrations/modules.ts` captured the injected
value into a **module-level `const` at evaluation time**:

```ts
const SERVER_MODULES = typeof __SENTRY_SERVER_MODULES__ === 'undefined' ? {} : __SENTRY_SERVER_MODULES__;
```

The two bundlers inject `__SENTRY_SERVER_MODULES__` differently:

- **webpack** replaces the bare token with a literal at build time via
`DefinePlugin` → available the moment this module evaluates. ✅
- **Turbopack** (added in #19231) assigns
`globalThis.__SENTRY_SERVER_MODULES__` at **runtime**, via a
value-injection loader on `instrumentation.*`.

The catch: the `instrumentation.*` file's ESM `import`s are **hoisted
above** the injected assignment. Verified in a real Turbopack build
(`.next/server/chunks/[root-of-the-server]__*.js`):

```js
769449, e=>{ "use strict";
  var r = e.i(298962);                                  // import @sentry/* — evaluates modules.ts (SERVER_MODULES captured = {})
  async function s(){ await e.A(145684) }               // register()
  globalThis.__SENTRY_SERVER_MODULES__ = {/* …deps… */} // injection runs AFTER the import
}
```

So `@sentry/node-core/modules` evaluates **before** the global is
assigned, and the `const` is frozen as `{}`. The other two sources in
`collectModules()` also come up empty on a bundled server (no
full-dependency `package.json` at `process.cwd()`; `ai` is bundled so
it's not in `require.cache`, and the server is ESM not CJS). Net:
`getModules().ai` is `undefined` → `shouldForceIntegration` returns
`false` → `addVercelAiProcessors` never attaches.

## Why #19231 didn't catch it

#19231 was unit-tested at the config-generation layer (asserting the
value-injection rule is emitted). The `nextjs-16` AI E2E that asserts
`gen_ai.*` spans passes for the wrong reason — it runs `next start`
**locally**, where `getModulesFromPackageJson()` reads
`process.cwd()/package.json` (present, lists `ai`) and masks the broken
`SERVER_MODULES` path. On Vercel that fallback is empty, so detection
fails.

## Fix

Read the value **lazily** (per call) instead of capturing it at
module-eval time, and support both injection styles:

```ts
function getServerModules(): Record<string, string> {
  if (typeof __SENTRY_SERVER_MODULES__ !== 'undefined') return __SENTRY_SERVER_MODULES__; // webpack
  return (GLOBAL_OBJ as ...).__SENTRY_SERVER_MODULES__ ?? {};                              // turbopack
}
```

By the time `getModules()` is first called (during integration
`afterAllSetup`, i.e. after `register()` → `Sentry.init()`), the
instrumentation module body has fully executed and the global is set.
webpack is unaffected (token still replaced).

## Regression test

`packages/node-core/test/integrations/modules.test.ts` re-imports the
module with no global set (mirroring Turbopack), then assigns
`globalThis.__SENTRY_SERVER_MODULES__` **after** import and asserts
`getModules()` reflects it. This **fails on the previous code** and
passes with the fix.

## Blast radius

Low. webpack path unchanged; Turbopack now honored; `event.modules`
restored on Turbopack. Re-enables all module-detection-based auto
integrations on Next.js 16 without requiring `vercelAIIntegration({
force: true })`.

## Follow-up (separate)

The existing `nextjs-16` AI E2E should be hardened so it can't pass via
the `process.cwd()` package.json fallback — e.g. a `--turbopack` build
variant run from a working directory whose `package.json` does not list
the AI SDK, asserting `gen_ai.*` spans still appear. Happy to do this in
a follow-up.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Sign up for free to 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.

vercelAIIntegration doesn't activate on Vercel deployments without force: true

2 participants