add _finish_active_http_child_span to end HTTP spans in Boto3 integration in correct order

Author: pabloDeputter

sentry_sdk/integrations/boto3/_client.py

@@ -5,6 +5,7 @@
 from sentry_sdk.integrations.boto3 import Boto3Integration
 from sentry_sdk.integrations.boto3._context import AwsCallContext
 from sentry_sdk.integrations.boto3._instrumentation import (
+    _finish_active_http_child_span,
     _finish_client_span,
     _sentry_before_sign,
     _sentry_request_created,
@@ -65,11 +66,13 @@ def sentry_patched_make_api_call(
         except BaseException as exc:
             if span is not None:
                 with capture_internal_exceptions():
+                    _finish_active_http_child_span(span)
                     span.__exit__(type(exc), exc, exc.__traceback__)
             raise
 
         if span is not None:
             with capture_internal_exceptions():
+                _finish_active_http_child_span(span)
                 _finish_client_span(span, parsed)
         return parsed
 

sentry_sdk/integrations/boto3/_instrumentation.py

@@ -33,6 +33,7 @@
 
 
 _AWS_RPC_SYSTEM_NAME = "aws-api"
+_STDLIB_HTTP_SPAN_ORIGIN = "auto.http.stdlib.httplib"
 
 
 def _set_span_attributes(
@@ -140,6 +141,30 @@ def _start_client_span(
     return span
 
 
+def _finish_active_http_child_span(
+    span: "Union[Span, StreamedSpan]",
+) -> None:
+    if not isinstance(span, StreamedSpan):
+        return
+
+    http_span = sentry_sdk.traces.get_current_span()
+    if (
+        http_span is None
+        or http_span is span
+        or http_span.get_attributes().get(SPANDATA.SENTRY_ORIGIN)
+        != _STDLIB_HTTP_SPAN_ORIGIN
+        or http_span._parent_span_id != span.span_id
+    ):
+        return
+
+    # Stdlib normally keeps its HTTP span open until the response body is read.
+    # Boto3 has a separate `http.client.stream` span for that work, so finish the
+    # HTTP span after the headers and preserve LIFO scope restoration. OTel permits
+    # HTTP client spans to end after response headers are read.
+    # https://opentelemetry.io/docs/specs/semconv/http/http-spans/#http-client-span-duration
+    http_span.end()
+
+
 def _finish_client_span(
     span: "Union[Span, StreamedSpan]",
     parsed: "Dict[str, Any]",