Merge branch 'master' into potel-base

sentrivana · sentrivana · commit b5db56f9fe98 · 2025-04-15T16:53:51.000+02:00
diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml
@@ -91,7 +91,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8","3.9","3.11","3.12"]
+        python-version: ["3.8","3.9","3.10","3.11","3.12","3.13"]
         os: [ubuntu-22.04]
     steps:
       - uses: actions/checkout@v4.2.2
diff --git a/.github/workflows/test-integrations-web-1.yml b/.github/workflows/test-integrations-web-1.yml
@@ -22,82 +22,6 @@ env:
   CACHED_BUILD_PATHS: |
     ${{ github.workspace }}/dist-serverless
 jobs:
-  test-web_1-latest:
-    name: Web 1 (latest)
-    timeout-minutes: 30
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.8","3.12","3.13"]
-        os: [ubuntu-22.04]
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: sentry
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        # Maps tcp port 5432 on service container to the host
-        ports:
-          - 5432:5432
-    env:
-      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
-      SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
-      SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
-    steps:
-      - uses: actions/checkout@v4.2.2
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          allow-prereleases: true
-      - name: Setup Test Env
-        run: |
-          pip install "coverage[toml]" tox
-      - name: Erase coverage
-        run: |
-          coverage erase
-      - name: Test django latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-django-latest"
-      - name: Test flask latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-flask-latest"
-      - name: Test starlette latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-starlette-latest"
-      - name: Test fastapi latest
-        run: |
-          set -x # print commands that are executed
-          ./scripts/runtox.sh "py${{ matrix.python-version }}-fastapi-latest"
-      - name: Generate coverage XML
-        if: ${{ !cancelled() }}
-        run: |
-          coverage combine .coverage-sentry-*
-          coverage xml
-      - name: Upload coverage to Codecov
-        if: ${{ !cancelled() }}
-        uses: codecov/codecov-action@v5.4.0
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage.xml
-          # make sure no plugins alter our coverage reports
-          plugin: noop
-          verbose: true
-      - name: Upload test results to Codecov
-        if: ${{ !cancelled() }}
-        uses: codecov/test-results-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: .junitxml
-          verbose: true
   test-web_1-pinned:
     name: Web 1 (pinned)
     timeout-minutes: 30
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,36 @@
 # Changelog
 
+## 2.26.1
+
+### Various fixes & improvements
+
+- fix(threading): Data leak in ThreadingIntegration between threads (#4281) by @antonpirker
+- fix(logging): Clarify separate warnings case is for Python <3.11 (#4296) by @szokeasaurusrex
+- fix(logging): Add formatted message to log events (#4292) by @szokeasaurusrex
+- fix(logging): Send raw logging parameters (#4291) by @szokeasaurusrex
+- fix: Revert "chore: Deprecate `same_process_as_parent` (#4244)" (#4290) by @sentrivana
+
+## 2.26.0
+
+### Various fixes & improvements
+
+- fix(debug): Do not consider parent loggers for debug logging (#4286) by @szokeasaurusrex
+- test(tracing): Simplify static/classmethod tracing tests (#4278) by @szokeasaurusrex
+- feat(transport): Add a timeout (#4252) by @sentrivana
+- meta: Change CODEOWNERS back to Python SDK owners (#4269) by @sentrivana
+- feat(logs): Add sdk name and version as log attributes (#4262) by @AbhiPrasad
+- feat(logs): Add server.address to logs (#4257) by @AbhiPrasad
+- chore: Deprecate `same_process_as_parent` (#4244) by @sentrivana
+- feat(logs): Add sentry.origin attribute for log handler (#4250) by @AbhiPrasad
+- feat(tests): Add optional cutoff to toxgen (#4243) by @sentrivana
+- toxgen: Retry & fail if we fail to fetch PyPI data (#4251) by @sentrivana
+- build(deps): bump actions/create-github-app-token from 1.12.0 to 2.0.2 (#4248) by @dependabot
+- Trying to prevent the grpc setup from being flaky (#4233) by @antonpirker
+- feat(breadcrumbs): add `_meta` information for truncation of breadcrumbs (#4007) by @shellmayr
+- tests: Move django under toxgen (#4238) by @sentrivana
+- fix: Handle JSONDecodeError gracefully in StarletteRequestExtractor (#4226) by @moodix
+- fix(asyncio): Remove shutdown handler (#4237) by @sentrivana
+
 ## 2.25.1
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
@@ -33,7 +33,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.25.1"
+release = "2.26.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
@@ -55,6 +55,27 @@
         "package": "falcon",
         "python": "<3.13",
     },
+    "fastapi": {
+        "package": "fastapi",
+        "deps": {
+            "*": [
+                "httpx",
+                "pytest-asyncio",
+                "python-multipart",
+                "requests",
+                "anyio<4",
+            ],
+            # There's an incompatibility between FastAPI's TestClient, which is
+            # actually Starlette's TestClient, which is actually httpx's Client.
+            # httpx dropped a deprecated Client argument in 0.28.0, Starlette
+            # dropped it from its TestClient in 0.37.2, and FastAPI only pinned
+            # Starlette>=0.37.2 from version 0.110.1 onwards -- so for older
+            # FastAPI versions we use older httpx which still supports the
+            # deprecated argument.
+            "<0.110.1": ["httpx<0.28.0"],
+            "py3.6": ["aiocontextvars"],
+        },
+    },
     "flask": {
         "package": "flask",
         "deps": {
@@ -137,7 +158,8 @@
                 "jinja2",
                 "httpx",
             ],
-            "<0.37": ["httpx<0.28.0"],
+            # See the comment on FastAPI's httpx bound for more info
+            "<0.37.2": ["httpx<0.28.0"],
             "<0.15": ["jinja2<3.1"],
             "py3.6": ["aiocontextvars"],
         },
diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py
@@ -75,11 +75,8 @@
     "boto3",
     "chalice",
     "cohere",
-    "fastapi",
     "gcp",
     "httpx",
-    "huey",
-    "huggingface_hub",
     "langchain",
     "langchain_notiktoken",
     "openai",
diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja
@@ -80,10 +80,6 @@ envlist =
     {py3.9,py3.11,py3.12}-cohere-v5
     {py3.9,py3.11,py3.12}-cohere-latest
 
-    # FastAPI
-    {py3.7,py3.10}-fastapi-v{0.79}
-    {py3.8,py3.12,py3.13}-fastapi-latest
-
     # GCP
     {py3.7}-gcp
 
@@ -245,16 +241,6 @@ deps =
     cohere-v5: cohere~=5.3.3
     cohere-latest: cohere
 
-    # FastAPI
-    fastapi: httpx
-    # (this is a dependency of httpx)
-    fastapi: anyio<4.0.0
-    fastapi: pytest-asyncio
-    fastapi: python-multipart
-    fastapi: requests
-    fastapi-v{0.79}: fastapi~=0.79.0
-    fastapi-latest: fastapi
-
     # HTTPX
     httpx-v0.16: pytest-httpx==0.10.0
     httpx-v0.18: pytest-httpx==0.12.0
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
@@ -985,4 +985,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.25.1"
+VERSION = "2.26.1"
diff --git a/sentry_sdk/debug.py b/sentry_sdk/debug.py
@@ -18,7 +18,7 @@ def filter(self, record):
 
 def init_debug_support():
     # type: () -> None
-    if not logger.hasHandlers():
+    if not logger.handlers:
         configure_logger()
 
 
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
@@ -1,4 +1,5 @@
 import logging
+import sys
 from datetime import datetime, timezone
 from fnmatch import fnmatch
 
@@ -253,29 +254,25 @@ def _emit(self, record):
             event["level"] = level  # type: ignore[typeddict-item]
         event["logger"] = record.name
 
-        # Log records from `warnings` module as separate issues
-        record_captured_from_warnings_module = (
-            record.name == "py.warnings" and record.msg == "%s"
-        )
-        if record_captured_from_warnings_module:
-            # use the actual message and not "%s" as the message
-            # this prevents grouping all warnings under one "%s" issue
-            msg = record.args[0]  # type: ignore
-
-            event["logentry"] = {
-                "message": msg,
-                "params": (),
-            }
-
+        if (
+            sys.version_info < (3, 11)
+            and record.name == "py.warnings"
+            and record.msg == "%s"
+        ):
+            # warnings module on Python 3.10 and below sets record.msg to "%s"
+            # and record.args[0] to the actual warning message.
+            # This was fixed in https://github.com/python/cpython/pull/30975.
+            message = record.args[0]
+            params = ()
         else:
-            event["logentry"] = {
-                "message": to_string(record.msg),
-                "params": (
-                    tuple(str(arg) if arg is None else arg for arg in record.args)
-                    if record.args
-                    else ()
-                ),
-            }
+            message = record.msg
+            params = record.args
+
+        event["logentry"] = {
+            "message": to_string(message),
+            "formatted": record.getMessage(),
+            "params": params,
+        }
 
         event["extra"] = self._extra_from_record(record)
 
diff --git a/sentry_sdk/integrations/threading.py b/sentry_sdk/integrations/threading.py
@@ -1,4 +1,5 @@
 import sys
+import warnings
 from functools import wraps
 from threading import Thread, current_thread
 
@@ -35,6 +36,15 @@ def setup_once():
         # type: () -> None
         old_start = Thread.start
 
+        try:
+            from django import VERSION as django_version  # noqa: N811
+            import channels  # type: ignore[import-not-found]
+
+            channels_version = channels.__version__
+        except ImportError:
+            django_version = None
+            channels_version = None
+
         @wraps(old_start)
         def sentry_start(self, *a, **kw):
             # type: (Thread, *Any, **Any) -> Any
@@ -43,8 +53,27 @@ def sentry_start(self, *a, **kw):
                 return old_start(self, *a, **kw)
 
             if integration.propagate_scope:
-                isolation_scope = sentry_sdk.get_isolation_scope()
-                current_scope = sentry_sdk.get_current_scope()
+                if (
+                    sys.version_info < (3, 9)
+                    and channels_version is not None
+                    and channels_version < "4.0.0"
+                    and django_version is not None
+                    and django_version >= (3, 0)
+                    and django_version < (4, 0)
+                ):
+                    warnings.warn(
+                        "There is a known issue with Django channels 2.x and 3.x when using Python 3.8 or older. "
+                        "(Async support is emulated using threads and some Sentry data may be leaked between those threads.) "
+                        "Please either upgrade to Django channels 4.0+, use Django's async features "
+                        "available in Django 3.1+ instead of Django channels, or upgrade to Python 3.9+.",
+                        stacklevel=2,
+                    )
+                    isolation_scope = sentry_sdk.get_isolation_scope()
+                    current_scope = sentry_sdk.get_current_scope()
+
+                else:
+                    isolation_scope = sentry_sdk.get_isolation_scope().fork()
+                    current_scope = sentry_sdk.get_current_scope().fork()
             else:
                 isolation_scope = None
                 current_scope = None
diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.25.1",
+    version="2.26.1",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",
diff --git a/tests/integrations/django/asgi/test_asgi.py b/tests/integrations/django/asgi/test_asgi.py
@@ -38,9 +38,25 @@ async def test_basic(sentry_init, capture_events, application):
 
     events = capture_events()
 
-    comm = HttpCommunicator(application, "GET", "/view-exc?test=query")
-    response = await comm.get_response()
-    await comm.wait()
+    import channels  # type: ignore[import-not-found]
+
+    if (
+        sys.version_info < (3, 9)
+        and channels.__version__ < "4.0.0"
+        and django.VERSION >= (3, 0)
+        and django.VERSION < (4, 0)
+    ):
+        # We emit a UserWarning for channels 2.x and 3.x on Python 3.8 and older
+        # because the async support was not really good back then and there is a known issue.
+        # See the TreadingIntegration for details.
+        with pytest.warns(UserWarning):
+            comm = HttpCommunicator(application, "GET", "/view-exc?test=query")
+            response = await comm.get_response()
+            await comm.wait()
+    else:
+        comm = HttpCommunicator(application, "GET", "/view-exc?test=query")
+        response = await comm.get_response()
+        await comm.wait()
 
     assert response["status"] == 500
 
diff --git a/tests/integrations/huggingface_hub/test_huggingface_hub.py b/tests/integrations/huggingface_hub/test_huggingface_hub.py
diff --git a/tests/integrations/logging/test_logging.py b/tests/integrations/logging/test_logging.py
diff --git a/tests/integrations/threading/test_threading.py b/tests/integrations/threading/test_threading.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -985,4 +985,4 @@ def _get_default_options():`
`985`	`985`	`del _get_default_options`
`986`	`986`
`987`	`987`
`988`		`-VERSION = "2.25.1"`
	`988`	`+VERSION = "2.26.1"`