Merge remote-tracking branch 'upstream/master' into feat/offline

Author: timfish

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# Since version 2.23 (released in August 2019), git-blame has a feature
+# to ignore or bypass certain commits.
+#
+# This file contains a list of commits that are not likely what you
+# are looking for in a blame, such as mass reformatting or renaming.
+
+#  build: Add `@typescript-eslint/consistent-type-imports` rule (#6662)
+2aa4e94b036675245290596884959e06dcced044

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,6 +1,6 @@
 name: 🐞 Bug Report
 description: Tell us about something that's not working the way we (probably) intend.
-labels: ["Type: Bug"]
+labels: ['Type: Bug']
 body:
   - type: checkboxes
     attributes:
@@ -27,19 +27,19 @@ body:
     attributes:
       label: Which package are you using?
       options:
-        - "@sentry/angular"
-        - "@sentry/browser"
-        - "@sentry/ember"
-        - "@sentry/gatsby"
-        - "@sentry/nextjs"
-        - "@sentry/node"
-        - "@sentry/opentelemetry-node"
-        - "@sentry/react"
-        - "@sentry/remix"
-        - "@sentry/serverless"
-        - "@sentry/svelte"
-        - "@sentry/vue"
-        - "@sentry/wasm"
+        - '@sentry/angular'
+        - '@sentry/browser'
+        - '@sentry/ember'
+        - '@sentry/gatsby'
+        - '@sentry/nextjs'
+        - '@sentry/node'
+        - '@sentry/opentelemetry-node'
+        - '@sentry/react'
+        - '@sentry/remix'
+        - '@sentry/serverless'
+        - '@sentry/svelte'
+        - '@sentry/vue'
+        - '@sentry/wasm'
     validations:
       required: true
   - type: input
@@ -54,14 +54,32 @@ body:
     id: framework-version
     attributes:
       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?
+      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?
       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.
+      description:
+        If applicable, 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
+    attributes:
+      label: SDK Setup
+      description: How do you set up your Sentry SDK? Please show us your `Sentry.init` options.
+      placeholder: |-
+        ```javascript
+        Sentry.init({
+          dsn: __YOUR_DSN__
+          ...
+        });
+        ```
+    validations:
+      required: false
   - type: textarea
     id: repro
     attributes:

.github/ISSUE_TEMPLATE/flaky.yml

@@ -0,0 +1,45 @@
+name: ❅ Flaky Test
+description: Report a flaky test in CI
+title: '[Flaky CI]: '
+labels: ['Type: Tests']
+body:
+  - type: dropdown
+    id: type
+    attributes:
+      label: Flakiness Type
+      description: What are you observing
+      options:
+        - Timeout
+        - Assertion failure
+        - Other / Unknown
+    validations:
+      required: true
+  - type: input
+    id: job-name
+    attributes:
+      label: Name of Job
+      placeholder: Build & Test / Nextjs (Node 10) Tests
+      description: name of job as reported in the status report
+    validations:
+      required: true
+  - type: input
+    id: test-name
+    attributes:
+      label: Name of Test
+      placeholder: suites/replay/captureReplay/test.ts
+      description: file name or function name of failing test
+    validations:
+      required: false
+  - type: input
+    id: test-run-link
+    attributes:
+      label: Link to Test Run
+      placeholder: https://github.com/getsentry/sentry/runs/5582673807
+      description: paste the URL to a test run showing the issue
+    validations:
+      required: true
+  - type: textarea
+    id: details
+    attributes:
+      label: Details
+      description: If you know anything else, please add it here

.github/workflows/build.yml

@@ -191,7 +191,6 @@ jobs:
       - name: Check build cache
         uses: actions/cache@v3
         id: cache_built_packages
-        if: needs.job_get_metadata.outputs.force_skip_cache == 'false'
         with:
           path: ${{ env.CACHED_BUILD_PATHS }}
           key: ${{ env.BUILD_CACHE_KEY }}
@@ -486,57 +485,35 @@ jobs:
         with:
           path: ${{ env.CACHED_BUILD_PATHS }}
           key: ${{ env.BUILD_CACHE_KEY }}
+      - name: Get npm cache directory
+        id: npm-cache-dir
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
+      - name: Get Playwright version
+        id: playwright-version
+        run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
+      - uses: actions/cache@v3
+        name: Check if Playwright browser is cached
+        id: playwright-cache
+        with:
+          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-Playwright-${{steps.playwright-version.outputs.version}}
+      - name: Install Playwright browser if not cached
+        if: steps.playwright-cache.outputs.cache-hit != 'true'
+        continue-on-error: true # playwright needs node >= 14
+        run: npx playwright install --with-deps
+        env:
+          PLAYWRIGHT_BROWSERS_PATH: ${{steps.npm-cache-dir.outputs.dir}}
+      - name: Install OS dependencies of Playwright if cache hit
+        if: steps.playwright-cache.outputs.cache-hit == 'true'
+        continue-on-error: true # playwright needs node >= 14
+        run: npx playwright install-deps
       - name: Run tests
         env:
           NODE_VERSION: ${{ matrix.node }}
         run: |
           cd packages/nextjs
           yarn test:integration
 
-  # Ember tests are separate from the rest because they are the slowest part of the test suite, and making them a
-  # separate job allows them to run in parallel with the other tests.
-  job_ember_tests:
-    name: Ember (${{ matrix.scenario }}) Tests
-    needs: [job_get_metadata, job_build]
-    if: needs.job_get_metadata.outputs.changed_ember == 'true' || github.event_name != 'pull_request'
-    timeout-minutes: 10
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        scenario: [ember-release, embroider-optimized, ember-4.0]
-    steps:
-      - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-          # TODO: removing `fetch-depth` below seems to have no effect, and the commit which added it had no description,
-          # so it's not clear why it's necessary. That said, right now ember tests are xfail, so it's a little hard to
-          # tell if it's safe to remove. Once ember tests are fixed, let's try again with it turned off, and if all goes
-          # well, we can pull it out.
-          fetch-depth: 0
-      - name: Set up Node
-        uses: actions/setup-node@v3
-        with:
-          # We support node 14+. If that works, we can safely assume that newer versions will also work.
-          node-version: '14'
-      - name: Check dependency cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
-          key: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check build cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.CACHED_BUILD_PATHS }}
-          key: ${{ env.BUILD_CACHE_KEY }}
-      - name: Run Ember tests
-        run: |
-          cd packages/ember
-          yarn ember try:one ${{ matrix.scenario }} --skip-cleanup=true
-      - name: Compute test coverage
-        uses: codecov/codecov-action@v3
-
   job_browser_playwright_tests:
     name: Playwright (${{ matrix.bundle }})${{ (matrix.tracing_only && ' tracing only') || '' }} Tests
     needs: [job_get_metadata, job_build]
@@ -581,12 +558,10 @@ jobs:
           key: ${{ env.BUILD_CACHE_KEY }}
       - name: Get npm cache directory
         id: npm-cache-dir
-        run: |
-          echo "::set-output name=dir::$(npm config get cache)"
+        run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
       - name: Get Playwright version
         id: playwright-version
-        run: |
-          echo "::set-output name=version::$(node -p "require('@playwright/test/package.json').version")"
+        run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
       - uses: actions/cache@v3
         name: Check if Playwright browser is cached
         id: playwright-cache
@@ -805,7 +780,6 @@ jobs:
         job_browser_playwright_tests,
         job_browser_integration_tests,
         job_remix_integration_tests,
-        job_ember_tests,
       ]
     # Always run this, even if a dependent job failed
     if: always()
@@ -815,3 +789,51 @@ jobs:
         if: contains(needs.*.result, 'failure')
         run: |
           echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
+
+  replay_metrics:
+    name: Replay Metrics
+    needs: [job_get_metadata, job_build]
+    runs-on: ubuntu-20.04
+    timeout-minutes: 30
+    if: contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements')
+    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
+      - name: Check dependency cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
+          key: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Check build cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.CACHED_BUILD_PATHS }}
+          key: ${{ env.BUILD_CACHE_KEY }}
+
+      - name: Setup
+        run: yarn install
+        working-directory: packages/replay/metrics
+
+      - name: Collect
+        run: yarn ci:collect
+        working-directory: packages/replay/metrics
+
+      - name: Process
+        id: process
+        run: yarn ci:process
+        working-directory: packages/replay/metrics
+        # Don't run on forks - the PR comment cannot be added.
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Upload results
+        uses: actions/upload-artifact@v3
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
+        with:
+          name: ${{ steps.process.outputs.artifactName }}
+          path: ${{ steps.process.outputs.artifactPath }}

.github/workflows/canary.yml

@@ -18,7 +18,7 @@ permissions:
 
 jobs:
   job_canary_test:
-    name: Run Canary Tests
+    name: Canary Tests
     runs-on: ubuntu-20.04
     timeout-minutes: 30
     steps:
@@ -55,3 +55,41 @@ jobs:
           RUN_LINK: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
         with:
           filename: .github/CANARY_FAILURE_TEMPLATE.md
+
+  job_ember_canary_test:
+    name: Ember Canary Tests
+    runs-on: ubuntu-20.04
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        scenario: [ember-release, embroider-optimized, ember-4.0]
+    steps:
+      - name: 'Check out current commit'
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ env.HEAD_COMMIT }}
+      - name: Set up Node
+        uses: volta-cli/action@v4
+
+      - name: Install dependencies
+        run: yarn install --ignore-engines --frozen-lockfile
+
+      - name: Build dependencies
+        run: |
+          yarn lerna run build:types --scope=@sentry/ember --include-dependencies
+          yarn lerna run build:transpile --scope=@sentry/ember --include-dependencies
+
+      - name: Run Ember tests
+        run: |
+          cd packages/ember
+          yarn ember try:one ${{ matrix.scenario }} --skip-cleanup=true
+
+      - name: Create Issue
+        if: failure()
+        uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RUN_LINK: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        with:
+          filename: .github/CANARY_FAILURE_TEMPLATE.md

.gitignore

@@ -47,4 +47,4 @@ tmp.js
 
 # eslint
 .eslintcache
-eslintcache/*
+**/eslintcache/*

.size-limit.js

@@ -78,4 +78,10 @@ module.exports = [
     limit: '48 KB',
     ignore: ['@sentry/browser', '@sentry/utils', '@sentry/core', '@sentry/types'],
   },
+  {
+    name: '@sentry/browser + @sentry/tracing + @sentry/replay - ES6 CDN Bundle (gzipped + minified)',
+    path: 'packages/tracing/build/bundles/bundle.tracing.replay.min.js',
+    gzip: true,
+    limit: '80 KB',
+  },
 ];

.vscode/launch.json

@@ -37,6 +37,22 @@
       "internalConsoleOptions": "openOnSessionStart",
       "outputCapture": "std"
     },
+    {
+        "type": "node",
+        "name": "Debug replay metrics collection script",
+        "request": "launch",
+        "cwd": "${workspaceFolder}/packages/replay/metrics/",
+        "program": "${workspaceFolder}/packages/replay/metrics/configs/dev/collect.ts",
+        "preLaunchTask": "Build Replay metrics script",
+    },
+    {
+        "type": "node",
+        "name": "Debug replay metrics processing script",
+        "request": "launch",
+        "cwd": "${workspaceFolder}/packages/replay/metrics/",
+        "program": "${workspaceFolder}/packages/replay/metrics/configs/dev/process.ts",
+        "preLaunchTask": "Build Replay metrics script",
+    },
     // Run rollup using the config file which is in the currently active tab.
     {
       "name": "Debug rollup (config from open file)",

.vscode/tasks.json

@@ -7,7 +7,13 @@
 			"type": "npm",
 			"script": "predebug",
 			"path": "packages/nextjs/test/integration/",
-			"detail": "Link the SDK (if not already linked) and build test app"
+			"detail": "Link the SDK (if not already linked) and build test app",
+		},
+		{
+			"label": "Build Replay metrics script",
+			"type": "npm",
+			"script": "build",
+			"path": "packages/replay/metrics",
 		}
 	]
 }