Make sure thread info is added to http breadcrumbs

Author: antonpirker

sentry_sdk/integrations/aiohttp.py

@@ -34,6 +34,7 @@
     parse_url,
     parse_version,
     reraise,
+    set_thread_info_from_span,
     transaction_from_function,
     HAS_REAL_CONTEXTVARS,
     CONTEXTVARS_ERROR_MESSAGE,
@@ -241,6 +242,8 @@ async def on_request_start(session, trace_config_ctx, params):
         data = {
             SPANDATA.HTTP_METHOD: method,
         }
+        set_thread_info_from_span(data, span)
+
         if parsed_url is not None:
             data["url"] = parsed_url.url
             data[SPANDATA.HTTP_QUERY] = parsed_url.query

sentry_sdk/integrations/boto3.py

@@ -8,6 +8,7 @@
     ensure_integration_enabled,
     parse_url,
     parse_version,
+    set_thread_info_from_span,
 )
 
 from typing import TYPE_CHECKING
@@ -70,6 +71,8 @@ def _sentry_request_created(service_id, request, operation_name, **kwargs):
     data = {
         SPANDATA.HTTP_METHOD: request.method,
     }
+    set_thread_info_from_span(data, span)
+
     with capture_internal_exceptions():
         parsed_url = parse_url(request.url, sanitize=False)
         data["aws.request.url"] = parsed_url.url

sentry_sdk/integrations/httpx.py

@@ -9,6 +9,7 @@
     http_client_status_to_breadcrumb_level,
     logger,
     parse_url,
+    set_thread_info_from_span,
 )
 
 from typing import TYPE_CHECKING
@@ -65,6 +66,8 @@ def send(self, request, **kwargs):
             data = {
                 SPANDATA.HTTP_METHOD: request.method,
             }
+            set_thread_info_from_span(data, span)
+
             if parsed_url is not None:
                 data["url"] = parsed_url.url
                 data[SPANDATA.HTTP_QUERY] = parsed_url.query

sentry_sdk/integrations/stdlib.py

@@ -19,6 +19,7 @@
     logger,
     safe_repr,
     parse_url,
+    set_thread_info_from_span,
 )
 
 from typing import TYPE_CHECKING
@@ -102,16 +103,13 @@ def putrequest(self, method, url, *args, **kwargs):
         data = {
             SPANDATA.HTTP_METHOD: method,
         }
+        set_thread_info_from_span(data, span)
+
         if parsed_url is not None:
             data["url"] = parsed_url.url
             data[SPANDATA.HTTP_QUERY] = parsed_url.query
             data[SPANDATA.HTTP_FRAGMENT] = parsed_url.fragment
 
-        if span.get_attribute(SPANDATA.THREAD_ID) is not None:
-            data[SPANDATA.THREAD_ID] = span.get_attribute(SPANDATA.THREAD_ID)
-            if span.get_attribute(SPANDATA.THREAD_NAME) is not None:
-                data[SPANDATA.THREAD_NAME] = span.get_attribute(SPANDATA.THREAD_NAME)
-
         for key, value in data.items():
             span.set_attribute(key, value)
 
@@ -261,8 +259,8 @@ def sentry_patched_popen_init(self, *a, **kw):
                 thread_id, thread_name = get_current_thread_meta()
                 breadcrumb_data = {
                     "subprocess.pid": self.pid,
-                    "thread.id": thread_id,
-                    "thread.name": thread_name,
+                    SPANDATA.THREAD_ID: thread_id,
+                    SPANDATA.THREAD_NAME: thread_name,
                 }
                 if cwd:
                     breadcrumb_data["subprocess.cwd"] = cwd

sentry_sdk/utils.py

@@ -29,13 +29,15 @@
     DEFAULT_ADD_FULL_STACK,
     DEFAULT_MAX_STACK_FRAMES,
     DEFAULT_MAX_VALUE_LENGTH,
+    SPANDATA,
     EndpointType,
 )
 from sentry_sdk._types import Annotated, AnnotatedValue, SENSITIVE_DATA_SUBSTITUTE
 
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
+    from sentry_sdk.tracing import Span
     from types import FrameType, TracebackType
     from typing import (
         Any,
@@ -1941,3 +1943,11 @@ def http_client_status_to_breadcrumb_level(status_code):
             return "warning"
 
     return "info"
+
+
+def set_thread_info_from_span(data, span):
+    # type: (Dict[str, Any], Span) -> None
+    if span.get_attribute(SPANDATA.THREAD_ID) is not None:
+        data[SPANDATA.THREAD_ID] = span.get_attribute(SPANDATA.THREAD_ID)
+        if span.get_attribute(SPANDATA.THREAD_NAME) is not None:
+            data[SPANDATA.THREAD_NAME] = span.get_attribute(SPANDATA.THREAD_NAME)