Merge branch 'develop' into feat-replay-change-stop-flush-clear-session

Author: billyvg

.github/ISSUE_TEMPLATE/bug.yml

@@ -25,12 +25,13 @@ body:
   - type: dropdown
     id: package
     attributes:
-      label:
-        Which SDK are you using? If you use the CDN bundles, please specify the exact bundle (e.g.
-        `bundle.tracing.min.js`) in your SDK setup.
+      label: Which SDK are you using?
+      description:
+        If you're using the CDN bundles, please specify the exact bundle (e.g. `bundle.tracing.min.js`) in your SDK
+        setup.
       options:
-        - '@sentry/angular'
         - '@sentry/browser'
+        - '@sentry/angular'
         - '@sentry/ember'
         - '@sentry/gatsby'
         - '@sentry/nextjs'
@@ -43,8 +44,8 @@ body:
         - '@sentry/sveltekit'
         - '@sentry/vue'
         - '@sentry/wasm'
-        - Sentry Browser CDN bundle
         - Sentry Browser Loader
+        - Sentry Browser CDN bundle
     validations:
       required: true
   - type: input
@@ -61,15 +62,15 @@ body:
       label: Framework Version
       description:
         If you're using one of our framework-specific SDKs (`@sentry/react`, for example), what version of the
-        _framework_ (not SDK) are you using?
+        _framework_ are you using?
       placeholder: ex. React 17.0.0
   - type: input
     id: link-to-sentry
     attributes:
       label: Link to Sentry event
       description:
-        If applicable, provide a link to the affected event from your Sentry account. The event will only be viewable by
-        Sentry staff.
+        If applicable, please provide a link to the affected event from your Sentry account. The event will only be
+        viewable by Sentry staff.
       placeholder: https://sentry.io/organizations/<org-slug>/issues/<issue-id>/events/<event-id>/?project=<project-id>
   - type: textarea
     id: sdk-setup

.github/workflows/build.yml

@@ -161,7 +161,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
         # we use a hash of yarn.lock as our cache key, because if it hasn't changed, our dependencies haven't changed,
         # so no need to reinstall them
       - name: Compute dependency cache key
@@ -207,8 +209,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
-
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Check dependency cache
         uses: actions/cache/restore@v3
         with:
@@ -262,7 +265,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:
@@ -331,7 +336,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:
@@ -352,7 +359,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:
@@ -372,7 +381,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:
@@ -422,7 +433,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [8, 10, 12, 14, 16, 18]
+        node: [8, 10, 12, 14, 16, 18, 20]
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v3
@@ -526,7 +537,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:
@@ -570,6 +583,7 @@ jobs:
         bundle:
           - loader_base
           - loader_eager
+          - loader_debug
           - loader_tracing
           - loader_replay
           - loader_tracing_replay
@@ -580,7 +594,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:
@@ -631,7 +647,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:
@@ -655,7 +673,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:
@@ -678,7 +698,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [10, 12, 14, 16, 18]
+        node: [10, 12, 14, 16, 18, 20]
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v3
@@ -730,7 +750,7 @@ jobs:
           yarn test:integration:ci
 
   job_e2e_tests:
-    name: E2E Tests
+    name: E2E Tests (Shard ${{ matrix.shard }})
     # We only run E2E tests for non-fork PRs because the E2E tests require secrets to work and they can't be accessed from forks
     # Dependabot PRs sadly also don't have access to secrets, so we skip them as well
     if:
@@ -739,13 +759,19 @@ jobs:
     needs: [job_get_metadata, job_build]
     runs-on: ubuntu-20.04
     timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2, 3]
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v3
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:
@@ -761,6 +787,8 @@ jobs:
           E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }}
           E2E_TEST_SENTRY_ORG_SLUG: 'sentry-javascript-sdks'
           E2E_TEST_SENTRY_TEST_PROJECT: 'sentry-javascript-e2e-tests'
+          E2E_TEST_SHARD: ${{ matrix.shard }}
+          E2E_TEST_SHARD_AMOUNT: 3
         run: |
           cd packages/e2e-tests
           yarn test:e2e
@@ -803,7 +831,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Restore caches
         uses: ./.github/actions/restore-cache
         env:

.github/workflows/canary.yml

@@ -20,14 +20,16 @@ jobs:
   job_canary_test:
     name: Canary Tests
     runs-on: ubuntu-20.04
-    timeout-minutes: 30
+    timeout-minutes: 60
     steps:
       - name: 'Check out current commit'
         uses: actions/checkout@v3
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Install dependencies
         run: yarn install --ignore-engines --frozen-lockfile
       - name: Build packages
@@ -70,8 +72,9 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: volta-cli/action@v4
-
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Install dependencies
         run: yarn install --ignore-engines --frozen-lockfile
 

.github/workflows/flaky-test-detector.yml

@@ -6,7 +6,6 @@ on:
       - 'packages/browser-integration-tests/suites/**'
     branches-ignore:
       - master
-      - develop
 
 env:
   HEAD_COMMIT: ${{ github.event.inputs.commit || github.sha }}
@@ -27,12 +26,15 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     name: 'Check tests for flakiness'
+    # Also skip if PR is from master -> develop
+    if: ${{ github.base_ref != 'master' && github.ref != 'refs/heads/master' }}
     steps:
       - name: Check out current branch
         uses: actions/checkout@v3
       - name: Set up Node
-        uses: volta-cli/action@v4
-
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: 'package.json'
       - name: Install dependencies
         run: yarn install --ignore-engines --frozen-lockfile
 

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

@@ -39,11 +39,13 @@ jobs:
           github_token: ${{ secrets.REPO_SCOPED_TOKEN }}
 
       - name: Enable automerge for PR
-        run: gh pr merge --merge --auto "1"
+        if: steps.open-pr.outputs.pr_number != ''
+        run: gh pr merge --merge --auto "${{ steps.open-pr.outputs.pr_number }}"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       # https://github.com/marketplace/actions/auto-approve
       - name: Auto approve PR
-        # Always skip this for now, until we got a proper bot setup
         if: steps.open-pr.outputs.pr_number != ''
         uses: hmarr/auto-approve-action@v3
         with:

.github/workflows/label-last-commenter.yml

@@ -0,0 +1,31 @@
+name: 'Tag issues with last commenter'
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  toggle_labels:
+    name: Toggle Labels
+    runs-on: ubuntu-latest
+    if: ${{ !github.event.issue.pull_request }}
+    steps:
+      - name: Add label if commenter is not member
+        # Note: We only add the label if the issue is still open
+        if: |
+          github.event.comment.author_association != 'COLLABORATOR'
+          && github.event.comment.author_association != 'MEMBER'
+          && github.event.comment.author_association != 'OWNER'
+          && !github.event.issue.closed
+        uses: actions-ecosystem/action-add-labels@v1
+        with:
+          labels: 'Waiting for: Team'
+
+      - name: Remove label if commenter is member
+        if: |
+          github.event.comment.author_association == 'COLLABORATOR'
+          || github.event.comment.author_association == 'MEMBER'
+          || github.event.comment.author_association == 'OWNER'
+        uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: 'Waiting for: Team'

.prettierignore

@@ -1,2 +1,3 @@
 *.md
 .nxcache
+packages/browser-integration-tests/fixtures