Skip to content

Commit acea201

Browse files
author
Luca Forstner
committed
Merge remote-tracking branch 'origin/master' into lforst-next-auto-tunnel
2 parents f350027 + 65245f4 commit acea201

File tree

139 files changed

+3486
-4312
lines changed

Some content is hidden

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

139 files changed

+3486
-4312
lines changed

.craft.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ targets:
2121
cacheControl: 'public, max-age=31536000'
2222
- name: github
2323
includeNames: /^sentry-.*$/
24-
excludeNames: /^sentry-replay-.*$/
2524
- name: npm
26-
excludeNames: /^sentry-replay-.*$/
2725
- name: registry
2826
sdks:
2927
'npm:@sentry/browser':

.github/workflows/build.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222

2323
CACHED_DEPENDENCY_PATHS: |
2424
${{ github.workspace }}/node_modules
25-
${{ github.workspace }}/packages/**/node_modules
25+
${{ github.workspace }}/packages/*/node_modules
2626
~/.cache/ms-playwright/
2727
~/.cache/mongodb-binaries/
2828
@@ -44,7 +44,7 @@ env:
4444
jobs:
4545
job_get_metadata:
4646
name: Get Metadata
47-
runs-on: ubuntu-latest
47+
runs-on: ubuntu-20.04
4848
permissions:
4949
pull-requests: read
5050
steps:
@@ -121,7 +121,7 @@ jobs:
121121
job_install_deps:
122122
name: Install Dependencies
123123
needs: job_get_metadata
124-
runs-on: ubuntu-latest
124+
runs-on: ubuntu-20.04
125125
timeout-minutes: 15
126126
steps:
127127
- name: 'Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})'
@@ -150,7 +150,7 @@ jobs:
150150
job_build:
151151
name: Build
152152
needs: [job_get_metadata, job_install_deps]
153-
runs-on: ubuntu-latest
153+
runs-on: ubuntu-20.04
154154
timeout-minutes: 20
155155
steps:
156156
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
@@ -187,7 +187,7 @@ jobs:
187187
needs: [job_get_metadata, job_build]
188188
# only upload the zipped layer file if we're about to release
189189
if: startsWith(github.ref, 'refs/heads/release/')
190-
runs-on: ubuntu-latest
190+
runs-on: ubuntu-20.04
191191
steps:
192192
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
193193
uses: actions/checkout@v3
@@ -226,7 +226,7 @@ jobs:
226226
name: Size Check
227227
needs: [job_get_metadata, job_build]
228228
timeout-minutes: 15
229-
runs-on: ubuntu-latest
229+
runs-on: ubuntu-20.04
230230
# Size Check will error out outside of the context of a PR
231231
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master'
232232
steps:
@@ -265,7 +265,7 @@ jobs:
265265
# inter-package dependencies resolve cleanly.
266266
needs: [job_get_metadata, job_build]
267267
timeout-minutes: 10
268-
runs-on: ubuntu-latest
268+
runs-on: ubuntu-20.04
269269
steps:
270270
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
271271
uses: actions/checkout@v3
@@ -290,7 +290,7 @@ jobs:
290290
name: Circular Dependency Check
291291
needs: [job_get_metadata, job_build]
292292
timeout-minutes: 10
293-
runs-on: ubuntu-latest
293+
runs-on: ubuntu-20.04
294294
steps:
295295
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
296296
uses: actions/checkout@v3
@@ -314,7 +314,7 @@ jobs:
314314
job_artifacts:
315315
name: Upload Artifacts
316316
needs: [job_get_metadata, job_build]
317-
runs-on: ubuntu-latest
317+
runs-on: ubuntu-20.04
318318
# Build artifacts are only needed for releasing workflow.
319319
if: startsWith(github.ref, 'refs/heads/release/')
320320
steps:
@@ -344,13 +344,14 @@ jobs:
344344
${{ github.workspace }}/packages/browser/build/bundles/**
345345
${{ github.workspace }}/packages/integrations/build/bundles/**
346346
${{ github.workspace }}/packages/tracing/build/bundles/**
347+
${{ github.workspace }}/packages/replay/build/bundles/**
347348
${{ github.workspace }}/packages/**/*.tgz
348349
349350
job_unit_test:
350351
name: Test (Node ${{ matrix.node }})
351352
needs: [job_get_metadata, job_build]
352353
timeout-minutes: 30
353-
runs-on: ubuntu-latest
354+
runs-on: ubuntu-20.04
354355
strategy:
355356
fail-fast: false
356357
matrix:
@@ -388,7 +389,7 @@ jobs:
388389
needs: [job_get_metadata, job_build]
389390
if: needs.job_get_metadata.outputs.changed_nextjs == 'true' || github.event_name != 'pull_request'
390391
timeout-minutes: 30
391-
runs-on: ubuntu-latest
392+
runs-on: ubuntu-20.04
392393
strategy:
393394
fail-fast: false
394395
matrix:
@@ -426,7 +427,7 @@ jobs:
426427
needs: [job_get_metadata, job_build]
427428
if: needs.job_get_metadata.outputs.changed_ember == 'true' || github.event_name != 'pull_request'
428429
timeout-minutes: 10
429-
runs-on: ubuntu-latest
430+
runs-on: ubuntu-20.04
430431
strategy:
431432
fail-fast: false
432433
matrix:
@@ -467,7 +468,7 @@ jobs:
467468
name: Playwright - ${{ (matrix.tracing_only && 'Browser + Tracing') || 'Browser' }} (${{ matrix.bundle }})
468469
needs: [job_get_metadata, job_build]
469470
if: needs.job_get_metadata.outputs.changed_browser_integration == 'true' || github.event_name != 'pull_request'
470-
runs-on: ubuntu-latest
471+
runs-on: ubuntu-20.04
471472
strategy:
472473
matrix:
473474
bundle:
@@ -517,7 +518,7 @@ jobs:
517518
name: Old Browser Integration Tests (${{ matrix.browser }})
518519
needs: [job_get_metadata, job_build]
519520
if: needs.job_get_metadata.outputs.changed_browser == 'true' || github.event_name != 'pull_request'
520-
runs-on: ubuntu-latest
521+
runs-on: ubuntu-20.04
521522
timeout-minutes: 10
522523
strategy:
523524
fail-fast: false
@@ -554,7 +555,7 @@ jobs:
554555
job_browser_build_tests:
555556
name: Browser Build Tests
556557
needs: [job_get_metadata, job_build]
557-
runs-on: ubuntu-latest
558+
runs-on: ubuntu-20.04
558559
timeout-minutes: 5
559560
steps:
560561
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
@@ -586,7 +587,7 @@ jobs:
586587
name: Node SDK Integration Tests (${{ matrix.node }})
587588
needs: [job_get_metadata, job_build]
588589
if: needs.job_get_metadata.outputs.changed_node == 'true' || github.event_name != 'pull_request'
589-
runs-on: ubuntu-latest
590+
runs-on: ubuntu-20.04
590591
timeout-minutes: 10
591592
strategy:
592593
fail-fast: false
@@ -622,7 +623,7 @@ jobs:
622623
name: Remix SDK Integration Tests (${{ matrix.node }})
623624
needs: [job_get_metadata, job_build]
624625
if: needs.job_get_metadata.outputs.changed_remix == 'true' || github.event_name != 'pull_request'
625-
runs-on: ubuntu-latest
626+
runs-on: ubuntu-20.04
626627
timeout-minutes: 10
627628
strategy:
628629
fail-fast: false
@@ -662,7 +663,7 @@ jobs:
662663
(github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) &&
663664
github.actor != 'dependabot[bot]'
664665
needs: [job_get_metadata, job_build]
665-
runs-on: ubuntu-latest
666+
runs-on: ubuntu-20.04
666667
timeout-minutes: 10
667668
steps:
668669
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
@@ -710,7 +711,7 @@ jobs:
710711
]
711712
# Always run this, even if a dependent job failed
712713
if: always()
713-
runs-on: ubuntu-latest
714+
runs-on: ubuntu-20.04
714715
steps:
715716
- name: Check for failures
716717
if: contains(needs.*.result, 'failure')

.github/workflows/canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919
jobs:
2020
job_canary_test:
2121
name: Run Canary Tests
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-20.04
2323
timeout-minutes: 30
2424
steps:
2525
- name: 'Check out current commit'

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ concurrency:
2929
jobs:
3030
analyze:
3131
name: Analyze
32-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-20.04
3333

3434
strategy:
3535
fail-fast: false

.github/workflows/enforce-license-compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
enforce-license-compliance:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-20.04
1212
steps:
1313
- name: 'Enforce License Compliance'
1414
uses: getsentry/action-enforce-license-compliance@main

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
required: false
1414
jobs:
1515
release:
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-20.04
1717
name: 'Release a new version'
1818
steps:
1919
- uses: actions/checkout@v3

.github/workflows/stale.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ on:
55
workflow_dispatch:
66
jobs:
77
stale:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-20.04
99
steps:
1010
- uses: actions/stale@87c2b794b9b47a9bec68ae03c01aeb572ffebdb1
1111
with:
1212
repo-token: ${{ github.token }}
1313
days-before-stale: 21
1414
days-before-close: 7
15-
only-labels: ""
15+
only-labels: ''
1616
operations-per-run: 100
1717
remove-stale-when-updated: true
1818
debug-only: false
1919
ascending: false
2020

21-
exempt-issue-labels: "Status: Backlog,Status: In Progress"
22-
stale-issue-label: "Status: Stale"
21+
exempt-issue-labels: 'Status: Backlog,Status: In Progress'
22+
stale-issue-label: 'Status: Stale'
2323
stale-issue-message: |-
2424
This issue has gone three weeks without activity. In another week, I will close it.
2525
@@ -29,11 +29,11 @@ jobs:
2929
3030
"A weed is but an unloved flower." ― _Ella Wheeler Wilcox_ 🥀
3131
skip-stale-issue-message: false
32-
close-issue-label: ""
33-
close-issue-message: ""
32+
close-issue-label: ''
33+
close-issue-message: ''
3434

35-
exempt-pr-labels: "Status: Backlog,Status: In Progress"
36-
stale-pr-label: "Status: Stale"
35+
exempt-pr-labels: 'Status: Backlog,Status: In Progress'
36+
stale-pr-label: 'Status: Stale'
3737
stale-pr-message: |-
3838
This pull request has gone three weeks without activity. In another week, I will close it.
3939
@@ -44,4 +44,4 @@ jobs:
4444
"A weed is but an unloved flower." ― _Ella Wheeler Wilcox_ 🥀
4545
skip-stale-pr-message: false
4646
close-pr-label:
47-
close-pr-message: ""
47+
close-pr-message: ''

.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
"search.exclude": {
1111
"**/node_modules/": true,
1212
"**/build/": true,
13-
"**/dist/": true
13+
"**/dist/": true,
14+
"**/coverage/": true,
15+
"**/yarn-error.log": true
1416
},
1517
"typescript.tsdk": "./node_modules/typescript/lib",
1618
"[json]": {

CHANGELOG.md

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

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

7+
## 7.24.2
8+
9+
- fix(replay): Add missing rrweb type declarations (#6464)
10+
- fix(tracing): Check for otel before loading db module (#6461)
11+
- fix(tracing): Deprecate and remove `reportAllChanges` option (#6456)
12+
- ref(replay): Extract integration to clarify public API (#6457)
13+
14+
## 7.24.1
15+
16+
This patch corrects an oversight on our end which caused the Sentry Replay integration CDN bundles to be ignored when uploading bundles to our CDN.
17+
If you want to use the Replay CDN bundles, please use version 7.24.1 or newer.
18+
19+
- fix(react): Add type for React Router's `encodeLocation` method (#6439)
20+
- fix(replay): Add CDN bundle path to release artifacts (#6452)
21+
- fix(tracing): Instrument cursors returned from MongoDB operations. (#6437)
22+
- ref(angular): Extract zonejs error unwrapper into a dedicated function (#6443)
23+
24+
Work in this release contributed by @theofidry. Thank you for your contribution!
25+
26+
## 7.24.0
27+
28+
This release bumps the [`@sentry/replay`](https://github.com/getsentry/sentry-javascript/blob/master/packages/replay/README.md) package from version 0.x to 7.24.0.
29+
Along with this version bump, we're introducing a few breaking changes.
30+
Take a look at the [Replay migration guide](https://github.com/getsentry/sentry-javascript/blob/master/packages/replay/MIGRATION.md) for further information.
31+
The Replay version bump is the result of moving the package into the Sentry JavaScript SDK monorepo which aligns the version with our other JS SDK packages.
32+
**Important:** If you're using Replay with version 7.24.x or newer, make sure to also upgrade your other `@sentry/*` packages to this version.
33+
34+
- feat(browser): Support dom.maxStringLength configuration (#6311)
35+
- feat(nextjs): Don't init SDK on Vercel Edge Runtime (#6408)
36+
- feat(nextjs): Parameterize prefix loader values (#6377)
37+
- feat(nextjs): Support `assetPrefix` option (#6388)
38+
- fix(nextjs): Inject SDK in dev mode (#6368)
39+
- fix(nextjs): Use `basePath` for `assetPrefix` if needed (#6424)
40+
- fix(node): Move `profilesSampleRate` into `BaseNodeOptions` (#6409)
41+
- ref(nextjs): Clean up client-side integrations code (#6382)
42+
- ref(nextjs): Use loader for rather than webpack plugin for injecting release (#6404)
43+
- ref(remix): Do not fail silently if `getClientIpAddress` throws error. (#6400)
44+
45+
Work in this release contributed by @tomgrossman and @ZachGawlik. Thank you for your contributions!
46+
747
## 7.23.0
848

949
- feat(browser): Add `__SENTRY_RELEASE__` magic string (#6322)

docs/new-sdk-release-checklist.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ This page serves as a checklist of what to do when releasing a new SDK for the f
4040
- [ ] Ensure dependent packages are correctly set for “Determine changed packages”
4141
- [ ] Ensure unit tests run correctly
4242

43+
- [ ] Make sure the file paths in the ["Upload Artifacts" job](https://github.com/getsentry/sentry-javascript/blob/e5c1486eed236b878f2c49d6a04be86093816ac9/.github/workflows/build.yml#L314-L349) in `build.yml` include your new artifacts.
44+
- **This is especially important, if you're adding new CDN bundles!**
45+
- Tarballs (*.tgz archives) should work OOTB
46+
4347
## Cutting the Release
4448

4549
When you’re ready to make the first release, there are a couple of steps that need to be performed in the **correct order**. Note that you can prepare the PRs at any time but the **merging oder** is important:

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "3.4.0",
3-
"version": "7.23.0",
3+
"version": "7.24.2",
44
"packages": "packages/*",
55
"npmClient": "yarn",
66
"useWorkspaces": true

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"lint:eslint": "lerna run --parallel lint:eslint",
2626
"postpublish": "lerna run --stream --concurrency 1 postpublish",
2727
"test": "lerna run --ignore @sentry-internal/browser-integration-tests --ignore @sentry-internal/node-integration-tests --stream --concurrency 1 --sort test",
28-
"test-ci": "ts-node ./scripts/test.ts"
28+
"test-ci": "ts-node ./scripts/test.ts",
29+
"postinstall": "patch-package"
2930
},
3031
"volta": {
3132
"node": "16.18.1",
@@ -89,6 +90,7 @@
8990
"mocha": "^6.1.4",
9091
"nodemon": "^2.0.16",
9192
"npm-run-all": "^4.1.5",
93+
"patch-package": "^6.5.0",
9294
"prettier": "2.7.1",
9395
"recast": "^0.20.5",
9496
"replace-in-file": "^4.0.0",

packages/angular/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular",
3-
"version": "7.23.0",
3+
"version": "7.24.2",
44
"description": "Official Sentry SDK for Angular",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
2121
"rxjs": "^6.5.5 || ^7.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "7.23.0",
25-
"@sentry/types": "7.23.0",
26-
"@sentry/utils": "7.23.0",
24+
"@sentry/browser": "7.24.2",
25+
"@sentry/types": "7.24.2",
26+
"@sentry/utils": "7.24.2",
2727
"tslib": "^2.0.0"
2828
},
2929
"devDependencies": {

0 commit comments

Comments
 (0)