Skip to content

Commit 71cdbec

Browse files
s1gr1dclaude
s1gr1d
and
claude
committed
Merge remote-tracking branch 'origin/develop' into sig/nextjs-tunnel-route-handler
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2 parents 5fa64c4 + 312818c commit 71cdbec

442 files changed

Lines changed: 1555 additions & 1561 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,6 +1030,16 @@ jobs:
10301030
compression-level: 6
10311031
overwrite: true
10321032

1033+
- name: Upload test-utils tarball artifact
1034+
uses: actions/upload-artifact@v7
1035+
with:
1036+
name: build-test-utils-tarball-output
1037+
path: dev-packages/test-utils/*.tgz
1038+
if-no-files-found: error
1039+
retention-days: 4
1040+
compression-level: 6
1041+
overwrite: true
1042+
10331043
job_e2e_tests:
10341044
name: E2E ${{ matrix.label || matrix.test-application }} Test
10351045
# We need to add the `always()` check here because the previous step has this as well :(
@@ -1080,24 +1090,35 @@ jobs:
10801090
uses: denoland/setup-deno@v2.0.5
10811091
with:
10821092
deno-version: ${{ matrix.deno-version || 'v2.8.3' }}
1083-
- name: Restore caches
1084-
uses: ./.github/actions/restore-cache
1085-
with:
1086-
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
1093+
- name: Install pnpm
1094+
uses: ./.github/actions/install-pnpm
10871095

10881096
- name: Restore tarball artifacts
10891097
uses: actions/download-artifact@v8
10901098
with:
10911099
name: build-tarball-output
10921100
path: ${{ env.TARBALL_ARTIFACT_DOWNLOAD_PATH }}
10931101

1102+
- name: Restore test-utils tarball artifact
1103+
uses: actions/download-artifact@v8
1104+
with:
1105+
name: build-test-utils-tarball-output
1106+
path: dev-packages/test-utils
1107+
10941108
- name: Restore build layer artifacts
10951109
uses: actions/download-artifact@v8
10961110
if: matrix.test-application == 'aws-serverless' || matrix.test-application == 'aws-serverless-layer'
10971111
with:
10981112
name: build-layer-output
10991113
path: ${{ env.BUILD_LAYER_PATH }}
11001114

1115+
# The Lambda functions install the built workspace packages directly (see `src/stack.ts`).
1116+
- name: Restore build artifacts
1117+
uses: actions/download-artifact@v8
1118+
if: matrix.test-application == 'aws-serverless'
1119+
with:
1120+
name: build-output
1121+
11011122
# Installs Playwright while the app builds.
11021123
# Started after the artifact downloads: starting next to them made `download-artifact` fail to read the event file.
11031124
- name: Install Playwright
@@ -1153,21 +1174,6 @@ jobs:
11531174
overwrite: true
11541175
retention-days: 7
11551176

1156-
- name: Pre-process E2E Test Dumps
1157-
if: failure()
1158-
run: |
1159-
node ./scripts/normalize-e2e-test-dump-transaction-events.js
1160-
1161-
- name: Upload E2E Test Event Dumps
1162-
uses: actions/upload-artifact@v7
1163-
if: failure()
1164-
with:
1165-
name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
1166-
path: ${{ runner.temp }}/test-application/event-dumps
1167-
overwrite: true
1168-
retention-days: 7
1169-
if-no-files-found: ignore
1170-
11711177
# - We skip optional tests on release branches
11721178
job_optional_e2e_tests:
11731179
name: E2E ${{ matrix.label || matrix.test-application }} Test (optional)
@@ -1225,17 +1231,21 @@ jobs:
12251231
uses: denoland/setup-deno@v2.0.5
12261232
with:
12271233
deno-version: ${{ matrix.deno-version || 'v2.8.3' }}
1228-
- name: Restore caches
1229-
uses: ./.github/actions/restore-cache
1230-
with:
1231-
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
1234+
- name: Install pnpm
1235+
uses: ./.github/actions/install-pnpm
12321236

12331237
- name: Restore tarball artifacts
12341238
uses: actions/download-artifact@v8
12351239
with:
12361240
name: build-tarball-output
12371241
path: ${{ env.TARBALL_ARTIFACT_DOWNLOAD_PATH }}
12381242

1243+
- name: Restore test-utils tarball artifact
1244+
uses: actions/download-artifact@v8
1245+
with:
1246+
name: build-test-utils-tarball-output
1247+
path: dev-packages/test-utils
1248+
12391249
# Installs Playwright while the app builds.
12401250
# Started after the artifact downloads: starting next to them made `download-artifact` fail to read the event file.
12411251
- name: Install Playwright
@@ -1278,21 +1288,6 @@ jobs:
12781288
timeout-minutes: 10
12791289
run: ${{ matrix.assert-command || 'pnpm test:assert' }}
12801290

1281-
- name: Pre-process E2E Test Dumps
1282-
if: failure()
1283-
run: |
1284-
node ./scripts/normalize-e2e-test-dump-transaction-events.js
1285-
1286-
- name: Upload E2E Test Event Dumps
1287-
uses: actions/upload-artifact@v7
1288-
if: failure()
1289-
with:
1290-
name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
1291-
path: ${{ runner.temp }}/test-application/event-dumps
1292-
overwrite: true
1293-
retention-days: 7
1294-
if-no-files-found: ignore
1295-
12961291
job_required_jobs_passed:
12971292
name: All required jobs passed or were skipped
12981293
needs:

‎.github/workflows/canary.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ env:
1414

1515
CACHED_BUILD_PATHS: |
1616
${{ github.workspace }}/packages/*/*.tgz
17+
${{ github.workspace }}/dev-packages/test-utils/*.tgz
1718
${{ github.workspace }}/node_modules
1819
${{ github.workspace }}/packages/*/node_modules
1920
${{ github.workspace }}/dev-packages/*/node_modules

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dist-serverless/
2020
sentry-node-serverless-*.zip
2121
# node tarballs
2222
packages/*/sentry-*.tgz
23+
dev-packages/test-utils/sentry-*.tgz
2324
.nxcache
2425

2526
# logs

‎.oxlintrc.base.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,14 @@
5959
"no-eval": "off",
6060
"no-import-assign": "off",
6161
"typescript/no-duplicate-type-constituents": "off",
62-
"typescript/no-deprecated": "error"
62+
// @types/node 20 still marks `channel.subscribe()` and `channel.unsubscribe()` as deprecated,
63+
// but Node revoked this deprecation (DEP0163) in v22.20.0 and v24.8.0.
64+
"typescript/no-deprecated": [
65+
"error",
66+
{
67+
"allow": [{ "from": "package", "package": "diagnostics_channel", "name": ["subscribe", "unsubscribe"] }]
68+
}
69+
]
6370
},
6471
"overrides": [
6572
{

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
Also, the server no longer sends spans of tunnel requests when span streaming is on, because these spans only show the SDK's own traffic.
2121

22-
Work in this release was contributed by @adityareddy-dev, @jpdefo, and @Jxxunnn. Thank you for your contributions!
22+
Work in this release was contributed by @adityareddy-dev, @jpdefo, @Jxxunnn, @philipatkinson, @Shubham-Padkonde, @mikamikasuki, and @mketiku. Thank you for your contributions!
2323

2424
## 11.8.0
2525

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ upgrading.
5151

5252
To test local versions of SDK packages, for instance in test projects, you have a couple of options:
5353

54-
- Use [`pnpm link`](https://pnpm.io/cli/link) to symlink your package to the test project.
54+
- Use [`pnpm link`](./docs/using-pnpm-link.md) to symlink your package to the test project.
5555
- Use [`yalc` to install SDK packages](./docs/using-yalc.md) as if they were already published.
5656
- Run `build:tarball` in the repo and `pnpm add ./path/to/tarball.tgz` in the project.
5757

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"dependencies": {
5959
"@babel/core": "^7.29.6",
6060
"@babel/preset-typescript": "^7.16.7",
61-
"@playwright/test": "~1.63.0",
61+
"@playwright/test": "1.64.1",
6262
"@sentry/rrweb": "2.44.1",
6363
"@sentry/browser": "11.8.0",
6464
"@sentry/replay": "11.8.0",
@@ -72,7 +72,7 @@
7272
"webpack": "^5.95.0"
7373
},
7474
"devDependencies": {
75-
"@types/node": "^18.19.1",
75+
"@types/node": "^20.19.0",
7676
"eslint-plugin-regexp": "^3.1.0",
7777
"glob": "^13.0.6"
7878
},

‎dev-packages/bundler-plugin-integration-tests/fixtures/esbuild/after-upload-deletion.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test(import.meta.url, ({ runBundler, readOutputFiles, runFileInNode }) => {
99
// _sentry-injection-stub
1010
!(function() {
1111
try {
12-
var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {};
12+
var e = "undefined" != typeof globalThis ? globalThis : "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : {};
1313
e.SENTRY_RELEASE = { id: "CURRENT_SHA" };
1414
} catch (e2) {
1515
}
@@ -18,7 +18,7 @@ test(import.meta.url, ({ runBundler, readOutputFiles, runFileInNode }) => {
1818
// sentry-debug-id-stub:_sentry-debug-id-injection-stub?sentry-module-id=00000000-0000-0000-0000-000000000000
1919
!(function() {
2020
try {
21-
var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {};
21+
var e = "undefined" != typeof globalThis ? globalThis : "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : {};
2222
var n = new e.Error().stack;
2323
n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "00000000-0000-0000-0000-000000000000", e._sentryDebugIdIdentifier = "sentry-dbid-00000000-0000-0000-0000-000000000000");
2424
} catch (e2) {

‎dev-packages/bundler-plugin-integration-tests/fixtures/esbuild/application-key.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test(import.meta.url, ({ runBundler, readOutputFiles, runFileInNode }) => {
99
// _sentry-injection-stub
1010
!(function() {
1111
try {
12-
var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {};
12+
var e = "undefined" != typeof globalThis ? globalThis : "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : {};
1313
e.SENTRY_RELEASE = { id: "CURRENT_SHA" };
1414
e._sentryModuleMetadata = e._sentryModuleMetadata || {}, e._sentryModuleMetadata[new e.Error().stack] = (function(e2) {
1515
for (var n = 1; n < arguments.length; n++) {
@@ -25,7 +25,7 @@ test(import.meta.url, ({ runBundler, readOutputFiles, runFileInNode }) => {
2525
// sentry-debug-id-stub:_sentry-debug-id-injection-stub?sentry-module-id=00000000-0000-0000-0000-000000000000
2626
!(function() {
2727
try {
28-
var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {};
28+
var e = "undefined" != typeof globalThis ? globalThis : "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : {};
2929
var n = new e.Error().stack;
3030
n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "00000000-0000-0000-0000-000000000000", e._sentryDebugIdIdentifier = "sentry-dbid-00000000-0000-0000-0000-000000000000");
3131
} catch (e2) {

‎dev-packages/bundler-plugin-integration-tests/fixtures/esbuild/basic-cjs.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test(import.meta.url, ({ runBundler, readOutputFiles, runFileInNode }) => {
99
// _sentry-injection-stub
1010
!(function() {
1111
try {
12-
var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {};
12+
var e = "undefined" != typeof globalThis ? globalThis : "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : {};
1313
e.SENTRY_RELEASE = { id: "CURRENT_SHA" };
1414
} catch (e2) {
1515
}
@@ -18,7 +18,7 @@ test(import.meta.url, ({ runBundler, readOutputFiles, runFileInNode }) => {
1818
// sentry-debug-id-stub:_sentry-debug-id-injection-stub?sentry-module-id=00000000-0000-0000-0000-000000000000
1919
!(function() {
2020
try {
21-
var e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {};
21+
var e = "undefined" != typeof globalThis ? globalThis : "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : {};
2222
var n = new e.Error().stack;
2323
n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "00000000-0000-0000-0000-000000000000", e._sentryDebugIdIdentifier = "sentry-dbid-00000000-0000-0000-0000-000000000000");
2424
} catch (e2) {

0 commit comments

Comments
 (0)