Merge remote-tracking branch 'upstream/develop' into timfish/test/cloudflare-integration-tests

Author: timfish

.craft.yml

@@ -144,16 +144,17 @@ targets:
     includeNames: /^sentry-internal-eslint-config-sdk-\d.*\.tgz$/
 
   # AWS Lambda Layer target
-  - name: aws-lambda-layer
-    includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/
-    layerName: SentryNodeServerlessSDKv10
-    compatibleRuntimes:
-      - name: node
-        versions:
-          - nodejs18.x
-          - nodejs20.x
-          - nodejs22.x
-    license: MIT
+  # Commented out until we release v10, otherwise we'd override the current v9 layer
+  # - name: aws-lambda-layer
+  #   includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/
+  #   layerName: SentryNodeServerlessSDKv10
+  #   compatibleRuntimes:
+  #     - name: node
+  #       versions:
+  #         - nodejs18.x
+  #         - nodejs20.x
+  #         - nodejs22.x
+  #   license: MIT
 
   # CDN Bundle Target
   - name: gcs

.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 }}
 
@@ -973,13 +971,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
@@ -1085,13 +1083,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

.size-limit.js

@@ -233,7 +233,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '144 KB',
+    limit: '146 KB',
   },
   {
     name: '@sentry/node - without tracing',

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+Work in this release was contributed by @richardjelinek-fastest. Thank you for your contribution!
+
 ## 9.40.0
 
 ### Important Changes

MIGRATION.md

@@ -61,6 +61,23 @@ Sentry.init({
 });
 ```
 
+## 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.
+
 ## No Version Support Timeline
 
 Version support timelines are stressful for everybody using the SDK, so we won't be defining one.

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/replay/sessionExpiry/test.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test';
+import type { replayIntegration as actualReplayIntegration } from '@sentry-internal/replay';
 import { sentryTest } from '../../../utils/fixtures';
 import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
 import {
@@ -13,55 +14,122 @@ import {
 // Session should expire after 2s - keep in sync with init.js
 const SESSION_TIMEOUT = 2000;
 
-sentryTest('handles an expired session', async ({ browserName, forceFlushReplay, getLocalTestUrl, page }) => {
-  if (shouldSkipReplayTest() || browserName !== 'chromium') {
-    sentryTest.skip();
-  }
+sentryTest(
+  'handles an expired session that re-samples to session',
+  async ({ browserName, forceFlushReplay, getLocalTestUrl, page }) => {
+    if (shouldSkipReplayTest() || browserName !== 'chromium') {
+      sentryTest.skip();
+    }
 
-  const reqPromise0 = waitForReplayRequest(page, 0);
-  const reqPromise1 = waitForReplayRequest(page, 1);
+    const reqPromise0 = waitForReplayRequest(page, 0);
+    const reqPromise1 = waitForReplayRequest(page, 1);
 
-  const url = await getLocalTestUrl({ testDir: __dirname });
+    const url = await getLocalTestUrl({ testDir: __dirname });
 
-  await page.goto(url);
-  const req0 = await reqPromise0;
+    await page.goto(url);
+    const req0 = await reqPromise0;
 
-  const replayEvent0 = getReplayEvent(req0);
-  expect(replayEvent0).toEqual(getExpectedReplayEvent({}));
+    const replayEvent0 = getReplayEvent(req0);
+    expect(replayEvent0).toEqual(getExpectedReplayEvent({}));
 
-  const fullSnapshots0 = getFullRecordingSnapshots(req0);
-  expect(fullSnapshots0.length).toEqual(1);
-  const stringifiedSnapshot = normalize(fullSnapshots0[0]);
-  expect(stringifiedSnapshot).toMatchSnapshot('snapshot-0.json');
+    const fullSnapshots0 = getFullRecordingSnapshots(req0);
+    expect(fullSnapshots0.length).toEqual(1);
+    const stringifiedSnapshot = normalize(fullSnapshots0[0]);
+    expect(stringifiedSnapshot).toMatchSnapshot('snapshot-0.json');
 
-  // We wait for another segment 0
-  const reqPromise2 = waitForReplayRequest(page, 0);
+    // We wait for another segment 0
+    const reqPromise2 = waitForReplayRequest(page, 0);
 
-  await page.locator('#button1').click();
-  await forceFlushReplay();
-  const req1 = await reqPromise1;
+    await page.locator('#button1').click();
+    await forceFlushReplay();
+    const req1 = await reqPromise1;
 
-  const replayEvent1 = getReplayEvent(req1);
-  expect(replayEvent1).toEqual(getExpectedReplayEvent({ segment_id: 1, urls: [] }));
+    const replayEvent1 = getReplayEvent(req1);
+    expect(replayEvent1).toEqual(getExpectedReplayEvent({ segment_id: 1, urls: [] }));
 
-  const replay = await getReplaySnapshot(page);
-  const oldSessionId = replay.session?.id;
+    const replay = await getReplaySnapshot(page);
+    const oldSessionId = replay.session?.id;
 
-  await new Promise(resolve => setTimeout(resolve, SESSION_TIMEOUT));
+    await new Promise(resolve => setTimeout(resolve, SESSION_TIMEOUT));
 
-  await page.locator('#button2').click();
-  await forceFlushReplay();
-  const req2 = await reqPromise2;
+    await page.locator('#button2').click();
+    await forceFlushReplay();
+    const req2 = await reqPromise2;
 
-  const replay2 = await getReplaySnapshot(page);
+    const replay2 = await getReplaySnapshot(page);
 
-  expect(replay2.session?.id).not.toEqual(oldSessionId);
+    expect(replay2.session?.id).not.toEqual(oldSessionId);
 
-  const replayEvent2 = getReplayEvent(req2);
-  expect(replayEvent2).toEqual(getExpectedReplayEvent({}));
+    const replayEvent2 = getReplayEvent(req2);
+    expect(replayEvent2).toEqual(getExpectedReplayEvent({}));
 
-  const fullSnapshots2 = getFullRecordingSnapshots(req2);
-  expect(fullSnapshots2.length).toEqual(1);
-  const stringifiedSnapshot2 = normalize(fullSnapshots2[0]);
-  expect(stringifiedSnapshot2).toMatchSnapshot('snapshot-2.json');
-});
+    const fullSnapshots2 = getFullRecordingSnapshots(req2);
+    expect(fullSnapshots2.length).toEqual(1);
+    const stringifiedSnapshot2 = normalize(fullSnapshots2[0]);
+    expect(stringifiedSnapshot2).toMatchSnapshot('snapshot-2.json');
+  },
+);
+
+sentryTest(
+  'handles an expired session that re-samples to buffer',
+  async ({ browserName, forceFlushReplay, getLocalTestUrl, page }) => {
+    if (shouldSkipReplayTest() || browserName !== 'chromium') {
+      sentryTest.skip();
+    }
+
+    const reqPromise0 = waitForReplayRequest(page, 0);
+    const reqPromise1 = waitForReplayRequest(page, 1);
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    await page.goto(url);
+    const req0 = await reqPromise0;
+
+    const replayEvent0 = getReplayEvent(req0);
+    expect(replayEvent0).toEqual(getExpectedReplayEvent({}));
+
+    const fullSnapshots0 = getFullRecordingSnapshots(req0);
+    expect(fullSnapshots0.length).toEqual(1);
+    const stringifiedSnapshot = normalize(fullSnapshots0[0]);
+    expect(stringifiedSnapshot).toMatchSnapshot('snapshot-0.json');
+
+    await page.locator('#button1').click();
+    await forceFlushReplay();
+    const req1 = await reqPromise1;
+
+    const replayEvent1 = getReplayEvent(req1);
+    expect(replayEvent1).toEqual(getExpectedReplayEvent({ segment_id: 1, urls: [] }));
+
+    const replay = await getReplaySnapshot(page);
+    const oldSessionId = replay.session?.id;
+
+    await new Promise(resolve => setTimeout(resolve, SESSION_TIMEOUT));
+    await page.evaluate(() => {
+      const replayIntegration = (window as unknown as Window & { Replay: ReturnType<typeof actualReplayIntegration> })
+        .Replay;
+      replayIntegration['_replay'].getOptions().errorSampleRate = 1.0;
+      replayIntegration['_replay'].getOptions().sessionSampleRate = 0.0;
+    });
+
+    let wasReplayFlushed = false;
+    page.on('request', request => {
+      if (request.url().includes('/api/1337/envelope/')) {
+        wasReplayFlushed = true;
+      }
+    });
+    await page.locator('#button2').click();
+    await forceFlushReplay();
+
+    // This timeout is not ideal, but not sure of a better way to ensure replay is not flushed
+    await new Promise(resolve => setTimeout(resolve, SESSION_TIMEOUT));
+
+    expect(wasReplayFlushed).toBe(false);
+
+    const currentSessionId = await page.evaluate(() => {
+      // @ts-expect-error - Replay is not typed
+      return window.Replay._replay.session?.id;
+    });
+
+    expect(currentSessionId).not.toEqual(oldSessionId);
+  },
+);