Merge remote-tracking branch 'origin/develop' into lforst-nextjs-otel

Author: Luca Forstner

.eslintrc.js

@@ -21,6 +21,7 @@ module.exports = {
     'examples/**',
     'test/manual/**',
     'types/**',
+    'scripts/*.js',
   ],
   reportUnusedDisableDirectives: true,
   overrides: [

.github/workflows/build.yml

@@ -921,6 +921,7 @@ jobs:
             'tanstack-router',
             'generic-ts3.8',
             'node-fastify',
+            'node-fastify-5',
             'node-hapi',
             'node-nestjs-basic',
             'node-nestjs-distributed-tracing',
@@ -1034,6 +1035,15 @@ jobs:
           overwrite: true
           retention-days: 7
 
+      - name: Upload E2E Test Event Dumps
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: playwright-event-dumps-job_e2e_playwright_tests-${{ matrix.test-application }}
+          path: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/event-dumps
+          overwrite: true
+          retention-days: 7
+
       - name: Upload test results to Codecov
         if: cancelled() == false
         continue-on-error: true

.github/workflows/release-comment-issues.yml

@@ -20,7 +20,12 @@ jobs:
         run: echo "version=${{ github.event.inputs.version || github.event.release.tag_name }}" >> $GITHUB_OUTPUT
 
       - name: Comment on linked issues that are mentioned in release
-        if: steps.get_version.outputs.version != ''
+        if: |
+          steps.get_version.outputs.version != ''
+          && !contains(steps.get_version.outputs.version, '-beta.')
+          && !contains(steps.get_version.outputs.version, '-alpha.')
+          && !contains(steps.get_version.outputs.version, '-rc.')
+
         uses: getsentry/release-comment-issues-gh-action@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

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

@@ -287,6 +287,125 @@ sentryTest(
   },
 );
 
+sentryTest(
+  '[buffer-mode] manually starting replay ignores earlier performance entries',
+  async ({ getLocalTestUrl, page, browserName }) => {
+    // This was sometimes flaky on webkit, so skipping for now
+    if (shouldSkipReplayTest() || browserName === 'webkit') {
+      sentryTest.skip();
+    }
+
+    const reqPromise0 = waitForReplayRequest(page, 0);
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    await page.goto(url);
+
+    // Wait for everything to be initialized - Replay is not running yet
+    await page.waitForFunction('!!window.Replay');
+
+    // Wait for a second, then start replay
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    await page.evaluate('window.Replay.start()');
+
+    const req0 = await reqPromise0;
+
+    const event0 = getReplayEvent(req0);
+    const content0 = getReplayRecordingContent(req0);
+
+    expect(event0).toEqual(
+      getExpectedReplayEvent({
+        replay_type: 'session',
+      }),
+    );
+
+    const { performanceSpans } = content0;
+
+    // Here, we test that this does not contain any web-vital etc. performance spans
+    // as these have been emitted _before_ the replay was manually started
+    expect(performanceSpans).toEqual([
+      {
+        op: 'memory',
+        description: 'memory',
+        startTimestamp: expect.any(Number),
+        endTimestamp: expect.any(Number),
+        data: {
+          memory: {
+            jsHeapSizeLimit: expect.any(Number),
+            totalJSHeapSize: expect.any(Number),
+            usedJSHeapSize: expect.any(Number),
+          },
+        },
+      },
+    ]);
+  },
+);
+
+sentryTest(
+  '[buffer-mode] manually starting replay ignores earlier performance entries when starting immediately',
+  async ({ getLocalTestUrl, page, browserName }) => {
+    // This was sometimes flaky on webkit, so skipping for now
+    if (shouldSkipReplayTest() || browserName === 'webkit') {
+      sentryTest.skip();
+    }
+
+    const reqPromise0 = waitForReplayRequest(page, 0);
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    page.goto(url);
+
+    // Wait for everything to be initialized, then start replay as soon as possible
+    await page.waitForFunction('!!window.Replay');
+    await page.evaluate('window.Replay.start()');
+
+    const req0 = await reqPromise0;
+
+    const event0 = getReplayEvent(req0);
+    const content0 = getReplayRecordingContent(req0);
+
+    expect(event0).toEqual(
+      getExpectedReplayEvent({
+        replay_type: 'session',
+      }),
+    );
+
+    const { performanceSpans } = content0;
+
+    expect(performanceSpans).toEqual([
+      {
+        op: 'memory',
+        description: 'memory',
+        startTimestamp: expect.any(Number),
+        endTimestamp: expect.any(Number),
+        data: {
+          memory: {
+            jsHeapSizeLimit: expect.any(Number),
+            totalJSHeapSize: expect.any(Number),
+            usedJSHeapSize: expect.any(Number),
+          },
+        },
+      },
+    ]);
+  },
+);
+
 // Doing this in buffer mode to test changing error sample rate after first
 // error happens.
 sentryTest(

dev-packages/e2e-tests/test-applications/astro-4/package.json

@@ -12,13 +12,13 @@
     "test:assert": "TEST_ENV=production playwright test"
   },
   "dependencies": {
-    "@astrojs/check": "^0.9.2",
-    "@astrojs/node": "^8.3.2",
+    "@astrojs/check": "0.9.2",
+    "@astrojs/node": "8.3.2",
     "@playwright/test": "^1.46.0",
     "@sentry/astro": "* || latest",
     "@sentry-internal/test-utils": "link:../../../test-utils",
-    "@spotlightjs/astro": "^2.1.6",
-    "astro": "^4.13.3",
+    "@spotlightjs/astro": "2.1.6",
+    "astro": "4.13.3",
     "typescript": "^5.5.4"
   },
   "devDependencies": {

dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json

@@ -19,7 +19,10 @@
   "dependencies": {
     "@astrojs/cloudflare": "8.1.0",
     "@sentry/astro": "latest || *",
-    "astro": "4.1.1"
+    "astro": "4.16.1"
+  },
+  "devDependencies": {
+    "@astrojs/internal-helpers": "0.4.1"
   },
   "volta": {
     "extends": "../../package.json"

dev-packages/e2e-tests/test-applications/nextjs-15/.gitignore

@@ -43,3 +43,4 @@ next-env.d.ts
 .vscode
 
 test-results
+event-dumps

dev-packages/e2e-tests/test-applications/nextjs-15/next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

dev-packages/e2e-tests/test-applications/nextjs-15/start-event-proxy.mjs

@@ -1,6 +1,14 @@
+import * as fs from 'fs';
+import * as path from 'path';
 import { startEventProxyServer } from '@sentry-internal/test-utils';
 
+const packageJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'package.json')));
+
 startEventProxyServer({
   port: 3031,
   proxyServerName: 'nextjs-15',
+  envelopeDumpPath: path.join(
+    process.cwd(),
+    `event-dumps/next-${packageJson.dependencies.next}-${process.env.TEST_ENV}.dump`,
+  ),
 });

dev-packages/e2e-tests/test-applications/node-fastify-5/.gitignore

@@ -0,0 +1 @@
+dist