Merge branch 'webb/boto3/span-first' of github.com:getsentry/sentry-python into webb/boto3/span-first

Author: alexander-alderman-webb

CHANGELOG.md

@@ -1,5 +1,88 @@
 # Changelog
 
+## 2.59.0
+
+### New Features ✨
+
+#### Langchain
+
+- Record `run_name` as `gen_ai.function_id` on Invoke Agent Spans by @alexander-alderman-webb in [#5926](https://github.com/getsentry/sentry-python/pull/5926)
+- Record `run_name` in `on_tool_start` by @alexander-alderman-webb in [#5925](https://github.com/getsentry/sentry-python/pull/5925)
+- Record `run_name` in `on_chat_model_start` by @alexander-alderman-webb in [#5924](https://github.com/getsentry/sentry-python/pull/5924)
+
+#### Other
+
+- (ci) Cancel in-progress PR workflows on new commit push by @joshuarli in [#5994](https://github.com/getsentry/sentry-python/pull/5994)
+- (consts) Add updated span convention constants to SPANDATA by @ericapisani in [#6093](https://github.com/getsentry/sentry-python/pull/6093)
+- (fastapi) Support span streaming in active thread tracking by @ericapisani in [#6118](https://github.com/getsentry/sentry-python/pull/6118)
+- (httpx) Migrate to span first by @ericapisani in [#6084](https://github.com/getsentry/sentry-python/pull/6084)
+- (huggingface_hub) Migrate to span first by @ericapisani in [#6124](https://github.com/getsentry/sentry-python/pull/6124)
+- (mcp) Migrate to span first by @ericapisani in [#6131](https://github.com/getsentry/sentry-python/pull/6131)
+- Add `db.driver.name` spans to database integrations by @ericapisani in [#6082](https://github.com/getsentry/sentry-python/pull/6082)
+
+### Bug Fixes 🐛
+
+We've put additional data that might contain sensitive information, like GraphQL documents, behind the `send_default_pii` option.
+
+#### Httpx
+
+- Consistently early-exit when adding request source by @alexander-alderman-webb in [#6151](https://github.com/getsentry/sentry-python/pull/6151)
+- Set `code.namespace` and `code.function` instead of `code.function.name` in span streaming by @alexander-alderman-webb in [#6150](https://github.com/getsentry/sentry-python/pull/6150)
+
+#### Langchain
+
+- Record `run_name` as `gen_ai.function_id` for text completions by @alexander-alderman-webb in [#6073](https://github.com/getsentry/sentry-python/pull/6073)
+- Set agent name as `gen_ai.agent.name` for chat and tool spans by @alexander-alderman-webb in [#5877](https://github.com/getsentry/sentry-python/pull/5877)
+
+#### Other
+
+- (asgi) Use `inspect.iscoroutinefunction` on Python 3.14+ by @alexander-alderman-webb in [#6135](https://github.com/getsentry/sentry-python/pull/6135)
+- (batcher) Reset lock and flusher in child after fork by @ericapisani in [#6163](https://github.com/getsentry/sentry-python/pull/6163)
+- (google_genai) Redact binary data in inline_data and fix multi-part message extraction by @ericapisani in [#5977](https://github.com/getsentry/sentry-python/pull/5977)
+- (grpc) Add isolation_scope to async server interceptor by @robinvd in [#5940](https://github.com/getsentry/sentry-python/pull/5940)
+- (metrics,logs) Don't attach `span_id` if no active span by @sentrivana in [#6162](https://github.com/getsentry/sentry-python/pull/6162)
+- (monitor) Release `Monitor._thread_lock` after fork (#6148) by @vokracko in [#6159](https://github.com/getsentry/sentry-python/pull/6159)
+- (openai-agents) Resolve agent from `bindings` for openai-agents >= 0.14 by @ericapisani in [#6102](https://github.com/getsentry/sentry-python/pull/6102)
+- (profiler) Stop nulling buffer on teardown by @ericapisani in [#6075](https://github.com/getsentry/sentry-python/pull/6075)
+- (quart) Use `inspect.iscoroutinefunction` when Quart does by @alexander-alderman-webb in [#6133](https://github.com/getsentry/sentry-python/pull/6133)
+- (security) Prevent GitHub script injection in update-tox workflow by @fix-it-felix-sentry in [#6171](https://github.com/getsentry/sentry-python/pull/6171)
+- (starlette/fastapi) Use `inspect.iscoroutinefunction` when Starlette does by @alexander-alderman-webb in [#6134](https://github.com/getsentry/sentry-python/pull/6134)
+- (tornado) Make sure context manager doesn't double yield by @sentrivana in [#6152](https://github.com/getsentry/sentry-python/pull/6152)
+- Introduce `_get_current_streamed_span()` to keep types backwards compatible by @alexander-alderman-webb in [#6177](https://github.com/getsentry/sentry-python/pull/6177)
+
+### Internal Changes 🔧
+
+#### Stdlib
+
+- Pin timestamps in `add_http_request_source()` patch by @alexander-alderman-webb in [#6160](https://github.com/getsentry/sentry-python/pull/6160)
+- Stop mocking `HTTPSConnection.send` in trace header tests by @alexander-alderman-webb in [#6156](https://github.com/getsentry/sentry-python/pull/6156)
+
+#### Other
+
+- (batcher) Only flush the bucket that triggered the flush event by @sentrivana in [#6168](https://github.com/getsentry/sentry-python/pull/6168)
+- (celery) Remove unused `NoOpMgr` from utils by @sentrivana in [#6078](https://github.com/getsentry/sentry-python/pull/6078)
+- (ci) Update outdated pinned action version comments by @JoshuaMoelans in [#6088](https://github.com/getsentry/sentry-python/pull/6088)
+- (fastmcp) Span streaming tests by @alexander-alderman-webb in [#6167](https://github.com/getsentry/sentry-python/pull/6167)
+- (graphql) Update document setting by @sentrivana in [#6153](https://github.com/getsentry/sentry-python/pull/6153)
+- (grpc) Mirror sync interceptor by @sentrivana in [#6158](https://github.com/getsentry/sentry-python/pull/6158)
+- (langchain) Separate test to remove conditional by @alexander-alderman-webb in [#6076](https://github.com/getsentry/sentry-python/pull/6076)
+- (pydantic-ai) Remove dead `Model.request` patch by @alexander-alderman-webb in [#5956](https://github.com/getsentry/sentry-python/pull/5956)
+- (queues) Update integrations by @sentrivana in [#6157](https://github.com/getsentry/sentry-python/pull/6157)
+- (tests) Replace deprecated `enable_tracing`with `traces_sample_rate` by @sentrivana in [#6077](https://github.com/getsentry/sentry-python/pull/6077)
+- (transport) Remove redundant checks for dsn by @psh9508 in [#6104](https://github.com/getsentry/sentry-python/pull/6104)
+- Rename file by @sentrivana in [#6194](https://github.com/getsentry/sentry-python/pull/6194)
+- 🤖 Update test matrix with new releases (05/04) by @github-actions in [#6186](https://github.com/getsentry/sentry-python/pull/6186)
+- Assert presence of profile chunks after shutdown by @alexander-alderman-webb in [#6174](https://github.com/getsentry/sentry-python/pull/6174)
+- 🤖 Update test matrix with new releases (04/29) by @github-actions in [#6173](https://github.com/getsentry/sentry-python/pull/6173)
+- Limit `update-tox` action to master branch by @alexander-alderman-webb in [#6172](https://github.com/getsentry/sentry-python/pull/6172)
+- Expand scrubbing by @sentrivana in [#6161](https://github.com/getsentry/sentry-python/pull/6161)
+- Remove Python 2 compat from qualname_from_function by @ericapisani in [#6137](https://github.com/getsentry/sentry-python/pull/6137)
+- Update test matrix with new releases (04/27) by @alexander-alderman-webb in [#6146](https://github.com/getsentry/sentry-python/pull/6146)
+- Raise shutdown timeout in aws lambda tests by @sentrivana in [#6129](https://github.com/getsentry/sentry-python/pull/6129)
+- Join thread in continuous profiler test by @alexander-alderman-webb in [#6125](https://github.com/getsentry/sentry-python/pull/6125)
+- 🤖 Update test matrix with new releases (04/20) by @github-actions in [#6100](https://github.com/getsentry/sentry-python/pull/6100)
+- Set explicit base-branch for codecov action by @ericapisani in [#5992](https://github.com/getsentry/sentry-python/pull/5992)
+
 ## 2.58.0
 
 ### New Features ✨

docs/conf.py

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

requirements-linting.txt

@@ -20,3 +20,4 @@ typer
 strawberry-graphql
 setuptools<82
 httpx
+botocore-stubs

scripts/build_aws_lambda_layer.py

@@ -49,7 +49,7 @@ def install_python_packages(self) -> None:
 
         sentry_python_sdk = os.path.join(
             DIST_PATH,
-            f"sentry_sdk-{SDK_VERSION}-py2.py3-none-any.whl",  # this is generated by "make dist" that is called by "make aws-lambda-layer"
+            f"sentry_sdk-{SDK_VERSION}-py3-none-any.whl",  # this is generated by "make dist" that is called by "make aws-lambda-layer"
         )
         subprocess.run(
             [

sentry_sdk/_types.py

@@ -6,13 +6,14 @@
 
 from typing import TYPE_CHECKING, TypeVar, Union
 
-
 # Re-exported for compat, since code out there in the wild might use this variable.
 MYPY = TYPE_CHECKING
 
 
 SENSITIVE_DATA_SUBSTITUTE = "[Filtered]"
 BLOB_DATA_SUBSTITUTE = "[Blob substitute]"
+OVER_SIZE_LIMIT_SUBSTITUTE = "[Exceeds maximum size]"
+UNPARSABLE_RAW_DATA_SUBSTITUTE = "[Unparsable]"
 
 
 class AnnotatedValue:
@@ -47,6 +48,8 @@ def __len__(self: "AnnotatedValue") -> int:
     @classmethod
     def removed_because_raw_data(cls) -> "AnnotatedValue":
         """The value was removed because it could not be parsed. This is done for request body values that are not json nor a form."""
+        # This is the legacy approach - we want to transition over to `substituted_because_raw_data` after we completely transition
+        # to span-first
         return AnnotatedValue(
             value="",
             metadata={
@@ -59,12 +62,29 @@ def removed_because_raw_data(cls) -> "AnnotatedValue":
             },
         )
 
+    @classmethod
+    def substituted_because_raw_data(cls) -> "AnnotatedValue":
+        """The value was replaced because it could not be parsed. This is done for request body values that are not json nor a form."""
+        return AnnotatedValue(
+            value=UNPARSABLE_RAW_DATA_SUBSTITUTE,
+            metadata={
+                "rem": [  # Remark
+                    [
+                        "!raw",  # Unparsable raw data
+                        "s",  # The fields original value was substituted
+                    ]
+                ]
+            },
+        )
+
     @classmethod
     def removed_because_over_size_limit(cls, value: "Any" = "") -> "AnnotatedValue":
         """
         The actual value was removed because the size of the field exceeded the configured maximum size,
         for example specified with the max_request_body_size sdk option.
         """
+        # This is the legacy approach - we want to transition over to `substituted_because_over_size_limit` after we completely transition
+        # to span-first
         return AnnotatedValue(
             value=value,
             metadata={
@@ -77,6 +97,26 @@ def removed_because_over_size_limit(cls, value: "Any" = "") -> "AnnotatedValue":
             },
         )
 
+    @classmethod
+    def substituted_because_over_size_limit(
+        cls, value: "Any" = OVER_SIZE_LIMIT_SUBSTITUTE
+    ) -> "AnnotatedValue":
+        """
+        The actual value was replaced because the size of the field exceeded the configured maximum size,
+        for example specified with the max_request_body_size sdk option.
+        """
+        return AnnotatedValue(
+            value=value,
+            metadata={
+                "rem": [  # Remark
+                    [
+                        "!config",  # Because of configured maximum size
+                        "s",  # The fields original value was substituted
+                    ]
+                ]
+            },
+        )
+
     @classmethod
     def substituted_because_contains_sensitive_data(cls) -> "AnnotatedValue":
         """The actual value was removed because it contained sensitive information."""
@@ -99,17 +139,10 @@ def substituted_because_contains_sensitive_data(cls) -> "AnnotatedValue":
 
 if TYPE_CHECKING:
     from collections.abc import Container, MutableMapping, Sequence
-
     from datetime import datetime
-
     from types import TracebackType
-    from typing import Any
-    from typing import Callable
-    from typing import Dict
-    from typing import Mapping
-    from typing import NotRequired
-    from typing import Optional
-    from typing import Type
+    from typing import Any, Callable, Dict, Mapping, NotRequired, Optional, Type
+
     from typing_extensions import Literal, TypedDict
 
     class SDKInfo(TypedDict):

sentry_sdk/consts.py

@@ -893,6 +893,12 @@ class SPANDATA:
     Example: "5249fbada8d5416482c2f6e47e337372"
     """
 
+    RPC_METHOD = "rpc.method"
+    """
+    The fully-qualified logical name of the method from the RPC interface perspective.
+    Example: "com.example.ExampleService/exampleMethod"
+    """
+
     SERVER_ADDRESS = "server.address"
     """
     Name of the database host.
@@ -1645,4 +1651,4 @@ def _get_default_options() -> "dict[str, Any]":
 del _get_default_options
 
 
-VERSION = "2.58.0"
+VERSION = "2.59.0"

sentry_sdk/integrations/_asgi_common.py

@@ -93,7 +93,9 @@ def _get_request_data(asgi_scope: "Any") -> "Dict[str, Any]":
     if ty in ("http", "websocket"):
         request_data["method"] = asgi_scope.get("method")
 
-        request_data["headers"] = headers = _filter_headers(_get_headers(asgi_scope))
+        request_data["headers"] = headers = _filter_headers(
+            _get_headers(asgi_scope),
+        )
         request_data["query_string"] = _get_query(asgi_scope)
 
         request_data["url"] = _get_url(

sentry_sdk/integrations/_wsgi_common.py

@@ -218,11 +218,11 @@ def _filter_headers(
     if should_send_default_pii():
         return headers
 
-    substitute: "Union[AnnotatedValue, str]"
-    if use_annotated_value:
-        substitute = AnnotatedValue.removed_because_over_size_limit()
-    else:
-        substitute = SENSITIVE_DATA_SUBSTITUTE
+    substitute: "Union[AnnotatedValue, str]" = (
+        SENSITIVE_DATA_SUBSTITUTE
+        if not use_annotated_value
+        else AnnotatedValue.removed_because_over_size_limit()
+    )
 
     return {
         k: (v if k.upper().replace("-", "_") not in SENSITIVE_HEADERS else substitute)

sentry_sdk/integrations/asyncio.py

@@ -1,29 +1,32 @@
-import sys
 import functools
+import sys
 
 import sentry_sdk
 from sentry_sdk.consts import OP
-from sentry_sdk.integrations import Integration, DidNotEnable
+from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.integrations._wsgi_common import nullcontext
+from sentry_sdk.traces import StreamedSpan
+from sentry_sdk.tracing import Span
+from sentry_sdk.tracing_utils import has_span_streaming_enabled
+from sentry_sdk.transport import AsyncHttpTransport
 from sentry_sdk.utils import (
     event_from_exception,
+    is_internal_task,
     logger,
     reraise,
-    is_internal_task,
 )
-from sentry_sdk.transport import AsyncHttpTransport
 
 try:
     import asyncio
     from asyncio.tasks import Task
 except ImportError:
     raise DidNotEnable("asyncio not available")
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional, Union
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, TypeVar
     from collections.abc import Coroutine
+    from typing import Any, Callable, TypeVar
 
     from sentry_sdk._types import ExcInfo
 
@@ -142,22 +145,31 @@ def _sentry_task_factory(
             @_wrap_coroutine(coro)
             async def _task_with_sentry_span_creation() -> "Any":
                 result = None
-
-                integration = sentry_sdk.get_client().get_integration(
-                    AsyncioIntegration
-                )
+                client = sentry_sdk.get_client()
+                integration = client.get_integration(AsyncioIntegration)
                 task_spans = integration.task_spans if integration else False
 
+                span_ctx: "Optional[Union[StreamedSpan, Span]]" = None
+                is_span_streaming_enabled = has_span_streaming_enabled(client.options)
+
                 with sentry_sdk.isolation_scope():
-                    with (
-                        sentry_sdk.start_span(
-                            op=OP.FUNCTION,
-                            name=get_name(coro),
-                            origin=AsyncioIntegration.origin,
-                        )
-                        if task_spans
-                        else nullcontext()
-                    ):
+                    if task_spans:
+                        if is_span_streaming_enabled:
+                            span_ctx = sentry_sdk.traces.start_span(
+                                name=get_name(coro),
+                                attributes={
+                                    "sentry.op": OP.FUNCTION,
+                                    "sentry.origin": AsyncioIntegration.origin,
+                                },
+                            )
+                        else:
+                            span_ctx = sentry_sdk.start_span(
+                                op=OP.FUNCTION,
+                                name=get_name(coro),
+                                origin=AsyncioIntegration.origin,
+                            )
+
+                    with span_ctx if span_ctx else nullcontext():
                         try:
                             result = await coro
                         except StopAsyncIteration as e: