Just bundle @sentry/server-utils

Author: timfish

packages/nextjs/src/config/diagnosticsChannelInjection.ts

@@ -9,22 +9,17 @@ import { resolveOrchestrionRuntimeRequest } from '@sentry/server-utils/orchestri
 export const BUNDLE_SAFE_INSTRUMENTED_PACKAGES = ['ioredis'];
 
 /**
- * The orchestrion runtime machinery must stay external — its parser breaks when bundled, which
- * silently disables the runtime module hook.
+ * `@sentry/server-utils` (where `register.ts` and the bundled orchestrion runtime ship) must stay
+ * external: `register.ts` passes its own `__filename`/`import.meta.url` as the `parentURL` for
+ * `Module.register('@sentry/server-utils/orchestrion/hook.mjs', …)`, so that self-reference only
+ * resolves while the code still lives at its real `node_modules` location. Bundled into an app
+ * server chunk instead, the specifier would have to resolve from the chunk's output location,
+ * which fails under isolated installs (pnpm) where the package is a transitive dependency.
  *
- * `@sentry/server-utils` (the package `register.ts` — the code that actually calls into
- * `@apm-js-collab/tracing-hooks` — ships in) is included too: if it stays external, its own
- * `__filename`/`import.meta.url` keep pointing at their real `node_modules` location, so its
- * bare-specifier `require`/`import` of the (also-external) tracing-hooks packages resolve
- * correctly. If `@sentry/server-utils` were bundled into an app server chunk instead, its code
- * would be relocated away from `node_modules`, and those same specifiers would fail to resolve
- * under isolated installs (pnpm).
+ * (The `@apm-js-collab/*` packages no longer appear here: they are bundled into
+ * `@sentry/server-utils`' build, so no import of them exists at runtime.)
  */
-export const ORCHESTRION_RUNTIME_EXTERNAL_PACKAGES = [
-  '@apm-js-collab/tracing-hooks',
-  '@apm-js-collab/code-transformer',
-  '@sentry/server-utils',
-];
+export const ORCHESTRION_RUNTIME_EXTERNAL_PACKAGES = ['@sentry/server-utils'];
 
 /** Remove the given packages from a `serverExternalPackages` list. */
 export function filterInstrumentedExternals(externals: string[], packagesToBundle: string[]): string[] {
@@ -41,12 +36,12 @@ export function filterInstrumentedExternals(externals: string[], packagesToBundl
  * package when its bare specifier also resolves from the project root (`resolveExternal`'s
  * base-resolve check in `next/dist/build/handle-externals.js`) — otherwise the
  * `require('<bare specifier>')` it emits into the chunk would dangle at runtime, so Next silently
- * bundles the package instead. Under isolated installs (pnpm) these packages are transitive
- * dependencies that never resolve from the project root, so the whole orchestrion runtime ended up
- * compiled into the server chunk, which breaks it twice over: the code-transformer parser doesn't
- * survive bundling, and the runtime hook's own bare specifiers can't resolve from the chunk's
- * output location. Absolute paths sidestep all of this — webpack emits `require('/abs/path/…')`,
- * which loads the real files from `node_modules` no matter where the chunk lives.
+ * bundles the package instead. Under isolated installs (pnpm) the package is a transitive
+ * dependency that never resolves from the project root, so the orchestrion runtime ended up
+ * compiled into the server chunk — breaking the `Module.register` self-reference described on
+ * {@link ORCHESTRION_RUNTIME_EXTERNAL_PACKAGES}. Absolute paths sidestep all of this — webpack
+ * emits `require('/abs/path/…')`, which loads the real files from `node_modules` no matter where
+ * the chunk lives.
  *
  * Must be placed *before* Next's own externals handler in the `externals` array: webpack calls
  * array entries in order and stops at the first one that returns a result.

packages/nextjs/test/config/diagnosticsChannelInjection.test.ts

@@ -36,8 +36,7 @@ describe('getServerExternalPackagesPatch (diagnostics-channel injection)', () =>
     expect(externals).toContain('pg');
     expect(externals).toContain('pg-pool');
     // The orchestrion machinery must be external for the runtime hook to work.
-    expect(externals).toContain('@apm-js-collab/tracing-hooks');
-    expect(externals).toContain('@apm-js-collab/code-transformer');
+    expect(externals).toContain('@sentry/server-utils');
   });
 
   it('respects user-provided externals even for bundle-safe packages', () => {
@@ -55,21 +54,22 @@ describe('getServerExternalPackagesPatch (diagnostics-channel injection)', () =>
 });
 
 describe('externalizeOrchestrionRuntimePackages', () => {
-  it.each([
-    '@sentry/server-utils',
-    '@sentry/server-utils/orchestrion',
-    '@sentry/server-utils/orchestrion/register',
-    '@apm-js-collab/tracing-hooks',
-    '@apm-js-collab/tracing-hooks/hook-sync.mjs',
-    '@apm-js-collab/tracing-hooks/lib/diagnostics.js',
-    '@apm-js-collab/code-transformer',
-  ])('externalizes %s as an absolute-path commonjs require', async request => {
-    const external = await externalizeOrchestrionRuntimePackages({ request });
-
-    expect(external).toMatch(/^commonjs /);
-    const resolvedPath = external!.slice('commonjs '.length);
-    expect(isAbsolute(resolvedPath)).toBe(true);
-    expect(existsSync(resolvedPath)).toBe(true);
+  it.each(['@sentry/server-utils', '@sentry/server-utils/orchestrion', '@sentry/server-utils/orchestrion/register'])(
+    'externalizes %s as an absolute-path commonjs require',
+    async request => {
+      const external = await externalizeOrchestrionRuntimePackages({ request });
+
+      expect(external).toMatch(/^commonjs /);
+      const resolvedPath = external!.slice('commonjs '.length);
+      expect(isAbsolute(resolvedPath)).toBe(true);
+      expect(existsSync(resolvedPath)).toBe(true);
+    },
+  );
+
+  it('ignores the bundled @apm-js-collab packages — no import of them exists in the dist anymore', async () => {
+    await expect(
+      externalizeOrchestrionRuntimePackages({ request: '@apm-js-collab/tracing-hooks' }),
+    ).resolves.toBeUndefined();
   });
 
   it('resolves @sentry/server-utils subpaths to the CJS build, since the emitted external is a require()', async () => {

packages/nuxt/src/module.ts

@@ -13,7 +13,6 @@ import type { SentryNuxtModuleOptions } from './common/types';
 import { addDynamicImportEntryFileWrapper, addSentryTopImport, addServerConfigToBuild } from './vite/addServerConfig';
 import { addDatabaseInstrumentation } from './vite/databaseConfig';
 import { addMiddlewareImports, addMiddlewareInstrumentation } from './vite/middlewareConfig';
-import { setupModuleSyncTracing } from './vite/moduleSyncTracing';
 import { setupOrchestrion } from './vite/orchestrion';
 import { setupSourceMaps } from './vite/sourceMaps';
 import { addStorageInstrumentation } from './vite/storageConfig';
@@ -86,10 +85,6 @@ export default defineNuxtModule<ModuleOptions>({
     const isMinNuxtV4 = nuxtMajor >= 4;
 
     if (serverConfigFile) {
-      // Deliberately not gated on the orchestrion opt-in: the server SDK's dependency graph reaches
-      // `module-sync` packages either way, so every traced server build needs this.
-      setupModuleSyncTracing(nuxt, isNitroV3);
-
       if (moduleOptions._experimental?.useDiagnosticsChannelInjection) {
         setupOrchestrion(nuxt);
       }

packages/nuxt/src/vite/moduleSyncTracing.ts

@@ -52,13 +52,20 @@
       "import": "./build/esm/orchestrion/bundler/webpack.js",
       "require": "./build/cjs/orchestrion/bundler/webpack.js"
     },
+    "./orchestrion/webpack-loader": {
+      "import": "./build/esm/orchestrion/bundler/webpack-loader.js",
+      "require": "./build/cjs/orchestrion/bundler/webpack-loader.js"
+    },
     "./orchestrion/esbuild": {
       "types": "./build/types/orchestrion/bundler/esbuild.d.ts",
       "import": "./build/esm/orchestrion/bundler/esbuild.js",
       "require": "./build/cjs/orchestrion/bundler/esbuild.js"
     },
     "./orchestrion/import-hook": {
       "import": "./build/orchestrion/import-hook.mjs"
+    },
+    "./orchestrion/hook": {
+      "import": "./build/esm/orchestrion/runtime/hook.js"
     }
   },
   "typesVersions": {
@@ -90,14 +97,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@apm-js-collab/code-transformer-bundler-plugins": "^0.7.1",
-    "@apm-js-collab/tracing-hooks": "^0.13.0",
     "@sentry/conventions": "^0.16.0",
-    "@sentry/core": "10.67.0",
-    "meriyah": "^6.1.4"
+    "@sentry/core": "10.67.0"
   },
   "devDependencies": {
+    "@apm-js-collab/code-transformer-bundler-plugins": "^0.7.1",
+    "@apm-js-collab/tracing-hooks": "^0.13.0",
     "@types/node": "^18.19.1",
+    "meriyah": "^6.1.4",
     "vite": "^6.4.3"
   },
   "scripts": {