-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into onur/dataloader-integration
- Loading branch information
Showing
101 changed files
with
1,079 additions
and
378 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| name: "Automation: Update GH Project" | ||
| on: | ||
| pull_request: | ||
| types: | ||
| - closed | ||
| - opened | ||
| - reopened | ||
| - ready_for_review | ||
| - converted_to_draft | ||
|
|
||
| jobs: | ||
| # Check if PR is in project | ||
| check_project: | ||
| name: Check if PR is in project | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Check if PR is in project | ||
| continue-on-error: true | ||
| id: check_project | ||
| uses: github/update-project-action@f980378bc179626af5b4e20ec05ec39c7f7a6f6d | ||
| with: | ||
| github_token: ${{ secrets.GH_PROJECT_AUTOMATION }} | ||
| organization: getsentry | ||
| project_number: 31 | ||
| content_id: ${{ github.event.pull_request.node_id }} | ||
| field: Status | ||
| operation: read | ||
|
|
||
| - name: If project field is read, set is_in_project to 1 | ||
| if: steps.check_project.outputs.field_read_value | ||
| id: is_in_project | ||
| run: echo "is_in_project=1" >> "$GITHUB_OUTPUT" | ||
|
|
||
| outputs: | ||
| is_in_project: ${{ steps.is_in_project.outputs.is_in_project || '0' }} | ||
|
|
||
| # When a PR is a draft, it should go into "In Progress" | ||
| mark_as_in_progress: | ||
| name: "Mark as In Progress" | ||
| needs: check_project | ||
| if: | | ||
| needs.check_project.outputs.is_in_project == '1' | ||
| && (github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'converted_to_draft') | ||
| && github.event.pull_request.draft == true | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Update status to in_progress | ||
| uses: github/update-project-action@f980378bc179626af5b4e20ec05ec39c7f7a6f6d | ||
| with: | ||
| github_token: ${{ secrets.GH_PROJECT_AUTOMATION }} | ||
| organization: getsentry | ||
| project_number: 31 | ||
| content_id: ${{ github.event.pull_request.node_id }} | ||
| field: Status | ||
| value: "🏗 In Progress" | ||
|
|
||
| # When a PR is not a draft, it should go into "In Review" | ||
| mark_as_in_review: | ||
| name: "Mark as In Review" | ||
| needs: check_project | ||
| if: | | ||
| needs.check_project.outputs.is_in_project == '1' | ||
| && (github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'ready_for_review') | ||
| && github.event.pull_request.draft == false | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Update status to in_review | ||
| id: update_status | ||
| uses: github/update-project-action@f980378bc179626af5b4e20ec05ec39c7f7a6f6d | ||
| with: | ||
| github_token: ${{ secrets.GH_PROJECT_AUTOMATION }} | ||
| organization: getsentry | ||
| project_number: 31 | ||
| content_id: ${{ github.event.pull_request.node_id }} | ||
| field: Status | ||
| value: "👀 In Review" | ||
|
|
||
| # By default, closed PRs go into "Ready for Release" | ||
| # But if they are closed without merging, they should go into "Done" | ||
| mark_as_done: | ||
| name: "Mark as Done" | ||
| needs: check_project | ||
| if: | | ||
| needs.check_project.outputs.is_in_project == '1' | ||
| && github.event.action == 'closed' && github.event.pull_request.merged == false | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Update status to done | ||
| id: update_status | ||
| uses: github/update-project-action@f980378bc179626af5b4e20ec05ec39c7f7a6f6d | ||
| with: | ||
| github_token: ${{ secrets.GH_PROJECT_AUTOMATION }} | ||
| organization: getsentry | ||
| project_number: 31 | ||
| content_id: ${{ github.event.pull_request.node_id }} | ||
| field: Status | ||
| value: "✅ Done" | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
dev-packages/e2e-tests/test-applications/nextjs-13/tests/server/404.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { test } from '@playwright/test'; | ||
| import { waitForTransaction } from '@sentry-internal/test-utils'; | ||
|
|
||
| test('should create a transaction for a CJS pages router API endpoint', async ({ page }) => { | ||
| let received404Transaction = false; | ||
| waitForTransaction('nextjs-13', async transactionEvent => { | ||
| return transactionEvent.transaction === 'GET /404' || transactionEvent.transaction === 'GET /_not-found'; | ||
| }).then(() => { | ||
| received404Transaction = true; | ||
| }); | ||
|
|
||
| await page.goto('/page-that-doesnt-exist'); | ||
|
|
||
| await new Promise<void>((resolve, reject) => { | ||
| setTimeout(() => { | ||
| if (received404Transaction) { | ||
| reject(new Error('received 404 transaction')); | ||
| } else { | ||
| resolve(); | ||
| } | ||
| }, 5_000); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
dev-packages/e2e-tests/test-applications/node-profiling/build.shimmed.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| // Because bundlers can now predetermine a static set of binaries we need to ensure those binaries | ||
| // actually exists, else we risk a compile time error when bundling the package. This could happen | ||
| // if we added a new binary in cpu_profiler.ts, but forgot to prebuild binaries for it. Because CI | ||
| // only runs integration and unit tests, this change would be missed and could end up in a release. | ||
| // Therefor, once all binaries are precompiled in CI and tests pass, run esbuild with bundle:true | ||
| // which will copy all binaries to the outfile folder and throw if any of them are missing. | ||
| import esbuild from 'esbuild'; | ||
|
|
||
| console.log('Running build using esbuild version', esbuild.version); | ||
|
|
||
| esbuild.buildSync({ | ||
| platform: 'node', | ||
| entryPoints: ['./index.ts'], | ||
| outfile: './dist/index.shimmed.mjs', | ||
| target: 'esnext', | ||
| format: 'esm', | ||
| bundle: true, | ||
| loader: { '.node': 'copy' }, | ||
| banner: { | ||
| js: ` | ||
| import { dirname } from 'node:path'; | ||
| import { fileURLToPath } from 'node:url'; | ||
| import { createRequire } from 'node:module'; | ||
| const require = createRequire(import.meta.url); | ||
| const __filename = fileURLToPath(import.meta.url); | ||
| const __dirname = dirname(__filename); | ||
| `, | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
dev-packages/node-integration-tests/suites/tracing/kafkajs/docker-compose.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| services: | ||
| db: | ||
| image: apache/kafka:latest | ||
| restart: always | ||
| container_name: integration-tests-kafka | ||
| ports: | ||
| - '9092:9092' |
Oops, something went wrong.