test(e2e): Send qa environment to avoid transacitons from being dynamically sampled (#8027)

Luca Forstner · web-flow · commit 589745472e52 · 2023-05-03T14:22:50.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -783,19 +783,18 @@ jobs:
         id: versions
         run: |
           echo "echo node=$(jq -r '.volta.node' package.json)" >> $GITHUB_OUTPUT
-      # Temporarily disabling e2e tests
-      # - name: Run E2E tests
-      #   env:
-      #     E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
-      #     E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
-      #     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
+      - name: Run E2E tests
+        env:
+          E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
+          E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
+          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
 
   job_required_tests:
     name: All required tests passed or skipped
diff --git a/packages/e2e-tests/test-applications/create-next-app/sentry.client.config.ts b/packages/e2e-tests/test-applications/create-next-app/sentry.client.config.ts
@@ -5,6 +5,7 @@
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
   // Adjust this value in production, or use tracesSampler for greater control
   tracesSampleRate: 1.0,
diff --git a/packages/e2e-tests/test-applications/create-next-app/sentry.server.config.ts b/packages/e2e-tests/test-applications/create-next-app/sentry.server.config.ts
@@ -11,6 +11,7 @@ declare global {
 }
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
   // Adjust this value in production, or use tracesSampler for greater control
   tracesSampleRate: 1.0,
diff --git a/packages/e2e-tests/test-applications/create-react-app/src/index.tsx b/packages/e2e-tests/test-applications/create-react-app/src/index.tsx
@@ -7,6 +7,7 @@ import * as Sentry from '@sentry/react';
 import { BrowserTracing } from '@sentry/tracing';
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   integrations: [new BrowserTracing()],
 
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.client.config.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.client.config.ts
@@ -1,6 +1,7 @@
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
   tunnel: `http://localhost:${
     Number(process.env.NEXT_PUBLIC_BASE_PORT) +
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts
@@ -1,6 +1,7 @@
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
   tunnel: `http://localhost:${
     Number(process.env.NEXT_PUBLIC_BASE_PORT) +
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts
@@ -1,6 +1,7 @@
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
   tunnel: `http://localhost:${
     Number(process.env.NEXT_PUBLIC_BASE_PORT) +
diff --git a/packages/e2e-tests/test-applications/node-express-app/src/app.ts b/packages/e2e-tests/test-applications/node-express-app/src/app.ts
@@ -10,6 +10,7 @@ declare global {
 }
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
   integrations: [new Integrations.HttpClient()],
   debug: true,
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/index.tsx b/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/index.tsx
@@ -15,6 +15,7 @@ import Index from './pages/Index';
 import User from './pages/User';
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.REACT_APP_E2E_TEST_DSN,
   integrations: [
     new BrowserTracing({
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react/src/index.tsx b/packages/e2e-tests/test-applications/standard-frontend-react/src/index.tsx
@@ -16,6 +16,7 @@ import User from './pages/User';
 const replay = new Sentry.Replay();
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.REACT_APP_E2E_TEST_DSN,
   integrations: [
     new Sentry.BrowserTracing({
diff --git a/packages/e2e-tests/test-applications/sveltekit/src/hooks.client.ts b/packages/e2e-tests/test-applications/sveltekit/src/hooks.client.ts
@@ -2,6 +2,7 @@ import { env } from '$env/dynamic/public';
 import * as Sentry from '@sentry/sveltekit';
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: env.PUBLIC_E2E_TEST_DSN,
   debug: true,
   tunnel: `http://localhost:${
diff --git a/packages/e2e-tests/test-applications/sveltekit/src/hooks.server.ts b/packages/e2e-tests/test-applications/sveltekit/src/hooks.server.ts
@@ -2,6 +2,7 @@ import { env } from '$env/dynamic/private';
 import * as Sentry from '@sentry/sveltekit';
 
 Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: env.E2E_TEST_DSN,
   debug: true,
   tunnel: `http://localhost:${Number(env.BASE_PORT) + Number(env.PORT_MODULO) + Number(env.PORT_GAP)}/`, // proxy server

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ declare global {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`Sentry.init({`
	`14`	`+ environment: 'qa', // dynamic sampling bias to keep transactions`
`14`	`15`	`dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,`
`15`	`16`	`// Adjust this value in production, or use tracesSampler for greater control`
`16`	`17`	`tracesSampleRate: 1.0,`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ declare global {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`Sentry.init({`
	`13`	`+ environment: 'qa', // dynamic sampling bias to keep transactions`
`13`	`14`	`dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,`
`14`	`15`	`integrations: [new Integrations.HttpClient()],`
`15`	`16`	`debug: true,`