Skip to content

Commit 92967cd

Browse files
antonpirkerantonpirker
authored
Merge branch 'master' into fix-default-scope-transaction-info
2 parents 21344e4 + fe4b88b commit 92967cd

File tree

109 files changed

+5057
-858
lines changed

Some content is hidden

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

109 files changed

+5057
-858
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
timeout-minutes: 10
2525

2626
steps:
27-
- uses: actions/[email protected].0
27+
- uses: actions/[email protected].2
2828
- uses: actions/setup-python@v5
2929
with:
3030
python-version: 3.12
@@ -39,7 +39,7 @@ jobs:
3939
timeout-minutes: 10
4040

4141
steps:
42-
- uses: actions/[email protected].0
42+
- uses: actions/[email protected].2
4343
- uses: actions/setup-python@v5
4444
with:
4545
python-version: 3.12
@@ -54,7 +54,7 @@ jobs:
5454
timeout-minutes: 10
5555

5656
steps:
57-
- uses: actions/[email protected].0
57+
- uses: actions/[email protected].2
5858
- uses: actions/setup-python@v5
5959
with:
6060
python-version: 3.12
@@ -85,7 +85,7 @@ jobs:
8585
timeout-minutes: 10
8686

8787
steps:
88-
- uses: actions/[email protected].0
88+
- uses: actions/[email protected].2
8989
- uses: actions/setup-python@v5
9090
with:
9191
python-version: 3.12

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ on:
1717
- master
1818
- sentry-sdk-2.0
1919
pull_request:
20-
# The branches below must be a subset of the branches above
21-
branches:
22-
- master
23-
- sentry-sdk-2.0
2420
schedule:
2521
- cron: '18 18 * * 3'
2622

23+
# Cancel in progress workflows on pull_requests.
24+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
25+
concurrency:
26+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
27+
cancel-in-progress: true
28+
2729
permissions:
2830
contents: read
2931

@@ -46,7 +48,7 @@ jobs:
4648

4749
steps:
4850
- name: Checkout repository
49-
uses: actions/[email protected].0
51+
uses: actions/[email protected].2
5052

5153
# Initializes the CodeQL tools for scanning.
5254
- name: Initialize CodeQL

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ on:
88
- release/*
99
- sentry-sdk-2.0
1010
pull_request:
11-
branches:
12-
- master
13-
- main
14-
- sentry-sdk-2.0
11+
12+
# Cancel in progress workflows on pull_requests.
13+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1516

1617
jobs:
1718
enforce-license-compliance:

‎.github/workflows/release-comment-issues.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: "Automation: Notify issues for release"
2+
on:
3+
release:
4+
types:
5+
- published
6+
workflow_dispatch:
7+
inputs:
8+
version:
9+
description: Which version to notify issues for
10+
required: false
11+
12+
# This workflow is triggered when a release is published
13+
jobs:
14+
release-comment-issues:
15+
runs-on: ubuntu-20.04
16+
name: Notify issues
17+
steps:
18+
- name: Get version
19+
id: get_version
20+
run: echo "version=${{ github.event.inputs.version || github.event.release.tag_name }}" >> $GITHUB_OUTPUT
21+
22+
- name: Comment on linked issues that are mentioned in release
23+
if: |
24+
steps.get_version.outputs.version != ''
25+
&& !contains(steps.get_version.outputs.version, 'a')
26+
&& !contains(steps.get_version.outputs.version, 'b')
27+
&& !contains(steps.get_version.outputs.version, 'rc')
28+
uses: getsentry/release-comment-issues-gh-action@v1
29+
with:
30+
github_token: ${{ secrets.GITHUB_TOKEN }}
31+
version: ${{ steps.get_version.outputs.version }}

‎.github/workflows/release.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,20 @@ jobs:
1818
runs-on: ubuntu-latest
1919
name: "Release a new version"
2020
steps:
21-
- uses: actions/[email protected]
21+
- name: Get auth token
22+
id: token
23+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
2224
with:
23-
token: ${{ secrets.GH_RELEASE_PAT }}
25+
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
26+
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
27+
- uses: actions/[email protected]
28+
with:
29+
token: ${{ steps.token.outputs.token }}
2430
fetch-depth: 0
2531
- name: Prepare release
2632
uses: getsentry/action-prepare-release@v1
2733
env:
28-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
34+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
2935
with:
3036
version: ${{ github.event.inputs.version }}
3137
force: ${{ github.event.inputs.force }}

‎.github/workflows/test-integrations-ai.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3535
os: [ubuntu-20.04]
3636
steps:
37-
- uses: actions/[email protected].0
37+
- uses: actions/[email protected].2
3838
- uses: actions/setup-python@v5
3939
with:
4040
python-version: ${{ matrix.python-version }}
@@ -78,7 +78,7 @@ jobs:
7878
coverage xml
7979
- name: Upload coverage to Codecov
8080
if: ${{ !cancelled() }}
81-
uses: codecov/codecov-action@v4.6.0
81+
uses: codecov/codecov-action@v5.0.7
8282
with:
8383
token: ${{ secrets.CODECOV_TOKEN }}
8484
files: coverage.xml
@@ -99,14 +99,14 @@ jobs:
9999
strategy:
100100
fail-fast: false
101101
matrix:
102-
python-version: ["3.7","3.9","3.11","3.12","3.13"]
102+
python-version: ["3.8","3.9","3.11","3.12","3.13"]
103103
# python3.6 reached EOL and is no longer being supported on
104104
# new versions of hosted runners on Github Actions
105105
# ubuntu-20.04 is the last version that supported python3.6
106106
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
107107
os: [ubuntu-20.04]
108108
steps:
109-
- uses: actions/[email protected].0
109+
- uses: actions/[email protected].2
110110
- uses: actions/setup-python@v5
111111
with:
112112
python-version: ${{ matrix.python-version }}
@@ -150,7 +150,7 @@ jobs:
150150
coverage xml
151151
- name: Upload coverage to Codecov
152152
if: ${{ !cancelled() }}
153-
uses: codecov/codecov-action@v4.6.0
153+
uses: codecov/codecov-action@v5.0.7
154154
with:
155155
token: ${{ secrets.CODECOV_TOKEN }}
156156
files: coverage.xml
@@ -165,7 +165,7 @@ jobs:
165165
files: .junitxml
166166
verbose: true
167167
check_required_tests:
168-
name: All AI tests passed
168+
name: All pinned AI tests passed
169169
needs: test-ai-pinned
170170
# Always run this, even if a dependent job failed
171171
if: always()

‎.github/workflows/test-integrations-aws-lambda.yml‎ renamed to ‎.github/workflows/test-integrations-aws.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Do not edit this file. This file is generated automatically by executing
22
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
3-
name: Test AWS Lambda
3+
name: Test AWS
44
on:
55
push:
66
branches:
@@ -32,7 +32,7 @@ jobs:
3232
name: permissions check
3333
runs-on: ubuntu-20.04
3434
steps:
35-
- uses: actions/[email protected].0
35+
- uses: actions/[email protected].2
3636
with:
3737
persist-credentials: false
3838
- name: Check permissions on PR
@@ -52,8 +52,8 @@ jobs:
5252
- name: Check permissions on repo branch
5353
if: github.event_name == 'push'
5454
run: true
55-
test-aws_lambda-pinned:
56-
name: AWS Lambda (pinned)
55+
test-aws-pinned:
56+
name: AWS (pinned)
5757
timeout-minutes: 30
5858
runs-on: ${{ matrix.os }}
5959
strategy:
@@ -67,7 +67,7 @@ jobs:
6767
os: [ubuntu-20.04]
6868
needs: check-permissions
6969
steps:
70-
- uses: actions/[email protected].0
70+
- uses: actions/[email protected].2
7171
with:
7272
ref: ${{ github.event.pull_request.head.sha || github.ref }}
7373
- uses: actions/setup-python@v5
@@ -97,7 +97,7 @@ jobs:
9797
coverage xml
9898
- name: Upload coverage to Codecov
9999
if: ${{ !cancelled() }}
100-
uses: codecov/codecov-action@v4.6.0
100+
uses: codecov/codecov-action@v5.0.7
101101
with:
102102
token: ${{ secrets.CODECOV_TOKEN }}
103103
files: coverage.xml
@@ -112,13 +112,13 @@ jobs:
112112
files: .junitxml
113113
verbose: true
114114
check_required_tests:
115-
name: All AWS Lambda tests passed
116-
needs: test-aws_lambda-pinned
115+
name: All pinned AWS tests passed
116+
needs: test-aws-pinned
117117
# Always run this, even if a dependent job failed
118118
if: always()
119119
runs-on: ubuntu-20.04
120120
steps:
121121
- name: Check for failures
122-
if: contains(needs.test-aws_lambda-pinned.result, 'failure') || contains(needs.test-aws_lambda-pinned.result, 'skipped')
122+
if: contains(needs.test-aws-pinned.result, 'failure') || contains(needs.test-aws-pinned.result, 'skipped')
123123
run: |
124124
echo "One of the dependent jobs has failed. You may need to re-run it." && exit 1

‎.github/workflows/test-integrations-cloud-computing.yml‎ renamed to ‎.github/workflows/test-integrations-cloud.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Do not edit this file. This file is generated automatically by executing
22
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
3-
name: Test Cloud Computing
3+
name: Test Cloud
44
on:
55
push:
66
branches:
@@ -20,8 +20,8 @@ env:
2020
CACHED_BUILD_PATHS: |
2121
${{ github.workspace }}/dist-serverless
2222
jobs:
23-
test-cloud_computing-latest:
24-
name: Cloud Computing (latest)
23+
test-cloud-latest:
24+
name: Cloud (latest)
2525
timeout-minutes: 30
2626
runs-on: ${{ matrix.os }}
2727
strategy:
@@ -34,7 +34,7 @@ jobs:
3434
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3535
os: [ubuntu-20.04]
3636
steps:
37-
- uses: actions/[email protected].0
37+
- uses: actions/[email protected].2
3838
- uses: actions/setup-python@v5
3939
with:
4040
python-version: ${{ matrix.python-version }}
@@ -74,7 +74,7 @@ jobs:
7474
coverage xml
7575
- name: Upload coverage to Codecov
7676
if: ${{ !cancelled() }}
77-
uses: codecov/codecov-action@v4.6.0
77+
uses: codecov/codecov-action@v5.0.7
7878
with:
7979
token: ${{ secrets.CODECOV_TOKEN }}
8080
files: coverage.xml
@@ -88,8 +88,8 @@ jobs:
8888
token: ${{ secrets.CODECOV_TOKEN }}
8989
files: .junitxml
9090
verbose: true
91-
test-cloud_computing-pinned:
92-
name: Cloud Computing (pinned)
91+
test-cloud-pinned:
92+
name: Cloud (pinned)
9393
timeout-minutes: 30
9494
runs-on: ${{ matrix.os }}
9595
strategy:
@@ -102,7 +102,7 @@ jobs:
102102
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
103103
os: [ubuntu-20.04]
104104
steps:
105-
- uses: actions/[email protected].0
105+
- uses: actions/[email protected].2
106106
- uses: actions/setup-python@v5
107107
with:
108108
python-version: ${{ matrix.python-version }}
@@ -142,7 +142,7 @@ jobs:
142142
coverage xml
143143
- name: Upload coverage to Codecov
144144
if: ${{ !cancelled() }}
145-
uses: codecov/codecov-action@v4.6.0
145+
uses: codecov/codecov-action@v5.0.7
146146
with:
147147
token: ${{ secrets.CODECOV_TOKEN }}
148148
files: coverage.xml
@@ -157,13 +157,13 @@ jobs:
157157
files: .junitxml
158158
verbose: true
159159
check_required_tests:
160-
name: All Cloud Computing tests passed
161-
needs: test-cloud_computing-pinned
160+
name: All pinned Cloud tests passed
161+
needs: test-cloud-pinned
162162
# Always run this, even if a dependent job failed
163163
if: always()
164164
runs-on: ubuntu-20.04
165165
steps:
166166
- name: Check for failures
167-
if: contains(needs.test-cloud_computing-pinned.result, 'failure') || contains(needs.test-cloud_computing-pinned.result, 'skipped')
167+
if: contains(needs.test-cloud-pinned.result, 'failure') || contains(needs.test-cloud-pinned.result, 'skipped')
168168
run: |
169169
echo "One of the dependent jobs has failed. You may need to re-run it." && exit 1

‎.github/workflows/test-integrations-common.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3535
os: [ubuntu-20.04]
3636
steps:
37-
- uses: actions/[email protected].0
37+
- uses: actions/[email protected].2
3838
- uses: actions/setup-python@v5
3939
with:
4040
python-version: ${{ matrix.python-version }}
@@ -62,7 +62,7 @@ jobs:
6262
coverage xml
6363
- name: Upload coverage to Codecov
6464
if: ${{ !cancelled() }}
65-
uses: codecov/codecov-action@v4.6.0
65+
uses: codecov/codecov-action@v5.0.7
6666
with:
6767
token: ${{ secrets.CODECOV_TOKEN }}
6868
files: coverage.xml
@@ -77,7 +77,7 @@ jobs:
7777
files: .junitxml
7878
verbose: true
7979
check_required_tests:
80-
name: All Common tests passed
80+
name: All pinned Common tests passed
8181
needs: test-common-pinned
8282
# Always run this, even if a dependent job failed
8383
if: always()

0 commit comments

Comments
 (0)