Merge branch 'develop' into jb/pkg/profiling-node

Author: JonasBa

.github/workflows/build.yml

@@ -145,7 +145,7 @@ jobs:
 
       - name: Get PR labels
         id: pr-labels
-        uses: mydea/pr-labels-action@update-core
+        uses: mydea/pr-labels-action@fn/bump-node20
 
     outputs:
       commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
@@ -592,14 +592,13 @@ jobs:
     name: Playwright (${{ matrix.bundle }}) Tests
     needs: [job_get_metadata, job_build]
     if: needs.job_get_metadata.outputs.changed_browser_integration == 'true' || github.event_name != 'pull_request'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-20.04-large-js
     timeout-minutes: 25
     strategy:
       fail-fast: false
       matrix:
         bundle:
           - esm
-          - cjs
           - bundle_es5
           - bundle_es5_min
           - bundle_es6
@@ -714,7 +713,7 @@ jobs:
     name: Browser (${{ matrix.browser }}) Tests
     needs: [job_get_metadata, job_build]
     if: needs.job_get_metadata.outputs.changed_browser == 'true' || github.event_name != 'pull_request'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-20.04-large-js
     timeout-minutes: 20
     strategy:
       fail-fast: false
@@ -884,7 +883,7 @@ jobs:
       (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) &&
       github.actor != 'dependabot[bot]'
     needs: [job_get_metadata, job_build, job_compile_bindings_profiling_node]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-20.04-large-js
     timeout-minutes: 15
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
@@ -1009,6 +1008,9 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: 'dev-packages/e2e-tests/package.json'
+      - name: Set up Bun
+        if: matrix.test-application == 'node-exports-test-app'
+        uses: oven-sh/setup-bun@v1
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:

CHANGELOG.md

@@ -4,6 +4,43 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.99.0
+
+### Important Changes
+
+#### Deprecations
+
+This release includes some deprecations for span related methods and integrations in our Deno SDK, `@sentry/deno`. For
+more details please look at our
+[migration guide](https://github.com/getsentry/sentry-javascript/blob/develop/MIGRATION.md).
+
+- feat(core): Deprecate `Span.setHttpStatus` in favor of `setHttpStatus` (#10268)
+- feat(core): Deprecate `spanStatusfromHttpCode` in favour of `getSpanStatusFromHttpCode` (#10361)
+- feat(core): Deprecate `StartSpanOptions.origin` in favour of passing attribute (#10274)
+- feat(deno): Expose functional integrations to replace classes (#10355)
+
+### Other Changes
+
+- feat(bun): Add missing `@sentry/node` re-exports (#10396)
+- feat(core): Add `afterAllSetup` hook for integrations (#10345)
+- feat(core): Ensure `startSpan()` can handle spans that require parent (#10386)
+- feat(core): Read propagation context off scopes in `startSpan` APIs (#10300)
+- feat(remix): Export missing `@sentry/node` functions (#10385, #10391)
+- feat(serverless): Add missing `@sentry/node` re-exports (#10390)
+- feat(sveltekit): Add more missing `@sentry/node` re-exports (#10392)
+- feat(tracing): Export proper type for browser tracing (#10411)
+- feat(tracing): Expose new `browserTracingIntegration` (#10351)
+- fix: Ensure `afterAllSetup` is called when using `addIntegration()` (#10372)
+- fix(core): Export `spanToTraceContext` function from span utils (#10364)
+- fix(core): Make `FunctionToString` integration use SETUP_CLIENTS weakmap (#10358)
+- fix(deno): Call function if client is not setup (#10354)
+- fix(react): Fix attachReduxState option (#10381)
+- fix(spotlight): Use unpatched http.request (#10369)
+- fix(tracing): Only create request span if there is active span (#10375)
+- ref: Read propagation context off of scope and isolation scope when propagating and applying trace context (#10297)
+
+Work in this release contributed by @AleshaOleg. Thank you for your contribution!
+
 ## 7.98.0
 
 This release primarily fixes some type declaration errors:
@@ -20,7 +57,7 @@ Note: The 7.96.0 release was incomplete. This release is partially encompassing
 
 ## 7.96.0
 
-Note: This release was incomplete. Not all Sentry SDK packages were released for this version. Please upgrade to 7.97.0
+Note: This release was incomplete. Not all Sentry SDK packages were released for this version. Please upgrade to 7.98.0
 directly.
 
 ### Important Changes

README.md

@@ -32,6 +32,7 @@ convenient interface and improved consistency between various JavaScript environ
 - [Supported Platforms](#supported-platforms)
 - [Installation and Usage](#installation-and-usage)
 - [Other Packages](#other-packages)
+- [Bug Bounty Program](#bug-bounty-program)
 
 ## Supported Platforms
 
@@ -104,3 +105,13 @@ below:
   utility functions useful for various SDKs.
 - [`@sentry/types`](https://github.com/getsentry/sentry-javascript/tree/master/packages/types): Types used in all
   packages.
+
+## Bug Bounty Program
+
+Our bug bounty program aims to improve the security of our open source projects by encouraging the community to identify
+and report potential security vulnerabilities. Your reward will depend on the severity of the identified vulnerability.
+
+Our program is currently running on an invitation basis. If you're interested in participating, please send us an email
+to [email protected] and tell us, that you are interested in auditing this repository.
+
+For more details, please have a look at https://sentry.io/security/#vulnerability-disclosure.

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "7.98.0",
+  "version": "7.99.0",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -47,8 +47,8 @@
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "^1.40.1",
     "@sentry-internal/rrweb": "2.9.0",
-    "@sentry/browser": "7.98.0",
-    "@sentry/tracing": "7.98.0",
+    "@sentry/browser": "7.99.0",
+    "@sentry/tracing": "7.99.0",
     "axios": "1.6.0",
     "babel-loader": "^8.2.2",
     "html-webpack-plugin": "^5.5.0",

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions/test.ts

@@ -51,7 +51,7 @@ sentryTest('should capture interaction transaction. @firefox', async ({ browserN
   expect(interactionSpan.timestamp).toBeDefined();
 
   const interactionSpanDuration = (interactionSpan.timestamp! - interactionSpan.start_timestamp) * 1000;
-  expect(interactionSpanDuration).toBeGreaterThan(70);
+  expect(interactionSpanDuration).toBeGreaterThan(65);
   expect(interactionSpanDuration).toBeLessThan(200);
 });
 

dev-packages/browser-integration-tests/suites/tracing/request/fetch-with-no-active-span/init.js

@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  // disable pageload transaction
+  integrations: [Sentry.BrowserTracing({ tracingOrigins: ['http://example.com'], startTransactionOnPageLoad: false })],
+  tracesSampleRate: 1,
+});

dev-packages/browser-integration-tests/suites/tracing/request/fetch-with-no-active-span/subject.js

@@ -0,0 +1 @@
+fetch('http://example.com/0').then(fetch('http://example.com/1').then(fetch('http://example.com/2')));

dev-packages/browser-integration-tests/suites/tracing/request/fetch-with-no-active-span/test.ts

@@ -0,0 +1,35 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { envelopeUrlRegex, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+sentryTest(
+  'there should be no span created for fetch requests with no active span',
+  async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+
+    let requestCount = 0;
+    page.on('request', request => {
+      expect(envelopeUrlRegex.test(request.url())).toBe(false);
+      requestCount++;
+    });
+
+    await page.goto(url);
+
+    // Here are the requests that should exist:
+    // 1. HTML page
+    // 2. Init JS bundle
+    // 3. Subject JS bundle
+    // 4 [OPTIONAl] CDN JS bundle
+    // and then 3 fetch requests
+    if (process.env.PW_BUNDLE && process.env.PW_BUNDLE.startsWith('bundle_')) {
+      expect(requestCount).toBe(7);
+    } else {
+      expect(requestCount).toBe(6);
+    }
+  },
+);

dev-packages/browser-integration-tests/suites/tracing/request/xhr-with-no-active-span/init.js

@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  // disable pageload transaction
+  integrations: [Sentry.BrowserTracing({ tracingOrigins: ['http://example.com'], startTransactionOnPageLoad: false })],
+  tracesSampleRate: 1,
+});

dev-packages/browser-integration-tests/suites/tracing/request/xhr-with-no-active-span/subject.js

@@ -0,0 +1,11 @@
+const xhr_1 = new XMLHttpRequest();
+xhr_1.open('GET', 'http://example.com/0');
+xhr_1.send();
+
+const xhr_2 = new XMLHttpRequest();
+xhr_2.open('GET', 'http://example.com/1');
+xhr_2.send();
+
+const xhr_3 = new XMLHttpRequest();
+xhr_3.open('GET', 'http://example.com/2');
+xhr_3.send();

dev-packages/browser-integration-tests/suites/tracing/request/xhr-with-no-active-span/test.ts

@@ -0,0 +1,35 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { envelopeUrlRegex, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+sentryTest(
+  'there should be no span created for xhr requests with no active span',
+  async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+
+    let requestCount = 0;
+    page.on('request', request => {
+      expect(envelopeUrlRegex.test(request.url())).toBe(false);
+      requestCount++;
+    });
+
+    await page.goto(url);
+
+    // Here are the requests that should exist:
+    // 1. HTML page
+    // 2. Init JS bundle
+    // 3. Subject JS bundle
+    // 4 [OPTIONAl] CDN JS bundle
+    // and then 3 fetch requests
+    if (process.env.PW_BUNDLE && process.env.PW_BUNDLE.startsWith('bundle_')) {
+      expect(requestCount).toBe(7);
+    } else {
+      expect(requestCount).toBe(6);
+    }
+  },
+);

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

@@ -1,7 +1,7 @@
 import type { Page, Request } from '@playwright/test';
 import type { EnvelopeItemType, Event, EventEnvelopeHeaders } from '@sentry/types';
 
-const envelopeUrlRegex = /\.sentry\.io\/api\/\d+\/envelope\//;
+export const envelopeUrlRegex = /\.sentry\.io\/api\/\d+\/envelope\//;
 
 export const envelopeParser = (request: Request | null): unknown[] => {
   // https://develop.sentry.dev/sdk/envelopes/

dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "7.98.0",
+  "version": "7.99.0",
   "license": "MIT",
   "private": true,
   "scripts": {

dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json

@@ -5,8 +5,8 @@
   "type": "module",
   "scripts": {
     "build": "tsc",
-    "start": "pnpm build && node dist/consistentExports.js",
-    "test": " node dist/consistentExports.js",
+    "start": "pnpm build && bun run ./dist/consistentExports.js",
+    "test": " bun run ./dist/consistentExports.js",
     "clean": "npx rimraf node_modules,pnpm-lock.yaml,dist",
     "test:build": "pnpm install && pnpm build",
     "test:assert": "pnpm test"

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -1,5 +1,5 @@
 import * as SentryAstro from '@sentry/astro';
-// import * as SentryBun from '@sentry/bun';
+import * as SentryBun from '@sentry/bun';
 import * as SentryNextJs from '@sentry/nextjs';
 import * as SentryNode from '@sentry/node';
 import * as SentryRemix from '@sentry/remix';
@@ -11,7 +11,7 @@ const NODE_EXPORTS_IGNORE = [
   'default',
   // Probably generated by transpilation, no need to require it
   '__esModule',
-  // this function was deprecates almost immediately after it was introduced
+  // this function was deprecated almost immediately after it was introduced
   // due to a name change (startSpan). No need to re-export it IMHO.
   'startActiveSpan',
   // this was never meant for external use (and documented as such)
@@ -22,8 +22,6 @@ const NODE_EXPORTS_IGNORE = [
   'DebugSession',
   'AnrIntegrationOptions',
   'LocalVariablesIntegrationOptions',
-  // deprecated
-  'spanStatusfromHttpCode',
 ];
 
 type Dependent = {
@@ -38,40 +36,35 @@ const DEPENDENTS: Dependent[] = [
     package: '@sentry/astro',
     exports: Object.keys(SentryAstro),
   },
+  {
+    package: '@sentry/bun',
+    exports: Object.keys(SentryBun),
+    ignoreExports: [
+      // not supported in bun:
+      'Handlers',
+      'NodeClient',
+      'hapiErrorPlugin',
+      'makeNodeTransport',
+    ],
+  },
   {
     package: '@sentry/nextjs',
     // Next.js doesn't require explicit exports, so we can just merge top level and `default` exports:
     // @ts-expect-error: `default` is not in the type definition but it's defined
     exports: Object.keys({ ...SentryNextJs, ...SentryNextJs.default }),
-    ignoreExports: ['withSentryConfig'],
   },
   {
     package: '@sentry/remix',
     exports: Object.keys(SentryRemix),
-    // TODO: Fix exports in remix
-    skip: true,
   },
   {
     package: '@sentry/serverless',
     exports: Object.keys(SentryServerless),
-    ignoreExports: [
-      // Deprecated, no need to add this now to serverless
-      'extractTraceparentData',
-      'getModuleFromFilename',
-      // TODO: Should these be exported from serverless?
-      'cron',
-      'enableAnrDetection',
-      'runWithAsyncContext',
-      'hapiErrorPlugin',
-    ],
-    // TODO: Fix exports in serverless
-    skip: true,
+    ignoreExports: ['cron', 'hapiErrorPlugin', 'enableAnrDetection'],
   },
   {
     package: '@sentry/sveltekit',
     exports: Object.keys(SentrySvelteKit),
-    // TODO: Fix exports in sveltekit
-    skip: true,
   },
 ];
 

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "7.98.0",
+  "version": "7.99.0",
   "license": "MIT",
   "engines": {
     "node": ">=10"
@@ -29,9 +29,9 @@
   "dependencies": {
     "@hapi/hapi": "^20.3.0",
     "@prisma/client": "3.15.2",
-    "@sentry/node": "7.98.0",
-    "@sentry/tracing": "7.98.0",
-    "@sentry/types": "7.98.0",
+    "@sentry/node": "7.99.0",
+    "@sentry/tracing": "7.99.0",
+    "@sentry/types": "7.99.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",

dev-packages/overhead-metrics/package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "7.98.0",
+  "version": "7.99.0",
   "name": "@sentry-internal/overhead-metrics",
   "main": "index.js",
   "author": "Sentry",