fix(nitro): Anchor both nitro integrations on h3 for Cloudflare auto-injection

.size-limit.js

@@ -406,7 +406,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '145 KB',
+    limit: '146 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -452,7 +452,7 @@ module.exports = [
     path: 'packages/node/build/esm/index.js',
     import: createImport('init'),
     gzip: true,
-    limit: '123 KB',
+    limit: '125 KB',
     disablePlugins: ['@size-limit/esbuild'],
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     modifyWebpackConfig: function (config) {

packages/astro/src/index.server.ts

@@ -87,6 +87,8 @@ export {
   mongoIntegration,
   mongooseIntegration,
   mysql2Integration,
+  nitroIntegration,
+  nitroServerTimingIntegration,
   mysqlIntegration,
   nativeNodeFetchIntegration,
   NodeClient,

packages/aws-serverless/src/index.ts

@@ -121,6 +121,8 @@ export {
   mongooseIntegration,
   mysqlIntegration,
   mysql2Integration,
+  nitroIntegration,
+  nitroServerTimingIntegration,
   redisIntegration,
   tediousIntegration,
   pinoIntegration,

packages/bun/src/index.ts

@@ -143,6 +143,8 @@ export {
   mongooseIntegration,
   mysqlIntegration,
   mysql2Integration,
+  nitroIntegration,
+  nitroServerTimingIntegration,
   redisIntegration,
   tediousIntegration,
   postgresIntegration,

packages/cloudflare/src/baseSdk.ts

@@ -37,7 +37,10 @@ import { defaultStackParser } from './vendor/stacktrace';
 function getRegisteredChannelIntegrations(): Integration[] {
   const registered = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations;
 
-  return registered ? [...registered.values()].map(factory => factory()) : [];
+  // A module holds a single factory, or a Set of them (once it registers more than one integration).
+  return registered
+    ? [...registered.values()].flatMap(entry => (entry instanceof Set ? [...entry] : [entry])).map(factory => factory())
+    : [];
 }
 
 /**
@@ -148,10 +151,9 @@ export function initWithDefaultIntegrations(
   // integration on the live client here. `addIntegration` dedupes by
   // integration name, so already-installed integrations are no-ops.
   client.on('orchestrion.module-injected', moduleName => {
-    const factory = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations?.get(moduleName);
-    if (factory) {
-      client.addIntegration(factory());
-    }
+    const entry = GLOBAL_OBJ.__SENTRY_ORCHESTRION__?.integrations?.get(moduleName);
+    const factories = entry instanceof Set ? entry : entry ? [entry] : [];
+    factories.forEach(factory => client.addIntegration(factory()));
   });
 
   return client;

packages/cloudflare/test/sdk.test.ts

@@ -357,4 +357,37 @@ describe('getDefaultIntegrations', () => {
 
     expect(client?.getIntegrationByName('Mysql')).toBeDefined();
   });
+
+  test('installs all integrations for a module registered after init via the module-injected event', async () => {
+    const { mysqlIntegration, lruMemoizerIntegration } = await import('@sentry/server-utils');
+    // `cacheClient: false` so this gets its own client rather than one a previous `init()` cached.
+    const client = init({ cacheClient: false });
+    expect(client?.getIntegrationByName('Mysql')).toBeUndefined();
+    expect(client?.getIntegrationByName('LruMemoizer')).toBeUndefined();
+
+    // A module registering more than one integration (like `h3` → span + Server-Timing) evaluates
+    // after init: store the Set of factories on the marker, then emit the event.
+    globalThis.__SENTRY_ORCHESTRION__ = {
+      bundler: new Set(['some-module']),
+      integrations: new Map([['some-module', new Set([mysqlIntegration, lruMemoizerIntegration])]]),
+    };
+    client?.emit('orchestrion.module-injected', 'some-module');
+
+    expect(client?.getIntegrationByName('Mysql')).toBeDefined();
+    expect(client?.getIntegrationByName('LruMemoizer')).toBeDefined();
+  });
+
+  test('installs all integrations a single module registers', async () => {
+    const { mysqlIntegration, lruMemoizerIntegration } = await import('@sentry/server-utils');
+    // One module registering more than one integration (like `h3` → span + Server-Timing).
+    globalThis.__SENTRY_ORCHESTRION__ = {
+      bundler: new Set(['some-module']),
+      integrations: new Map([['some-module', new Set([mysqlIntegration, lruMemoizerIntegration])]]),
+    };
+
+    const names = getDefaultIntegrations({}).map(i => i.name);
+
+    expect(names).toContain('Mysql');
+    expect(names).toContain('LruMemoizer');
+  });
 });

packages/core/src/utils/worldwide.ts

@@ -80,12 +80,15 @@ export type InternalGlobal = {
     /**
      * Channel-subscriber integration factories stored by the snippet the
      * bundler transform splices into each instrumented module, keyed by module
-     * name. A factory shared by several packages (e.g. pg/pg-pool) appears
-     * under several keys; integration-name deduplication collapses them at
-     * setup. A bundler-only SDK (e.g. `@sentry/cloudflare`) reads these at
-     * `init()` and instantiates them.
+     * name. A module holds a single factory, or a Set of them once it registers
+     * more than one integration (e.g. `h3` → span + Server-Timing) — the single
+     * shape is kept for the common case so an older reader stays compatible. A
+     * factory shared by several packages (e.g. pg/pg-pool) appears under several
+     * keys; integration-name deduplication collapses them at setup. A
+     * bundler-only SDK (e.g. `@sentry/cloudflare`) reads these at `init()` and
+     * instantiates them.
      */
-    integrations?: Map<string, () => Integration>;
+    integrations?: Map<string, (() => Integration) | Set<() => Integration>>;
     /**
      * Set once `registerDiagnosticsChannelInjection()` has run but could not
      * install the runtime module hooks — most commonly because

packages/deno/src/index.ts

@@ -146,6 +146,8 @@ export {
   mongooseIntegration,
   mysqlIntegration,
   mysql2Integration,
+  nitroIntegration,
+  nitroServerTimingIntegration,
   mistralAIIntegration,
   openAIIntegration,
   groqIntegration,

packages/deno/test/__snapshots__/mod.test.ts.snap

@@ -47,26 +47,7 @@ snapshot[`captureMessage 1`] = `
   platform: "javascript",
   sdk: {
     integrations: [
-      "EventFilters",
-      "RequestData",
-      "FunctionToString",
-      "LinkedErrors",
-      "Dedupe",
-      "ConversationId",
-      "Breadcrumbs",
-      "Console",
-      "DenoContext",
-      "DenoServe",
-      "Fetch",
-      "DenoHttp",
-      "ContextLines",
-      "NormalizePaths",
-      "GlobalHandlers",
-      "Express",
-      "Fastify",
-      "Hapi",
-      "Hono",
-      "Koa",
+      "{{integrations}}",
     ],
     name: "sentry.javascript.deno",
     packages: [
@@ -136,26 +117,7 @@ snapshot[`captureMessage twice 1`] = `
   platform: "javascript",
   sdk: {
     integrations: [
-      "EventFilters",
-      "RequestData",
-      "FunctionToString",
-      "LinkedErrors",
-      "Dedupe",
-      "ConversationId",
-      "Breadcrumbs",
-      "Console",
-      "DenoContext",
-      "DenoServe",
-      "Fetch",
-      "DenoHttp",
-      "ContextLines",
-      "NormalizePaths",
-      "GlobalHandlers",
-      "Express",
-      "Fastify",
-      "Hapi",
-      "Hono",
-      "Koa",
+      "{{integrations}}",
     ],
     name: "sentry.javascript.deno",
     packages: [
@@ -232,26 +194,7 @@ snapshot[`captureMessage twice 2`] = `
   platform: "javascript",
   sdk: {
     integrations: [
-      "EventFilters",
-      "RequestData",
-      "FunctionToString",
-      "LinkedErrors",
-      "Dedupe",
-      "ConversationId",
-      "Breadcrumbs",
-      "Console",
-      "DenoContext",
-      "DenoServe",
-      "Fetch",
-      "DenoHttp",
-      "ContextLines",
-      "NormalizePaths",
-      "GlobalHandlers",
-      "Express",
-      "Fastify",
-      "Hapi",
-      "Hono",
-      "Koa",
+      "{{integrations}}",
     ],
     name: "sentry.javascript.deno",
     packages: [

packages/deno/test/normalize.ts

@@ -79,6 +79,12 @@ function normalizeEvent(event: Event): Event {
     }
   }
 
+  // The default integration list is incidental to these snapshots, so collapse it to a placeholder.
+  // This keeps the snapshots stable when integrations are added to or removed from the defaults.
+  if (event.sdk?.integrations) {
+    event.sdk.integrations = ['{{integrations}}'];
+  }
+
   if (event.contexts?.app?.app_start_time) {
     event.contexts.app.app_start_time = '{{time}}';
   }

packages/elysia/src/index.ts

@@ -122,6 +122,8 @@ export {
   mongooseIntegration,
   mysqlIntegration,
   mysql2Integration,
+  nitroIntegration,
+  nitroServerTimingIntegration,
   redisIntegration,
   tediousIntegration,
   postgresIntegration,

packages/google-cloud-serverless/src/index.ts

@@ -121,6 +121,8 @@ export {
   mongooseIntegration,
   mysqlIntegration,
   mysql2Integration,
+  nitroIntegration,
+  nitroServerTimingIntegration,
   redisIntegration,
   tediousIntegration,
   pinoIntegration,

packages/nitro/package.json

@@ -39,8 +39,7 @@
     "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.1.0",
     "@sentry/node": "11.1.0",
-    "@sentry/server-runtime-injection": "11.1.0",
-    "@sentry/server-utils": "11.1.0"
+    "@sentry/server-runtime-injection": "11.1.0"
   },
   "devDependencies": {
     "nitro": "^3.0.260415-beta"

packages/nitro/src/runtime/plugins/server.ts

@@ -1,11 +1,6 @@
 import { definePlugin } from 'nitro';
 import { captureErrorHook } from '../hooks/captureErrorHook';
-import { captureStorageEvents } from '../hooks/captureStorageEvents';
-import { captureTracingEvents } from '../hooks/captureTracingEvents';
 
 export default definePlugin(nitroApp => {
   nitroApp.hooks.hook('error', captureErrorHook);
-
-  captureTracingEvents();
-  captureStorageEvents();
 });

packages/nitro/src/sdk.ts

@@ -1,7 +1,7 @@
 import type { Integration } from '@sentry/core';
 import { applySdkMetadata } from '@sentry/core';
 import type { NodeClient, NodeOptions } from '@sentry/node';
-import { getDefaultIntegrations as getDefaultNodeIntegrations, init as nodeInit } from '@sentry/node';
+import { getDefaultIntegrations as getDefaultNodeIntegrations, init as nodeInit, nitroIntegration } from '@sentry/node';
 
 /**
  * Initializes the Nitro SDK
@@ -28,5 +28,7 @@ export function init(options: NodeOptions | undefined = {}): NodeClient | undefi
  *  @returns The default integrations for the Nitro SDK.
  */
 export function getDefaultIntegrations(options: NodeOptions): Integration[] | undefined {
-  return [...getDefaultNodeIntegrations(options)];
+  // `nitroIntegration` is also part of the Node tracing integrations, but add it explicitly so it is
+  // always present for the Nitro SDK regardless of that gating (deduped by name when both are added).
+  return [...getDefaultNodeIntegrations(options), nitroIntegration()];
 }

packages/node/src/index.ts

@@ -32,6 +32,8 @@ export {
   mysqlIntegration,
   mistralAIIntegration,
   mysql2Integration,
+  nitroIntegration,
+  nitroServerTimingIntegration,
   openAIIntegration,
   togetherAIIntegration,
   typesafeIntegration,

packages/remix/src/server/index.ts

@@ -70,6 +70,8 @@ export {
   mongoIntegration,
   mongooseIntegration,
   mysql2Integration,
+  nitroIntegration,
+  nitroServerTimingIntegration,
   mysqlIntegration,
   nativeNodeFetchIntegration,
   NodeClient,

packages/server-utils/src/index.ts

@@ -74,5 +74,6 @@ export type { ExpressIntegrationOptions } from './integrations/express/types';
 export { expressErrorHandler, setupExpressErrorHandler } from './integrations/express/error-handler';
 /* oxlint-enable typescript/no-deprecated */
 export { firebaseIntegration } from './integrations/firebase';
+export { nitroIntegration, nitroServerTimingIntegration } from './integrations/nitro';
 
 export { getTracingIntegrations, getErrorIntegrations } from './integrations';

packages/server-utils/src/integrations/index.ts

@@ -29,6 +29,7 @@ import { postgresJsIntegration } from './postgres-js';
 import { firebaseIntegration } from './firebase';
 import { expressIntegration } from './express';
 import { fastifyIntegration } from './fastify';
+import { nitroIntegration, nitroServerTimingIntegration } from './nitro';
 import { hapiIntegration } from './hapi';
 import { honoIntegration } from './hono';
 import { koaIntegration } from './koa';
@@ -70,10 +71,22 @@ export function getTracingIntegrations(): Integration[] {
     postgresJsIntegration(),
     firebaseIntegration(),
     mcpServerIntegration(),
+    nitroIntegration(),
   ];
 }
 
-/** These are integrations that cover error capture, in addition to tracing. */
+/**
+ * These are default integrations that are registered regardless of whether tracing is enabled -
+ * either because they cover error capture in addition to tracing, or because they only handle trace
+ * propagation (which must work in tracing-without-performance mode too).
+ */
 export function getErrorIntegrations(): Integration[] {
-  return [expressIntegration(), fastifyIntegration(), hapiIntegration(), honoIntegration(), koaIntegration()];
+  return [
+    expressIntegration(),
+    fastifyIntegration(),
+    hapiIntegration(),
+    honoIntegration(),
+    koaIntegration(),
+    nitroServerTimingIntegration(),
+  ];
 }