Merge branch 'develop' into feat-use-vitest-replay

Author: billyvg

.github/workflows/build.yml

@@ -1017,7 +1017,7 @@ jobs:
             'generic-ts3.8',
             'node-fastify-app',
             # TODO(v8): Re-enable hapi tests
-            # 'node-hapi-app',
+            'node-hapi',
             'node-nestjs-app',
             'node-exports-test-app',
             'node-koa-app',

CHANGELOG.md

@@ -4,6 +4,30 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 8.0.0-beta.6
+
+This beta release contains various bugfixes and improvements for the v8 beta cycle.
+
+- feat: Add `tunnel` support to multiplexed transport (#11806)
+- feat: Export `spanToBaggageHeader` utility (#11881)
+- feat(browser): Disable standalone `http.client` spans (#11879)
+- feat(ember): Update ember dependencies (#11753)
+- feat(fedback): Convert CDN bundles to use async feedback for lower bundle sizes (#11791)
+- feat(feedback): Add `captureFeedback` method (#11428)
+- feat(feedback): Have screenshot by default (#11839)
+- feat(integrations): Add zod integration (#11144)
+- feat(ioredis): Add integration for `ioredis` (#11856)
+- feat(nextjs): Add transaction name to scope of server component (#11850)
+- feat(nextjs): Be smarter in warning about old ways of init configuration (#11882)
+- feat(nextjs): Set transaction names on scope for route handlers and generation functions (#11869)
+- feat(node): Support Node 22 (#11871)
+- fix(angular): Run tracing calls outside Angular (#11748)
+- fix(feedback): Be consistent about whether screenshot should and can render (#11859)
+- fix(nestjs): Ensure Nest.js interceptor works with non-http context (#11880)
+- fix(node): Fix nest.js error handler (#11874)
+- fix(react): Fix react router v4/v5 instrumentation (#11855)
+- ref: Add geo location types (#11847)
+
 ## 8.0.0-beta.5
 
 This beta release contains various bugfixes and improvements for the v8 beta cycle.

dev-packages/browser-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "8.0.0-beta.5",
+  "version": "8.0.0-beta.6",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -42,7 +42,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "^1.43.1",
     "@sentry-internal/rrweb": "2.11.0",
-    "@sentry/browser": "8.0.0-beta.5",
+    "@sentry/browser": "8.0.0-beta.6",
     "axios": "1.6.7",
     "babel-loader": "^8.2.2",
     "html-webpack-plugin": "^5.5.0",

dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts

@@ -1,9 +1,9 @@
 import { expect } from '@playwright/test';
 
-import { sentryTest } from '../../../utils/fixtures';
+import { TEST_HOST, sentryTest } from '../../../utils/fixtures';
 import { envelopeRequestParser, getEnvelopeType, shouldSkipFeedbackTest } from '../../../utils/helpers';
 
-sentryTest('should capture feedback', async ({ getLocalTestPath, page }) => {
+sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeedbackTest()) {
     sentryTest.skip();
   }
@@ -31,7 +31,7 @@ sentryTest('should capture feedback', async ({ getLocalTestPath, page }) => {
     });
   });
 
-  const url = await getLocalTestPath({ testDir: __dirname });
+  const url = await getLocalTestUrl({ testDir: __dirname });
 
   await page.goto(url);
   await page.getByText('Report a Bug').click();
@@ -51,7 +51,7 @@ sentryTest('should capture feedback', async ({ getLocalTestPath, page }) => {
         message: 'my example feedback',
         name: 'Jane Doe',
         source: 'widget',
-        url: expect.stringContaining('/dist/index.html'),
+        url: `${TEST_HOST}/index.html`,
       },
       trace: {
         trace_id: expect.stringMatching(/\w{32}/),
@@ -69,7 +69,7 @@ sentryTest('should capture feedback', async ({ getLocalTestPath, page }) => {
       packages: expect.anything(),
     },
     request: {
-      url: expect.stringContaining('/dist/index.html'),
+      url: `${TEST_HOST}/index.html`,
       headers: {
         'User-Agent': expect.stringContaining(''),
       },

dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts

@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test';
 
-import { sentryTest } from '../../../../utils/fixtures';
+import { TEST_HOST, sentryTest } from '../../../../utils/fixtures';
 import { envelopeRequestParser, getEnvelopeType, shouldSkipFeedbackTest } from '../../../../utils/helpers';
 import {
   collectReplayRequests,
@@ -9,7 +9,7 @@ import {
   waitForReplayRequest,
 } from '../../../../utils/replayHelpers';
 
-sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestPath, page }) => {
+sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestUrl, page }) => {
   if (shouldSkipFeedbackTest() || shouldSkipReplayTest()) {
     sentryTest.skip();
   }
@@ -39,7 +39,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestPat
     });
   });
 
-  const url = await getLocalTestPath({ testDir: __dirname });
+  const url = await getLocalTestUrl({ testDir: __dirname });
 
   await Promise.all([page.goto(url), page.getByText('Report a Bug').click(), reqPromise0]);
 
@@ -87,7 +87,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestPat
         name: 'Jane Doe',
         replay_id: replayEvent.event_id,
         source: 'widget',
-        url: expect.stringContaining('/dist/index.html'),
+        url: `${TEST_HOST}/index.html`,
       },
       trace: {
         trace_id: expect.stringMatching(/\w{32}/),
@@ -105,7 +105,7 @@ sentryTest('should capture feedback', async ({ forceFlushReplay, getLocalTestPat
       packages: expect.anything(),
     },
     request: {
-      url: expect.stringContaining('/dist/index.html'),
+      url: `${TEST_HOST}/index.html`,
       headers: {
         'User-Agent': expect.stringContaining(''),
       },

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

@@ -16,6 +16,14 @@ sentryTest('window.open() is considered for slow click', async ({ getLocalTestUr
     });
   });
 
+  await page.route('http://example.com/', route => {
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({}),
+    });
+  });
+
   const url = await getLocalTestUrl({ testDir: __dirname });
 
   await Promise.all([waitForReplayRequest(page, 0), page.goto(url)]);

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts

@@ -311,12 +311,12 @@ sentryTest(
 
 sentryTest(
   'user feedback event after navigation has navigation traceId in headers',
-  async ({ getLocalTestPath, page }) => {
+  async ({ getLocalTestUrl, page }) => {
     if (shouldSkipTracingTest() || shouldSkipFeedbackTest()) {
       sentryTest.skip();
     }
 
-    const url = await getLocalTestPath({ testDir: __dirname });
+    const url = await getLocalTestUrl({ testDir: __dirname });
 
     // ensure pageload transaction is finished
     await getFirstSentryEnvelopeRequest<Event>(page, url);

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts

@@ -297,12 +297,12 @@ sentryTest(
   },
 );
 
-sentryTest('user feedback event after pageload has pageload traceId in headers', async ({ getLocalTestPath, page }) => {
+sentryTest('user feedback event after pageload has pageload traceId in headers', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipTracingTest() || shouldSkipFeedbackTest()) {
     sentryTest.skip();
   }
 
-  const url = await getLocalTestPath({ testDir: __dirname });
+  const url = await getLocalTestUrl({ testDir: __dirname });
 
   const pageloadEvent = await getFirstSentryEnvelopeRequest<Event>(page, url);
   const pageloadTraceContext = pageloadEvent.contexts?.trace;

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts

@@ -294,12 +294,12 @@ sentryTest(
   },
 );
 
-sentryTest('user feedback event after pageload has pageload traceId in headers', async ({ getLocalTestPath, page }) => {
+sentryTest('user feedback event after pageload has pageload traceId in headers', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipTracingTest() || shouldSkipFeedbackTest()) {
     sentryTest.skip();
   }
 
-  const url = await getLocalTestPath({ testDir: __dirname });
+  const url = await getLocalTestUrl({ testDir: __dirname });
 
   const pageloadEvent = await getFirstSentryEnvelopeRequest<Event>(page, url);
   const pageloadTraceContext = pageloadEvent.contexts?.trace;

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

@@ -3,6 +3,7 @@ import path from 'path';
 /* eslint-disable no-empty-pattern */
 import { test as base } from '@playwright/test';
 
+import { SDK_VERSION } from '@sentry/browser';
 import { generatePage } from './generatePage';
 
 export const TEST_HOST = 'http://sentry-test.io';
@@ -63,6 +64,17 @@ const sentryTest = base.extend<TestFixtures>({
 
           return fs.existsSync(filePath) ? route.fulfill({ path: filePath }) : route.continue();
         });
+
+        // Ensure feedback can be lazy loaded
+        await page.route(`https://browser.sentry-cdn.com/${SDK_VERSION}/feedback-modal.min.js`, route => {
+          const filePath = path.resolve(testDir, './dist/feedback-modal.bundle.js');
+          return fs.existsSync(filePath) ? route.fulfill({ path: filePath }) : route.continue();
+        });
+
+        await page.route(`https://browser.sentry-cdn.com/${SDK_VERSION}/feedback-screenshot.min.js`, route => {
+          const filePath = path.resolve(testDir, './dist/feedback-screenshot.bundle.js');
+          return fs.existsSync(filePath) ? route.fulfill({ path: filePath }) : route.continue();
+        });
       }
 
       return pagePath;