Merge branch 'major/3.0' into pablo/boto3-add-lambda-extension

Author: pabloDeputter

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## 3.0.0b2
+
+### New Features ✨
+
+- (arq) Add an option to monitor arq cron jobs by @wedamija in [#8051](https://github.com/getsentry/sentry-python/pull/8051)
+- (huey) Add an option to monitor Huey periodic tasks by @wedamija in [#8052](https://github.com/getsentry/sentry-python/pull/8052)
+- (rq) Add an option to monitor rq-scheduler jobs by @wedamija in [#8053](https://github.com/getsentry/sentry-python/pull/8053)
+
+### Bug Fixes 🐛
+
+- (aiohttp) Leave existing `baggage` header alone if it has existin… by @pabloDeputter in [#8116](https://github.com/getsentry/sentry-python/pull/8116)
+- (arq) Don't monitor cron jobs with unsupported schedules by @wedamija in [#8098](https://github.com/getsentry/sentry-python/pull/8098)
+- (attributes) Handle special float values correctly by @sentrivana in [#8067](https://github.com/getsentry/sentry-python/pull/8067)
+- (boto3) Adapt to botocore no longer signing baggage by @sentrivana in [#8113](https://github.com/getsentry/sentry-python/pull/8113)
+- (celery) Don't round down beat schedule intervals by @wedamija in [#7842](https://github.com/getsentry/sentry-python/pull/7842)
+- Exclude litellm==1.107.0 from extras by @jonny-norwine in [#8104](https://github.com/getsentry/sentry-python/pull/8104)
+
+### Internal Changes 🔧
+
+#### Deps
+
+- Bump brotli to 1.2.1 by @sentry-junior in [#8122](https://github.com/getsentry/sentry-python/pull/8122)
+- Update github workflows by @renovate in [#8045](https://github.com/getsentry/sentry-python/pull/8045)
+- Update github workflows by @renovate in [#8036](https://github.com/getsentry/sentry-python/pull/8036)
+
+#### Other
+
+- (monitor) Stop background health checks in tests that drive the monitor by @sentry-junior in [#8032](https://github.com/getsentry/sentry-python/pull/8032)
+- Update `AGENTS.md` by @sentrivana in [#8077](https://github.com/getsentry/sentry-python/pull/8077)
+
+### Other
+
+- Next Python SDK major by @sentrivana in [#5005](https://github.com/getsentry/sentry-python/pull/5005)
+- Testing merge by @sentrivana in [#8115](https://github.com/getsentry/sentry-python/pull/8115)
+
 ## 3.0.0b1
 
 This is a pre-release of the next Python SDK major, to be released in November 2026.

docs/conf.py

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

sentry_sdk/consts.py

@@ -1507,6 +1507,16 @@ class OP:
     HUGGINGFACE_HUB_CHAT_COMPLETIONS_CREATE = (
         "ai.chat_completions.create.huggingface_hub"
     )
+    OBJECT_COPY = "object.copy"
+    OBJECT_DELETE = "object.delete"
+    OBJECT_GET = "object.get"
+    OBJECT_HEAD = "object.head"
+    OBJECT_LIST = "object.list"
+    OBJECT_MULTIPART_UPLOAD_ABORT = "object.multipart_upload.abort"
+    OBJECT_MULTIPART_UPLOAD_COMPLETE = "object.multipart_upload.complete"
+    OBJECT_MULTIPART_UPLOAD_CREATE = "object.multipart_upload.create"
+    OBJECT_PUT = "object.put"
+    OBJECT_UPLOAD_PART = "object.upload_part"
     QUEUE_PROCESS = "queue.process"
     QUEUE_PUBLISH = "queue.publish"
     QUEUE_SUBMIT_ARQ = "queue.submit.arq"
@@ -2014,4 +2024,4 @@ def _get_default_options() -> "dict[str, Any]":
 del _get_default_options
 
 
-VERSION = "3.0.0b1"
+VERSION = "3.0.0b2"

sentry_sdk/integrations/aiohttp.py

@@ -28,6 +28,7 @@
     SpanStatus,
 )
 from sentry_sdk.tracing_utils import (
+    Baggage,
     add_http_breadcrumb,
     add_http_request_source,
     should_propagate_trace,
@@ -343,6 +344,19 @@ async def on_request_start(
             if SENTRY_TRACE_HEADER_NAME in params.headers:
                 headers_to_skip.add(SENTRY_TRACE_HEADER_NAME)
 
+            # `baggage` with Sentry members (e.g. merged by the boto3 integration
+            # before signing): skip so Sentry members are not duplicated.
+            with capture_internal_exceptions():
+                baggage = params.headers.get(BAGGAGE_HEADER_NAME)
+                if baggage:
+                    if isinstance(baggage, bytes):
+                        baggage = baggage.decode("latin-1")
+                    if any(
+                        Baggage.SENTRY_PREFIX_REGEX.match(item.strip())
+                        for item in baggage.split(",")
+                    ):
+                        headers_to_skip.add(BAGGAGE_HEADER_NAME)
+
             with capture_internal_exceptions():
                 authorization = params.headers.get("Authorization")
                 if authorization:

sentry_sdk/integrations/boto3/_services/s3.py

@@ -2,7 +2,7 @@
 from datetime import datetime
 from typing import TYPE_CHECKING
 
-from sentry_sdk.consts import SPANDATA
+from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations.boto3._services.base import _ServiceExtension
 from sentry_sdk.integrations.boto3._utils import (
     _extract_attributes,
@@ -11,14 +11,36 @@
 from sentry_sdk.utils import capture_internal_exceptions
 
 if TYPE_CHECKING:
-    from typing import Any, Sequence
+    from typing import Any, Dict, Optional, Sequence
 
     from sentry_sdk._types import Attributes
     from sentry_sdk.integrations.boto3._context import AwsCallContext
     from sentry_sdk.integrations.boto3._utils import (
         _AttributeSpec,
     )
 
+# s3 object apis get `object.*` ops, every other s3 api, e.g. `ListBuckets`, keeps the default `rpc`.
+# https://github.com/getsentry/sentry-conventions/blob/main/model/op/object.json
+_OBJECT_OPS: "Dict[str, str]" = {
+    "GetObject": OP.OBJECT_GET,
+    "HeadObject": OP.OBJECT_HEAD,
+    # `GetObjectAttributes` combines `HeadObject` and `ListParts`.
+    # https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectAttributes.html
+    "GetObjectAttributes": OP.OBJECT_HEAD,
+    "PutObject": OP.OBJECT_PUT,
+    "CopyObject": OP.OBJECT_COPY,
+    "DeleteObject": OP.OBJECT_DELETE,
+    "DeleteObjects": OP.OBJECT_DELETE,
+    "ListObjects": OP.OBJECT_LIST,
+    "ListObjectsV2": OP.OBJECT_LIST,
+    "ListObjectVersions": OP.OBJECT_LIST,
+    "UploadPart": OP.OBJECT_UPLOAD_PART,
+    "UploadPartCopy": OP.OBJECT_UPLOAD_PART,
+    "CreateMultipartUpload": OP.OBJECT_MULTIPART_UPLOAD_CREATE,
+    "CompleteMultipartUpload": OP.OBJECT_MULTIPART_UPLOAD_COMPLETE,
+    "AbortMultipartUpload": OP.OBJECT_MULTIPART_UPLOAD_ABORT,
+}
+
 # maps s3 operations to the response field that contains the complete file size.
 _RESPONSE_FILE_SIZE_FIELDS = {
     "GetObjectAttributes": "ObjectSize",
@@ -36,6 +58,9 @@
 class _S3Extension(_ServiceExtension):
     __slots__ = ()
 
+    def get_span_op(self, ctx: "AwsCallContext") -> "Optional[str]":
+        return _OBJECT_OPS.get(ctx.operation_name)
+
     def get_request_attributes(self, ctx: "AwsCallContext") -> "Attributes":
         attributes: "Attributes" = _extract_attributes(ctx.params, _REQUEST_ATTRIBUTES)
         with capture_internal_exceptions():

setup.py

@@ -22,7 +22,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="3.0.0b1",
+    version="3.0.0b2",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

tests/integrations/aiohttp/test_aiohttp.py

@@ -743,8 +743,21 @@ async def handler(request):
 
 
 @pytest.mark.asyncio
-async def test_outgoing_trace_headers_preserves_signed_propagation_headers(
-    sentry_init, aiohttp_raw_server, aiohttp_client
+@pytest.mark.parametrize(
+    "signed_headers,baggage",
+    [
+        # both propagation headers are named in `SignedHeaders`.
+        ("baggage;host;sentry-trace", "vendor=value"),
+        # botocore 1.43.115+ never signs `baggage`; Sentry members were merged by
+        # the boto3 integration before signing.
+        (
+            "host;sentry-trace",
+            "vendor=value,sentry-trace_id=existing,sentry-sampled=true",
+        ),
+    ],
+)
+async def test_outgoing_trace_headers_preserves_existing_propagation_headers(
+    sentry_init, aiohttp_raw_server, aiohttp_client, signed_headers, baggage
 ):
     sentry_init(
         integrations=[AioHttpIntegration()],
@@ -755,11 +768,10 @@ async def handler(request):
         return web.Response(text="OK")
 
     raw_server = await aiohttp_raw_server(handler)
-    # both propagation headers are named in `SignedHeaders`.
     authorization = (
         "AWS4-HMAC-SHA256 "
         "Credential=test/20260804/eu-west-1/secretsmanager/aws4_request, "
-        "SignedHeaders=baggage;host;sentry-trace, "
+        f"SignedHeaders={signed_headers}, "
         "Signature=sixtyseven"
     )
 
@@ -768,15 +780,15 @@ async def handler(request):
         resp = await client.get(
             "/",
             headers={
-                "baggage": "vendor=value",
+                "baggage": baggage,
                 "sentry-trace": "existing-trace",
                 "Authorization": authorization,
             },
         )
 
     headers = resp.request_info.headers
-    # signed `baggage`: leave as-is.
-    assert headers["baggage"] == "vendor=value"
+    # signed `baggage` or `baggage` with Sentry members: leave as-is.
+    assert headers["baggage"] == baggage
     # signed `sentry-trace`: leave as-is.
     assert headers["sentry-trace"] == "existing-trace"