Merge branch 'v8' into aliu/unleash

Author: aliu39

.github/workflows/build.yml

@@ -738,8 +738,8 @@ jobs:
           node_version: ${{ matrix.node == 14 && '14' || '' }}
 
       - name: Overwrite typescript version
-        if: matrix.typescript
-        run: node ./scripts/use-ts-version.js ${{ matrix.typescript }}
+        if: matrix.typescript == '3.8'
+        run: node ./scripts/use-ts-3_8.js
         working-directory: dev-packages/node-integration-tests
 
       - name: Run integration tests

.size-limit.js

@@ -54,7 +54,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
     gzip: true,
-    limit: '68 KB',
+    limit: '68.5 KB',
     modifyWebpackConfig: function (config) {
       const webpack = require('webpack');
       const TerserPlugin = require('terser-webpack-plugin');

dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts

@@ -1,8 +1,10 @@
 import { expect } from '@playwright/test';
-import type { Event } from '@sentry/core';
-
 import { sentryTest } from '../../../../utils/fixtures';
-import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipTracingTest,
+  waitForTransactionRequestOnUrl,
+} from '../../../../utils/helpers';
 
 sentryTest('should create spans for fetch requests', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipTracingTest()) {
@@ -11,14 +13,8 @@ sentryTest('should create spans for fetch requests', async ({ getLocalTestUrl, p
 
   const url = await getLocalTestUrl({ testDir: __dirname });
 
-  // Because we fetch from http://example.com, fetch will throw a CORS error in firefox and webkit.
-  // Chromium does not throw for cors errors.
-  // This means that we will intercept a dynamic amount of envelopes here.
-
-  // We will wait 500ms for all envelopes to be sent. Generally, in all browsers, the last sent
-  // envelope contains tracing data.
-  const envelopes = await getMultipleSentryEnvelopeRequests<Event>(page, 4, { url, timeout: 10000 });
-  const tracingEvent = envelopes.find(event => event.type === 'transaction')!; // last envelope contains tracing data on all browsers
+  const req = await waitForTransactionRequestOnUrl(page, url);
+  const tracingEvent = envelopeRequestParser(req);
 
   const requestSpans = tracingEvent.spans?.filter(({ op }) => op === 'http.client');
 

dev-packages/browser-integration-tests/suites/tracing/request/init.js

@@ -7,4 +7,5 @@ Sentry.init({
   integrations: [Sentry.browserTracingIntegration()],
   tracePropagationTargets: ['http://example.com'],
   tracesSampleRate: 1,
+  autoSessionTracking: false,
 });

dev-packages/browser-integration-tests/suites/transport/multiplexed/init.js

@@ -0,0 +1,20 @@
+import * as Sentry from '@sentry/browser';
+
+import { makeMultiplexedTransport } from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  transport: makeMultiplexedTransport(Sentry.makeFetchTransport, ({ getEvent }) => {
+    const event = getEvent('event');
+
+    if (event.tags.to === 'a') {
+      return ['https://[email protected]/1337'];
+    } else if (event.tags.to === 'b') {
+      return ['https://[email protected]/1337'];
+    } else {
+      throw new Error('Unknown destination');
+    }
+  }),
+});

dev-packages/browser-integration-tests/suites/transport/multiplexed/subject.js

@@ -0,0 +1,10 @@
+setTimeout(() => {
+  Sentry.withScope(scope => {
+    scope.setTag('to', 'a');
+    Sentry.captureException(new Error('Error a'));
+  });
+  Sentry.withScope(scope => {
+    scope.setTag('to', 'b');
+    Sentry.captureException(new Error('Error b'));
+  });
+}, 0);

dev-packages/browser-integration-tests/suites/transport/multiplexed/test.ts

@@ -0,0 +1,20 @@
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/core';
+
+import { sentryTest } from '../../../utils/fixtures';
+import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers';
+
+sentryTest('sends event to DSNs specified in makeMultiplexedTransport', async ({ getLocalTestUrl, page }) => {
+  const url = await getLocalTestUrl({ testDir: __dirname });
+  const errorEvents = await getMultipleSentryEnvelopeRequests<Event>(page, 2, { envelopeType: 'event', url });
+
+  expect(errorEvents).toHaveLength(2);
+
+  const [evt1, evt2] = errorEvents;
+
+  const errorA = evt1?.tags?.to === 'a' ? evt1 : evt2;
+  const errorB = evt1?.tags?.to === 'b' ? evt1 : evt2;
+
+  expect(errorA.tags?.to).toBe('a');
+  expect(errorB.tags?.to).toBe('b');
+});

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

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import type { Package } from '@sentry/core';
+import { type Package } from '@sentry/core';
 import HtmlWebpackPlugin, { createHtmlTagObject } from 'html-webpack-plugin';
 import type { Compiler } from 'webpack';
 
@@ -38,6 +38,8 @@ const IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS: Record<string, string> = {
   sessionTimingIntegration: 'sessiontiming',
   feedbackIntegration: 'feedback',
   moduleMetadataIntegration: 'modulemetadata',
+  // technically, this is not an integration, but let's add it anyway for simplicity
+  makeMultiplexedTransport: 'multiplexedtransport',
 };
 
 const BUNDLE_PATHS: Record<string, Record<string, string>> = {

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json

@@ -44,7 +44,7 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "typescript": "^5.1.6",
-    "vite": "^5.4.10",
+    "vite": "^5.4.11",
     "vite-tsconfig-paths": "^4.2.1"
   },
   "volta": {

dev-packages/e2e-tests/test-applications/nestjs-fastify/src/app.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Param, ParseIntPipe, UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
+import { All, Controller, Get, Param, ParseIntPipe, UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
 import { flush } from '@sentry/nestjs';
 import { AppService } from './app.service';
 import { AsyncInterceptor } from './async-example.interceptor';
@@ -121,4 +121,9 @@ export class AppController {
   testFunctionName() {
     return this.appService.getFunctionName();
   }
+
+  @All('test-all')
+  testAll() {
+    return {};
+  }
 }