Merge branch 'develop' of https://github.com/getsentry/sentry-javascript into feature/parameterize-public-api

Author: AleshaOleg

.craft.yml

@@ -32,6 +32,10 @@ targets:
   - name: npm
     id: '@sentry-internal/feedback'
     includeNames: /^sentry-internal-feedback-\d.*\.tgz$/
+  ## 1.8 ReplayCanvas package (browser only)
+  - name: npm
+    id: '@sentry-internal/replay-canvas'
+    includeNames: /^sentry-internal-replay-canvas-\d.*\.tgz$/
 
   ## 2. Browser & Node SDKs
   - name: npm

.git-blame-ignore-revs

@@ -12,3 +12,6 @@ ef6b3c7877d5fc8031c08bb28b0ffafaeb01f501
 
 # chore: Enforce formatting of MD files in repository root #10127
 aecf26f22dbf65ce2c0caadc4ce71b46266c9f45
+
+# chore: Create dev-packages folder #9997 
+35205b4cc5783237e69452c39ea001e461d9c84d

.github/workflows/build.yml

@@ -100,6 +100,7 @@ jobs:
               - *shared
               - 'packages/browser/**'
               - 'packages/replay/**'
+              - 'packages/replay-canvas/**'
               - 'packages/feedback/**'
             browser_integration:
               - *shared
@@ -371,6 +372,7 @@ jobs:
             ${{ github.workspace }}/packages/browser/build/bundles/**
             ${{ github.workspace }}/packages/integrations/build/bundles/**
             ${{ github.workspace }}/packages/replay/build/bundles/**
+            ${{ github.workspace }}/packages/replay-canvas/build/bundles/**
             ${{ github.workspace }}/packages/**/*.tgz
             ${{ github.workspace }}/packages/serverless/build/aws/dist-serverless/*.zip
 
@@ -776,8 +778,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [14, 16, 18, 20, 21]
+        node: [18, 20, 21]
         remix: [1, 2]
+        # Remix v2 only supports Node 18+, so run Node 14, 16 tests separately
+        include:
+          - node: 14
+            remix: 1
+          - node: 16
+            remix: 1
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v4
@@ -863,8 +871,9 @@ jobs:
             'node-express-app',
             'create-react-app',
             'create-next-app',
-            'create-remix-app',
-            'create-remix-app-v2',
+            # disabling remix e2e tests because of flakes
+            # 'create-remix-app',
+            # 'create-remix-app-v2',
             'debug-id-sourcemaps',
             'nextjs-app-dir',
             'nextjs-14',

.size-limit.js

@@ -14,6 +14,13 @@ module.exports = [
     gzip: true,
     limit: '75 KB',
   },
+  {
+    name: '@sentry/browser (incl. Tracing, Replay with Canvas) - Webpack (gzipped)',
+    path: 'packages/browser/build/npm/esm/index.js',
+    import: '{ init, Replay, BrowserTracing, ReplayCanvas }',
+    gzip: true,
+    limit: '90 KB',
+  },
   {
     name: '@sentry/browser (incl. Tracing, Replay) - Webpack with treeshaking flags (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',
@@ -47,6 +54,13 @@ module.exports = [
     gzip: true,
     limit: '50 KB',
   },
+  {
+    name: '@sentry/browser (incl. sendFeedback) - Webpack (gzipped)',
+    path: 'packages/browser/build/npm/esm/index.js',
+    import: '{ init, sendFeedback }',
+    gzip: true,
+    limit: '50 KB',
+  },
   {
     name: '@sentry/browser - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',

CHANGELOG.md

@@ -4,6 +4,86 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.94.1
+
+This release fixes a publishing issue.
+
+## 7.94.0
+
+### Important Changes
+
+#### Deprecations
+
+As we're moving closer to the next major version of the SDK, more public APIs were deprecated.
+
+To get a head start on migrating to the replacement APIs, please take a look at our
+[migration guide](https://github.com/getsentry/sentry-javascript/blob/develop/MIGRATION.md).
+
+- feat: Deprecate user segment field (#10210)
+- feat(core): Deprecate `finish` on `Span` interface in favour of `end` (#10161)
+- feat(core): Deprecate `getCurrentHub()` (#10200)
+- feat(core): Deprecate `hub.bindClient()` & `makeMain()` (#10188)
+- feat(core): Deprecate `Span.instrumenter` (#10139)
+- feat(core): Deprecate `Span.isSuccess()` in favor of reading span status (#10213)
+- feat(core): Deprecate `Span.op` in favor of op attribute (#10189)
+- feat(core): Deprecate `Span.spanRecorder` (#10199)
+- feat(core): Deprecate `Span.status` (#10208)
+- feat(core): Deprecate `Span.transaction` in favor of `getRootSpan` (#10134)
+- feat(core): Deprecate `Transaction.instrumenter` (#10162)
+- feat(core): Deprecate `Transaction.setMeasurement` in favor of `setMeasurement` (#10182)
+- feat(core): Deprecate integration classes & `Integrations.X` (#10198)
+- feat(core): Deprecate methods on `Hub` (#10124)
+- feat(core): Deprecate remaining `setName` declarations on `Transaction` and `Span` (#10164)
+- feat(core): Deprecate span `startTimestamp` & `endTimestamp` (#10192)
+- feat(core): Deprecate `hub.bindClient()` and `makeMain()` (#10118)
+- feat(types): Deprecate `op` on `Span` interface (#10217)
+- feat(integrations): Deprecate `Transaction` integration (#10178)
+- feat(integrations): Deprecate pluggable integration classes (#10211)
+
+#### Replay & Canvas
+
+We have added a new `ReplayCanvas` integration (#10112), which you can add to capture the contents of canvas elements
+with Replay.
+
+Just add it _in addition_ to the regular replay integration:
+
+```js
+Sentry.init({
+  integrations: [new Sentry.Replay(), new Sentry.ReplayCanvas()],
+});
+```
+
+### Other Changes
+
+- feat(core): Add `client.getIntegrationByName()` (#10130)
+- feat(core): Add `client.init()` to replace `client.setupIntegrations()` (#10118)
+- feat(core): Add `withActiveSpan` (#10195)
+- feat(core): Add `withIsolationScope` (#10141)
+- feat(core): Streamline integration function results to be compatible (#10135)
+- feat(core): Write data from `setUser`, `setTags`, `setExtras`, `setTag`, `setExtra`, and `setContext` to isolation
+  scope (#10163)
+- feat(core): Add domain information to resource span data #10205
+- feat(feedback): Export sendFeedback from @sentry/browser (#10231)
+- feat(node): Update and vendor https-proxy-agent (#10088)
+- feat(node-experimental): Add `withActiveSpan` (#10194)
+- feat(replays): Add snapshot function to replay canvas integration (#10066)
+- feat(types): Add `SerializedEvent` interface (pre v8) (#10240)
+- feat(types): Add support for new monitor config thresholds (#10225)
+- fix: Ensure all integration classes have correct types (#10183)
+- fix(astro): Fix import path when using external init files with default path (#10214)
+- fix(cdn): Emit console warning instead of error for integration shims (#10193)
+- fix(core): Take user from current scope when starting a session (#10153)
+- fix(node-experimental): Ensure `http.status_code` is always a string (#10177)
+- fix(node): Guard against `process.argv[1]` being undefined (#10155)
+- fix(node): Module name resolution (#10144)
+- fix(node): Remove leading slash in Windows filenames (#10147)
+- fix(remix): Capture thrown fetch responses. (#10166)
+- fix(tracing): Gate mongo operation span data behind sendDefaultPii (#10227)
+- fix(tracing-internal): Delay pageload transaction finish until document is interactive (#10215)
+- fix(tracing-internal): Only collect request/response spans when browser performance timing is available (#10207)
+- fix(tracing-internal): Prefer `fetch` init headers over `fetch` input headers (#10176)
+- fix(utils): Ensure dropUndefinedKeys() does not break class instances (#10245)
+
 ## 7.93.0
 
 ### Important Changes

MIGRATION.md

@@ -10,6 +10,33 @@ npx @sentry/migr8@latest
 This will let you select which updates to run, and automatically update your code. Make sure to still review all code
 changes!
 
+## Deprecate `getCurrentHub()`
+
+In v8, you will no longer have a Hub, only Scopes as a concept. This also means that `getCurrentHub()` will eventually
+be removed.
+
+Instead of `getCurrentHub()`, use the respective replacement API directly - see [Deprecate Hub](#deprecate-hub) for
+details.
+
+## Deprecate class-based integrations
+
+In v7, integrations are classes and can be added as e.g. `integrations: [new Sentry.Integrations.ContextLines()]`. In
+v8, integrations will not be classes anymore, but instead functions. Both the use as a class, as well as accessing
+integrations from the `Integrations.XXX` hash, is deprecated in favor of using the new functional integrations
+
+- for example, `new Integrations.LinkedErrors()` becomes `linkedErrorsIntegration()`.
+
+The following list shows how integrations should be migrated:
+
+| Old                      | New                             | Packages                                                                                                |
+| ------------------------ | ------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| `new InboundFilters()`   | `inboundFiltersIntegration()`   | `@sentry/core`, `@sentry/browser`, `@sentry/node`, `@sentry/deno`, `@sentry/bun`, `@sentry/vercel-edge` |
+| `new FunctionToString()` | `functionToStringIntegration()` | `@sentry/core`, `@sentry/browser`, `@sentry/node`, `@sentry/deno`, `@sentry/bun`, `@sentry/vercel-edge` |
+| `new LinkedErrors()`     | `linkedErrorsIntegration()`     | `@sentry/core`, `@sentry/browser`, `@sentry/node`, `@sentry/deno`, `@sentry/bun`, `@sentry/vercel-edge` |
+| `new ModuleMetadata()`   | `moduleMetadataIntegration()`   | `@sentry/core`, `@sentry/browser`                                                                       |
+| `new RequestData()`      | `requestDataIntegration()`      | `@sentry/core`, `@sentry/node`, `@sentry/deno`, `@sentry/bun`, `@sentry/vercel-edge`                    |
+| `new Wasm() `            | `wasmIntegration()`             | `@sentry/wasm`                                                                                          |
+
 ## Deprecate `hub.bindClient()` and `makeMain()`
 
 Instead, either directly use `initAndBind()`, or the new APIs `setCurrentClient()` and `client.init()`. See
@@ -54,7 +81,7 @@ If you are using the `Hub` right now, see the following table on how to migrate
 | ---------------------- | ------------------------------------------------------------------------------------ |
 | `new Hub()`            | `withScope()`, `withIsolationScope()` or `new Scope()`                               |
 | hub.isOlderThan()      | REMOVED - Was used to compare `Hub` instances, which are gonna be removed            |
-| hub.bindClient()       | A combination of `scope.setClient()` and `client.setupIntegrations()`                |
+| hub.bindClient()       | A combination of `scope.setClient()` and `client.init()`                             |
 | hub.pushScope()        | `Sentry.withScope()`                                                                 |
 | hub.popScope()         | `Sentry.withScope()`                                                                 |
 | hub.withScope()        | `Sentry.withScope()`                                                                 |
@@ -167,6 +194,7 @@ In v8, the Span class is heavily reworked. The following properties & methods ar
 - `span.getTraceContext()`: Use `spanToTraceContext(span)` utility function instead.
 - `span.sampled`: Use `span.isRecording()` instead.
 - `span.spanId`: Use `span.spanContext().spanId` instead.
+- `span.parentSpanId`: Use `spanToJSON(span).parent_span_id` instead.
 - `span.traceId`: Use `span.spanContext().traceId` instead.
 - `span.name`: Use `spanToJSON(span).description` instead.
 - `span.description`: Use `spanToJSON(span).description` instead.
@@ -178,6 +206,9 @@ In v8, the Span class is heavily reworked. The following properties & methods ar
 - `span.instrumenter` This field was removed and will be replaced internally.
 - `span.transaction`: Use `getRootSpan` utility function instead.
 - `span.spanRecorder`: Span recording will be handled internally by the SDK.
+- `span.status`: Use `.setStatus` to set or update and `spanToJSON()` to read the span status.
+- `span.op`: Use `startSpan` functions to set, `setAttribute()` to update and `spanToJSON` to read the span operation.
+- `span.isSuccess`: Use `spanToJSON(span).status === 'ok'` instead.
 - `transaction.setMetadata()`: Use attributes instead, or set data on the scope.
 - `transaction.metadata`: Use attributes instead, or set data on the scope.
 - `transaction.setContext()`: Set context on the surrounding scope instead.

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "7.93.0",
+  "version": "7.94.1",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -45,9 +45,9 @@
   "dependencies": {
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "^1.31.1",
-    "@sentry-internal/rrweb": "2.7.3",
-    "@sentry/browser": "7.93.0",
-    "@sentry/tracing": "7.93.0",
+    "@sentry-internal/rrweb": "2.9.0",
+    "@sentry/browser": "7.94.1",
+    "@sentry/tracing": "7.94.1",
     "axios": "1.6.0",
     "babel-loader": "^8.2.2",
     "html-webpack-plugin": "^5.5.0",

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/init.js

@@ -0,0 +1,16 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  beforeSend(event) {
+    Sentry.captureUserFeedback({
+      event_id: event.event_id,
+      name: 'John Doe',
+      email: '[email protected]',
+      comments: 'This feedback should be attached associated with the captured error',
+    });
+    return event;
+  },
+});

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/subject.js

@@ -0,0 +1 @@
+Sentry.captureException(new Error('Error with Feedback'));

dev-packages/browser-integration-tests/suites/public-api/captureUserFeedback/withCaptureException/test.ts

@@ -0,0 +1,23 @@
+import { expect } from '@playwright/test';
+import type { Event, UserFeedback } from '@sentry/types';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
+
+sentryTest('capture user feedback when captureException is called', async ({ getLocalTestPath, page }) => {
+  const url = await getLocalTestPath({ testDir: __dirname });
+
+  const data = (await getMultipleSentryEnvelopeRequests(page, 2, { url })) as (Event | UserFeedback)[];
+
+  expect(data).toHaveLength(2);
+
+  const errorEvent = ('exception' in data[0] ? data[0] : data[1]) as Event;
+  const feedback = ('exception' in data[0] ? data[1] : data[0]) as UserFeedback;
+
+  expect(feedback).toEqual({
+    comments: 'This feedback should be attached associated with the captured error',
+    email: '[email protected]',
+    event_id: errorEvent.event_id,
+    name: 'John Doe',
+  });
+});