Merge branch 'develop' into feat/tracing-in-core

Author: timfish

.github/workflows/auto-release.yml

@@ -0,0 +1,38 @@
+name: Gitflow - Auto prepare release
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+
+# This workflow tirggers a release when merging a branch with the pattern `prepare-release/VERSION` into master.
+jobs:
+  release:
+    runs-on: ubuntu-20.04
+    name: 'Prepare a new version'
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GH_RELEASE_PAT }}
+          fetch-depth: 0
+
+      # https://github.com/actions-ecosystem/action-regex-match
+      - uses: actions-ecosystem/action-regex-match@v2
+        id: version
+        with:
+          # Parse version from head branch
+          text: ${{ github.head_ref }}
+          # match: preprare-release/xx.xx.xx
+          regex: '^preprare-release\/(\d+\.\d+\.\d+)$'
+
+      - name: Prepare release
+        uses: getsentry/action-prepare-release@v1
+        if: github.event.pull_request.merged == true && steps.version.outputs.match != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
+        with:
+          version: ${{ steps.version.outputs.match != '' }}
+          force: false
+          merge_target: master

.github/workflows/build.yml

@@ -137,7 +137,8 @@ jobs:
       # Note: These next three have to be checked as strings ('true'/'false')!
       is_develop: ${{ github.ref == 'refs/heads/develop' }}
       is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
-      is_gitflow_sync: ${{ github.head_ref == 'refs/heads/develop' || github.head_ref == 'refs/heads/master' }}
+      # When merging into master, or from master
+      is_gitflow_sync: ${{ github.head_ref == 'refs/heads/master' || github.ref == 'refs/heads/master' }}
       has_gitflow_label:
         ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' Gitflow ') }}
       force_skip_cache:
@@ -468,7 +469,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [10, 12, 14, 16, 18]
+        node: [10, 12, 14, 16, '18.13.0']
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v3
@@ -532,6 +533,8 @@ jobs:
           - bundle_es5_min
           - bundle_es6
           - bundle_es6_min
+          - bundle_replay_es6
+          - bundle_replay_es6_min
         tracing_only:
           - true
           - false

.github/workflows/gitflow-sync-master.yml

@@ -4,15 +4,38 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.37.2
+
+This release includes changes and fixes around text masking and blocking in Replay's `rrweb` dependency. See versions [1.102.0](https://github.com/getsentry/rrweb/releases/tag/1.102.0) and [1.103.0](https://github.com/getsentry/rrweb/releases/tag/1.103.0).
+
+- feat: Check `blockSelector` for blocking elements as well
+- feat: With maskAllText, mask the attributes: placeholder, title, `aria-label`
+- feat: fix masking on `textarea`
+- feat: Add `maskAllText` option
+
+SDK Changes:
+
+- fix(replay): Fix svgs not getting unblocked  (#7132)
+
+## 7.37.1
+
+- fix(browser): Support `async` in stack frame urls (#7131)
+- fix(nextjs): Make api route identifier stricter (#7126)
+- fix(node): Don't rely on `this` in http integration (#7135)
+- fix(replay): Fix missing fetch/xhr requests (#7134)
+- fix(tracing): Export `defaultStackParser` from tracing CDN bundles (#7116)
+
 ## 7.37.0
 
 - feat: Add source map debug ids (#7068)
 - feat(browser): Add IndexedDb offline transport store (#6983)
 - feat(nextjs): Add auto-wrapping for server components (#6953)
+- feat(nextjs): Improve client stack traces (#7097)
 - feat(replay): Improve rrweb error ignoring (#7087 & #7094)
 - feat(replay): Send client_report when replay sending fails (#7093)
 - fix(node): `LocalVariables`, Improve frame matching for ESM (#7049)
 - fix(node): Add lru cache to http integration span map (#7064)
+- fix(replay): Export Replay from Sentry namespace in full CDN bundle (#7119)
 
 Work in this release contributed by @JamesHenry. Thank you for your contribution!
 

CHANGELOG.md

@@ -254,7 +254,7 @@ export function makeMyCustomTransport(options: BaseTransportOptions): Transport
   }
 
   // `createTransport` takes care of rate limiting and flushing
-  return createTransport({ bufferSize: options.bufferSize }, makeRequest);
+  return createTransport(options, makeRequest);
 }
 
 Sentry.init({

MIGRATION.md

@@ -6,20 +6,20 @@ _These steps are only relevant to Sentry employees when preparing and publishing
 **If you want to release a new SDK for the first time, be sure to follow the [New SDK Release Checklist](./new-sdk-release-checklist.md)**
 
 1. Determine what version will be released (we use [semver](https://semver.org)).
-2. Update [`CHANGELOG.md`](https://github.com/getsentry/sentry-javascript/edit/master/CHANGELOG.md) to add an entry for the next release number and a list of changes since the last release. (See details below.)
-  a. Merging the Changelog PR will automatically trigger a sync from `develop` -> `master`
-3. Run the [Prepare Release](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) workflow.
-  a. Wait for this until the sync to `master` is completed.
-4. A new issue should appear in https://github.com/getsentry/publish/issues.
-5. Ask a member of the [@getsentry/releases team](https://github.com/orgs/getsentry/teams/releases/members) to approve the release.
+2. Create a branch `prepare-release/VERSION`, eg. `prepare-release/7.37.0`, off develop
+3. Update [`CHANGELOG.md`](https://github.com/getsentry/sentry-javascript/edit/master/CHANGELOG.md) to add an entry for the next release number and a list of changes since the last release. (See details below.)
+4. Create a PR towards `master` branch
+5. When the PR is merged, it will automatically trigger the [Prepare Release](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) on master.
+6. A new issue should appear in https://github.com/getsentry/publish/issues.
+7. Ask a member of the [@getsentry/releases team](https://github.com/orgs/getsentry/teams/releases/members) to approve the release.
   a. Once the release is completed, a sync from `master` ->` develop` will be automatically triggered
 
 ## Updating the Changelog
 
-1. Create a new branch.
+1. Create a new branch `prepare-release/VERSION` off of `develop`, e.g. `prepare-release/7.37.1`.
 2. Run `yarn changelog` and copy everything
 3. Create a new section in the changelog, deciding based on the changes whether it should be a minor bump or a patch release.
 4. Paste in the logs you copied earlier.
 5. Delete any which aren't user-facing changes.
 7. If any of the PRs are from external contributors, include underneath the commits `Work in this release contributed by <list of external contributors' GitHub usernames>. Thank you for your contributions!`. If there's only one external PR, don't forget to remove the final `s`. If there are three or more, use an Oxford comma. (It's in the Sentry styleguide!)
-8. Commit, push, and open a PR with the title `meta: Update changelog for <fill in relevant version here>` against `develop` branch.
+8. Commit, push, and open a PR with the title `meta(changelog): Update changelog for VERSION` against `master` branch.

docs/publishing-a-release.md

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "7.36.0",
+  "version": "7.37.2",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

lerna.json

@@ -109,8 +109,7 @@
     "typescript": "3.8.3"
   },
   "resolutions": {
-    "**/agent-base": "5",
-    "@types/express-serve-static-core": "4.17.30"
+    "**/agent-base": "5"
   },
   "version": "0.0.0",
   "name": "sentry-javascript"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "7.36.0",
+  "version": "7.37.2",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "7.36.0",
-    "@sentry/types": "7.36.0",
-    "@sentry/utils": "7.36.0",
+    "@sentry/browser": "7.37.2",
+    "@sentry/types": "7.37.2",
+    "@sentry/utils": "7.37.2",
     "tslib": "^2.0.0"
   },
   "devDependencies": {

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "7.36.0",
+  "version": "7.37.2",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,10 +16,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "7.36.0",
-    "@sentry/replay": "7.36.0",
-    "@sentry/types": "7.36.0",
-    "@sentry/utils": "7.36.0",
+    "@sentry/core": "7.37.2",
+    "@sentry/replay": "7.37.2",
+    "@sentry/types": "7.37.2",
+    "@sentry/utils": "7.37.2",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/browser/package.json

@@ -31,7 +31,7 @@ function createFrame(filename: string, func: string, lineno?: number, colno?: nu
 
 // Chromium based browsers: Chrome, Brave, new Opera, new Edge
 const chromeRegex =
-  /^\s*at (?:(.*\).*?|.*?) ?\((?:address at )?)?((?:file|https?|blob|chrome-extension|address|native|eval|webpack|<anonymous>|[-a-z]+:|.*bundle|\/)?.*?)(?::(\d+))?(?::(\d+))?\)?\s*$/i;
+  /^\s*at (?:(.*\).*?|.*?) ?\((?:address at )?)?(?:async )?((?:file|https?|blob|chrome-extension|address|native|eval|webpack|<anonymous>|[-a-z]+:|.*bundle|\/)?.*?)(?::(\d+))?(?::(\d+))?\)?\s*$/i;
 const chromeEvalRegex = /\((\S*)(?::(\d+))(?::(\d+))\)/;
 
 const chrome: StackLineParserFn = line => {

packages/browser/src/stack-parsers.ts

@@ -332,6 +332,31 @@ describe('Tracekit - Chrome Tests', () => {
     });
   });
 
+  it('should parse frames with async urls', () => {
+    const CHROME_109_ASYNC_URL = {
+      message: 'bad',
+      name: 'Error',
+      stack: `Error: bad
+          at callAnotherThing (http://localhost:5000/:20:16)
+          at Object.callback (async http://localhost:5000/:25:7)
+          at test (http://localhost:5000/:33:23)`,
+    };
+
+    const ex = exceptionFromError(parser, CHROME_109_ASYNC_URL);
+
+    expect(ex).toEqual({
+      value: 'bad',
+      type: 'Error',
+      stacktrace: {
+        frames: [
+          { filename: 'http://localhost:5000/', function: 'test', lineno: 33, colno: 23, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'Object.callback', lineno: 25, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'callAnotherThing', lineno: 20, colno: 16, in_app: true },
+        ],
+      },
+    });
+  });
+
   it('should parse exceptions with native code frames in Edge 44', () => {
     const EDGE44_NATIVE_CODE_EXCEPTION = {
       message: 'test',

packages/browser/test/unit/tracekit/chromium.test.ts

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "7.36.0",
+  "version": "7.37.2",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -16,8 +16,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/types": "7.36.0",
-    "@sentry/utils": "7.36.0",
+    "@sentry/types": "7.37.2",
+    "@sentry/utils": "7.37.2",
     "tslib": "^1.9.3"
   },
   "scripts": {

packages/core/package.json

@@ -1 +1 @@
-export const SDK_VERSION = '7.36.0';
+export const SDK_VERSION = '7.37.2';

packages/core/src/version.ts

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "7.36.0",
+  "version": "7.37.2",
   "license": "MIT",
   "engines": {
     "node": ">=10"

packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "7.36.0",
+  "version": "7.37.2",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -29,10 +29,10 @@
   },
   "dependencies": {
     "@embroider/macros": "^1.9.0",
-    "@sentry/browser": "7.36.0",
-    "@sentry/tracing": "7.36.0",
-    "@sentry/types": "7.36.0",
-    "@sentry/utils": "7.36.0",
+    "@sentry/browser": "7.37.2",
+    "@sentry/tracing": "7.37.2",
+    "@sentry/types": "7.37.2",
+    "@sentry/utils": "7.37.2",
     "ember-auto-import": "^1.12.1 || ^2.4.3",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.1.1",

packages/ember/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "7.36.0",
+  "version": "7.37.2",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -19,8 +19,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "7.36.0",
-    "@sentry-internal/typescript": "7.36.0",
+    "@sentry-internal/eslint-plugin-sdk": "7.37.2",
+    "@sentry-internal/typescript": "7.37.2",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
     "eslint-config-prettier": "^6.11.0",

packages/eslint-config-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "7.36.0",
+  "version": "7.37.2",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",