8000 Add thread info to HTTP breadcrumbs by antonpirker · Pull Request #4368 · getsentry/sentry-python · GitHub
[go: up one dir, main page]
Skip to content

Add thread info to HTTP breadcrumbs #4368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 6, 2025
Merged

Add thread info to HTTP breadcrumbs #4368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d456e8
Add thread to httplib breadcrumbs
antonpirker May 6, 2025
32d4eb3
Make sure thread info is added to http breadcrumbs
antonpirker May 6, 2025
6573704
not in boto
antonpirker May 6, 2025
5c78fa9
whitespace
antonpirker May 6, 2025
57dee8b
linting
antonpirker May 6, 2025
b1a40ec
now
antonpirker May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sentry_sdk/integrations/aiohttp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
parse_url,
parse_version,
reraise,
set_thread_info_from_span,
transaction_from_function,
HAS_REAL_CONTEXTVARS,
CONTEXTVARS_ERROR_MESSAGE,
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions sentry_sdk/integrations/httpx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
http_client_status_to_breadcrumb_level,
logger,
parse_url,
set_thread_info_from_span,
)

from typing import TYPE_CHECKING
Expand Down Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions sentry_sdk/integrations/stdlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
logger,
safe_repr,
parse_url,
set_thread_info_from_span,
)

from typing import TYPE_CHECKING
Expand Down Expand Up @@ -102,6 +103,8 @@ 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
Expand Down Expand Up @@ -256,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
Expand Down
2 changes: 2 additions & 0 deletions sentry_sdk/tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ def __init__(
if status is not None:
self.set_status(status)

self.update_active_thread()

def __eq__(self, other):
# type: (object) -> bool
if not isinstance(other, Span):
Expand Down
9 changes: 9 additions & 0 deletions sentry_sdk/utils.py
View file
Open in desktop
4D36
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
DEFAULT_ADD_FULL_STACK,
DEFAULT_MAX_STACK_FRAMES,
DEFAULT_MAX_VALUE_LENGTH,
SPANDATA,
EndpointType,
)
from sentry_sdk._types import Annotated, AnnotatedValue, SENSITIVE_DATA_SUBSTITUTE
Expand Down Expand Up @@ -1941,3 +1942,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], sentry_sdk.tracing.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)
Loading
0