Merge branch 'develop' into instrument-genai-google

Author: RulaKhaled

.github/ISSUE_TEMPLATE/bug.yml

@@ -133,6 +133,16 @@ body:
       description: Logs? Screenshots? Yes, please.
     validations:
       required: true
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description:
+        Add any other context here. Please keep the pre-filled text, which helps us manage issue prioritization.
+      value: |-
+        <sub>Tip: React with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it.</sub>
+    validations:
+      required: false
   - type: markdown
     attributes:
       value: |-

.github/ISSUE_TEMPLATE/feature.yml

@@ -23,6 +23,16 @@ body:
         Add a blender to Sentry.
     validations:
       required: true
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description:
+        Add any other context here. Please keep the pre-filled text, which helps us manage feature prioritization.
+      value: |-
+        <sub>Tip: React with 👍 to help prioritize this improvement. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it.</sub>
+    validations:
+      required: false
   - type: markdown
     attributes:
       value: |-

CHANGELOG.md

@@ -6,6 +6,12 @@
 
 ### Important Changes
 
+- **feat(node) Ensure `prismaIntegration` works with Prisma 5 ([#17595](https://github.com/getsentry/sentry-javascript/pull/17595))**
+
+We used to require to pass in the v5 version of `@prisma/instrumentation` into `prismaIntegration({ prismaInstrumentation: new PrismaInstrumentation() })`, if you wanted to get full instrumentation for Prisma v5. However, it turns out this does not work on v10 of the SDK anymore, because `@prisma/instrumentation@5` requires OTEL v1.
+
+With this release, we dropped the requirement to configure anything to get v5 support of Prisma. You do not need to configure anything in the integration anymore, and can remove the dependency on `@prisma/instrumentation@5` if you had it in your application. You only need to configure the `tracing` preview feature [according to our docs](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/prisma/).
+
 - **feat(deps): Update OpenTelemetry dependencies ([#17558](https://github.com/getsentry/sentry-javascript/pull/17558))**
   - @opentelemetry/core bumped to ^2.1.0
   - @opentelemetry/context-async-hooks bumped to ^2.1.0

dev-packages/cloudflare-integration-tests/suites/tracing/anthropic-ai/index.ts

@@ -0,0 +1,32 @@
+import * as Sentry from '@sentry/cloudflare';
+import type { AnthropicAiClient } from '@sentry/core';
+import { MockAnthropic } from './mocks';
+
+interface Env {
+  SENTRY_DSN: string;
+}
+
+const mockClient = new MockAnthropic({
+  apiKey: 'mock-api-key',
+});
+
+const client: AnthropicAiClient = Sentry.instrumentAnthropicAiClient(mockClient);
+
+export default Sentry.withSentry(
+  (env: Env) => ({
+    dsn: env.SENTRY_DSN,
+    tracesSampleRate: 1.0,
+  }),
+  {
+    async fetch(_request, _env, _ctx) {
+      const response = await client.messages?.create({
+        model: 'claude-3-haiku-20240307',
+        messages: [{ role: 'user', content: 'What is the capital of France?' }],
+        temperature: 0.7,
+        max_tokens: 100,
+      });
+
+      return new Response(JSON.stringify(response));
+    },
+  },
+);

dev-packages/cloudflare-integration-tests/suites/tracing/anthropic-ai/mocks.ts

@@ -0,0 +1,68 @@
+import type { AnthropicAiClient, AnthropicAiResponse } from '@sentry/core';
+
+export class MockAnthropic implements AnthropicAiClient {
+  public messages: {
+    create: (...args: unknown[]) => Promise<AnthropicAiResponse>;
+    countTokens: (...args: unknown[]) => Promise<AnthropicAiResponse>;
+  };
+  public models: {
+    list: (...args: unknown[]) => Promise<AnthropicAiResponse>;
+    get: (...args: unknown[]) => Promise<AnthropicAiResponse>;
+  };
+  public completions: {
+    create: (...args: unknown[]) => Promise<AnthropicAiResponse>;
+  };
+  public apiKey: string;
+
+  public constructor(config: { apiKey: string }) {
+    this.apiKey = config.apiKey;
+
+    // Main focus: messages.create functionality
+    this.messages = {
+      create: async (...args: unknown[]) => {
+        const params = args[0] as { model: string; stream?: boolean };
+        // Simulate processing time
+        await new Promise(resolve => setTimeout(resolve, 10));
+
+        if (params.model === 'error-model') {
+          const error = new Error('Model not found');
+          (error as unknown as { status: number }).status = 404;
+          (error as unknown as { headers: Record<string, string> }).headers = { 'x-request-id': 'mock-request-123' };
+          throw error;
+        }
+
+        return {
+          id: 'msg_mock123',
+          type: 'message',
+          role: 'assistant',
+          model: params.model,
+          content: [
+            {
+              type: 'text',
+              text: 'Hello from Anthropic mock!',
+            },
+          ],
+          stop_reason: 'end_turn',
+          stop_sequence: null,
+          usage: {
+            input_tokens: 10,
+            output_tokens: 15,
+            cache_creation_input_tokens: 0,
+            cache_read_input_tokens: 0,
+          },
+        };
+      },
+      countTokens: async (..._args: unknown[]) => ({ id: 'mock', type: 'model', model: 'mock', input_tokens: 0 }),
+    };
+
+    // Minimal implementations for required interface compliance
+    this.models = {
+      list: async (..._args: unknown[]) => ({ id: 'mock', type: 'model', model: 'mock' }),
+      get: async (..._args: unknown[]) => ({ id: 'mock', type: 'model', model: 'mock' }),
+    };
+
+    this.completions = {
+      create: async (..._args: unknown[]) => ({ id: 'mock', type: 'completion', model: 'mock' }),
+    };
+  }
+}

dev-packages/cloudflare-integration-tests/suites/tracing/anthropic-ai/test.ts

@@ -0,0 +1,41 @@
+import { expect, it } from 'vitest';
+import { createRunner } from '../../../runner';
+
+// These tests are not exhaustive because the instrumentation is
+// already tested in the node integration tests and we merely
+// want to test that the instrumentation does not break in our
+// cloudflare SDK.
+
+it('traces a basic message creation request', async () => {
+  const runner = createRunner(__dirname)
+    .ignore('event')
+    .expect(envelope => {
+      const transactionEvent = envelope[1]?.[0]?.[1] as any;
+
+      expect(transactionEvent.transaction).toBe('GET /');
+      expect(transactionEvent.spans).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            data: expect.objectContaining({
+              'gen_ai.operation.name': 'messages',
+              'sentry.op': 'gen_ai.messages',
+              'sentry.origin': 'auto.ai.anthropic',
+              'gen_ai.system': 'anthropic',
+              'gen_ai.request.model': 'claude-3-haiku-20240307',
+              'gen_ai.request.temperature': 0.7,
+              'gen_ai.response.model': 'claude-3-haiku-20240307',
+              'gen_ai.response.id': 'msg_mock123',
+              'gen_ai.usage.input_tokens': 10,
+              'gen_ai.usage.output_tokens': 15,
+            }),
+            description: 'messages claude-3-haiku-20240307',
+            op: 'gen_ai.messages',
+            origin: 'auto.ai.anthropic',
+          }),
+        ]),
+      );
+    })
+    .start();
+  await runner.makeRequest('get', '/');
+  await runner.completed();
+});

dev-packages/cloudflare-integration-tests/suites/tracing/anthropic-ai/wrangler.jsonc

@@ -0,0 +1,6 @@
+{
+  "name": "worker-name",
+  "compatibility_date": "2025-06-17",
+  "main": "index.ts",
+  "compatibility_flags": ["nodejs_compat"],
+}

dev-packages/e2e-tests/test-applications/angular-20/package.json

@@ -44,9 +44,17 @@
     "karma-coverage": "~2.2.0",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~5.8.3"
+    "typescript": "~5.9.0"
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "sentryTest": {
+    "optionalVariants": [
+      {
+        "build-command": "pnpm test:build-canary",
+        "label": "angular (canary)"
+      }
+    ]
   }
 }

dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts

@@ -160,7 +160,7 @@ test.describe('Lambda layer', () => {
         type: 'Error',
         value: 'test',
         mechanism: {
-          type: 'auto.function.aws-serverless.otel',
+          type: 'auto.function.aws_serverless.otel',
           handled: false,
         },
       }),
@@ -188,7 +188,7 @@ test.describe('Lambda layer', () => {
         type: 'Error',
         value: 'test esm',
         mechanism: {
-          type: 'auto.function.aws-serverless.otel',
+          type: 'auto.function.aws_serverless.otel',
           handled: false,
         },
       }),

dev-packages/e2e-tests/test-applications/nextjs-13/middleware.ts

@@ -0,0 +1,6 @@
+import { NextResponse } from 'next/server';
+
+export function middleware() {
+  // Basic middleware to ensure that the build works with edge runtime
+  return NextResponse.next();
+}