Merge branch 'srothh/async-transport' into srothh/async-transport-integration

Author: srothh

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 3.0.0a2
+## 3.0.0a3
 
 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
@@ -20,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
 

docs/conf.py

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

requirements-testing.txt

@@ -6,7 +6,6 @@ pytest-forked
 pytest-localserver
 pytest-watch
 jsonschema
-pyrsistent
 executing
 asttokens
 responses

scripts/populate_tox/config.py

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

sentry_sdk/ai/monitoring.py

@@ -28,10 +28,10 @@ def ai_track(description: str, **span_kwargs: Any) -> Callable[..., Any]:
     def decorator(f: Callable[..., Any]) -> Callable[..., Any]:
         def sync_wrapped(*args: Any, **kwargs: Any) -> Any:
             curr_pipeline = _ai_pipeline_name.get()
-            op = span_kwargs.get("op", "ai.run" if curr_pipeline else "ai.pipeline")
+            op = span_kwargs.pop("op", "ai.run" if curr_pipeline else "ai.pipeline")
 
             with start_span(
-                name=description, op=op, only_if_parent=True, **span_kwargs
+                name=description, op=op, only_as_child_span=True, **span_kwargs
             ) as span:
                 for k, v in kwargs.pop("sentry_tags", {}).items():
                     span.set_tag(k, v)
@@ -58,10 +58,10 @@ def sync_wrapped(*args: Any, **kwargs: Any) -> Any:
 
         async def async_wrapped(*args: Any, **kwargs: Any) -> Any:
             curr_pipeline = _ai_pipeline_name.get()
-            op = span_kwargs.get("op", "ai.run" if curr_pipeline else "ai.pipeline")
+            op = span_kwargs.pop("op", "ai.run" if curr_pipeline else "ai.pipeline")
 
             with start_span(
-                name=description, op=op, only_if_parent=True, **span_kwargs
+                name=description, op=op, only_as_child_span=True, **span_kwargs
             ) as span:
                 for k, v in kwargs.pop("sentry_tags", {}).items():
                     span.set_tag(k, v)

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 (
@@ -359,6 +358,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/consts.py

@@ -1242,4 +1242,4 @@ def _get_default_options() -> dict[str, Any]:
 del _get_default_options
 
 
-VERSION = "3.0.0a2"
+VERSION = "3.0.0a3"

sentry_sdk/integrations/aiohttp.py

@@ -238,7 +238,7 @@ async def on_request_start(
             name="%s %s"
             % (method, parsed_url.url if parsed_url else SENSITIVE_DATA_SUBSTITUTE),
             origin=AioHttpIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         )
 
         data = {

sentry_sdk/integrations/anthropic.py

@@ -161,7 +161,7 @@ def _sentry_patched_create_common(f: Any, *args: Any, **kwargs: Any) -> Any:
         op=OP.ANTHROPIC_MESSAGES_CREATE,
         description="Anthropic messages create",
         origin=AnthropicIntegration.origin,
-        only_if_parent=True,
+        only_as_child_span=True,
     )
     span.__enter__()
 

sentry_sdk/integrations/arq.py

@@ -81,7 +81,7 @@ async def _sentry_enqueue_job(
             op=OP.QUEUE_SUBMIT_ARQ,
             name=function,
             origin=ArqIntegration.origin,
-            only_if_parent=True,
+            only_as_child_span=True,
         ):
             return await old_enqueue_job(self, function, *args, **kwargs)