Skip to content

Commit d0d2dbb

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into patch-1
2 parents 78724a2 + 4415881 commit d0d2dbb

File tree

592 files changed

+5453
-12938
lines changed

Some content is hidden

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

592 files changed

+5453
-12938
lines changed

.craft.yml

Lines changed: 20 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,27 @@ targets:
99
- name: npm
1010
id: '@sentry/types'
1111
includeNames: /^sentry-types-\d.*\.tgz$/
12-
## 1.2 Utils
13-
# TODO(v9): Remove
14-
- name: npm
15-
id: '@sentry/utils'
16-
includeNames: /^sentry-utils-\d.*\.tgz$/
17-
## 1.3 Core SDK
12+
## 1.2 Core SDK
1813
- name: npm
1914
id: '@sentry/core'
2015
includeNames: /^sentry-core-\d.*\.tgz$/
21-
## 1.4 Browser Utils package
16+
## 1.3 Browser Utils package
2217
- name: npm
2318
id: '@sentry-internal/browser-utils'
2419
includeNames: /^sentry-internal-browser-utils-\d.*\.tgz$/
25-
## 1.5 Replay Internal package (browser only)
20+
## 1.4 Replay Internal package (browser only)
2621
- name: npm
2722
id: '@sentry-internal/replay'
2823
includeNames: /^sentry-internal-replay-\d.*\.tgz$/
29-
## 1.6 OpenTelemetry package
24+
## 1.5 OpenTelemetry package
3025
- name: npm
3126
id: '@sentry/opentelemetry'
3227
includeNames: /^sentry-opentelemetry-\d.*\.tgz$/
33-
## 1.7 Feedback package (browser only)
28+
## 1.6 Feedback package (browser only)
3429
- name: npm
3530
id: '@sentry-internal/feedback'
3631
includeNames: /^sentry-internal-feedback-\d.*\.tgz$/
37-
## 1.8 ReplayCanvas package (browser only)
32+
## 1.7 ReplayCanvas package (browser only)
3833
- name: npm
3934
id: '@sentry-internal/replay-canvas'
4035
includeNames: /^sentry-internal-replay-canvas-\d.*\.tgz$/
@@ -143,37 +138,20 @@ targets:
143138
includeNames: /^sentry-internal-eslint-config-sdk-\d.*\.tgz$/
144139

145140
# AWS Lambda Layer target
146-
- name: aws-lambda-layer
147-
includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/
148-
layerName: SentryNodeServerlessSDK
149-
compatibleRuntimes:
150-
- name: node
151-
versions:
152-
- nodejs10.x
153-
- nodejs12.x
154-
- nodejs14.x
155-
- nodejs16.x
156-
- nodejs18.x
157-
- nodejs20.x
158-
license: MIT
159-
160-
# NOTE: We publish the v8 layer under its own name so people on v8 can still get patches
161-
# whenever we release a new v8 version—otherwise we would overwrite the current major lambda layer.
162-
163-
# AWS Lambda Layer target
164-
- name: aws-lambda-layer
165-
includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/
166-
layerName: SentryNodeServerlessSDKv8
167-
compatibleRuntimes:
168-
- name: node
169-
versions:
170-
- nodejs10.x
171-
- nodejs12.x
172-
- nodejs14.x
173-
- nodejs16.x
174-
- nodejs18.x
175-
- nodejs20.x
176-
license: MIT
141+
# TODO(v9): Once stable, re-add this target to publish the AWS Lambda layer
142+
# - name: aws-lambda-layer
143+
# includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/
144+
# layerName: SentryNodeServerlessSDK
145+
# compatibleRuntimes:
146+
# - name: node
147+
# versions:
148+
# - nodejs10.x
149+
# - nodejs12.x
150+
# - nodejs14.x
151+
# - nodejs16.x
152+
# - nodejs18.x
153+
# - nodejs20.x
154+
# license: MIT
177155

178156
# CDN Bundle Target
179157
- name: gcs

.github/ISSUE_TEMPLATE/flaky.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ body:
1919
id: job-name
2020
attributes:
2121
label: Name of Job
22-
placeholder: "CI: Build & Test / Nextjs (Node 14) Tests"
22+
placeholder: "CI: Build & Test / Nextjs (Node 18) Tests"
2323
description: name of job as reported in the status report
2424
validations:
2525
required: true

.github/actions/restore-cache/action.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ inputs:
55
dependency_cache_key:
66
description: "The dependency cache key"
77
required: true
8-
node_version:
9-
description: "If set, temporarily set node version to default one before installing, then revert to this version after."
10-
required: false
118

129
runs:
1310
using: "composite"
@@ -24,19 +21,7 @@ runs:
2421
with:
2522
name: build-output
2623

27-
- name: Use default node version for install
28-
if: inputs.node_version && steps.dep-cache.outputs.cache-hit != 'true'
29-
uses: actions/setup-node@v4
30-
with:
31-
node-version-file: 'package.json'
32-
3324
- name: Install dependencies
3425
if: steps.dep-cache.outputs.cache-hit != 'true'
3526
run: yarn install --ignore-engines --frozen-lockfile
3627
shell: bash
37-
38-
- name: Revert node version to ${{ inputs.node_version }}
39-
if: inputs.node_version && steps.dep-cache.outputs.cache-hit != 'true'
40-
uses: actions/setup-node@v4
41-
with:
42-
node-version: ${{ inputs.node_version }}

.github/dependency-review-config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ allow-ghsas:
77
- GHSA-fr5h-rqp8-mj6g
88
# we need this for an E2E test for the minimum required version of Nuxt 3.7.0
99
- GHSA-v784-fjjh-f8r4
10+
# Next.js Cache poisoning - We require a vulnerable version for E2E testing
11+
- GHSA-gp8f-8m3g-qvj9

.github/workflows/build.yml

Lines changed: 21 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
branches:
55
- develop
66
- master
7+
- v9
8+
- v8
79
- release/**
810
pull_request:
911
merge_group:
@@ -105,7 +107,7 @@ jobs:
105107
outputs:
106108
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
107109
# Note: These next three have to be checked as strings ('true'/'false')!
108-
is_develop: ${{ github.ref == 'refs/heads/develop' }}
110+
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
109111
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
110112
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
111113
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
@@ -126,7 +128,7 @@ jobs:
126128
timeout-minutes: 15
127129
if: |
128130
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
129-
needs.job_get_metadata.outputs.is_develop == 'true' ||
131+
needs.job_get_metadata.outputs.is_base_branch == 'true' ||
130132
needs.job_get_metadata.outputs.is_release == 'true' ||
131133
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
132134
steps:
@@ -171,7 +173,7 @@ jobs:
171173
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
172174
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
173175
restore-keys:
174-
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
176+
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
175177

176178
- name: Build packages
177179
# Set the CODECOV_TOKEN for Bundle Analysis
@@ -219,7 +221,7 @@ jobs:
219221
timeout-minutes: 15
220222
runs-on: ubuntu-20.04
221223
if:
222-
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
224+
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
223225
needs.job_get_metadata.outputs.is_release == 'true'
224226
steps:
225227
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
@@ -457,7 +459,7 @@ jobs:
457459
strategy:
458460
fail-fast: false
459461
matrix:
460-
node: [14, 16, 18, 20, 22]
462+
node: [18, 20, 22]
461463
steps:
462464
- name: Check out base commit (${{ github.event.pull_request.base.sha }})
463465
uses: actions/checkout@v4
@@ -476,7 +478,6 @@ jobs:
476478
uses: ./.github/actions/restore-cache
477479
with:
478480
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
479-
node_version: ${{ matrix.node == 14 && '14' || '' }}
480481

481482
- name: Run affected tests
482483
run: yarn test:pr:node --base=${{ github.event.pull_request.base.sha }}
@@ -713,7 +714,7 @@ jobs:
713714
strategy:
714715
fail-fast: false
715716
matrix:
716-
node: [14, 16, 18, 20, 22]
717+
node: [18, 20, 22]
717718
typescript:
718719
- false
719720
include:
@@ -733,17 +734,13 @@ jobs:
733734
uses: ./.github/actions/restore-cache
734735
with:
735736
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
736-
node_version: ${{ matrix.node == 14 && '14' || '' }}
737737

738738
- name: Overwrite typescript version
739-
if: matrix.typescript
740-
run: node ./scripts/use-ts-version.js ${{ matrix.typescript }}
739+
if: matrix.typescript == '3.8'
740+
run: node ./scripts/use-ts-3_8.js
741741
working-directory: dev-packages/node-integration-tests
742742

743743
- name: Run integration tests
744-
env:
745-
NODE_VERSION: ${{ matrix.node }}
746-
TS_VERSION: ${{ matrix.typescript }}
747744
working-directory: dev-packages/node-integration-tests
748745
run: yarn test
749746

@@ -758,10 +755,6 @@ jobs:
758755
matrix:
759756
node: [18, 20, 22]
760757
remix: [1, 2]
761-
# Remix v2 only supports Node 18+, so run 16 tests separately
762-
include:
763-
- node: 16
764-
remix: 1
765758
steps:
766759
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
767760
uses: actions/checkout@v4
@@ -1241,24 +1234,22 @@ jobs:
12411234
echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
12421235
12431236
job_compile_bindings_profiling_node:
1244-
name: Compile & Test Profiling Bindings (v${{ matrix.node }}) ${{ matrix.target_platform || matrix.os }}, ${{ matrix.node || matrix.container }}, ${{ matrix.arch || matrix.container }}, ${{ contains(matrix.container, 'alpine') && 'musl' || 'glibc' }}
1237+
name: Compile profiling-node (v${{ matrix.node }}) ${{ matrix.target_platform || matrix.os }}, ${{ matrix.arch || matrix.container }}, ${{ contains(matrix.container, 'alpine') && 'musl' || 'glibc' }}
12451238
needs: [job_get_metadata, job_build]
12461239
# Compiling bindings can be very slow (especially on windows), so only run precompile
12471240
# Skip precompile unless we are on a release branch as precompile slows down CI times.
12481241
if: |
12491242
(needs.job_get_metadata.outputs.changed_profiling_node == 'true') ||
12501243
(needs.job_get_metadata.outputs.is_release == 'true')
12511244
runs-on: ${{ matrix.os }}
1252-
container: ${{ matrix.container }}
1245+
container:
1246+
image: ${{ matrix.container }}
12531247
timeout-minutes: 30
12541248
strategy:
12551249
fail-fast: false
12561250
matrix:
12571251
include:
12581252
# x64 glibc
1259-
- os: ubuntu-20.04
1260-
node: 16
1261-
binary: linux-x64-glibc-93
12621253
- os: ubuntu-20.04
12631254
node: 18
12641255
binary: linux-x64-glibc-108
@@ -1270,10 +1261,6 @@ jobs:
12701261
binary: linux-x64-glibc-127
12711262

12721263
# x64 musl
1273-
- os: ubuntu-20.04
1274-
container: node:16-alpine3.16
1275-
binary: linux-x64-musl-93
1276-
node: 16
12771264
- os: ubuntu-20.04
12781265
container: node:18-alpine3.17
12791266
node: 18
@@ -1288,10 +1275,6 @@ jobs:
12881275
binary: linux-x64-musl-127
12891276

12901277
# arm64 glibc
1291-
- os: ubuntu-20.04
1292-
arch: arm64
1293-
node: 16
1294-
binary: linux-arm64-glibc-93
12951278
- os: ubuntu-20.04
12961279
arch: arm64
12971280
node: 18
@@ -1306,11 +1289,6 @@ jobs:
13061289
binary: linux-arm64-glibc-127
13071290

13081291
# arm64 musl
1309-
- os: ubuntu-20.04
1310-
container: node:16-alpine3.16
1311-
arch: arm64
1312-
node: 16
1313-
binary: linux-arm64-musl-93
13141292
- os: ubuntu-20.04
13151293
arch: arm64
13161294
container: node:18-alpine3.17
@@ -1328,10 +1306,6 @@ jobs:
13281306
binary: linux-arm64-musl-127
13291307

13301308
# macos x64
1331-
- os: macos-13
1332-
node: 16
1333-
arch: x64
1334-
binary: darwin-x64-93
13351309
- os: macos-13
13361310
node: 18
13371311
arch: x64
@@ -1346,11 +1320,6 @@ jobs:
13461320
binary: darwin-x64-127
13471321

13481322
# macos arm64
1349-
- os: macos-13
1350-
arch: arm64
1351-
node: 16
1352-
target_platform: darwin
1353-
binary: darwin-arm64-93
13541323
- os: macos-13
13551324
arch: arm64
13561325
node: 18
@@ -1368,10 +1337,6 @@ jobs:
13681337
binary: darwin-arm64-127
13691338

13701339
# windows x64
1371-
- os: windows-2022
1372-
node: 16
1373-
arch: x64
1374-
binary: win32-x64-93
13751340
- os: windows-2022
13761341
node: 18
13771342
arch: x64
@@ -1397,8 +1362,13 @@ jobs:
13971362
with:
13981363
ref: ${{ env.HEAD_COMMIT }}
13991364

1365+
# Note: On alpine images, this does nothing
1366+
# The node version will be the one that is installed in the image
1367+
# If you want to change the node version, you need to change the image
1368+
# For non-alpine imgages, this will install the correct version of node
14001369
- name: Setup Node
14011370
uses: actions/setup-node@v4
1371+
if: contains(matrix.container, 'alpine') == false
14021372
with:
14031373
node-version: ${{ matrix.node }}
14041374

@@ -1415,10 +1385,10 @@ jobs:
14151385
run: yarn config set network-timeout 600000 -g
14161386

14171387
- name: Install dependencies
1418-
env:
1419-
SKIP_PLAYWRIGHT_BROWSER_INSTALL: "1"
14201388
if: steps.restore-dependencies.outputs.cache-hit != 'true'
14211389
run: yarn install --ignore-engines --frozen-lockfile
1390+
env:
1391+
SKIP_PLAYWRIGHT_BROWSER_INSTALL: "1"
14221392

14231393
- name: Configure safe directory
14241394
run: |
@@ -1496,8 +1466,7 @@ jobs:
14961466
BUILD_ARCH=arm64 \
14971467
yarn build:bindings:arm64
14981468
1499-
- name: Build Monorepo
1500-
if: steps.restore-build.outputs.cache-hit != 'true'
1469+
- name: Build profiling-node & its dependencies
15011470
run: yarn build --scope @sentry/profiling-node
15021471

15031472
- name: Test Bindings

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,18 @@ name: "CI: Enforce License Compliance"
22

33
on:
44
push:
5-
branches: [master, develop, release/*]
5+
branches:
6+
- develop
7+
- master
8+
- v9
9+
- v8
10+
- release/**
611
pull_request:
7-
branches: [master, develop]
12+
branches:
13+
- develop
14+
- master
15+
- v9
16+
- v8
817

918
jobs:
1019
enforce-license-compliance:

0 commit comments

Comments
 (0)