remove modules

Author: mydea

packages/cloudflare/src/index.ts

@@ -108,7 +108,6 @@ export { getDefaultIntegrations } from './sdk';
 
 export { fetchIntegration } from './integrations/fetch';
 export { vercelAIIntegration } from './integrations/tracing/vercelai';
-export { modulesIntegration } from './integrations/modules';
 
 export { instrumentD1WithSentry } from './d1';
 

packages/cloudflare/src/integrations/modules.ts

@@ -8,51 +8,27 @@
  * and users have to manually set this to get spans.
  */
 
-import type { Client, IntegrationFn } from '@sentry/core';
+import type { IntegrationFn } from '@sentry/core';
 import { addVercelAiProcessors, defineIntegration } from '@sentry/core';
-import type { modulesIntegration } from '../modules';
-
-interface VercelAiOptions {
-  /**
-   * By default, the instrumentation will register span processors only when the ai package is used.
-   * If you want to register the span processors even when the ai package usage cannot be detected, you can set `force` to `true`.
-   */
-  force?: boolean;
-}
 
 const INTEGRATION_NAME = 'VercelAI';
 
-/**
- * Determines if the integration should be forced based on environment and package availability.
- * Returns true if the 'ai' package is available.
- */
-function shouldRunIntegration(client: Client): boolean {
-  const modules = client.getIntegrationByName<ReturnType<typeof modulesIntegration>>('Modules');
-  return !!modules?.getModules?.()?.ai;
-}
-
-const _vercelAIIntegration = ((options: VercelAiOptions = {}) => {
+const _vercelAIIntegration = (() => {
   return {
     name: INTEGRATION_NAME,
-    options,
     setup(client) {
-      if (options.force || shouldRunIntegration(client)) {
-        addVercelAiProcessors(client);
-      }
+      addVercelAiProcessors(client);
     },
   };
 }) satisfies IntegrationFn;
 
 /**
  * Adds Sentry tracing instrumentation for the [ai](https://www.npmjs.com/package/ai) library.
+ * This integration is not enabled by default, you need to manually add it.
  *
  * For more information, see the [`ai` documentation](https://sdk.vercel.ai/docs/ai-sdk-core/telemetry).
  *
- * The integration automatically detects when to force registration
- * when the 'ai' package is available. You can still manually set the `force` option if needed.
- *
- * Unlike the Vercel AI integration in the node SDK, this integration does not add tracing support to
- * `ai` function calls. You need to enable collecting spans for a specific call by setting
+ *  You need to enable collecting spans for a specific call by setting
  * `experimental_telemetry.isEnabled` to `true` in the first argument of the function call.
  *
  * ```javascript

packages/cloudflare/src/integrations/tracing/vercelai.ts

@@ -13,8 +13,6 @@ import {
 import type { CloudflareClientOptions, CloudflareOptions } from './client';
 import { CloudflareClient } from './client';
 import { fetchIntegration } from './integrations/fetch';
-import { modulesIntegration } from './integrations/modules';
-import { vercelAIIntegration } from './integrations/tracing/vercelai';
 import { setupOpenTelemetryTracer } from './opentelemetry/tracer';
 import { makeCloudflareTransport } from './transport';
 import { defaultStackParser } from './vendor/stacktrace';
@@ -32,11 +30,9 @@ export function getDefaultIntegrations(options: CloudflareOptions): Integration[
     functionToStringIntegration(),
     linkedErrorsIntegration(),
     fetchIntegration(),
-    modulesIntegration(),
     // TODO(v10): the `include` object should be defined directly in the integration based on `sendDefaultPii`
     requestDataIntegration(sendDefaultPii ? undefined : { include: { cookies: false } }),
     consoleIntegration(),
-    vercelAIIntegration(),
   ];
 }
 

packages/cloudflare/src/sdk.ts

@@ -42,6 +42,7 @@ const _vercelAIIntegration = ((options: VercelAiOptions = {}) => {
 
 /**
  * Adds Sentry tracing instrumentation for the [ai](https://www.npmjs.com/package/ai) library.
+ * This integration is not enabled by default, you need to manually add it.
  *
  * For more information, see the [`ai` documentation](https://sdk.vercel.ai/docs/ai-sdk-core/telemetry).
  *
@@ -54,17 +55,14 @@ const _vercelAIIntegration = ((options: VercelAiOptions = {}) => {
  * });
  * ```
  *
- * The integration automatically detects when to force registration in CommonJS environments
- * when the 'ai' package is available. You can still manually set the `force` option if needed.
- *
- * By default this integration adds tracing support to all `ai` function calls. If you need to disable
- * collecting spans for a specific call, you can do so by setting `experimental_telemetry.isEnabled` to
- * `false` in the first argument of the function call.
+ * This integration adds tracing support to all `ai` function calls.
+ * You need to opt-in to collecting spans for a specific call,
+ * you can do so by setting `experimental_telemetry.isEnabled` to `true` in the first argument of the function call.
  *
  * ```javascript
  * const result = await generateText({
  *   model: openai('gpt-4-turbo'),
- *   experimental_telemetry: { isEnabled: false },
+ *   experimental_telemetry: { isEnabled: true },
  * });
  * ```
  *