ref(boto3): refactor get_span_config() into get_span_op() and `ge…

…t_span_origin()`
getsentry · pabloDeputter · Sep 18, 2026 · Sep 21, 2026 · Sep 21, 2026 · Sep 30, 2026
commit 032eff31a5872eaa8cccaabea2bcda5641e60358
@@ -196,13 +196,14 @@ def _start_client_span(
 
     if service_ext is not None:
         with capture_internal_exceptions():
-            config = service_ext.get_span_config(ctx)
-            if config is not None:
-                service_op, service_origin = config
-                if isinstance(service_op, str) and service_op:
-                    span_op = service_op
-                if isinstance(service_origin, str) and service_origin:
-                    span_origin = service_origin
+            service_op = service_ext.get_span_op(ctx)
+            if service_op is not None:
+                span_op = service_op
+
+        with capture_internal_exceptions():
+            service_origin = service_ext.get_span_origin(ctx)
+            if service_origin is not None:
+                span_origin = service_origin
 
         with capture_internal_exceptions():
             attributes.update(service_ext.get_request_attributes(ctx))

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Any, Optional, Tuple
+    from typing import Any, Optional
 
     from sentry_sdk._types import Attributes
     from sentry_sdk.integrations.boto3._context import AwsCallContext
@@ -14,10 +14,12 @@ class _ServiceExtension:
 
     __slots__ = ()
 
-    def get_span_config(
-        self, ctx: "AwsCallContext"
-    ) -> "Optional[Tuple[Optional[str], Optional[str]]]":
-        """Return an optional `(op, origin)` override for the client span."""
+    def get_span_op(self, ctx: "AwsCallContext") -> "Optional[str]":
+        """Return an optional `sentry.op` override for the client span."""
+        return None
+
+    def get_span_origin(self, ctx: "AwsCallContext") -> "Optional[str]":
+        """Return an optional `sentry.origin` override for the client span."""
         return None
 
     def get_request_attributes(self, ctx: "AwsCallContext") -> "Attributes":

@@ -321,7 +321,12 @@ def respond(request, **kwargs):
     return request_span_ids
 
 
-def _capture_boto3_spans_by_op(invoke_client_method, capture_items, span_streaming):
+def _capture_bot^o3_spans_by_op(
+    invoke_client_method,
+    capture_items,
+    span_streaming,
+    expected_origin=ORIGIN,
+):
     items = capture_items()
 
     if span_streaming:
@@ -333,14 +338,17 @@ def _capture_boto3_spans_by_op(invoke_client_method, capture_items, span_streami
             item.payload
             for item in items
             if item.type == "span"
-            and item.payload["attributes"].get(SPANDATA.SENTRY_ORIGIN) == ORIGIN
+            and item.payload["attributes"].get(SPANDATA.SENTRY_ORIGIN)
+            == expected_origin
         ]
     else:
         with sentry_sdk.start_transaction():
             invoke_client_method()
 
         transaction = next(item.payload for item in items if item.type == "transaction")
-        spans = [span for span in transaction["spans"] if span["origin"] == ORIGIN]
+        spans = [
+            span for span in transaction["spans"] if span["origin"] == expected_origin
+        ]
 
     spans_by_op = {}
     for span in spans:
@@ -398,8 +406,11 @@ def test_service_extension_customizes_client_span(
     span_streaming,
 ):
     class TestServiceExtension(_ServiceExtension):
-        def get_span_config(self, ctx):
-            return ("aws.test", None)
+        def get_span_op(self, ctx):
+            return "aws.test"
+
+        def get_span_origin(self, ctx):
+            return "auto.aws.test"
 
         def get_request_attributes(self, ctx):
             return {
@@ -437,6 +448,7 @@ def get_response_attributes(self, ctx, response):
             lambda: client.head_object(**api_params),
             capture_items,
             span_streaming,
+            expected_origin="auto.aws.test",
         )
 
     spans = spans_by_op.get("aws.test", [])
@@ -447,6 +459,10 @@ def get_response_attributes(self, ctx, response):
     assert attributes[SPANDATA.SENTRY_KIND] == "producer"
     assert attributes[SPANDATA.RPC_METHOD] == "HeadObject"
     assert attributes[SPANDATA.HTTP_STATUS_CODE] == 200
+    if span_streaming:
+        assert attributes[SPANDATA.SENTRY_ORIGIN] == "auto.aws.test"
+    else:
+        assert spans[0]["origin"] == "auto.aws.test"
 
 
 @pytest.mark.parametrize("span_streaming", [True, False])