ci: establish SENTRY_DSN_PERFORMANCE, and fix broken Sentry tags

Author: HowardBraham

.github/workflows/main.yml

@@ -376,6 +376,7 @@ jobs:
       TS_MIGRATION_DASHBOARD_TOKEN: ${{ secrets.TS_MIGRATION_DASHBOARD_TOKEN }}
 
   build-source-map-explorer:
+    if: ${{ github.event_name != 'merge_group' }} # Skip this job for the Merge Queue
     needs:
       - identify-builds
       - prep-deps

.github/workflows/run-benchmarks.yml

@@ -40,6 +40,7 @@ jobs:
       ARTIFACT_NAME: build-test${{ matrix.browser == 'firefox' && '-mv2' || '' }}-${{ matrix.buildType }}
       OUTPUT_NAME: benchmark-${{ matrix.browser }}-${{ matrix.buildType }}-${{ matrix.pageType }}.json
       INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
+      SENTRY_DSN_PERFORMANCE: ${{ vars.SENTRY_DSN_PERFORMANCE }}
     continue-on-error: true
     steps:
       - name: Checkout and setup environment

.github/workflows/run-build.yml

@@ -86,6 +86,7 @@ jobs:
       ANALYTICS_DATA_DELETION_ENDPOINT: ${{ secrets.ANALYTICS_DATA_DELETION_ENDPOINT }}
       SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       SENTRY_DSN_DEV: ${{ secrets.SENTRY_DSN_DEV }}
+      SENTRY_DSN_PERFORMANCE: ${{ vars.SENTRY_DSN_PERFORMANCE }}
       TZ: 'UTC' # Ensures the bundles are consistent across machine time zones
       VAPID_KEY: ${{ secrets.VAPID_KEY }}
     steps:

.github/workflows/run-e2e.yml

@@ -59,6 +59,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # This is to support tests that set manifestFlags.testing.infuraProjectId, such as power-user.spec.ts
       INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
+      SENTRY_DSN_PERFORMANCE: ${{ vars.SENTRY_DSN_PERFORMANCE }}
       # For a `pull_request` event, the branch is `github.head_ref``.
       # For a `push` event, the branch is `github.ref_name`.
       BRANCH: ${{ github.head_ref || github.ref_name }}

.github/workflows/run-tests.yml

@@ -85,6 +85,7 @@ jobs:
 
   report-coverage:
     name: Report coverage
+    if: ${{ github.event_name != 'merge_group' }} # Skip this job for the Merge Queue
     runs-on: ubuntu-latest
     timeout-minutes: 30
     needs:

app/scripts/lib/setupSentry.js

@@ -24,6 +24,7 @@ const RELEASE = getSentryRelease(
 );
 const SENTRY_DSN = process.env.SENTRY_DSN;
 const SENTRY_DSN_DEV = process.env.SENTRY_DSN_DEV;
+const SENTRY_DSN_PERFORMANCE = process.env.SENTRY_DSN_PERFORMANCE;
 /* eslint-enable prefer-destructuring */
 
 // This is a fake DSN that can be used to test Sentry without sending data to the real Sentry server.
@@ -101,6 +102,8 @@ function getClientOptions() {
     // `false`.
     sendClientReports: false,
     tracesSampleRate: getTracesSampleRate(sentryTarget),
+    // If we are reporting to SENTRY_DSN_PERFORMANCE, we want to ignore all errors.
+    ignoreErrors: sentryTarget === SENTRY_DSN_PERFORMANCE ? [/.*/u] : undefined,
     transport: makeTransport,
   };
 }
@@ -125,12 +128,12 @@ function getTracesSampleRate(sentryTarget) {
   }
 
   if (flags.ci) {
-    // Report very frequently on main branch, and never on other branches
+    // Report more frequently on main branch, and less frequently on other branches
     // (Unless you use a `flags = {"sentry": {"tracesSampleRate": x.xx}}` override)
     if (flags.ci.branch === 'main') {
       return 0.015;
     }
-    return 0;
+    return 0.001;
   }
 
   if (METAMASK_DEBUG) {
@@ -205,13 +208,19 @@ function getSentryEnvironment() {
 }
 
 function getSentryTarget() {
+  const manifestFlags = getManifestFlags();
+
   if (
     process.env.IN_TEST &&
-    (!SENTRY_DSN_DEV || !getManifestFlags().sentry?.forceEnable)
+    (!SENTRY_DSN_DEV || !manifestFlags.sentry?.forceEnable)
   ) {
     return SENTRY_DSN_FAKE;
   }
 
+  if (manifestFlags.ci?.enabled && SENTRY_DSN_PERFORMANCE) {
+    return SENTRY_DSN_PERFORMANCE;
+  }
+
   if (METAMASK_ENVIRONMENT !== 'production') {
     return SENTRY_DSN_DEV;
   }

builds.yml

@@ -315,6 +315,7 @@ env:
   - SEGMENT_HOST: null
   - SENTRY_DSN: null
   - SENTRY_DSN_DEV: null
+  - SENTRY_DSN_PERFORMANCE: null
   # also INFURA_PROJECT_ID below
 
   ###

test/e2e/benchmarks/benchmark.ts

@@ -40,7 +40,7 @@ async function measurePageStandard(
     {
       fixtures: new FixtureBuilder().build(),
       disableServerMochaToBackground: true,
-      title: 'benchmark-pageload',
+      title: 'measurePageStandard',
     },
     async ({ driver, getNetworkReport, clearNetworkReport }) => {
       await unlockWallet(driver);

test/e2e/mock-e2e.js

@@ -331,6 +331,19 @@ async function setupMocking(
       };
     });
 
+  // SENTRY_DSN_PERFORMANCE
+  await server
+    .forPost('https://sentry.io/api/4510302346608640/envelope/')
+    .thenPassThrough({
+      beforeRequest: (req) => {
+        console.log(
+          'Request going to Sentry metamask-performance ============',
+          req.url,
+        );
+        return {};
+      },
+    });
+
   await server
     .forGet('https://www.4byte.directory/api/v1/signatures/')
     .thenCallback(() => {

test/e2e/set-manifest-flags.ts

@@ -32,7 +32,7 @@ export async function setManifestFlags(flags: ManifestFlags = {}) {
       enabled: true,
       branch: process.env.BRANCH,
       commitHash: process.env.HEAD_COMMIT_HASH,
-      job: process.env.JOB_NAME,
+      job: process.env.JOB_NAME?.split(' ')[0], // Remove matrix info
       matrixIndex: parseIntOrUndefined(process.env.MATRIX_INDEX),
       prNumber: parseIntOrUndefined(process.env.PR_NUMBER),
     };