Move stuff to sub folder, update with small refactor

Author: RulaKhaled

packages/core/src/index.ts

@@ -125,8 +125,8 @@ 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 type { OpenAiClient, OpenAiOptions, InstrumentedMethod } from './utils/openai-types';
+export { INTEGRATION_NAME } from './utils/openai/constants';
+export type { OpenAiClient, OpenAiOptions, InstrumentedMethod } from './utils/openai/types';
 export type { FeatureFlag } from './utils/featureFlags';
 export {
   _INTERNAL_copyFlagsFromScopeToEvent,

packages/core/src/utils/openai-constants.ts renamed to packages/core/src/utils/openai/constants.ts

@@ -1,7 +1,7 @@
-import { getCurrentScope } from '../currentScopes';
-import { captureException } from '../exports';
-import { startSpan } from '../tracing/trace';
-import type { Span, SpanAttributeValue } from '../types-hoist/span';
+import { getCurrentScope } from '../../currentScopes';
+import { captureException } from '../../exports';
+import { startSpan } from '../../tracing/trace';
+import type { Span, SpanAttributeValue } from '../../types-hoist/span';
 import {
   GEN_AI_OPERATION_NAME_ATTRIBUTE,
   GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE,
@@ -23,8 +23,8 @@ import {
   OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE,
   OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE,
   OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE,
-} from './gen-ai-attributes';
-import { INTEGRATION_NAME } from './openai-constants';
+} from '../gen-ai-attributes';
+import { INTEGRATION_NAME } from './constants';
 import type {
   InstrumentedMethod,
   OpenAiChatCompletionObject,
@@ -33,15 +33,15 @@ import type {
   OpenAiOptions,
   OpenAiResponse,
   OpenAIResponseObject,
-} from './openai-types';
+} from './types';
 import {
   buildMethodPath,
   getOperationName,
   getSpanOperation,
   isChatCompletionResponse,
   isResponsesApiResponse,
   shouldInstrument,
-} from './openai-utils';
+} from './utils';
 
 /**
  * Extract request attributes from method arguments

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

@@ -1,4 +1,4 @@
-import type { INSTRUMENTED_METHODS } from './openai-constants';
+import type { INSTRUMENTED_METHODS } from './constants';
 
 /**
  * Attribute values may be any non-nullish primitive value except an object.

packages/core/src/utils/openai-types.ts renamed to packages/core/src/utils/openai/types.ts

@@ -1,6 +1,6 @@
-import { OPENAI_OPERATIONS } from './gen-ai-attributes';
-import { INSTRUMENTED_METHODS } from './openai-constants';
-import type { InstrumentedMethod, OpenAiChatCompletionObject, OpenAIResponseObject } from './openai-types';
+import { OPENAI_OPERATIONS } from '../gen-ai-attributes';
+import { INSTRUMENTED_METHODS } from './constants';
+import type { InstrumentedMethod, OpenAiChatCompletionObject, OpenAIResponseObject } from './types';
 
 /**
  * Maps OpenAI method paths to Sentry operation names

packages/core/src/utils/openai-utils.ts renamed to packages/core/src/utils/openai/utils.ts

@@ -6,7 +6,7 @@ import {
   isChatCompletionResponse,
   isResponsesApiResponse,
   shouldInstrument,
-} from '../../../src/utils/openai-utils';
+} from '../../../src/utils/openai/utils';
 
 describe('openai-utils', () => {
   describe('getOperationName', () => {

packages/core/test/lib/utils/openai-utils.test.ts

@@ -7,6 +7,8 @@ import {
 import type { Integration, OpenAiClient, OpenAiOptions } from '@sentry/core';
 import { getCurrentScope, instrumentOpenAiClient, INTEGRATION_NAME, SDK_VERSION } from '@sentry/core';
 
+const supportedVersions = ['>=4.0.0 <6'];
+
 export interface OpenAiIntegration extends Integration {
   options: OpenAiOptions;
 }
@@ -46,7 +48,7 @@ export class SentryOpenAiInstrumentation extends InstrumentationBase<Instrumenta
    * Initializes the instrumentation by defining the modules to be patched.
    */
   public init(): InstrumentationModuleDefinition {
-    const module = new InstrumentationNodeModuleDefinition('openai', ['>=4.0.0'], this._patch.bind(this));
+    const module = new InstrumentationNodeModuleDefinition('openai', supportedVersions, this._patch.bind(this));
     return module;
   }
 
@@ -76,7 +78,7 @@ export class SentryOpenAiInstrumentation extends InstrumentationBase<Instrumenta
       const scopeClient = getCurrentScope().getClient();
       const integration = scopeClient?.getIntegrationByName<OpenAiIntegration>(INTEGRATION_NAME);
       const integrationOpts = integration?.options;
-      const defaultPii = integration ? Boolean(scopeClient?.getOptions().sendDefaultPii) : false;
+      const defaultPii = Boolean(scopeClient?.getOptions().sendDefaultPii);
 
       const { recordInputs, recordOutputs } = determineRecordingSettings(integrationOpts, defaultPii);