fixes for vercel ai

Author: mydea

packages/core/src/integration.ts

@@ -195,10 +195,10 @@ export function defineIntegration<Fn extends IntegrationFn>(
  * });
  * ```
  */
-export function extendIntegration<Base extends Integration, Extended extends Partial<Integration>>(
-  integration: Base,
-  extendedIntegration: Extended,
-): Omit<Base, keyof Extended> & Extended {
+export function extendIntegration<
+  Base extends Integration,
+  Extended extends Record<string, unknown> & Partial<Integration>,
+>(integration: Base, extendedIntegration: Extended): Omit<Base, keyof Extended> & Extended {
   // The extension overrides the base for any shared key (object spread + the wrapping below), so the
   // result type drops the overridden base keys rather than intersecting them — `Base & Extended` would
   // wrongly intersect shared keys (e.g. a re-typed property collapses to `never`).

packages/node/src/integrations/tracing/vercelai/index.ts

@@ -1,5 +1,5 @@
 import type { Client, IntegrationFn } from '@sentry/core';
-import { addVercelAiProcessors, defineIntegration } from '@sentry/core';
+import { addVercelAiProcessors, defineIntegration, extendIntegration } from '@sentry/core';
 import { generateInstrumentOnce, type modulesIntegration } from '@sentry/node-core';
 import { vercelAiIntegration as serverUtilsVercelAiIntegration } from '@sentry/server-utils';
 import { INTEGRATION_NAME } from './constants';
@@ -22,12 +22,10 @@ const _vercelAIIntegration = ((options: VercelAiOptions = {}) => {
 
   const parentIntegration = serverUtilsVercelAiIntegration(options);
 
-  return {
-    name: INTEGRATION_NAME,
+  return extendIntegration(parentIntegration, {
     options,
     setupOnce() {
       instrumentation = instrumentVercelAi();
-      parentIntegration.setupOnce?.();
     },
     afterAllSetup(client) {
       // Auto-detect if we should force the integration when running with 'ai' package available
@@ -40,7 +38,7 @@ const _vercelAIIntegration = ((options: VercelAiOptions = {}) => {
         instrumentation?.callWhenPatched(() => addVercelAiProcessors(client));
       }
     },
-  };
+  });
 }) satisfies IntegrationFn;
 
 /**

packages/server-utils/src/vercel-ai/index.ts

@@ -26,7 +26,7 @@ type VercelAiOptions = {
 
 const _vercelAiIntegration = ((options: VercelAiOptions = {}) => {
   return {
-    name: 'VercelAi',
+    name: 'VercelAi' as const,
     setupOnce() {
       // Bail if this is not available
       if (!dc.tracingChannel) {