Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

POtel implementation base branch #3152

Draft
wants to merge 131 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
add2067
Skeletons for new components
sl0thentr0py Jun 10, 2024
5bad7f1
mypy fixes
sentrivana Jun 26, 2024
b6a6231
Add simple scope management whenever a context is attached (#3159)
sl0thentr0py Jul 9, 2024
4428ee9
Implement new POTel span processor (#3223)
sl0thentr0py Jul 9, 2024
acd7cf2
feat(tracing): Remove `instrumenter` option
szokeasaurusrex Jul 22, 2024
980b268
Span description, op, and status improvements (#3259)
antonpirker Jul 26, 2024
86daf73
Sync with master
sentrivana Jul 30, 2024
81cdbd4
Merge branch 'master' into potel-base
sentrivana Jul 30, 2024
275189e
feat(api): Remove `sentry_sdk.configure_scope` (#3406)
szokeasaurusrex Aug 7, 2024
3936502
feat(api): Remove `sentry_sdk.push_scope` (#3408)
szokeasaurusrex Aug 7, 2024
b80a55c
Merge branch 'master' into potel-base
szokeasaurusrex Aug 9, 2024
062a155
feat(transport): Remove `HttpTransport` `hub_cls` attribute (#3412)
szokeasaurusrex Aug 9, 2024
bd36b0d
Merge branch 'master' into potel-base
sentrivana Aug 12, 2024
da00efc
Start a migration guide (#3440)
sentrivana Aug 12, 2024
a576bdc
Drop Python 3.6 (#3434)
sentrivana Aug 12, 2024
57166a4
Merge branch 'master' into potel-base
antonpirker Aug 13, 2024
3c5f761
Remove `Hub` and related code for good. (#3446)
antonpirker Aug 14, 2024
17a8494
Merge branch 'master' into potel-base
sentrivana Aug 26, 2024
2f540eb
feat(potel): Make tracing APIs use OTel in the background (#3242)
sentrivana Aug 26, 2024
5e35db8
Implement new continue_trace and make WSGI work (#3460)
sl0thentr0py Aug 26, 2024
c6b96ca
Update migration guide for continue_trace
sl0thentr0py Aug 26, 2024
efa06ac
Merge branch 'master' into potel-base
sentrivana Aug 28, 2024
7b88290
update mig guide
sentrivana Aug 28, 2024
3f9e2d0
fix english
sentrivana Aug 28, 2024
64cbaff
Fix "indented block" linter error (#3468)
szokeasaurusrex Aug 28, 2024
4331362
Remove the _active flag from POTelSpan (#3470)
sentrivana Aug 28, 2024
268a524
Add OTelIntegration to DEFAULT_INTEGRATIONS (#3471)
sentrivana Aug 28, 2024
f980b97
Set span on scope (#3472)
sentrivana Aug 29, 2024
39ae104
Merge branch 'master' into potel-base
sentrivana Aug 29, 2024
c74a947
fix integrations tests
sentrivana Aug 29, 2024
e573d61
Fix some properties (#3474)
sentrivana Aug 29, 2024
56e5312
Merge branch 'master' into potel-base
sentrivana Aug 29, 2024
3d8cc7c
Add note to mig guide
sentrivana Aug 30, 2024
2e2be3b
Set the correct SpanContext in continue_trace (#3475)
sl0thentr0py Aug 30, 2024
963afef
Add migration line for start_span no span arg
sl0thentr0py Aug 30, 2024
118ae73
Merge remote-tracking branch 'origin/master' into potel-base
sl0thentr0py Aug 30, 2024
7c4a3a0
Restore original scope (#3485)
sentrivana Aug 30, 2024
245195e
Update integrations with new continue_trace callback usage (#3486)
sl0thentr0py Sep 2, 2024
2725322
Merge branch 'master' into potel-base
sentrivana Sep 4, 2024
f430c20
Fix _merge_scopes to work with PotelScope (#3499)
sl0thentr0py Sep 5, 2024
2b10d78
Add context-friendly `use_scope`, `use_isolation_scope` (#3500)
sentrivana Sep 5, 2024
2ccd70a
Merge branch 'master' into potel-base
sentrivana Sep 6, 2024
0764220
remove 3.6-only coverage conf
sentrivana Sep 6, 2024
b8e687e
Fix some methods in POTelSpan (#3492)
sl0thentr0py Sep 6, 2024
0e0b5b0
Add root_span implementation (#3513)
sl0thentr0py Sep 10, 2024
3b54bbf
Potel Sampling (#3501)
antonpirker Sep 10, 2024
3610e85
Merge branch 'master' into potel-base
sentrivana Sep 11, 2024
178c6a5
missing import
sentrivana Sep 11, 2024
3ce8065
Merge branch 'master' into potel-base
antonpirker Sep 11, 2024
28d8b82
Remove 3.6 compat (#3517)
sentrivana Sep 11, 2024
0653357
Drop metrics (#3518)
sentrivana Sep 11, 2024
04f5fe1
Merge branch 'master' into potel-base
sentrivana Sep 11, 2024
682b652
Store Baggage object on PropagationContext instead of DSC hash (#3523)
sl0thentr0py Sep 11, 2024
b27a43f
Add propagation context change to migration guide
sl0thentr0py Sep 11, 2024
a4bc9de
Use POTel `use_scope`, `use_isolation_scope` (#3522)
sentrivana Sep 12, 2024
97bf513
Merge branch 'master' into potel-base
antonpirker Sep 12, 2024
13441e3
Make sure op/name/description are set correctly on transactions/spans…
antonpirker Sep 12, 2024
d1de481
Make span.finish work (#3559)
sl0thentr0py Sep 24, 2024
a8516c2
Merge branch 'master' into potel-base
antonpirker Sep 25, 2024
0d60d45
Make DSC work for outgoing traces (#3566)
sl0thentr0py Sep 26, 2024
ed8b452
Fix PropagationContext test (#3570)
antonpirker Sep 30, 2024
3bf8b13
Use freezegun to make spans of a certain duration (#3571)
antonpirker Sep 30, 2024
3ef267c
Removed datetime_from_timezone (#3569)
antonpirker Sep 30, 2024
b48371d
Merge branch 'master' into potel-base
antonpirker Sep 30, 2024
97638a7
Merge branch 'master' into potel-base
antonpirker Sep 30, 2024
e80d293
linting
antonpirker Sep 30, 2024
362049c
Added new depenceny to lambda layer generation. (#3586)
antonpirker Oct 1, 2024
5ecd9c5
Merge branch 'master' into potel-base
sentrivana Oct 2, 2024
29aeebb
Fix http_methods_to_capture (#3596)
sentrivana Oct 4, 2024
710fe87
Merge branch 'master' into potel-base
sentrivana Oct 4, 2024
6b03581
Replace nullcontext with stdlib nullcontext
sentrivana Oct 4, 2024
a8afb8b
Merge branch 'master' into potel-base
sentrivana Oct 4, 2024
558daee
Merge branch 'master' into potel-base
sentrivana Oct 4, 2024
b65b742
Head SDK DSC population (#3599)
sl0thentr0py Oct 4, 2024
f266415
Merge branch 'master' into potel-base
antonpirker Oct 7, 2024
f0703b3
Set correct span op (#3628)
antonpirker Oct 8, 2024
58cd8aa
Implement set_contexts and fix response context (#3630)
sl0thentr0py Oct 8, 2024
4b2b6db
Fix redis pipeline commands, because otel attributes do not allow dic…
antonpirker Oct 8, 2024
0526d15
Merge branch 'master' into potel-base
sentrivana Oct 9, 2024
74cb7db
make black happy
sentrivana Oct 9, 2024
c6ad235
Set internal_error span status on span context manager exit (#3642)
sl0thentr0py Oct 10, 2024
56f2113
Remove deprecated span description (#3640)
sentrivana Oct 10, 2024
a67125a
Fix clickhouse-driver integration spans (#3638)
sentrivana Oct 10, 2024
1c72747
Only `add` to trace state if key does not exist (#3645)
sentrivana Oct 11, 2024
94f06e6
Merge branch 'master' into potel-base
sentrivana Oct 11, 2024
e205f2d
Make transaction names work (#3643)
sl0thentr0py Oct 11, 2024
f9187be
Fix tests using `_span_recorder` (#3633)
antonpirker Oct 14, 2024
ef7c39c
Fix asyncpg spans (#3639)
sentrivana Oct 15, 2024
ebf1b9f
Merge branch 'master' into potel-base
sentrivana Oct 15, 2024
e32d286
Merge branch 'master' into potel-base
sentrivana Oct 16, 2024
caa1ebe
Fix Django CI (#3659)
sl0thentr0py Oct 16, 2024
bb08e88
Merge branch 'master' into potel-base
sentrivana Oct 17, 2024
2a3a738
remove PY37, everything is PY37
sentrivana Oct 17, 2024
b46faea
more leftovers
sentrivana Oct 17, 2024
acf7746
Serialize span attrs properly (#3668)
sentrivana Oct 17, 2024
6e3778d
Move `subprocess` breadcrumbs from `maybe_create_breadcrumbs_from_spa…
antonpirker Oct 21, 2024
7cd4c8d
Add sentry_meta object to Span and pass it through to ReadableSpan (#…
sl0thentr0py Oct 21, 2024
8e339bd
Merge branch 'master' into potel-base
sentrivana Oct 21, 2024
e72e62f
Use root span transaction name in populated head DSC (#3677)
sl0thentr0py Oct 22, 2024
949ff5b
Fix breadcrumbs in redis (#3680)
antonpirker Oct 22, 2024
4179751
Enable back pressure monitor in Potel (#3602)
antonpirker Oct 23, 2024
7422a4c
Merge branch 'master' into potel-base
sentrivana Oct 23, 2024
f02c204
Fix asyncpg breadcrumbs (#3685)
sentrivana Oct 23, 2024
a2dff73
Fix pymongo (#3688)
sentrivana Oct 24, 2024
6b3aab6
Merge branch 'master' into potel-base
sentrivana Oct 24, 2024
43ca6f3
Fix breadcrumbs in HTTP clients (#3683)
antonpirker Oct 24, 2024
8b875c1
Fix broken sampler after backpressure change (#3702)
sl0thentr0py Oct 28, 2024
2c26f42
Make profiling work with potel (#3704)
sl0thentr0py Oct 28, 2024
49a6d1d
Remove name sanitization for POTelSpan and quote trace state populate…
sl0thentr0py Oct 28, 2024
8f87ada
Fix migration guide for commas in tx names
sl0thentr0py Oct 28, 2024
8ee97d9
Merge remote-tracking branch 'origin/master' into potel-base
sl0thentr0py Oct 28, 2024
fae6713
ref(init): Deprecate `sentry_sdk.init` context manager
szokeasaurusrex Nov 5, 2024
e7218da
feat(init): Remove `sentry_sdk.init` context manager
szokeasaurusrex Nov 5, 2024
0ffc5cd
Make Anthropic integration work with Potel (#3686)
antonpirker Nov 5, 2024
453d152
Moved _serialize_span_attribute into set_attribute (#3732)
antonpirker Nov 5, 2024
64ae2ef
Fix Cohere tests (#3731)
antonpirker Nov 5, 2024
fb66e1a
Fix WSGI tests (#3734)
sl0thentr0py Nov 5, 2024
e850655
Fix ASGI tests (#3737)
sl0thentr0py Nov 5, 2024
4650c7e
Merge branch 'master' into potel-base
antonpirker Nov 6, 2024
632dc68
Add `only_if_parent` option to POTelSpan and use it in integrations (…
sl0thentr0py Nov 11, 2024
0f01912
Fixed tests
antonpirker Nov 11, 2024
706300c
Make it more obvious how otel allows the span status to be set (#3759)
antonpirker Nov 11, 2024
b3084d1
Revert tracing set_status change and just set OK properly in huey
sl0thentr0py Nov 11, 2024
fbbf5e7
Fix most starlette tests (#3749)
sl0thentr0py Nov 11, 2024
665b4a5
Fix rq tests (#3762)
antonpirker Nov 11, 2024
ebca500
Fix django db tests again
sl0thentr0py Nov 11, 2024
3f638f7
Reverted test forking
antonpirker Nov 11, 2024
afd8cc5
Remove custom_sampling_context (#3747)
sentrivana Nov 12, 2024
766f4c5
Fix leftover starlette tests
sl0thentr0py Nov 12, 2024
fccf50b
Cleanup span is not None checks (#3765)
sl0thentr0py Nov 12, 2024
09b4a01
Fix aiohttp tests (#3771)
sl0thentr0py Nov 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .coveragerc36

This file was deleted.

28 changes: 4 additions & 24 deletions .github/workflows/test-integrations-ai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.7","3.9","3.11","3.12","3.13"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
os: [ubuntu-latest]
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -65,14 +61,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-huggingface_hub-latest"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand Down Expand Up @@ -100,11 +90,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.7","3.9","3.11","3.12","3.13"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
os: [ubuntu-latest]
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -137,14 +123,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-huggingface_hub"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/test-integrations-aws-lambda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.9"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
os: [ubuntu-latest]
needs: check-permissions
steps:
- uses: actions/[email protected]
Expand All @@ -84,14 +80,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand Down
30 changes: 5 additions & 25 deletions .github/workflows/test-integrations-cloud-computing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.8","3.11","3.12","3.13"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
os: [ubuntu-latest]
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -61,14 +57,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-gcp-latest"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand All @@ -95,12 +85,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6","3.7","3.9","3.11","3.12","3.13"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
python-version: ["3.7","3.9","3.11","3.12","3.13"]
os: [ubuntu-latest]
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -129,14 +115,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-gcp"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand Down
16 changes: 3 additions & 13 deletions .github/workflows/test-integrations-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
os: [ubuntu-latest]
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
Expand All @@ -49,14 +45,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-common"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand Down
32 changes: 6 additions & 26 deletions .github/workflows/test-integrations-data-processing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6","3.7","3.8","3.10","3.11","3.12","3.13"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
python-version: ["3.7","3.8","3.10","3.11","3.12","3.13"]
os: [ubuntu-latest]
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -79,14 +75,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-spark-latest"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand All @@ -113,12 +103,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12"]
os: [ubuntu-latest]
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -165,14 +151,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-spark"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand Down
30 changes: 5 additions & 25 deletions .github/workflows/test-integrations-databases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.7","3.8","3.11","3.12","3.13"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
os: [ubuntu-latest]
services:
postgres:
image: postgres
Expand Down Expand Up @@ -88,14 +84,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-sqlalchemy-latest"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand All @@ -122,12 +112,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12"]
os: [ubuntu-latest]
services:
postgres:
image: postgres
Expand Down Expand Up @@ -183,14 +169,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-sqlalchemy"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand Down
28 changes: 4 additions & 24 deletions .github/workflows/test-integrations-graphql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.7","3.8","3.12","3.13"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
os: [ubuntu-latest]
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -61,14 +57,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh "py${{ matrix.python-version }}-strawberry-latest"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand Down Expand Up @@ -96,11 +86,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.7","3.8","3.11","3.12"]
# python3.6 reached EOL and is no longer being supported on
# new versions of hosted runners on Github Actions
# ubuntu-20.04 is the last version that supported python3.6
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
os: [ubuntu-20.04]
os: [ubuntu-latest]
steps:
- uses: actions/[email protected]
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -129,14 +115,8 @@ jobs:
run: |
set -x # print commands that are executed
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-strawberry"
- name: Generate coverage XML (Python 3.6)
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
run: |
export COVERAGE_RCFILE=.coveragerc36
coverage combine .coverage-sentry-*
coverage xml --ignore-errors
- name: Generate coverage XML
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
if: ${{ !cancelled() }}
run: |
coverage combine .coverage-sentry-*
coverage xml
Expand Down
Loading
Loading