Merge remote-tracking branch 'origin/master' into potel-base

Author: sl0thentr0py

CHANGELOG.md

@@ -2,37 +2,6 @@
 
 ## 3.0.0a3
 
-### Various fixes & improvements
-
-- fix(integrations): allow explicit op parameter in `ai_track` (#4597) by @mshavliuk
-- fix: Fix `abs_path` bug in `serialize_frame` (#4599) by @szokeasaurusrex
-- Remove pyrsistent from test dependencies (#4588) by @musicinmybrain
-- Setup opentelemetry patch only once (#4595) by @sl0thentr0py
-- Don't use remote server in tests.. (#3152) by @sl0thentr0py
-- Fix merge (#3152) by @sl0thentr0py
-- Remove explicit __del__'s in threaded classes (#4590) by @sl0thentr0py
-- ci: Check strictly for success (#4589) by @szokeasaurusrex
-- test: Remove `test_installed_modules` (#4593) by @szokeasaurusrex
-- Remove forked from test_transport, separate gevent tests and generalize capturing_server to be module level (#4577) by @sl0thentr0py
-- Improve token usage recording (#4566) by @antonpirker
-- Remove eventlet support (#4584) by @sl0thentr0py
-- meta: Update CHANGELOG.md (98b107fd) by @szokeasaurusrex
-- release: 2.33.0 (220a235b) by @getsentry-bot
-- feat(langchain): Support `BaseCallbackManager` (#4486) by @szokeasaurusrex
-- tests: Regenerate tox.ini (#4583) by @sentrivana
-- Add custom sampling context testcases (#4579) by @sl0thentr0py
-- feat(tracing): Add option to exclude specific span origins (#4463) by @sl0thentr0py
-- Cleanup op and description mapping (#4560) by @sl0thentr0py
-- Remove all forked markers in test_api (#4576) by @sl0thentr0py
-- Remove forked marker in client uwsgi test (#4575) by @sl0thentr0py
-- Fix pytest collection warning (#4574) by @sl0thentr0py
-- Remove print statements from excepthook test (#4573) by @sl0thentr0py
-- Use `span.data` instead of `measurements` for token usage (#4567) by @antonpirker
-
-_Plus 42 more_
-
-## 3.0.0a2
-
 We're excited to announce that version 3.0 of the Sentry Python SDK is now
 available. This release is the result of a long-term effort to use OpenTelemetry
 under the hood for tracing. This switch opens the door for us to leverage the
@@ -51,25 +20,23 @@ for your feedback. How was the migration? Is everything working as expected? Is
 [on GitHub](https://github.com/getsentry/sentry-python/discussions/3936) or
 [on Discord](https://discord.com/invite/Ww9hbqr).
 
-## 3.0.0a1
+## 2.33.2
 
-We're excited to announce that version 3.0 of the Sentry Python SDK is now
-available. This release is the result of a long-term effort to use OpenTelemetry
-under the hood for tracing. This switch opens the door for us to leverage the
-full power of OpenTelemetry, so stay tuned for more integrations and features
-in future releases.
+### Various fixes & improvements
 
-Looking to upgrade from Sentry SDK 2.x to 3.x? See the
-[full list of changes](MIGRATION_GUIDE.md) for a comprehensive overview
-of what's changed. Looking for a more digestible summary? See the
-[migration guide in the docs](https://docs.sentry.io/platforms/python/migration/2.x-to-3.x)
-with the most common migration patterns.
+- ref(spotlight): Do not import `sentry_sdk.spotlight` unless enabled (#4607) by @sentrivana
+- ref(gnu-integration): update clickhouse stacktrace parsing (#4598) by @MeredithAnya
 
-⚠️ This is a pre-release. If you feel like taking it for a spin, we'd be grateful
-for your feedback. How was the migration? Is everything working as expected? Is
-*nothing* working as expected? Something in between? Please let us know
-[on GitHub](https://github.com/getsentry/sentry-python/discussions/3936) or
-[on Discord](https://discord.com/invite/Ww9hbqr).
+## 2.33.1
+
+### Various fixes & improvements
+
+- fix(integrations): allow explicit op parameter in `ai_track` (#4597) by @mshavliuk
+- fix: Fix `abs_path` bug in `serialize_frame` (#4599) by @szokeasaurusrex
+- Remove pyrsistent from test dependencies (#4588) by @musicinmybrain
+- Remove explicit `__del__`'s in threaded classes (#4590) by @sl0thentr0py
+- Remove forked from test_transport, separate gevent tests and generalize capturing_server to be module level (#4577) by @sl0thentr0py
+- Improve token usage recording (#4566) by @antonpirker
 
 ## 2.33.0
 

scripts/populate_tox/config.py

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

sentry_sdk/client.py

@@ -46,7 +46,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 (
@@ -358,6 +357,10 @@ def _capture_envelope(envelope: Envelope) -> None:
                 )
 
             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/integrations/gnu_backtrace.py

@@ -13,23 +13,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

@@ -106,7 +106,7 @@ def run(*a: Any, **kw: Any) -> Any:
         def _run_old_run_func() -> 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())
 

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_exceptions import (
     HTTPInternalServerError,
@@ -650,6 +650,7 @@ async def handler(request):
 @pytest.mark.asyncio
 async def test_span_origin(
     sentry_init,
+    aiohttp_raw_server,
     aiohttp_client,
     capture_events,
 ):
@@ -658,10 +659,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:{

tests/integrations/openai_agents/test_openai_agents.py

@@ -19,6 +19,11 @@
     ResponseFunctionToolCall,
 )
 
+from openai.types.responses.response_usage import (
+    InputTokensDetails,
+    OutputTokensDetails,
+)
+
 test_run_config = agents.RunConfig(tracing_disabled=True)
 
 
@@ -29,8 +34,8 @@ def mock_usage():
         input_tokens=10,
         output_tokens=20,
         total_tokens=30,
-        input_tokens_details=MagicMock(cached_tokens=0),
-        output_tokens_details=MagicMock(reasoning_tokens=5),
+        input_tokens_details=InputTokensDetails(cached_tokens=0),
+        output_tokens_details=OutputTokensDetails(reasoning_tokens=5),
     )
 
 

tests/integrations/stdlib/test_httplib.py

@@ -391,7 +391,7 @@ def test_http_timeout(monkeypatch, sentry_init, capture_envelopes):
 
     with pytest.raises(TimeoutError):
         with start_span(op="op", name="name"):
-            conn = HTTPSConnection("www.example.com")
+            conn = HTTPConnection("localhost", port=PORT)
             conn.request("GET", "/bla")
             conn.getresponse()
 
@@ -401,4 +401,4 @@ def test_http_timeout(monkeypatch, sentry_init, capture_envelopes):
 
     span = transaction["spans"][0]
     assert span["op"] == "http.client"
-    assert span["description"] == "GET https://www.example.com/bla"
+    assert span["description"] == f"GET http://localhost:{PORT}/bla"  # noqa: E231