Skip to content

Commit 7376e5a

Browse files
authored
Merge branch 'master' into feature/deprecate-propagate_traces
2 parents 94100fb + 98d0415 commit 7376e5a

Some content is hidden

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

73 files changed

+1020
-705
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- master
77
- release/**
8-
- sentry-sdk-2.0
8+
- potel-base
99

1010
pull_request:
1111

@@ -45,8 +45,8 @@ jobs:
4545
python-version: 3.12
4646

4747
- run: |
48-
pip install jinja2
49-
python scripts/split-tox-gh-actions/split-tox-gh-actions.py --fail-on-changes
48+
pip install -r scripts/split_tox_gh_actions/requirements.txt
49+
python scripts/split_tox_gh_actions/split_tox_gh_actions.py --fail-on-changes
5050
5151
build_lambda_layer:
5252
name: Build Package

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
push:
1616
branches:
1717
- master
18-
- sentry-sdk-2.0
18+
- potel-base
1919
pull_request:
2020
schedule:
2121
- cron: '18 18 * * 3'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77
- main
88
- release/*
9-
- sentry-sdk-2.0
9+
- potel-base
1010
pull_request:
1111

1212
# Cancel in progress workflows on pull_requests.

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- name: Get auth token
2222
id: token
23-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
23+
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
2424
with:
2525
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2626
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
# Do not edit this file. This file is generated automatically by executing
2-
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
1+
# Do not edit this YAML file. This file is generated automatically by executing
2+
# python scripts/split_tox_gh_actions/split_tox_gh_actions.py
3+
# The template responsible for it is in
4+
# scripts/split_tox_gh_actions/templates/base.jinja
35
name: Test AI
46
on:
57
push:
68
branches:
79
- master
810
- release/**
9-
- sentry-sdk-2.0
11+
- potel-base
1012
pull_request:
1113
# Cancel in progress workflows on pull_requests.
1214
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -78,7 +80,7 @@ jobs:
7880
coverage xml
7981
- name: Upload coverage to Codecov
8082
if: ${{ !cancelled() }}
81-
uses: codecov/codecov-action@v5.0.7
83+
uses: codecov/codecov-action@v5.1.2
8284
with:
8385
token: ${{ secrets.CODECOV_TOKEN }}
8486
files: coverage.xml
@@ -150,7 +152,7 @@ jobs:
150152
coverage xml
151153
- name: Upload coverage to Codecov
152154
if: ${{ !cancelled() }}
153-
uses: codecov/codecov-action@v5.0.7
155+
uses: codecov/codecov-action@v5.1.2
154156
with:
155157
token: ${{ secrets.CODECOV_TOKEN }}
156158
files: coverage.xml

.github/workflows/test-integrations-aws.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
# Do not edit this file. This file is generated automatically by executing
2-
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
1+
# Do not edit this YAML file. This file is generated automatically by executing
2+
# python scripts/split_tox_gh_actions/split_tox_gh_actions.py
3+
# The template responsible for it is in
4+
# scripts/split_tox_gh_actions/templates/base.jinja
35
name: Test AWS
46
on:
57
push:
68
branches:
79
- master
810
- release/**
9-
- sentry-sdk-2.0
11+
- potel-base
1012
# XXX: We are using `pull_request_target` instead of `pull_request` because we want
1113
# this to run on forks with access to the secrets necessary to run the test suite.
1214
# Prefer to use `pull_request` when possible.
@@ -97,7 +99,7 @@ jobs:
9799
coverage xml
98100
- name: Upload coverage to Codecov
99101
if: ${{ !cancelled() }}
100-
uses: codecov/codecov-action@v5.0.7
102+
uses: codecov/codecov-action@v5.1.2
101103
with:
102104
token: ${{ secrets.CODECOV_TOKEN }}
103105
files: coverage.xml

.github/workflows/test-integrations-cloud.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
# Do not edit this file. This file is generated automatically by executing
2-
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
1+
# Do not edit this YAML file. This file is generated automatically by executing
2+
# python scripts/split_tox_gh_actions/split_tox_gh_actions.py
3+
# The template responsible for it is in
4+
# scripts/split_tox_gh_actions/templates/base.jinja
35
name: Test Cloud
46
on:
57
push:
68
branches:
79
- master
810
- release/**
9-
- sentry-sdk-2.0
11+
- potel-base
1012
pull_request:
1113
# Cancel in progress workflows on pull_requests.
1214
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -74,7 +76,7 @@ jobs:
7476
coverage xml
7577
- name: Upload coverage to Codecov
7678
if: ${{ !cancelled() }}
77-
uses: codecov/codecov-action@v5.0.7
79+
uses: codecov/codecov-action@v5.1.2
7880
with:
7981
token: ${{ secrets.CODECOV_TOKEN }}
8082
files: coverage.xml
@@ -142,7 +144,7 @@ jobs:
142144
coverage xml
143145
- name: Upload coverage to Codecov
144146
if: ${{ !cancelled() }}
145-
uses: codecov/codecov-action@v5.0.7
147+
uses: codecov/codecov-action@v5.1.2
146148
with:
147149
token: ${{ secrets.CODECOV_TOKEN }}
148150
files: coverage.xml

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
# Do not edit this file. This file is generated automatically by executing
2-
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
1+
# Do not edit this YAML file. This file is generated automatically by executing
2+
# python scripts/split_tox_gh_actions/split_tox_gh_actions.py
3+
# The template responsible for it is in
4+
# scripts/split_tox_gh_actions/templates/base.jinja
35
name: Test Common
46
on:
57
push:
68
branches:
79
- master
810
- release/**
9-
- sentry-sdk-2.0
11+
- potel-base
1012
pull_request:
1113
# Cancel in progress workflows on pull_requests.
1214
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -62,7 +64,7 @@ jobs:
6264
coverage xml
6365
- name: Upload coverage to Codecov
6466
if: ${{ !cancelled() }}
65-
uses: codecov/codecov-action@v5.0.7
67+
uses: codecov/codecov-action@v5.1.2
6668
with:
6769
token: ${{ secrets.CODECOV_TOKEN }}
6870
files: coverage.xml

.github/workflows/test-integrations-dbs.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
# Do not edit this file. This file is generated automatically by executing
2-
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
1+
# Do not edit this YAML file. This file is generated automatically by executing
2+
# python scripts/split_tox_gh_actions/split_tox_gh_actions.py
3+
# The template responsible for it is in
4+
# scripts/split_tox_gh_actions/templates/base.jinja
35
name: Test DBs
46
on:
57
push:
68
branches:
79
- master
810
- release/**
9-
- sentry-sdk-2.0
11+
- potel-base
1012
pull_request:
1113
# Cancel in progress workflows on pull_requests.
1214
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
@@ -101,7 +103,7 @@ jobs:
101103
coverage xml
102104
- name: Upload coverage to Codecov
103105
if: ${{ !cancelled() }}
104-
uses: codecov/codecov-action@v5.0.7
106+
uses: codecov/codecov-action@v5.1.2
105107
with:
106108
token: ${{ secrets.CODECOV_TOKEN }}
107109
files: coverage.xml
@@ -196,7 +198,7 @@ jobs:
196198
coverage xml
197199
- name: Upload coverage to Codecov
198200
if: ${{ !cancelled() }}
199-
uses: codecov/codecov-action@v5.0.7
201+
uses: codecov/codecov-action@v5.1.2
200202
with:
201203
token: ${{ secrets.CODECOV_TOKEN }}
202204
files: coverage.xml
Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
# Do not edit this YAML file. This file is generated automatically by executing
2+
# python scripts/split_tox_gh_actions/split_tox_gh_actions.py
3+
# The template responsible for it is in
4+
# scripts/split_tox_gh_actions/templates/base.jinja
5+
name: Test Flags
6+
on:
7+
push:
8+
branches:
9+
- master
10+
- release/**
11+
- potel-base
12+
pull_request:
13+
# Cancel in progress workflows on pull_requests.
14+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
17+
cancel-in-progress: true
18+
permissions:
19+
contents: read
20+
env:
21+
BUILD_CACHE_KEY: ${{ github.sha }}
22+
CACHED_BUILD_PATHS: |
23+
${{ github.workspace }}/dist-serverless
24+
jobs:
25+
test-flags-latest:
26+
name: Flags (latest)
27+
timeout-minutes: 30
28+
runs-on: ${{ matrix.os }}
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
python-version: ["3.8","3.12","3.13"]
33+
# python3.6 reached EOL and is no longer being supported on
34+
# new versions of hosted runners on Github Actions
35+
# ubuntu-20.04 is the last version that supported python3.6
36+
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37+
os: [ubuntu-20.04]
38+
steps:
39+
- uses: actions/[email protected]
40+
- uses: actions/setup-python@v5
41+
with:
42+
python-version: ${{ matrix.python-version }}
43+
allow-prereleases: true
44+
- name: Setup Test Env
45+
run: |
46+
pip install "coverage[toml]" tox
47+
- name: Erase coverage
48+
run: |
49+
coverage erase
50+
- name: Test launchdarkly latest
51+
run: |
52+
set -x # print commands that are executed
53+
./scripts/runtox.sh "py${{ matrix.python-version }}-launchdarkly-latest"
54+
- name: Test openfeature latest
55+
run: |
56+
set -x # print commands that are executed
57+
./scripts/runtox.sh "py${{ matrix.python-version }}-openfeature-latest"
58+
- name: Test unleash latest
59+
run: |
60+
set -x # print commands that are executed
61+
./scripts/runtox.sh "py${{ matrix.python-version }}-unleash-latest"
62+
- name: Generate coverage XML (Python 3.6)
63+
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
64+
run: |
65+
export COVERAGE_RCFILE=.coveragerc36
66+
coverage combine .coverage-sentry-*
67+
coverage xml --ignore-errors
68+
- name: Generate coverage XML
69+
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
70+
run: |
71+
coverage combine .coverage-sentry-*
72+
coverage xml
73+
- name: Upload coverage to Codecov
74+
if: ${{ !cancelled() }}
75+
uses: codecov/[email protected]
76+
with:
77+
token: ${{ secrets.CODECOV_TOKEN }}
78+
files: coverage.xml
79+
# make sure no plugins alter our coverage reports
80+
plugin: noop
81+
verbose: true
82+
- name: Upload test results to Codecov
83+
if: ${{ !cancelled() }}
84+
uses: codecov/test-results-action@v1
85+
with:
86+
token: ${{ secrets.CODECOV_TOKEN }}
87+
files: .junitxml
88+
verbose: true
89+
test-flags-pinned:
90+
name: Flags (pinned)
91+
timeout-minutes: 30
92+
runs-on: ${{ matrix.os }}
93+
strategy:
94+
fail-fast: false
95+
matrix:
96+
python-version: ["3.8","3.12","3.13"]
97+
# python3.6 reached EOL and is no longer being supported on
98+
# new versions of hosted runners on Github Actions
99+
# ubuntu-20.04 is the last version that supported python3.6
100+
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
101+
os: [ubuntu-20.04]
102+
steps:
103+
- uses: actions/[email protected]
104+
- uses: actions/setup-python@v5
105+
with:
106+
python-version: ${{ matrix.python-version }}
107+
allow-prereleases: true
108+
- name: Setup Test Env
109+
run: |
110+
pip install "coverage[toml]" tox
111+
- name: Erase coverage
112+
run: |
113+
coverage erase
114+
- name: Test launchdarkly pinned
115+
run: |
116+
set -x # print commands that are executed
117+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-launchdarkly"
118+
- name: Test openfeature pinned
119+
run: |
120+
set -x # print commands that are executed
121+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openfeature"
122+
- name: Test unleash pinned
123+
run: |
124+
set -x # print commands that are executed
125+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-unleash"
126+
- name: Generate coverage XML (Python 3.6)
127+
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
128+
run: |
129+
export COVERAGE_RCFILE=.coveragerc36
130+
coverage combine .coverage-sentry-*
131+
coverage xml --ignore-errors
132+
- name: Generate coverage XML
133+
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
134+
run: |
135+
coverage combine .coverage-sentry-*
136+
coverage xml
137+
- name: Upload coverage to Codecov
138+
if: ${{ !cancelled() }}
139+
uses: codecov/[email protected]
140+
with:
141+
token: ${{ secrets.CODECOV_TOKEN }}
142+
files: coverage.xml
143+
# make sure no plugins alter our coverage reports
144+
plugin: noop
145+
verbose: true
146+
- name: Upload test results to Codecov
147+
if: ${{ !cancelled() }}
148+
uses: codecov/test-results-action@v1
149+
with:
150+
token: ${{ secrets.CODECOV_TOKEN }}
151+
files: .junitxml
152+
verbose: true
153+
check_required_tests:
154+
name: All pinned Flags tests passed
155+
needs: test-flags-pinned
156+
# Always run this, even if a dependent job failed
157+
if: always()
158+
runs-on: ubuntu-20.04
159+
steps:
160+
- name: Check for failures
161+
if: contains(needs.test-flags-pinned.result, 'failure') || contains(needs.test-flags-pinned.result, 'skipped')
162+
run: |
163+
echo "One of the dependent jobs has failed. You may need to re-run it." && exit 1

0 commit comments

Comments
 (0)