Merge branch 'potel-base' into potel-base-run-all-tests

Author: sl0thentr0py

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

@@ -30,11 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["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-22.04]
     steps:
       - uses: actions/[email protected]
       - uses: actions/setup-python@v5
@@ -59,14 +55,8 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-unleash-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
@@ -94,11 +84,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["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-22.04]
     steps:
       - uses: actions/[email protected]
       - uses: actions/setup-python@v5
@@ -123,14 +109,8 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-unleash"
-      - 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

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

@@ -82,10 +82,6 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-typer-latest"
-      - name: Test unleash latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-unleash-latest"
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |
@@ -167,10 +163,6 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-typer"
-      - name: Test unleash pinned
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-unleash"
       - name: Generate coverage XML
         if: ${{ !cancelled() }}
         run: |

tests/tracing/test_integration_tests.py

@@ -121,7 +121,7 @@ def test_continue_trace(
 def test_propagate_traces_deprecation_warning(sentry_init, sample_rate):
     sentry_init(traces_sample_rate=sample_rate, propagate_traces=False)
 
-    with start_transaction(name="hi"):
+    with start_span(name="hi"):
         with start_span() as old_span:
             with pytest.warns(DeprecationWarning):
                 dict(