Merge branch 'develop' into nh/openai-embeddings-api

Author: nicohrubec

.github/ISSUE_TEMPLATE/bug.yml

@@ -136,13 +136,14 @@ body:
     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>
+      description: Add any other context here.
     validations:
       required: false
-  - type: markdown
+  - type: dropdown
     attributes:
-      value: |-
-        ## Thanks 🙏
+      label: 'Priority'
+      description: Please keep the pre-filled option, which helps us manage issue prioritization.
+      default: 0
+      options:
+        - <sub>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>

.github/ISSUE_TEMPLATE/feature.yml

@@ -27,14 +27,14 @@ body:
     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>
+      description: Add any other context here.
     validations:
       required: false
-  - type: markdown
+  - type: dropdown
     attributes:
-      value: |-
-        ## Thanks 🙏
-        Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.
+      label: 'Priority'
+      description: Please keep the pre-filled option, which helps us manage issue prioritization.
+      default: 0
+      options:
+        - <sub>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>

.size-limit.js

@@ -38,7 +38,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '41.3 KB',
+    limit: '41.38 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Profiling)',
@@ -127,7 +127,7 @@ module.exports = [
     import: createImport('init', 'ErrorBoundary', 'reactRouterV6BrowserTracingIntegration'),
     ignore: ['react/jsx-runtime'],
     gzip: true,
-    limit: '43.3 KB',
+    limit: '43.33 KB',
   },
   // Vue SDK (ESM)
   {
@@ -142,7 +142,7 @@ module.exports = [
     path: 'packages/vue/build/esm/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '43.1 KB',
+    limit: '43.2 KB',
   },
   // Svelte SDK (ESM)
   {

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
+
 - fix(node): Fix Spotlight configuration precedence to match specification (#18195)
 
 ## 10.25.0

dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/init.js

@@ -0,0 +1,25 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0.0',
+  environment: 'test',
+  integrations: integrations => {
+    return integrations.filter(integration => integration.name !== 'BrowserSession');
+  },
+  beforeSendMetric: metric => {
+    if (metric.name === 'test.counter') {
+      return {
+        ...metric,
+        attributes: {
+          ...metric.attributes,
+          modified: 'by-beforeSendMetric',
+          original: undefined,
+        },
+      };
+    }
+    return metric;
+  },
+});

dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/subject.js

@@ -0,0 +1,14 @@
+// Store captured metrics from the afterCaptureMetric event
+window.capturedMetrics = [];
+
+const client = Sentry.getClient();
+
+client.on('afterCaptureMetric', metric => {
+  window.capturedMetrics.push(metric);
+});
+
+// Capture metrics - these should be processed by beforeSendMetric
+Sentry.metrics.count('test.counter', 1, { attributes: { endpoint: '/api/test', original: 'value' } });
+Sentry.metrics.gauge('test.gauge', 42, { unit: 'millisecond', attributes: { server: 'test-1' } });
+
+Sentry.flush();

dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/test.ts

@@ -0,0 +1,59 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../utils/fixtures';
+
+sentryTest(
+  'should emit afterCaptureMetric event with processed metric from beforeSendMetric',
+  async ({ getLocalTestUrl, page }) => {
+    const bundle = process.env.PW_BUNDLE || '';
+    if (bundle.startsWith('bundle') || bundle.startsWith('loader')) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+    await page.goto(url);
+
+    await page.waitForFunction(() => {
+      return (window as any).capturedMetrics.length >= 2;
+    });
+
+    const capturedMetrics = await page.evaluate(() => {
+      return (window as any).capturedMetrics;
+    });
+
+    expect(capturedMetrics).toHaveLength(2);
+
+    // Verify the counter metric was modified by beforeSendMetric
+    expect(capturedMetrics[0]).toMatchObject({
+      name: 'test.counter',
+      type: 'counter',
+      value: 1,
+      attributes: {
+        endpoint: '/api/test',
+        modified: 'by-beforeSendMetric',
+        'sentry.release': '1.0.0',
+        'sentry.environment': 'test',
+        'sentry.sdk.name': 'sentry.javascript.browser',
+      },
+    });
+
+    // Verify the 'original' attribute was removed by beforeSendMetric
+    expect(capturedMetrics[0].attributes.original).toBeUndefined();
+
+    // Verify the gauge metric was not modified (no beforeSendMetric processing)
+    expect(capturedMetrics[1]).toMatchObject({
+      name: 'test.gauge',
+      type: 'gauge',
+      unit: 'millisecond',
+      value: 42,
+      attributes: {
+        server: 'test-1',
+        'sentry.release': '1.0.0',
+        'sentry.environment': 'test',
+        'sentry.sdk.name': 'sentry.javascript.browser',
+      },
+    });
+
+    expect(capturedMetrics[0].attributes['sentry.sdk.version']).toBeDefined();
+    expect(capturedMetrics[1].attributes['sentry.sdk.version']).toBeDefined();
+  },
+);

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

@@ -0,0 +1,48 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends a transaction for a request to app router with URL', async ({ page }) => {
+  const serverComponentTransactionPromise = waitForTransaction('nextjs-13', transactionEvent => {
+    return (
+      transactionEvent?.transaction === 'GET /parameterized/[one]/beep/[two]' &&
+      transactionEvent.contexts?.trace?.data?.['http.target']?.startsWith('/parameterized/1337/beep/42')
+    );
+  });
+
+  await page.goto('/parameterized/1337/beep/42');
+
+  const transactionEvent = await serverComponentTransactionPromise;
+
+  expect(transactionEvent.contexts?.trace).toEqual({
+    data: expect.objectContaining({
+      'sentry.op': 'http.server',
+      'sentry.origin': 'auto',
+      'sentry.sample_rate': 1,
+      'sentry.source': 'route',
+      'http.method': 'GET',
+      'http.response.status_code': 200,
+      'http.route': '/parameterized/[one]/beep/[two]',
+      'http.status_code': 200,
+      'http.target': '/parameterized/1337/beep/42',
+      'otel.kind': 'SERVER',
+      'next.route': '/parameterized/[one]/beep/[two]',
+    }),
+    op: 'http.server',
+    origin: 'auto',
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    status: 'ok',
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+  });
+
+  expect(transactionEvent.request).toMatchObject({
+    url: expect.stringContaining('/parameterized/1337/beep/42'),
+  });
+
+  // The transaction should not contain any spans with the same name as the transaction
+  // e.g. "GET /parameterized/[one]/beep/[two]"
+  expect(
+    transactionEvent.spans?.filter(span => {
+      return span.description === transactionEvent.transaction;
+    }),
+  ).toHaveLength(0);
+});

dev-packages/e2e-tests/test-applications/nextjs-15/app/isr-test/[product]/page.tsx

@@ -0,0 +1,17 @@
+export const revalidate = 60; // ISR: revalidate every 60 seconds
+export const dynamicParams = true; // Allow dynamic params beyond generateStaticParams
+
+export async function generateStaticParams(): Promise<Array<{ product: string }>> {
+  return [{ product: 'laptop' }, { product: 'phone' }, { product: 'tablet' }];
+}
+
+export default async function ISRProductPage({ params }: { params: Promise<{ product: string }> }) {
+  const { product } = await params;
+
+  return (
+    <div>
+      <h1>ISR Product: {product}</h1>
+      <div id="isr-product-id">{product}</div>
+    </div>
+  );
+}

dev-packages/e2e-tests/test-applications/nextjs-15/app/isr-test/static/page.tsx

@@ -0,0 +1,15 @@
+export const revalidate = 60; // ISR: revalidate every 60 seconds
+export const dynamicParams = true;
+
+export async function generateStaticParams(): Promise<never[]> {
+  return [];
+}
+
+export default function ISRStaticPage() {
+  return (
+    <div>
+      <h1>ISR Static Page</h1>
+      <div id="isr-static-marker">static-isr</div>
+    </div>
+  );
+}