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

getsentry · Dec 2, 2024 · c012e1e · c012e1e
2 parents 2e05fdf + bddf9b5
commit c012e1e
Show file tree

Hide file tree

Showing 22 changed files with 349 additions and 1,352 deletions.
diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
@@ -73,7 +73,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
@@ -94,7 +94,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.9","3.11","3.12","3.13"]
+        python-version: ["3.8","3.9","3.11","3.12","3.13"]
         os: [ubuntu-latest]
     steps:
       - uses: actions/[email protected]
@@ -140,7 +140,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/.github/workflows/test-integrations-aws.yml b/.github/workflows/test-integrations-aws.yml
@@ -88,7 +88,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/.github/workflows/test-integrations-cloud.yml b/.github/workflows/test-integrations-cloud.yml
@@ -68,7 +68,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
@@ -130,7 +130,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
@@ -53,7 +53,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml
@@ -97,7 +97,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
@@ -188,7 +188,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
@@ -68,7 +68,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
@@ -130,7 +130,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/.github/workflows/test-integrations-misc.yml b/.github/workflows/test-integrations-misc.yml
@@ -83,7 +83,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
@@ -160,7 +160,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/.github/workflows/test-integrations-network.yml b/.github/workflows/test-integrations-network.yml
@@ -68,7 +68,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
@@ -130,7 +130,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/.github/workflows/test-integrations-tasks.yml b/.github/workflows/test-integrations-tasks.yml
@@ -90,7 +90,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
@@ -174,7 +174,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/.github/workflows/test-integrations-web-1.yml b/.github/workflows/test-integrations-web-1.yml
@@ -86,7 +86,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
@@ -166,7 +166,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/.github/workflows/test-integrations-web-2.yml b/.github/workflows/test-integrations-web-2.yml
@@ -98,7 +98,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml
@@ -190,7 +190,7 @@ jobs:
           coverage xml
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.xml

diff --git a/pytest.ini b/pytest.ini
@@ -1,6 +1,7 @@
 [pytest]
 addopts = -vvv -rfEs -s --durations=5 --cov=./sentry_sdk --cov-branch --cov-report= --tb=short --junitxml=.junitxml
 asyncio_mode = strict
+asyncio_default_fixture_loop_scope = function
 markers = 
     tests_internal_exceptions: Handle internal exceptions just as the SDK does, to test it. (Otherwise internal exceptions are recorded and reraised.)
 

diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -82,7 +82,7 @@
 
       - name: Upload coverage to Codecov
         if: {% raw %}${{ !cancelled() }}{% endraw %}
-        uses: codecov/[email protected].2
+        uses: codecov/[email protected].7
         with:
           token: {% raw %}${{ secrets.CODECOV_TOKEN }}{% endraw %}
           files: coverage.xml

diff --git a/sentry_sdk/integrations/opentelemetry/integration.py b/sentry_sdk/integrations/opentelemetry/integration.py
@@ -6,8 +6,8 @@
 
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator
-from sentry_sdk.integrations.opentelemetry.potel_span_processor import (
-    PotelSentrySpanProcessor,
+from sentry_sdk.integrations.opentelemetry.span_processor import (
+    SentrySpanProcessor,
 )
 from sentry_sdk.integrations.opentelemetry.contextvars_context import (
     SentryContextVarsRuntimeContext,
@@ -79,7 +79,7 @@ def _setup_scope_context_management():
 def _setup_sentry_tracing():
     # type: () -> None
     provider = TracerProvider(sampler=SentrySampler())
-    provider.add_span_processor(PotelSentrySpanProcessor())
+    provider.add_span_processor(SentrySpanProcessor())
     trace.set_tracer_provider(provider)
 
     set_global_textmap(SentryPropagator())