simplify promise handle

Author: RulaKhaled

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

@@ -7,11 +7,17 @@ Sentry.init({
   tracesSampleRate: 1.0,
   sendDefaultPii: false,
   transport: loggingTransport,
-  registerEsmLoaderHooks: false,
   integrations: [
     Sentry.googleGenAIIntegration({
       recordInputs: true,
       recordOutputs: true,
     }),
   ],
+  beforeSendTransaction: event => {
+    // Filter out mock express server transactions
+    if (event.transaction.includes('/v1beta/')) {
+      return null;
+    }
+    return event;
+  },
 });

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

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

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

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

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

@@ -1,89 +1,59 @@
-import { instrumentGoogleGenAIClient } from '@sentry/core';
 import * as Sentry from '@sentry/node';
+import { GoogleGenAI } from '@google/genai';
 
-class MockGoogleGenAI {
-  constructor(config) {
-    this.apiKey = config.apiKey;
+import express from 'express';
 
-    this.models = {
-      generateContent: async params => {
-        // Simulate processing time
-        await new Promise(resolve => setTimeout(resolve, 10));
+const PORT = 3333;
 
-        if (params.model === 'error-model') {
-          const error = new Error('Model not found');
-          error.status = 404;
-          throw error;
-        }
+function startMockGoogleGenAIServer() {
+  const app = express();
+  app.use(express.json());
 
-        return {
-          candidates: [
-            {
-              content: {
-                parts: [
-                  {
-                    text: params.contents ? 'The capital of France is Paris.' : 'Mock response from Google GenAI!',
-                  },
-                ],
-                role: 'model',
-              },
-              finishReason: 'stop',
-              index: 0,
-            },
-          ],
-          usageMetadata: {
-            promptTokenCount: 8,
-            candidatesTokenCount: 12,
-            totalTokenCount: 20,
-          },
-        };
-      },
-    };
+  app.post('/v1beta/models/:model\\:generateContent', (req, res) => {
+    const model = req.params.model;
 
-    this.chats = {
-      create: options => {
-        // Return a chat instance with sendMessage method and model info
-        return {
-          model: options?.model || 'unknown', // Include model from create options
-          sendMessage: async () => {
-            // Simulate processing time
-            await new Promise(resolve => setTimeout(resolve, 10));
+    if (model === 'error-model') {
+      res.status(404).set('x-request-id', 'mock-request-123').end('Model not found');
+      return;
+    }
 
-            return {
-              candidates: [
-                {
-                  content: {
-                    parts: [
-                      {
-                        text: 'Mock response from Google GenAI!',
-                      },
-                    ],
-                    role: 'model',
-                  },
-                  finishReason: 'stop',
-                  index: 0,
-                },
-              ],
-              usageMetadata: {
-                promptTokenCount: 10,
-                candidatesTokenCount: 15,
-                totalTokenCount: 25,
+    res.send({
+      candidates: [
+        {
+          content: {
+            parts: [
+              {
+                text: 'Mock response from Google GenAI!',
               },
-            };
+            ],
+            role: 'model',
           },
-        };
+          finishReason: 'stop',
+          index: 0,
+        },
+      ],
+      usageMetadata: {
+        promptTokenCount: 8,
+        candidatesTokenCount: 12,
+        totalTokenCount: 20,
       },
-    };
-  }
+    });
+  });
+
+  return app.listen(PORT);
 }
 
 async function run() {
-  const genAI = new MockGoogleGenAI({ apiKey: 'test-api-key' });
-  const instrumentedClient = instrumentGoogleGenAIClient(genAI);
+  const server = startMockGoogleGenAIServer();
+
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    const client = new GoogleGenAI({
+      apiKey: 'mock-api-key',
+      httpOptions: { baseUrl: `http://localhost:${PORT}` }
+    });
 
-  await Sentry.startSpan({ name: 'main', op: 'function' }, async () => {
     // Test 1: chats.create and sendMessage flow
-    const chat = instrumentedClient.chats.create({
+    const chat = client.chats.create({
       model: 'gemini-1.5-pro',
       config: {
         temperature: 0.8,
@@ -103,7 +73,7 @@ async function run() {
     });
 
     // Test 2: models.generateContent
-    await instrumentedClient.models.generateContent({
+    await client.models.generateContent({
       model: 'gemini-1.5-flash',
       config: {
         temperature: 0.7,
@@ -120,7 +90,7 @@ async function run() {
 
     // Test 3: Error handling
     try {
-      await instrumentedClient.models.generateContent({
+      await client.models.generateContent({
         model: 'error-model',
         contents: [
           {
@@ -133,6 +103,8 @@ async function run() {
       // Expected error
     }
   });
+
+  server.close();
 }
 
 run();

dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts

@@ -34,9 +34,9 @@ describe('Google GenAI integration', () => {
           'sentry.origin': 'auto.ai.google_genai',
           'gen_ai.system': 'google_genai',
           'gen_ai.request.model': 'gemini-1.5-pro', // Should get from chat context
-          'gen_ai.usage.input_tokens': 10,
-          'gen_ai.usage.output_tokens': 15,
-          'gen_ai.usage.total_tokens': 25,
+          'gen_ai.usage.input_tokens': 8,
+          'gen_ai.usage.output_tokens': 12,
+          'gen_ai.usage.total_tokens': 20,
         },
         description: 'chat gemini-1.5-pro',
         op: 'gen_ai.chat',
@@ -111,9 +111,9 @@ describe('Google GenAI integration', () => {
           'gen_ai.request.model': 'gemini-1.5-pro',
           'gen_ai.request.messages': expect.any(String), // Should include message when recordInputs: true
           'gen_ai.response.text': expect.any(String), // Should include response when recordOutputs: true
-          'gen_ai.usage.input_tokens': 10,
-          'gen_ai.usage.output_tokens': 15,
-          'gen_ai.usage.total_tokens': 25,
+          'gen_ai.usage.input_tokens': 8,
+          'gen_ai.usage.output_tokens': 12,
+          'gen_ai.usage.total_tokens': 20,
         }),
         description: 'chat gemini-1.5-pro',
         op: 'gen_ai.chat',

packages/core/src/index.ts

@@ -215,6 +215,7 @@ export { basename, dirname, isAbsolute, join, normalizePath, relative, resolve }
 export { makePromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
 export type { PromiseBuffer } from './utils/promisebuffer';
 export { severityLevelFromString } from './utils/severity';
+export { replaceExports } from './utils/exports';
 export {
   UNKNOWN_FUNCTION,
   createStackParser,

packages/core/src/utils/exports.ts

@@ -0,0 +1,47 @@
+/**
+ * Replaces constructor functions in module exports, handling read-only properties,
+ * and both default and named exports by wrapping them with the constructor.
+ *
+ * @param exports The module exports object to modify
+ * @param exportName The name of the export to replace (e.g., 'GoogleGenAI', 'Anthropic', 'OpenAI')
+ * @param wrappedConstructor The wrapped constructor function to replace the original with
+ * @returns void
+ */
+export function replaceExports(
+  exports: { [key: string]: unknown },
+  exportName: string,
+  wrappedConstructor: unknown,
+): void {
+  const original = exports[exportName];
+
+  if (typeof original !== 'function') {
+    return;
+  }
+
+  // Replace the named export - handle read-only properties
+  try {
+    exports[exportName] = wrappedConstructor;
+  } catch (error) {
+    // If direct assignment fails, override the property descriptor
+    Object.defineProperty(exports, exportName, {
+      value: wrappedConstructor,
+      writable: true,
+      configurable: true,
+      enumerable: true,
+    });
+  }
+
+  // Replace the default export if it points to the original constructor
+  if (exports.default === original) {
+    try {
+      exports.default = wrappedConstructor;
+    } catch (error) {
+      Object.defineProperty(exports, 'default', {
+        value: wrappedConstructor,
+        writable: true,
+        configurable: true,
+        enumerable: true,
+      });
+    }
+  }
+}