Merge remote-tracking branch 'origin/develop' into lforst-bump-runners-ubuntu-24

Author: Luca Forstner

.craft.yml

@@ -108,12 +108,18 @@ targets:
   - name: npm
     id: '@sentry/sveltekit'
     includeNames: /^sentry-sveltekit-\d.*\.tgz$/
+  - name: npm
+    id: '@sentry/tanstackstart'
+    includeNames: /^sentry-tanstackstart-\d.*\.tgz$/
   - name: npm
     id: '@sentry/gatsby'
     includeNames: /^sentry-gatsby-\d.*\.tgz$/
   - name: npm
     id: '@sentry/astro'
     includeNames: /^sentry-astro-\d.*\.tgz$/
+  - name: npm
+    id: '@sentry/react-router'
+    includeNames: /^sentry-react-router-\d.*\.tgz$/
 
   ## 7. Other Packages
   ## 7.1

.size-limit.js

@@ -47,7 +47,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
     gzip: true,
-    limit: '75.1 KB',
+    limit: '75.2 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',

CHANGELOG.md

@@ -10,6 +10,8 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+Work in this release was contributed by @GerryWilko and @leoambio. Thank you for your contributions!
+
 ## 9.2.0
 
 ### Important Changes

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

@@ -41,7 +41,7 @@
   "dependencies": {
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "~1.50.0",
-    "@sentry-internal/rrweb": "2.32.0",
+    "@sentry-internal/rrweb": "2.33.0",
     "@sentry/browser": "9.2.0",
     "axios": "1.7.7",
     "babel-loader": "^8.2.2",

dev-packages/browser-integration-tests/suites/manual-client/browser-context/init.js

@@ -6,7 +6,7 @@ import {
   defaultStackParser,
   functionToStringIntegration,
   httpContextIntegration,
-  inboundFiltersIntegration,
+  eventFiltersIntegration,
   linkedErrorsIntegration,
   makeFetchTransport,
 } from '@sentry/browser';
@@ -16,7 +16,7 @@ const integrations = [
   functionToStringIntegration(),
   dedupeIntegration(),
   httpContextIntegration(),
-  inboundFiltersIntegration(),
+  eventFiltersIntegration(),
   linkedErrorsIntegration(),
 ];
 

dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts

@@ -38,7 +38,7 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
     environment: 'local',
     release: '0.0.1',
     sdk: {
-      integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'InboundFilters', 'LinkedErrors'],
+      integrations: ['Breadcrumbs', 'FunctionToString', 'Dedupe', 'HttpContext', 'EventFilters', 'LinkedErrors'],
       name: 'sentry.javascript.browser',
       version: expect.any(String),
       packages: [{ name: expect.any(String), version: expect.any(String) }],

dev-packages/e2e-tests/verdaccio-config/config.yaml

@@ -170,6 +170,12 @@ packages:
     unpublish: $all
     # proxy: npmjs # Don't proxy for E2E tests!
 
+  '@sentry/tanstackstart':
+    access: $all
+    publish: $all
+    unpublish: $all
+    # proxy: npmjs # Don't proxy for E2E tests!
+
   '@sentry/types':
     access: $all
     publish: $all

dev-packages/node-integration-tests/suites/contextLines/memory-leak/test.ts

@@ -1,16 +1,18 @@
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+import { describe, afterAll, test } from 'vitest';
 
 describe('ContextLines integration in CJS', () => {
   afterAll(() => {
     cleanupChildProcesses();
   });
 
   // Regression test for: https://github.com/getsentry/sentry-javascript/issues/14892
-  test('does not leak open file handles', done => {
-    createRunner(__dirname, 'scenario.ts')
+  test('does not leak open file handles', async () => {
+   await createRunner(__dirname, 'scenario.ts')
       .expectN(10, {
         event: {},
       })
-      .start(done);
+      .start()
+      .completed();
   });
 });

dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/test.ts

@@ -1,4 +1,4 @@
-import { afterAll, test } from 'vitest';
+import { afterAll, test, describe } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
 
 afterAll(() => {

dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/test.ts

@@ -1,12 +1,13 @@
 import { createRunner } from '../../../../utils/runner';
+import { describe, test, expect } from 'vitest'
 
 // Graphql Instrumentation emits some spans by default on server start
 const EXPECTED_START_SERVER_TRANSACTION = {
   transaction: 'Test Server Start',
 };
 
 describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
-  test('useOperationNameForRootSpan works with single query operation', done => {
+  test('useOperationNameForRootSpan works with single query operation', async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'GET /test-graphql (query GetHello)',
       spans: expect.arrayContaining([
@@ -24,13 +25,14 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
       ]),
     };
 
-    createRunner(__dirname, 'scenario-query.js')
+    await createRunner(__dirname, 'scenario-query.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 
-  test('useOperationNameForRootSpan works with single mutation operation', done => {
+  test('useOperationNameForRootSpan works with single mutation operation', async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'GET /test-graphql (mutation TestMutation)',
       spans: expect.arrayContaining([
@@ -50,13 +52,14 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
       ]),
     };
 
-    createRunner(__dirname, 'scenario-mutation.js')
+    await createRunner(__dirname, 'scenario-mutation.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 
-  test('useOperationNameForRootSpan ignores an invalid root span', done => {
+  test('useOperationNameForRootSpan ignores an invalid root span', async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'test span name',
       spans: expect.arrayContaining([
@@ -74,13 +77,14 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
       ]),
     };
 
-    createRunner(__dirname, 'scenario-invalid-root-span.js')
+    await createRunner(__dirname, 'scenario-invalid-root-span.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 
-  test('useOperationNameForRootSpan works with single query operation without name', done => {
+  test('useOperationNameForRootSpan works with single query operation without name', async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'GET /test-graphql (query)',
       spans: expect.arrayContaining([
@@ -97,13 +101,14 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
       ]),
     };
 
-    createRunner(__dirname, 'scenario-no-operation-name.js')
+    await createRunner(__dirname, 'scenario-no-operation-name.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 
-  test('useOperationNameForRootSpan works with multiple query operations', done => {
+  test('useOperationNameForRootSpan works with multiple query operations', async () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'GET /test-graphql (query GetHello, query GetWorld)',
       spans: expect.arrayContaining([
@@ -132,21 +137,23 @@ describe('GraphQL/Apollo Tests > useOperationNameForRootSpan', () => {
       ]),
     };
 
-    createRunner(__dirname, 'scenario-multiple-operations.js')
+    await createRunner(__dirname, 'scenario-multiple-operations.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 
-  test('useOperationNameForRootSpan works with more than 5 query operations', done => {
+  test('useOperationNameForRootSpan works with more than 5 query operations', async () => {
     const EXPECTED_TRANSACTION = {
       transaction:
         'GET /test-graphql (query GetHello1, query GetHello2, query GetHello3, query GetHello4, query GetHello5, +4)',
     };
 
-    createRunner(__dirname, 'scenario-multiple-operations-many.js')
+    await createRunner(__dirname, 'scenario-multiple-operations-many.js')
       .expect({ transaction: EXPECTED_START_SERVER_TRANSACTION })
       .expect({ transaction: EXPECTED_TRANSACTION })
-      .start(done);
+      .start()
+      .completed();
   });
 });