Merge branch 'master' into antonpirker/openai-overhaul

Author: antonpirker

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.33.2
+
+### Various fixes & improvements
+
+- ref(spotlight): Do not import `sentry_sdk.spotlight` unless enabled (#4607) by @sentrivana
+- ref(gnu-integration): update clickhouse stacktrace parsing (#4598) by @MeredithAnya
+
 ## 2.33.1
 
 ### Various fixes & improvements

docs/conf.py

@@ -31,7 +31,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.33.1"
+release = "2.33.2"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

scripts/populate_tox/config.py

@@ -144,6 +144,7 @@
         "deps": {
             "*": ["pytest-asyncio"],
         },
+        "python": ">=3.10",
     },
     "openfeature": {
         "package": "openfeature-sdk",

sentry_sdk/client.py

@@ -47,7 +47,6 @@
 )
 from sentry_sdk.scrubber import EventScrubber
 from sentry_sdk.monitor import Monitor
-from sentry_sdk.spotlight import setup_spotlight
 
 if TYPE_CHECKING:
     from typing import Any
@@ -429,6 +428,10 @@ def _capture_envelope(envelope):
                 )
 
             if self.options.get("spotlight"):
+                # This is intentionally here to prevent setting up spotlight
+                # stuff we don't need unless spotlight is explicitly enabled
+                from sentry_sdk.spotlight import setup_spotlight
+
                 self.spotlight = setup_spotlight(self.options)
                 if not self.options["dsn"]:
                     sample_all = lambda *_args, **_kwargs: 1.0

sentry_sdk/consts.py

@@ -1187,4 +1187,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.33.1"
+VERSION = "2.33.2"

sentry_sdk/integrations/gnu_backtrace.py

@@ -12,23 +12,12 @@
     from sentry_sdk._types import Event
 
 
-MODULE_RE = r"[a-zA-Z0-9/._:\\-]+"
-TYPE_RE = r"[a-zA-Z0-9._:<>,-]+"
-HEXVAL_RE = r"[A-Fa-f0-9]+"
-
+FUNCTION_RE = r"[^@]+?)\s+@\s+0x[0-9a-fA-F]+"
 
 FRAME_RE = r"""
-^(?P<index>\d+)\.\s
-(?P<package>{MODULE_RE})\(
-  (?P<retval>{TYPE_RE}\ )?
-  ((?P<function>{TYPE_RE})
-    (?P<args>\(.*\))?
-  )?
-  ((?P<constoffset>\ const)?\+0x(?P<offset>{HEXVAL_RE}))?
-\)\s
-\[0x(?P<retaddr>{HEXVAL_RE})\]$
+^(?P<index>\d+)\.\s+(?P<function>{FUNCTION_RE}\s+in\s+(?P<package>.+)$
 """.format(
-    MODULE_RE=MODULE_RE, HEXVAL_RE=HEXVAL_RE, TYPE_RE=TYPE_RE
+    FUNCTION_RE=FUNCTION_RE,
 )
 
 FRAME_RE = re.compile(FRAME_RE, re.MULTILINE | re.VERBOSE)

sentry_sdk/integrations/threading.py

@@ -120,7 +120,7 @@ def _run_old_run_func():
             # type: () -> Any
             try:
                 self = current_thread()
-                return old_run_func(self, *a, **kw)
+                return old_run_func(self, *a[1:], **kw)
             except Exception:
                 reraise(*_capture_exception())
 

setup.py

@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.33.1",
+    version="2.33.2",
     author="Sentry Team and Contributors",
     author_email="[email protected]",
     url="https://github.com/getsentry/sentry-python",

tests/integrations/aiohttp/test_aiohttp.py

@@ -6,7 +6,7 @@
 
 import pytest
 
-from aiohttp import web, ClientSession
+from aiohttp import web
 from aiohttp.client import ServerDisconnectedError
 from aiohttp.web_request import Request
 from aiohttp.web_exceptions import (
@@ -636,6 +636,7 @@ async def handler(request):
 @pytest.mark.asyncio
 async def test_span_origin(
     sentry_init,
+    aiohttp_raw_server,
     aiohttp_client,
     capture_events,
 ):
@@ -644,10 +645,16 @@ async def test_span_origin(
         traces_sample_rate=1.0,
     )
 
+    # server for making span request
+    async def handler(request):
+        return web.Response(text="OK")
+
+    raw_server = await aiohttp_raw_server(handler)
+
     async def hello(request):
-        async with ClientSession() as session:
-            async with session.get("http://example.com"):
-                return web.Response(text="hello")
+        span_client = await aiohttp_client(raw_server)
+        await span_client.get("/")
+        return web.Response(text="hello")
 
     app = web.Application()
     app.router.add_get(r"/", hello)

tests/integrations/huggingface_hub/test_huggingface_hub.py

@@ -15,8 +15,10 @@
 def mock_client_post(client, post_mock):
     # huggingface-hub==0.28.0 deprecates the `post` method
     # so patch `_inner_post` instead
-    client.post = post_mock
-    client._inner_post = post_mock
+    if hasattr(client, "post"):
+        client.post = post_mock
+    if hasattr(client, "_inner_post"):
+        client._inner_post = post_mock
 
 
 @pytest.mark.parametrize(
@@ -33,7 +35,8 @@ def test_nonstreaming_chat_completion(
     )
     events = capture_events()
 
-    client = InferenceClient()
+    client = InferenceClient(model="https://")
+
     if details_arg:
         post_mock = mock.Mock(
             return_value=b"""[{
@@ -92,7 +95,7 @@ def test_streaming_chat_completion(
     )
     events = capture_events()
 
-    client = InferenceClient()
+    client = InferenceClient(model="https://")
 
     post_mock = mock.Mock(
         return_value=[
@@ -141,7 +144,7 @@ def test_bad_chat_completion(sentry_init, capture_events):
     sentry_init(integrations=[HuggingfaceHubIntegration()], traces_sample_rate=1.0)
     events = capture_events()
 
-    client = InferenceClient()
+    client = InferenceClient(model="https://")
     post_mock = mock.Mock(side_effect=OverloadedError("The server is overloaded"))
     mock_client_post(client, post_mock)
 
@@ -159,7 +162,7 @@ def test_span_origin(sentry_init, capture_events):
     )
     events = capture_events()
 
-    client = InferenceClient()
+    client = InferenceClient(model="https://")
     post_mock = mock.Mock(
         return_value=[
             b"""data:{