Merge branch 'develop' into onur/firebase-instrumentation

Author: onurtemizkan

.github/workflows/build.yml

@@ -47,8 +47,6 @@ env:
     ${{ github.workspace }}/packages/*/lib
     ${{ github.workspace }}/packages/ember/*.d.ts
     ${{ github.workspace }}/packages/gatsby/*.d.ts
-    ${{ github.workspace }}/packages/utils/cjs
-    ${{ github.workspace }}/packages/utils/esm
 
   BUILD_CACHE_TARBALL_KEY: tarball-${{ github.event.inputs.commit || github.sha }}
 
@@ -950,13 +948,13 @@ jobs:
           retention-days: 7
 
       - name: Pre-process E2E Test Dumps
-        if: always()
+        if: failure()
         run: |
           node ./scripts/normalize-e2e-test-dump-transaction-events.js
 
       - name: Upload E2E Test Event Dumps
         uses: actions/upload-artifact@v4
-        if: always()
+        if: failure()
         with:
           name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
           path: ${{ runner.temp }}/test-application/event-dumps
@@ -1062,13 +1060,13 @@ jobs:
         run: pnpm ${{ matrix.assert-command || 'test:assert' }}
 
       - name: Pre-process E2E Test Dumps
-        if: always()
+        if: failure()
         run: |
           node ./scripts/normalize-e2e-test-dump-transaction-events.js
 
       - name: Upload E2E Test Event Dumps
         uses: actions/upload-artifact@v4
-        if: always()
+        if: failure()
         with:
           name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
           path: ${{ runner.temp }}/test-application/event-dumps

MIGRATION.md

@@ -70,3 +70,20 @@ Additionally, we hold ourselves accountable to any security issues, meaning that
 
 Note, that it is decided on a case-per-case basis, what gets backported or not.
 If you need a fix or feature in a previous version of the SDK, please reach out via a GitHub Issue.
+
+## 3. Behaviour Changes
+
+### Removal of First Input Delay (FID) Web Vital Reporting
+
+Affected SDKs: All SDKs running in browser applications (`@sentry/browser`, `@sentry/react`, `@sentry/nextjs`, etc.)
+
+In v10, the SDK stopped reporting the First Input Delay (FID) web vital.
+This was done because FID has been replaced by Interaction to Next Paint (INP) and is therefore no longer relevant for assessing and tracking a website's performance.
+For reference, FID has long been deprecated by Google's official `web-vitals` library and was eventually removed in version `5.0.0`.
+Sentry now follows Google's lead by also removing it.
+
+The removal entails **no breaking API changes**. However, in rare cases, you might need to adjust some of your Sentry SDK and product setup:
+
+- Remove any logic in `beforeSend` or other filtering/event processing logic that depends on FID or replace it with INP logic.
+- If you set up Sentry Alerts that depend on FID, be aware that these could trigger once you upgrade the SDK, due to a lack of new values.
+  To replace them, adjust your alerts (or dashbaords) to use INP.

dev-packages/browser-integration-tests/suites/replay/customEvents/test.ts

@@ -4,7 +4,6 @@ import {
   expectedClickBreadcrumb,
   expectedCLSPerformanceSpan,
   expectedFCPPerformanceSpan,
-  expectedFIDPerformanceSpan,
   expectedFPPerformanceSpan,
   expectedLCPPerformanceSpan,
   expectedMemoryPerformanceSpan,
@@ -56,7 +55,6 @@ sentryTest(
         expectedNavigationPerformanceSpan,
         expectedLCPPerformanceSpan,
         expectedCLSPerformanceSpan,
-        expectedFIDPerformanceSpan,
         expectedFPPerformanceSpan,
         expectedFCPPerformanceSpan,
         expectedMemoryPerformanceSpan, // two memory spans - once per flush

dev-packages/browser-integration-tests/suites/replay/multiple-pages/test.ts

@@ -4,7 +4,6 @@ import {
   expectedClickBreadcrumb,
   expectedCLSPerformanceSpan,
   expectedFCPPerformanceSpan,
-  expectedFIDPerformanceSpan,
   expectedFPPerformanceSpan,
   expectedLCPPerformanceSpan,
   expectedMemoryPerformanceSpan,
@@ -77,7 +76,6 @@ sentryTest(
         expectedNavigationPerformanceSpan,
         expectedLCPPerformanceSpan,
         expectedCLSPerformanceSpan,
-        expectedFIDPerformanceSpan,
         expectedFPPerformanceSpan,
         expectedFCPPerformanceSpan,
         expectedMemoryPerformanceSpan, // two memory spans - once per flush
@@ -117,7 +115,6 @@ sentryTest(
         expectedReloadPerformanceSpan,
         expectedLCPPerformanceSpan,
         expectedCLSPerformanceSpan,
-        expectedFIDPerformanceSpan,
         expectedFPPerformanceSpan,
         expectedFCPPerformanceSpan,
         expectedMemoryPerformanceSpan,
@@ -188,7 +185,6 @@ sentryTest(
         expectedNavigationPerformanceSpan,
         expectedLCPPerformanceSpan,
         expectedCLSPerformanceSpan,
-        expectedFIDPerformanceSpan,
         expectedFPPerformanceSpan,
         expectedFCPPerformanceSpan,
         expectedMemoryPerformanceSpan,
@@ -326,7 +322,6 @@ sentryTest(
         expectedNavigationPerformanceSpan,
         expectedLCPPerformanceSpan,
         expectedCLSPerformanceSpan,
-        expectedFIDPerformanceSpan,
         expectedFPPerformanceSpan,
         expectedFCPPerformanceSpan,
         expectedMemoryPerformanceSpan,

dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/template.html

@@ -148,19 +148,6 @@ export const expectedCLSPerformanceSpan = {
   },
 };
 
-export const expectedFIDPerformanceSpan = {
-  op: 'web-vital',
-  description: 'first-input-delay',
-  startTimestamp: expect.any(Number),
-  endTimestamp: expect.any(Number),
-  data: {
-    value: expect.any(Number),
-    rating: expect.any(String),
-    size: expect.any(Number),
-    nodeIds: expect.any(Array),
-  },
-};
-
 export const expectedINPPerformanceSpan = {
   op: 'web-vital',
   description: 'interaction-to-next-paint',

dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts

@@ -143,8 +143,27 @@ function getAffectedTestApplications(
     .map(line => line.trim())
     .filter(Boolean);
 
-  // If something in e2e tests themselves are changed, just run everything
+  // If something in e2e tests themselves are changed, check if only test applications were changed
   if (affectedProjects.includes('@sentry-internal/e2e-tests')) {
+    try {
+      const changedTestApps = getChangedTestApps(base, head);
+
+      // Shared code was changed, run all tests
+      if (changedTestApps === false) {
+        return testApplications;
+      }
+
+      // Only test applications that were changed, run selectively
+      if (changedTestApps.size > 0) {
+        return testApplications.filter(testApp => changedTestApps.has(testApp));
+      }
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error('Failed to get changed files, running all tests:', error);
+      return testApplications;
+    }
+
+    // Fall back to running all tests
     return testApplications;
   }
 
@@ -153,3 +172,32 @@ function getAffectedTestApplications(
     return sentryDependencies.some(dep => affectedProjects.includes(dep));
   });
 }
+
+function getChangedTestApps(base: string, head?: string): false | Set<string> {
+  const changedFiles = execSync(`git diff --name-only ${base}${head ? `..${head}` : ''} -- dev-packages/e2e-tests/`, {
+    encoding: 'utf-8',
+  })
+    .toString()
+    .split('\n')
+    .map(line => line.trim())
+    .filter(Boolean);
+
+  const changedTestApps: Set<string> = new Set();
+  const testAppsPrefix = 'dev-packages/e2e-tests/test-applications/';
+
+  for (const file of changedFiles) {
+    if (!file.startsWith(testAppsPrefix)) {
+      // Shared code change - need to run all tests
+      return false;
+    }
+
+    const pathAfterPrefix = file.slice(testAppsPrefix.length);
+    const slashIndex = pathAfterPrefix.indexOf('/');
+
+    if (slashIndex > 0) {
+      changedTestApps.add(pathAfterPrefix.slice(0, slashIndex));
+    }
+  }
+
+  return changedTestApps;
+}

dev-packages/browser-integration-tests/utils/replayEventTemplates.ts

@@ -0,0 +1,10 @@
+---
+import Layout from '../../layouts/Layout.astro';
+
+export const prerender = false;
+
+---
+
+<Layout title="User Settings">
+  <h1>User Settings</h1>
+</Layout>

dev-packages/e2e-tests/lib/getTestMatrix.ts

@@ -30,11 +30,11 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
         trace: {
           data: expect.objectContaining({
             'sentry.op': 'pageload',
-            'sentry.origin': 'auto.pageload.browser',
-            'sentry.source': 'url',
+            'sentry.origin': 'auto.pageload.astro',
+            'sentry.source': 'route',
           }),
           op: 'pageload',
-          origin: 'auto.pageload.browser',
+          origin: 'auto.pageload.astro',
           span_id: expect.stringMatching(/[a-f0-9]{16}/),
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -55,9 +55,7 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       transaction: '/test-ssr',
-      transaction_info: {
-        source: 'url',
-      },
+      transaction_info: { source: 'route' },
       type: 'transaction',
     });
 
@@ -113,9 +111,7 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       transaction: 'GET /test-ssr',
-      transaction_info: {
-        source: 'route',
-      },
+      transaction_info: { source: 'route' },
       type: 'transaction',
     });
   });
@@ -194,18 +190,21 @@ test.describe('nested SSR routes (client, server, server request)', () => {
       span => span.op === 'http.client' && span.description?.includes('/api/user/'),
     );
 
+    const routeNameMetaContent = await page.locator('meta[name="sentry-route-name"]').getAttribute('content');
+    expect(routeNameMetaContent).toBe('%2Fuser-page%2F%5BuserId%5D');
+
     // Client pageload transaction - actual URL with pageload operation
     expect(clientPageloadTxn).toMatchObject({
-      transaction: '/user-page/myUsername123', // todo: parametrize
-      transaction_info: { source: 'url' },
+      transaction: '/user-page/[userId]',
+      transaction_info: { source: 'route' },
       contexts: {
         trace: {
           op: 'pageload',
-          origin: 'auto.pageload.browser',
+          origin: 'auto.pageload.astro',
           data: {
             'sentry.op': 'pageload',
-            'sentry.origin': 'auto.pageload.browser',
-            'sentry.source': 'url',
+            'sentry.origin': 'auto.pageload.astro',
+            'sentry.source': 'route',
           },
         },
       },
@@ -275,20 +274,23 @@ test.describe('nested SSR routes (client, server, server request)', () => {
 
     await page.goto('/catchAll/hell0/whatever-do');
 
+    const routeNameMetaContent = await page.locator('meta[name="sentry-route-name"]').getAttribute('content');
+    expect(routeNameMetaContent).toBe('%2FcatchAll%2F%5Bpath%5D');
+
     const clientPageloadTxn = await clientPageloadTxnPromise;
     const serverPageRequestTxn = await serverPageRequestTxnPromise;
 
     expect(clientPageloadTxn).toMatchObject({
-      transaction: '/catchAll/hell0/whatever-do', // todo: parametrize
-      transaction_info: { source: 'url' },
+      transaction: '/catchAll/[path]',
+      transaction_info: { source: 'route' },
       contexts: {
         trace: {
           op: 'pageload',
-          origin: 'auto.pageload.browser',
+          origin: 'auto.pageload.astro',
           data: {
             'sentry.op': 'pageload',
-            'sentry.origin': 'auto.pageload.browser',
-            'sentry.source': 'url',
+            'sentry.origin': 'auto.pageload.astro',
+            'sentry.source': 'route',
           },
         },
       },
@@ -313,3 +315,55 @@ test.describe('nested SSR routes (client, server, server request)', () => {
     });
   });
 });
+
+// Case for `user-page/[id]` vs. `user-page/settings` static routes
+test.describe('parametrized vs static paths', () => {
+  test('should use static route name for static route in parametrized path', async ({ page }) => {
+    const clientPageloadTxnPromise = waitForTransaction('astro-4', txnEvent => {
+      return txnEvent?.transaction?.startsWith('/user-page/') ?? false;
+    });
+
+    const serverPageRequestTxnPromise = waitForTransaction('astro-4', txnEvent => {
+      return txnEvent?.transaction?.startsWith('GET /user-page/') ?? false;
+    });
+
+    await page.goto('/user-page/settings');
+
+    const clientPageloadTxn = await clientPageloadTxnPromise;
+    const serverPageRequestTxn = await serverPageRequestTxnPromise;
+
+    expect(clientPageloadTxn).toMatchObject({
+      transaction: '/user-page/settings',
+      transaction_info: { source: 'route' },
+      contexts: {
+        trace: {
+          op: 'pageload',
+          origin: 'auto.pageload.astro',
+          data: {
+            'sentry.op': 'pageload',
+            'sentry.origin': 'auto.pageload.astro',
+            'sentry.source': 'route',
+          },
+        },
+      },
+    });
+
+    expect(serverPageRequestTxn).toMatchObject({
+      transaction: 'GET /user-page/settings',
+      transaction_info: { source: 'route' },
+      contexts: {
+        trace: {
+          op: 'http.server',
+          origin: 'auto.http.astro',
+          data: {
+            'sentry.op': 'http.server',
+            'sentry.origin': 'auto.http.astro',
+            'sentry.source': 'route',
+            url: expect.stringContaining('/user-page/settings'),
+          },
+        },
+      },
+      request: { url: expect.stringContaining('/user-page/settings') },
+    });
+  });
+});