Merge branch 'lforst-standard-react-application-behaviour-e2e-test' into lforst-standard-react-application-transaction-session-tests

Author: Luca Forstner

.github/workflows/build.yml

@@ -643,6 +643,7 @@ jobs:
         env:
           E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ env.DEFAULT_NODE_VERSION }}
           E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
+          E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }}
         run: |
           cd packages/e2e-tests
           yarn test:e2e

packages/e2e-tests/.env.example

@@ -0,0 +1,2 @@
+E2E_TEST_AUTH_TOKEN=
+E2E_TEST_DSN=

packages/e2e-tests/.gitignore

@@ -1 +1 @@
-auth-token.json
+.env

packages/e2e-tests/package.json

@@ -13,11 +13,10 @@
     "lint": "run-s lint:prettier lint:eslint",
     "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
     "lint:prettier": "prettier --config ../../.prettierrc.json --check .",
-    "test:e2e": "run-s test:validate-configuration test:validate-test-app-setups test:validate-auth-token test:run",
+    "test:e2e": "run-s test:validate-configuration test:validate-test-app-setups test:run",
     "test:run": "ts-node run.ts",
     "test:validate-configuration": "ts-node validate-verdaccio-configuration.ts",
-    "test:validate-test-app-setups": "ts-node validate-test-app-setups.ts",
-    "test:validate-auth-token": "ts-node validate-auth-token.ts"
+    "test:validate-test-app-setups": "ts-node validate-test-app-setups.ts"
   },
   "devDependencies": {
     "@types/glob": "8.0.0",

packages/e2e-tests/run.ts

@@ -13,23 +13,27 @@ const PUBLISH_PACKAGES_DOCKER_IMAGE_NAME = 'publish-packages';
 
 const publishScriptNodeVersion = process.env.E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION;
 
-const DEFAULT_BUILD_TIMEOUT_SECONDS = 60;
+const DEFAULT_BUILD_TIMEOUT_SECONDS = 60 * 5;
 const DEFAULT_TEST_TIMEOUT_SECONDS = 60;
 
-let authToken = process.env.E2E_TEST_AUTH_TOKEN;
+if (!process.env.E2E_TEST_AUTH_TOKEN) {
+  console.log(
+    "No auth token configured! Please configure the E2E_TEST_AUTH_TOKEN environment variable with an auth token that has the scope 'project:read'!",
+  );
+}
 
-try {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-var-requires
-  authToken = require(path.resolve(__dirname, 'auth-token.json')).authToken;
-} catch (e) {
-  console.log('Failed to parse auth-token.json');
+if (!process.env.E2E_TEST_DSN) {
+  console.log('No DSN configured! Please configure the E2E_TEST_DSN environment variable with a DSN!');
 }
 
-if (!authToken) {
-  console.log('No auth token configured!');
+if (!process.env.E2E_TEST_AUTH_TOKEN || !process.env.E2E_TEST_DSN) {
   process.exit(1);
 }
 
+const envVarsToInject = {
+  REACT_APP_E2E_TEST_DSN: process.env.E2E_TEST_DSN,
+};
+
 // https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#grouping-log-lines
 function groupCIOutput(groupTitle: string, fn: () => void): void {
   if (process.env.CI) {
@@ -159,13 +163,32 @@ const recipeResults: RecipeResult[] = recipePaths.map(recipePath => {
       encoding: 'utf8',
       shell: true, // needed so we can pass the build command in as whole without splitting it up into args
       timeout: (recipe.buildTimeoutSeconds ?? DEFAULT_BUILD_TIMEOUT_SECONDS) * 1000,
+      env: {
+        ...process.env,
+        ...envVarsToInject,
+      },
     });
 
     // Prepends some text to the output build command's output so we can distinguish it from logging in this script
     console.log(buildCommandProcess.stdout.replace(/^/gm, '[BUILD OUTPUT] '));
     console.log(buildCommandProcess.stderr.replace(/^/gm, '[BUILD OUTPUT] '));
 
-    if (buildCommandProcess.status !== 0) {
+    const error: undefined | (Error & { code?: string }) = buildCommandProcess.error;
+
+    if (error?.code === 'ETIMEDOUT') {
+      processShouldExitWithError = true;
+
+      printCIErrorMessage(
+        `Build command in test application "${recipe.testApplicationName}" (${path.dirname(recipePath)}) timed out!`,
+      );
+
+      return {
+        testApplicationName: recipe.testApplicationName,
+        testApplicationPath: recipePath,
+        buildFailed: true,
+        testResults: [],
+      };
+    } else if (buildCommandProcess.status !== 0) {
       processShouldExitWithError = true;
 
       printCIErrorMessage(
@@ -190,11 +213,11 @@ const recipeResults: RecipeResult[] = recipePaths.map(recipePath => {
       cwd: path.dirname(recipePath),
       timeout: (test.timeoutSeconds ?? DEFAULT_TEST_TIMEOUT_SECONDS) * 1000,
       encoding: 'utf8',
+      shell: true, // needed so we can pass the test command in as whole without splitting it up into args
       env: {
         ...process.env,
-        E2E_TEST_AUTH_TOKEN: authToken,
+        ...envVarsToInject,
       },
-      shell: true, // needed so we can pass the test command in as whole without splitting it up into args
     });
 
     // Prepends some text to the output test command's output so we can distinguish it from logging in this script

packages/e2e-tests/test-applications/standard-frontend-react/.gitignore

@@ -22,7 +22,8 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-!*.d.ts
 /test-results/
 /playwright-report/
 /playwright/.cache/
+
+!*.d.ts

packages/e2e-tests/test-applications/standard-frontend-react/src/index.tsx

@@ -15,8 +15,7 @@ import Index from './pages/Index';
 import User from './pages/User';
 
 Sentry.init({
-  // DSN belongs to "e2e-javascript-standard-frontend-react" project in "sentry-sdks" org
-  dsn: 'https://[email protected]/4503941750587392',
+  dsn: process.env.REACT_APP_E2E_TEST_DSN,
   integrations: [
     new BrowserTracing({
       routingInstrumentation: Sentry.reactRouterV6Instrumentation(

packages/e2e-tests/test-applications/standard-frontend-react/test-recipe.json

@@ -1,7 +1,7 @@
 {
   "$schema": "../../test-recipe-schema.json",
   "testApplicationName": "standard-frontend-react",
-  "buildCommand": "yarn install && yarn build",
+  "buildCommand": "yarn install --pure-lockfile && npx playwright install && yarn build",
   "tests": [
     {
       "testName": "Playwright tests",

packages/e2e-tests/test-applications/standard-frontend-react/tests/behaviour-test.spec.ts

@@ -2,7 +2,7 @@ import { test, expect } from '@playwright/test';
 import axios, { AxiosError } from 'axios';
 
 const SENTRY_TEST_ORG_SLUG = 'sentry-sdks';
-const SENTRY_TEST_PROJECT = 'e2e-javascript-standard-frontend-react';
+const SENTRY_TEST_PROJECT = 'sentry-javascript-e2e-tests';
 
 const EVENT_POLLING_TIMEOUT = 45000;
 const EVENT_POLLING_RETRY_INTERVAL = 1000;

packages/e2e-tests/test-applications/standard-frontend-react/yarn.lock

@@ -1630,69 +1630,6 @@
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz#8be36a1f66f3265389e90b5f9c9962146758f728"
   integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==
 
-"@sentry/[email protected]":
-  version "7.14.0"
-  resolved "http://localhost:4873/@sentry%2fbrowser/-/browser-7.14.0.tgz#bc2c6934f9270e1287ae1437b63e4b0edd67a9f0"
-  integrity sha512-AdLmqeOXvCVYgJAgMUUby+TRh+yIeZO16NPpZWQPGggXIjnhSzoN4liyXJvQ7Mhm326GboFUKjQwqpCEviQcyg==
-  dependencies:
-    "@sentry/core" "7.14.0"
-    "@sentry/types" "7.14.0"
-    "@sentry/utils" "7.14.0"
-    tslib "^1.9.3"
-
-"@sentry/[email protected]":
-  version "7.14.0"
-  resolved "http://localhost:4873/@sentry%2fcore/-/core-7.14.0.tgz#89178822de75c6023e1718c29bee8d588687cedd"
-  integrity sha512-Hgn7De6CiCFnz868/Lrtei+9rj7/TIwhbDe3J+NeH+2ffXYn4VI8FxrlR/p2XfIq9iCfmG80EQXDtSh+Kh7mOw==
-  dependencies:
-    "@sentry/hub" "7.14.0"
-    "@sentry/types" "7.14.0"
-    "@sentry/utils" "7.14.0"
-    tslib "^1.9.3"
-
-"@sentry/[email protected]":
-  version "7.14.0"
-  resolved "http://localhost:4873/@sentry%2fhub/-/hub-7.14.0.tgz#cf8e8a345c63a75ea1f3a2d7169a47ab73ff9603"
-  integrity sha512-O+pxsipeiURC6Mxuivz1pX3yHlkQCI2yjP38bISxUZv1NIijHuxiDmgqrrcCJltiIfyY2+f9LAezKVCAXnPFuw==
-  dependencies:
-    "@sentry/types" "7.14.0"
-    "@sentry/utils" "7.14.0"
-    tslib "^1.9.3"
-
-"@sentry/react@*":
-  version "7.14.0"
-  resolved "http://localhost:4873/@sentry%2freact/-/react-7.14.0.tgz#62149de131ebac1d28a672a290c53a24d8de365a"
-  integrity sha512-IXO004UN3DGdd3Cz9nY2MrlyMMMrGz0uTJrkavbqjC/tLfcxB6iWNLkUueRCla6EzwFbuHRheJlK0EO/Qel2pQ==
-  dependencies:
-    "@sentry/browser" "7.14.0"
-    "@sentry/types" "7.14.0"
-    "@sentry/utils" "7.14.0"
-    hoist-non-react-statics "^3.3.2"
-    tslib "^1.9.3"
-
-"@sentry/tracing@*":
-  version "7.14.0"
-  resolved "http://localhost:4873/@sentry%2ftracing/-/tracing-7.14.0.tgz#2660be14502b1b7f73d61c2a0273abf52a06771e"
-  integrity sha512-dBQUHOHV9Qed/RzqGwJV/zaNHGZb2IKZl8lXno5p4YwOsGWnfs+54Bgqic0OqvOB5oJ/9Ye7nyGJqN7bbLff7A==
-  dependencies:
-    "@sentry/hub" "7.14.0"
-    "@sentry/types" "7.14.0"
-    "@sentry/utils" "7.14.0"
-    tslib "^1.9.3"
-
-"@sentry/[email protected]":
-  version "7.14.0"
-  resolved "http://localhost:4873/@sentry%2ftypes/-/types-7.14.0.tgz#8069e58a0104190e328647963036c7597e2e5fa8"
-  integrity sha512-9iFZS9Hr5hAoL+M9oUH2dY9burOaQh+CHGH66fortuTp++YDWKdbPEeKcz8hRJaUyBBn53rdxiBmAyHsrlE6KA==
-
-"@sentry/[email protected]":
-  version "7.14.0"
-  resolved "http://localhost:4873/@sentry%2futils/-/utils-7.14.0.tgz#477e3bf90b3ad75133645502db6162ffb1c949d1"
-  integrity sha512-QmogvExurgOF9jz95ibkiWdLrJoKq9LvozOPjr6ntL4mBKGxXChagfyrbWQ1cs6Z3QgExNIhCJU465Wmfcrqvg==
-  dependencies:
-    "@sentry/types" "7.14.0"
-    tslib "^1.9.3"
-
 "@sinclair/typebox@^0.24.1":
   version "0.24.44"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.44.tgz#0a0aa3bf4a155a678418527342a3ee84bd8caa5c"
@@ -4908,13 +4845,6 @@ he@^1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-hoist-non-react-statics@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
-  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
-  dependencies:
-    react-is "^16.7.0"
-
 hoopy@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
@@ -7591,7 +7521,7 @@ react-error-overlay@^6.0.11:
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
   integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
 
-react-is@^16.13.1, react-is@^16.7.0:
+react-is@^16.13.1:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -8726,7 +8656,7 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.8.1, tslib@^1.9.3:
+tslib@^1.8.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==