Remove vercel code leftovers from openai's

Author: RulaKhaled

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

@@ -99,7 +99,7 @@ async function run() {
         model: 'error-model',
         messages: [{ role: 'user', content: 'This will fail' }],
       });
-    } catch (error) {
+    } catch {
       // Error is expected and handled
     }
   });

packages/core/src/index.ts

@@ -125,7 +125,7 @@ export { _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer, _INTERNAL_captureSeria
 export { consoleLoggingIntegration } from './logs/console-integration';
 export { addVercelAiProcessors } from './utils/vercel-ai';
 export { instrumentOpenAiClient } from './utils/openai';
-export { INTEGRATION_NAME } from './utils/openai/constants';
+export { OPENAI_INTEGRATION_NAME } from './utils/openai/constants';
 export type { OpenAiClient, OpenAiOptions, InstrumentedMethod } from './utils/openai/types';
 export type { FeatureFlag } from './utils/featureFlags';
 export {

packages/core/src/utils/openai/constants.ts

@@ -1,4 +1,4 @@
-export const INTEGRATION_NAME = 'OpenAI';
+export const OPENAI_INTEGRATION_NAME = 'OpenAI';
 
 // https://platform.openai.com/docs/quickstart?api-mode=responses
 // https://platform.openai.com/docs/quickstart?api-mode=chat

packages/core/src/utils/openai/index.ts

@@ -24,7 +24,7 @@ import {
   OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE,
   OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE,
 } from '../gen-ai-attributes';
-import { INTEGRATION_NAME } from './constants';
+import { OPENAI_INTEGRATION_NAME } from './constants';
 import type {
   InstrumentedMethod,
   OpenAiChatCompletionObject,
@@ -200,7 +200,7 @@ function addRequestAttributes(span: Span, params: Record<string, unknown>): void
 function getOptionsFromIntegration(): OpenAiOptions {
   const scope = getCurrentScope();
   const client = scope.getClient();
-  const integration = client?.getIntegrationByName(INTEGRATION_NAME) as OpenAiIntegration | undefined;
+  const integration = client?.getIntegrationByName(OPENAI_INTEGRATION_NAME) as OpenAiIntegration | undefined;
   const shouldRecordInputsAndOutputs = integration ? Boolean(client?.getOptions().sendDefaultPii) : false;
 
   return {

packages/core/src/utils/openai/utils.ts

@@ -13,10 +13,6 @@ export function getOperationName(methodPath: string): string {
     // The responses API is also a chat operation
     return OPENAI_OPERATIONS.CHAT;
   }
-  if (methodPath.includes('embeddings')) {
-    return 'embeddings';
-  }
-  // Default to the last part of the method path
   return methodPath.split('.').pop() || 'unknown';
 }
 

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

@@ -1,13 +1,16 @@
 import type { IntegrationFn, OpenAiOptions } from '@sentry/core';
-import { defineIntegration, INTEGRATION_NAME } from '@sentry/core';
+import { defineIntegration, OPENAI_INTEGRATION_NAME } from '@sentry/core';
 import { generateInstrumentOnce } from '@sentry/node-core';
 import { SentryOpenAiInstrumentation } from './instrumentation';
 
-export const instrumentOpenAi = generateInstrumentOnce(INTEGRATION_NAME, () => new SentryOpenAiInstrumentation({}));
+export const instrumentOpenAi = generateInstrumentOnce(
+  OPENAI_INTEGRATION_NAME,
+  () => new SentryOpenAiInstrumentation({}),
+);
 
 const _openAiIntegration = ((options: OpenAiOptions = {}) => {
   return {
-    name: INTEGRATION_NAME,
+    name: OPENAI_INTEGRATION_NAME,
     options,
     setupOnce() {
       instrumentOpenAi();

packages/node/src/integrations/tracing/openai/instrumentation.ts

@@ -5,7 +5,7 @@ import {
   InstrumentationNodeModuleDefinition,
 } from '@opentelemetry/instrumentation';
 import type { Integration, OpenAiClient, OpenAiOptions } from '@sentry/core';
-import { getCurrentScope, instrumentOpenAiClient, INTEGRATION_NAME, SDK_VERSION } from '@sentry/core';
+import { getCurrentScope, instrumentOpenAiClient, OPENAI_INTEGRATION_NAME, SDK_VERSION } from '@sentry/core';
 
 const supportedVersions = ['>=4.0.0 <6'];
 
@@ -37,9 +37,6 @@ function determineRecordingSettings(
  * Sentry OpenAI instrumentation using OpenTelemetry.
  */
 export class SentryOpenAiInstrumentation extends InstrumentationBase<InstrumentationConfig> {
-  private _isPatched = false;
-  private _callbacks: Array<() => void> = [];
-
   public constructor(config: InstrumentationConfig = {}) {
     super('@sentry/instrumentation-openai', SDK_VERSION, config);
   }
@@ -52,31 +49,16 @@ export class SentryOpenAiInstrumentation extends InstrumentationBase<Instrumenta
     return module;
   }
 
-  /**
-   * Schedules a callback once patching is complete.
-   */
-  public callWhenPatched(callback: () => void): void {
-    if (this._isPatched) {
-      callback();
-    } else {
-      this._callbacks.push(callback);
-    }
-  }
-
   /**
    * Core patch logic applying instrumentation to the OpenAI client constructor.
    */
   private _patch(exports: PatchedModuleExports): PatchedModuleExports | void {
-    this._isPatched = true;
-    this._callbacks.forEach(cb => cb());
-    this._callbacks = [];
-
     const Original = exports.OpenAI;
 
     const WrappedOpenAI = function (this: unknown, ...args: unknown[]) {
       const instance = Reflect.construct(Original, args);
       const scopeClient = getCurrentScope().getClient();
-      const integration = scopeClient?.getIntegrationByName<OpenAiIntegration>(INTEGRATION_NAME);
+      const integration = scopeClient?.getIntegrationByName<OpenAiIntegration>(OPENAI_INTEGRATION_NAME);
       const integrationOpts = integration?.options;
       const defaultPii = Boolean(scopeClient?.getOptions().sendDefaultPii);