quick comments

Author: RulaKhaled

dev-packages/node-integration-tests/suites/tracing/google-genai/instrument-with-pii.mjs

@@ -7,7 +7,6 @@ Sentry.init({
   tracesSampleRate: 1.0,
   sendDefaultPii: true,
   transport: loggingTransport,
-  integrations: [Sentry.googleGenAIIntegration()],
   beforeSendTransaction: event => {
     // Filter out mock express server transactions
     if (event.transaction.includes('/v1beta/')) {

dev-packages/node-integration-tests/suites/tracing/google-genai/instrument.mjs

@@ -7,7 +7,6 @@ Sentry.init({
   tracesSampleRate: 1.0,
   sendDefaultPii: false,
   transport: loggingTransport,
-  integrations: [Sentry.googleGenAIIntegration()],
   beforeSendTransaction: event => {
     // Filter out mock express server transactions
     if (event.transaction.includes('/v1beta')) {

packages/core/src/utils/google-genai/types.ts

@@ -179,14 +179,6 @@ export interface GoogleGenAIChat {
   sendMessageStream: (...args: unknown[]) => Promise<AsyncGenerator<GenerateContentResponse, any, unknown>>;
 }
 
-/**
- * Google GenAI Integration interface for type safety
- */
-export interface GoogleGenAIIntegration {
-  name: string;
-  options: GoogleGenAIOptions;
-}
-
 export type GoogleGenAIIstrumentedMethod = (typeof GOOGLE_GENAI_INSTRUMENTED_METHODS)[number];
 
 // Export the response type for use in instrumentation

packages/node/src/integrations/tracing/google-genai/instrumentation.ts

@@ -37,6 +37,10 @@ export class SentryGoogleGenAiInstrumentation extends InstrumentationBase<Google
       supportedVersions,
       exports => this._patch(exports),
       exports => exports,
+      // In CJS, @google/genai re-exports from (dist/node/index.cjs) file.
+      // Patching only the root module sometimes misses the real implementation or
+      // gets overwritten when that file is loaded. We add a file-level patch so that
+      // _patch runs again on the concrete implementation
       [
         new InstrumentationNodeModuleFile(
           '@google/genai/dist/node/index.cjs',
@@ -57,7 +61,7 @@ export class SentryGoogleGenAiInstrumentation extends InstrumentationBase<Google
     const config = this.getConfig();
 
     if (typeof Original !== 'function') {
-      return;
+      return exports;
     }
 
     const WrappedGoogleGenAI = function (this: unknown, ...args: unknown[]): GoogleGenAIClient {