From e938ca2e47358f59d8c84c7e4db6a3ce6f55f6cb Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 10 Oct 2023 12:44:29 +0200 Subject: [PATCH 1/2] build: Fix clean commands for tarballs --- packages/bun/package.json | 2 +- packages/e2e-tests/package.json | 2 +- packages/tracing-internal/package.json | 2 +- packages/vercel-edge/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/bun/package.json b/packages/bun/package.json index 38db742a8c84..6cb29b2e403c 100644 --- a/packages/bun/package.json +++ b/packages/bun/package.json @@ -44,7 +44,7 @@ "build:types:watch": "tsc -p tsconfig.types.json --watch", "build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build", "circularDepCheck": "madge --circular src/index.ts", - "clean": "rimraf build coverage sentry-node-*.tgz", + "clean": "rimraf build coverage sentry-bun-*.tgz", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", "fix:prettier": "prettier --write \"{src,test,scripts}/**/**.ts\"", diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index 73790f4ddc4a..0e713a9afed2 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -17,7 +17,7 @@ "test:validate-test-app-setups": "ts-node validate-test-app-setups.ts", "test:prepare": "ts-node prepare.ts", "test:validate": "run-s test:validate-configuration test:validate-test-app-setups", - "clean": "rimraf tmp node_modules && yarn clean:test-applications", + "clean": "rimraf tmp node_modules pnpm-lock.yaml && yarn clean:test-applications", "clean:test-applications": "rimraf test-applications/**/{node_modules,dist,build,.next,.sveltekit,pnpm-lock.yaml}" }, "devDependencies": { diff --git a/packages/tracing-internal/package.json b/packages/tracing-internal/package.json index 4818702c81bb..266a5cce9183 100644 --- a/packages/tracing-internal/package.json +++ b/packages/tracing-internal/package.json @@ -43,7 +43,7 @@ "build:transpile:watch": "rollup -c rollup.npm.config.js --watch", "build:types:watch": "tsc -p tsconfig.types.json --watch", "build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build", - "clean": "rimraf build coverage sentry-tracing-*.tgz", + "clean": "rimraf build coverage sentry-internal-tracing-*.tgz", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", "fix:prettier": "prettier --write \"{src,test,scripts}/**/**.ts\"", diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json index bd72bbb9a0ab..b3d945ca9818 100644 --- a/packages/vercel-edge/package.json +++ b/packages/vercel-edge/package.json @@ -45,7 +45,7 @@ "build:types:watch": "tsc -p tsconfig.types.json --watch", "build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build", "circularDepCheck": "madge --circular src/index.ts", - "clean": "rimraf build coverage sentry-core-*.tgz", + "clean": "rimraf build coverage sentry-vercel-edge-*.tgz", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", "fix:prettier": "prettier --write \"{src,test,scripts}/**/**.ts\"", From 766a9114a8149faea1ccb3dda1227579e8a7d329 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 10 Oct 2023 12:57:47 +0200 Subject: [PATCH 2/2] make test more robust --- .../node-experimental-fastify-app/src/app.js | 2 - .../tests/{server.test.ts => errors.test.ts} | 38 ------------------- 2 files changed, 40 deletions(-) rename packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/{server.test.ts => errors.test.ts} (51%) diff --git a/packages/e2e-tests/test-applications/node-experimental-fastify-app/src/app.js b/packages/e2e-tests/test-applications/node-experimental-fastify-app/src/app.js index 62e194170fa8..2c123cbb12cc 100644 --- a/packages/e2e-tests/test-applications/node-experimental-fastify-app/src/app.js +++ b/packages/e2e-tests/test-applications/node-experimental-fastify-app/src/app.js @@ -30,8 +30,6 @@ app.get('/test-transaction', async function (req, res) { Sentry.startSpan({ name: 'child-span' }, () => {}); }); - await Sentry.flush(); - res.send({ transactionIds: global.transactionIds || [], }); diff --git a/packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/server.test.ts b/packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/errors.test.ts similarity index 51% rename from packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/server.test.ts rename to packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/errors.test.ts index 9a9848eefa1a..4656ba23e7de 100644 --- a/packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/server.test.ts +++ b/packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/errors.test.ts @@ -37,41 +37,3 @@ test('Sends exception to Sentry', async ({ baseURL }) => { ) .toBe(200); }); - -test('Sends transactions to Sentry', async ({ baseURL }) => { - const { data } = await axios.get(`${baseURL}/test-transaction`); - const { transactionIds } = data; - - console.log(`Polling for transaction eventIds: ${JSON.stringify(transactionIds)}`); - - expect(transactionIds.length).toBe(1); - - await Promise.all( - transactionIds.map(async (transactionId: string) => { - const url = `https://sentry.io/api/0/projects/${sentryTestOrgSlug}/${sentryTestProject}/events/${transactionId}/`; - - await expect - .poll( - async () => { - try { - const response = await axios.get(url, { headers: { Authorization: `Bearer ${authToken}` } }); - - return response.status; - } catch (e) { - if (e instanceof AxiosError && e.response) { - if (e.response.status !== 404) { - throw e; - } else { - return e.response.status; - } - } else { - throw e; - } - } - }, - { timeout: EVENT_POLLING_TIMEOUT }, - ) - .toBe(200); - }), - ); -});