fix(core): Do not overwrite user provided conversation id in Vercel (#19903)

We set the conversation id unconditionally based on the `resonse_id`, so
if a user calls `Sentry.setConversationId()` explicitly this will
be overwritten, which is unexpected.

Closes #19904 (added automatically)

Author: nicohrubec

packages/nuxt/src/runtime/plugins/database-legacy.server.ts

@@ -0,0 +1,13 @@
+import type { NitroAppPlugin } from 'nitropack';
+import { useDatabase } from 'nitropack/runtime';
+// @ts-expect-error - This is a virtual module
+import { databaseConfig } from '#sentry/database-config.mjs';
+import type { DatabaseConnectionConfig } from '../utils/database-span-data';
+import { createDatabasePlugin } from '../utils/instrumentDatabase';
+
+/**
+ * Nitro plugin that instruments database calls for Nuxt v3/v4 (Nitro v2)
+ */
+export default (() => {
+  createDatabasePlugin(useDatabase, databaseConfig as Record<string, DatabaseConnectionConfig>);
+}) satisfies NitroAppPlugin;

packages/nuxt/src/runtime/plugins/database.server.ts

@@ -1,232 +1,13 @@
-import {
-  addBreadcrumb,
-  captureException,
-  debug,
-  flushIfServerless,
-  SEMANTIC_ATTRIBUTE_SENTRY_OP,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  type Span,
-  SPAN_STATUS_ERROR,
-  startSpan,
-  type StartSpanOptions,
-} from '@sentry/core';
-import type { Database, PreparedStatement } from 'db0';
-import type { NitroAppPlugin } from 'nitropack';
-import { useDatabase } from 'nitropack/runtime';
-import type { DatabaseConnectionConfig as DatabaseConfig } from 'nitropack/types';
+import type { NitroAppPlugin } from 'nitro/types';
+import { useDatabase } from 'nitro/database';
 // @ts-expect-error - This is a virtual module
 import { databaseConfig } from '#sentry/database-config.mjs';
-import { type DatabaseSpanData, getDatabaseSpanData } from '../utils/database-span-data';
-
-type MaybeInstrumentedDatabase = Database & {
-  __sentry_instrumented__?: boolean;
-};
-
-/**
- * Keeps track of prepared statements that have been patched.
- */
-const patchedStatement = new WeakSet<PreparedStatement>();
+import type { DatabaseConnectionConfig } from '../utils/database-span-data';
+import { createDatabasePlugin } from '../utils/instrumentDatabase';
 
 /**
- * The Sentry origin for the database plugin.
- */
-const SENTRY_ORIGIN = 'auto.db.nuxt';
-
-/**
- * Creates a Nitro plugin that instruments the database calls.
+ * Nitro plugin that instruments database calls for Nuxt v5+ (Nitro v3+)
  */
 export default (() => {
-  try {
-    const _databaseConfig = databaseConfig as Record<string, DatabaseConfig>;
-    const databaseInstances = Object.keys(databaseConfig);
-    debug.log('[Nitro Database Plugin]: Instrumenting databases...');
-
-    for (const instance of databaseInstances) {
-      debug.log('[Nitro Database Plugin]: Instrumenting database instance:', instance);
-      const db = useDatabase(instance);
-      instrumentDatabase(db, _databaseConfig[instance]);
-    }
-
-    debug.log('[Nitro Database Plugin]: Databases instrumented.');
-  } catch (error) {
-    // During build time, we can't use the useDatabase function, so we just log an error.
-    if (error instanceof Error && /Cannot access 'instances'/.test(error.message)) {
-      debug.log('[Nitro Database Plugin]: Database instrumentation skipped during build time.');
-      return;
-    }
-
-    debug.error('[Nitro Database Plugin]: Failed to instrument database:', error);
-  }
+  createDatabasePlugin(useDatabase, databaseConfig as Record<string, DatabaseConnectionConfig>);
 }) satisfies NitroAppPlugin;
-
-/**
- * Instruments a database instance with Sentry.
- */
-function instrumentDatabase(db: MaybeInstrumentedDatabase, config?: DatabaseConfig): void {
-  if (db.__sentry_instrumented__) {
-    debug.log('[Nitro Database Plugin]: Database already instrumented. Skipping...');
-    return;
-  }
-
-  const metadata: DatabaseSpanData = {
-    'db.system.name': config?.connector ?? db.dialect,
-    ...getDatabaseSpanData(config),
-  };
-
-  db.prepare = new Proxy(db.prepare, {
-    apply(target, thisArg, args: Parameters<typeof db.prepare>) {
-      const [query] = args;
-
-      return instrumentPreparedStatement(target.apply(thisArg, args), query, metadata);
-    },
-  });
-
-  // Sadly the `.sql` template tag doesn't call `db.prepare` internally and it calls the connector's `.prepare` directly
-  // So we have to patch it manually, and would mean we would have less info in the spans.
-  // https://github.com/unjs/db0/blob/main/src/database.ts#L64
-  db.sql = new Proxy(db.sql, {
-    apply(target, thisArg, args: Parameters<typeof db.sql>) {
-      const query = args[0]?.[0] ?? '';
-      const opts = createStartSpanOptions(query, metadata);
-
-      return startSpan(
-        opts,
-        handleSpanStart(() => target.apply(thisArg, args)),
-      );
-    },
-  });
-
-  db.exec = new Proxy(db.exec, {
-    apply(target, thisArg, args: Parameters<typeof db.exec>) {
-      return startSpan(
-        createStartSpanOptions(args[0], metadata),
-        handleSpanStart(() => target.apply(thisArg, args), { query: args[0] }),
-      );
-    },
-  });
-
-  db.__sentry_instrumented__ = true;
-}
-
-/**
- * Instruments a DB prepared statement with Sentry.
- *
- * This is meant to be used as a top-level call, under the hood it calls `instrumentPreparedStatementQueries`
- * to patch the query methods. The reason for this abstraction is to ensure that the `bind` method is also patched.
- */
-function instrumentPreparedStatement(
-  statement: PreparedStatement,
-  query: string,
-  data: DatabaseSpanData,
-): PreparedStatement {
-  // statement.bind() returns a new instance of D1PreparedStatement, so we have to patch it as well.
-  // eslint-disable-next-line @typescript-eslint/unbound-method
-  statement.bind = new Proxy(statement.bind, {
-    apply(target, thisArg, args: Parameters<typeof statement.bind>) {
-      return instrumentPreparedStatementQueries(target.apply(thisArg, args), query, data);
-    },
-  });
-
-  return instrumentPreparedStatementQueries(statement, query, data);
-}
-
-/**
- * Patches the query methods of a DB prepared statement with Sentry.
- */
-function instrumentPreparedStatementQueries(
-  statement: PreparedStatement,
-  query: string,
-  data: DatabaseSpanData,
-): PreparedStatement {
-  if (patchedStatement.has(statement)) {
-    return statement;
-  }
-
-  // eslint-disable-next-line @typescript-eslint/unbound-method
-  statement.get = new Proxy(statement.get, {
-    apply(target, thisArg, args: Parameters<typeof statement.get>) {
-      return startSpan(
-        createStartSpanOptions(query, data),
-        handleSpanStart(() => target.apply(thisArg, args), { query }),
-      );
-    },
-  });
-
-  // eslint-disable-next-line @typescript-eslint/unbound-method
-  statement.run = new Proxy(statement.run, {
-    apply(target, thisArg, args: Parameters<typeof statement.run>) {
-      return startSpan(
-        createStartSpanOptions(query, data),
-        handleSpanStart(() => target.apply(thisArg, args), { query }),
-      );
-    },
-  });
-
-  // eslint-disable-next-line @typescript-eslint/unbound-method
-  statement.all = new Proxy(statement.all, {
-    apply(target, thisArg, args: Parameters<typeof statement.all>) {
-      return startSpan(
-        createStartSpanOptions(query, data),
-        handleSpanStart(() => target.apply(thisArg, args), { query }),
-      );
-    },
-  });
-
-  patchedStatement.add(statement);
-
-  return statement;
-}
-
-/**
- * Creates a span start callback handler
- */
-function handleSpanStart(fn: () => unknown, breadcrumbOpts?: { query: string }) {
-  return async (span: Span) => {
-    try {
-      const result = await fn();
-      if (breadcrumbOpts) {
-        createBreadcrumb(breadcrumbOpts.query);
-      }
-
-      return result;
-    } catch (error) {
-      span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
-      captureException(error, {
-        mechanism: {
-          handled: false,
-          type: SENTRY_ORIGIN,
-        },
-      });
-
-      // Re-throw the error to be handled by the caller
-      throw error;
-    } finally {
-      await flushIfServerless();
-    }
-  };
-}
-
-function createBreadcrumb(query: string): void {
-  addBreadcrumb({
-    category: 'query',
-    message: query,
-    data: {
-      'db.query.text': query,
-    },
-  });
-}
-
-/**
- * Creates a start span options object.
- */
-function createStartSpanOptions(query: string, data: DatabaseSpanData): StartSpanOptions {
-  return {
-    name: query,
-    attributes: {
-      'db.query.text': query,
-      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: SENTRY_ORIGIN,
-      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'db.query',
-      ...data,
-    },
-  };
-}

packages/nuxt/src/runtime/plugins/storage-legacy.server.ts

@@ -0,0 +1,12 @@
+import type { NitroAppPlugin } from 'nitropack';
+import { useStorage } from 'nitropack/runtime';
+// @ts-expect-error - This is a virtual module
+import { userStorageMounts } from '#sentry/storage-config.mjs';
+import { createStoragePlugin } from '../utils/instrumentStorage';
+
+/**
+ * Nitro plugin that instruments storage driver calls for Nuxt v3/v4 (Nitro v2)
+ */
+export default (async _nitroApp => {
+  await createStoragePlugin(useStorage, userStorageMounts as string[]);
+}) satisfies NitroAppPlugin;