Skip to content

Commit 41ac8bc

Browse files
chargomechargome
authored
Merge branch 'develop' into replay-worker-bundling
2 parents ce86312 + ab6b70f commit 41ac8bc

File tree

183 files changed

+1020
-862
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+1020
-862
lines changed

‎.craft.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@ targets:
88
- name: npm
99
id: '@sentry/types'
1010
includeNames: /^sentry-types-\d.*\.tgz$/
11-
## 1.2 Core SDK
11+
## 1.2 Core SDKs
1212
- name: npm
1313
id: '@sentry/core'
1414
includeNames: /^sentry-core-\d.*\.tgz$/
15+
# This SDK does not exist yet on `develop` but we need an entry
16+
# here to be able to publish a pre-release
17+
- name: npm
18+
id: '@sentry/node-core'
19+
includeNames: /^sentry-node-core-\d.*\.tgz$/
1520
## 1.3 Browser Utils package
1621
- name: npm
1722
id: '@sentry-internal/browser-utils'

‎.github/workflows/auto-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: Get auth token
1717
id: token
18-
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
18+
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
1919
with:
2020
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2121
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

‎.github/workflows/build.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -920,19 +920,23 @@ jobs:
920920
env:
921921
E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
922922

923+
- name: Copy to temp
924+
run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
925+
working-directory: dev-packages/e2e-tests
926+
923927
- name: Build E2E app
924-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
928+
working-directory: ${{ runner.temp }}/test-application
925929
timeout-minutes: 7
926930
run: pnpm ${{ matrix.build-command || 'test:build' }}
927931

928932
- name: Install Playwright
929933
uses: ./.github/actions/install-playwright
930934
with:
931935
browsers: chromium
932-
cwd: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
936+
cwd: ${{ runner.temp }}/test-application
933937

934938
- name: Run E2E test
935-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
939+
working-directory: ${{ runner.temp }}/test-application
936940
timeout-minutes: 10
937941
run: pnpm test:assert
938942

@@ -941,7 +945,7 @@ jobs:
941945
if: failure()
942946
with:
943947
name: playwright-traces-job_e2e_playwright_tests-${{ matrix.test-application}}
944-
path: dev-packages/e2e-tests/test-applications/${{ matrix.test-application}}/test-results
948+
path: ${{ runner.temp }}/test-application/test-results
945949
overwrite: true
946950
retention-days: 7
947951

@@ -955,7 +959,7 @@ jobs:
955959
if: always()
956960
with:
957961
name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
958-
path: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/event-dumps
962+
path: ${{ runner.temp }}/test-application/event-dumps
959963
overwrite: true
960964
retention-days: 7
961965
if-no-files-found: ignore
@@ -1037,19 +1041,23 @@ jobs:
10371041
env:
10381042
E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
10391043

1044+
- name: Copy to temp
1045+
run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
1046+
working-directory: dev-packages/e2e-tests
1047+
10401048
- name: Build E2E app
1041-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
1049+
working-directory: ${{ runner.temp }}/test-application
10421050
timeout-minutes: 7
10431051
run: pnpm ${{ matrix.build-command || 'test:build' }}
10441052

10451053
- name: Install Playwright
10461054
uses: ./.github/actions/install-playwright
10471055
with:
10481056
browsers: chromium
1049-
cwd: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
1057+
cwd: ${{ runner.temp }}/test-application
10501058

10511059
- name: Run E2E test
1052-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
1060+
working-directory: ${{ runner.temp }}/test-application
10531061
timeout-minutes: 10
10541062
run: pnpm ${{ matrix.assert-command || 'test:assert' }}
10551063

@@ -1063,20 +1071,19 @@ jobs:
10631071
if: always()
10641072
with:
10651073
name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
1066-
path: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/event-dumps
1074+
path: ${{ runner.temp }}/test-application/event-dumps
10671075
overwrite: true
10681076
retention-days: 7
10691077
if-no-files-found: ignore
10701078

10711079
- name: Deploy Astro to Cloudflare
1072-
uses: cloudflare/pages-action@v1
1080+
uses: cloudflare/wrangler-action@v3
10731081
if: matrix.test-application == 'cloudflare-astro'
10741082
with:
10751083
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
10761084
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
1077-
projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
1078-
directory: dist
1079-
workingDirectory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
1085+
command: pages deploy dist --project-name=${{ secrets.CLOUDFLARE_PROJECT_NAME }}
1086+
workingDirectory: ${{ runner.temp }}/test-application
10801087

10811088
job_required_jobs_passed:
10821089
name: All required jobs passed or were skipped

‎.github/workflows/canary.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,23 @@ jobs:
153153
env:
154154
E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}
155155

156+
- name: Copy to temp
157+
run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
158+
working-directory: dev-packages/e2e-tests
159+
156160
- name: Build E2E app
157-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
161+
working-directory: ${{ runner.temp }}/test-application
158162
timeout-minutes: 7
159163
run: yarn ${{ matrix.build-command }}
160164

161165
- name: Install Playwright
162166
uses: ./.github/actions/install-playwright
163167
with:
164168
browsers: chromium
165-
cwd: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
169+
cwd: ${{ runner.temp }}/test-application
166170

167171
- name: Run E2E test
168-
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
172+
working-directory: ${{ runner.temp }}/test-application
169173
timeout-minutes: 15
170174
run: yarn test:assert
171175

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Get auth token
2121
id: token
22-
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
22+
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
2323
with:
2424
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2525
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

‎CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@
44

55
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
66

7+
## 9.35.0
8+
9+
- feat(browser): Add ElementTiming instrumentation and spans ([#16589](https://github.com/getsentry/sentry-javascript/pull/16589))
10+
- feat(browser): Export `Context` and `Contexts` types ([#16763](https://github.com/getsentry/sentry-javascript/pull/16763))
11+
- feat(cloudflare): Add user agent to cloudflare spans ([#16793](https://github.com/getsentry/sentry-javascript/pull/16793))
12+
- feat(node): Add `eventLoopBlockIntegration` ([#16709](https://github.com/getsentry/sentry-javascript/pull/16709))
13+
- feat(node): Export server-side feature flag integration shims ([#16735](https://github.com/getsentry/sentry-javascript/pull/16735))
14+
- feat(node): Update vercel ai integration attributes ([#16721](https://github.com/getsentry/sentry-javascript/pull/16721))
15+
- fix(astro): Handle errors in middlewares better ([#16693](https://github.com/getsentry/sentry-javascript/pull/16693))
16+
- fix(browser): Ensure explicit `parentSpan` is considered ([#16776](https://github.com/getsentry/sentry-javascript/pull/16776))
17+
- fix(node): Avoid using dynamic `require` for fastify integration ([#16789](https://github.com/getsentry/sentry-javascript/pull/16789))
18+
- fix(nuxt): Add `@sentry/cloudflare` as optional peerDependency ([#16782](https://github.com/getsentry/sentry-javascript/pull/16782))
19+
- fix(nuxt): Ensure order of plugins is consistent ([#16798](https://github.com/getsentry/sentry-javascript/pull/16798))
20+
- fix(nestjs): Fix exception handling in `@Cron` decorated tasks ([#16792](https://github.com/getsentry/sentry-javascript/pull/16792))
21+
22+
Work in this release was contributed by @0xbad0c0d3 and @alSergey. Thank you for your contributions!
23+
724
## 9.34.0
825

926
### Important Changes

‎dev-packages/browser-integration-tests/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "9.34.0",
3+
"version": "9.35.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -42,7 +42,7 @@
4242
"@babel/preset-typescript": "^7.16.7",
4343
"@playwright/test": "~1.50.0",
4444
"@sentry-internal/rrweb": "2.34.0",
45-
"@sentry/browser": "9.34.0",
45+
"@sentry/browser": "9.35.0",
4646
"@supabase/supabase-js": "2.49.3",
4747
"axios": "1.8.2",
4848
"babel-loader": "^8.2.2",

‎dev-packages/bundle-analyzer-scenarios/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/bundle-analyzer-scenarios",
3-
"version": "9.34.0",
3+
"version": "9.35.0",
44
"description": "Scenarios to test bundle analysis with",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",

‎dev-packages/clear-cache-gh-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@sentry-internal/clear-cache-gh-action",
33
"description": "An internal Github Action to clear GitHub caches.",
4-
"version": "9.34.0",
4+
"version": "9.35.0",
55
"license": "MIT",
66
"engines": {
77
"node": ">=18"

‎dev-packages/e2e-tests/ciCopyToTemp.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* eslint-disable no-console */
2+
3+
import { copyToTemp } from './lib/copyToTemp';
4+
5+
async function run(): Promise<void> {
6+
const originalPath = process.argv[2];
7+
const tmpDirPath = process.argv[3];
8+
9+
if (!originalPath || !tmpDirPath) {
10+
throw new Error('Original path and tmp dir path are required');
11+
}
12+
13+
console.log(`Copying ${originalPath} to ${tmpDirPath}...`);
14+
15+
await copyToTemp(originalPath, tmpDirPath);
16+
}
17+
18+
// eslint-disable-next-line @typescript-eslint/no-floating-promises
19+
run();

0 commit comments

Comments
 (0)