Skip to content

chore: Drop more dual tracing helpers #7480

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
sentrivana merged 1 commit into from
Sep 11, 2026
Merged

chore: Drop more dual tracing helpers #7480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 8 additions & 33 deletions sentry_sdk/tracing_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ def _should_be_included(


def add_source(
span: "Union[sentry_sdk.tracing.Span, sentry_sdk.traces.StreamedSpan]",
span: "sentry_sdk.traces.StreamedSpan",
project_root: "Optional[str]",
in_app_include: "Optional[list[str]]",
in_app_exclude: "Optional[list[str]]",
Expand Down Expand Up @@ -317,20 +317,14 @@ def add_source(
except Exception:
lineno = None
if lineno is not None:
if isinstance(span, Span):
span.set_data(SPANDATA.CODE_LINENO, lineno)
else:
span.set_attribute("code.line.number", lineno)
span.set_attribute("code.line.number", lineno)

try:
namespace = frame.f_globals.get("__name__")
except Exception:
namespace = None
if namespace is not None:
if isinstance(span, Span):
span.set_data(SPANDATA.CODE_NAMESPACE, namespace)
else:
span.set_attribute(SPANDATA.CODE_NAMESPACE, namespace)
span.set_attribute(SPANDATA.CODE_NAMESPACE, namespace)

filepath = _get_frame_module_abs_path(frame)
if filepath is not None:
Expand All @@ -341,22 +335,16 @@ def add_source(
else:
in_app_path = filepath

if isinstance(span, Span):
span.set_data(SPANDATA.CODE_FILEPATH, in_app_path)
else:
if in_app_path is not None:
span.set_attribute("code.file.path", in_app_path)
if in_app_path is not None:
span.set_attribute("code.file.path", in_app_path)

try:
code_function = frame.f_code.co_name
except Exception:
code_function = None

if code_function is not None:
if isinstance(span, Span):
span.set_data(SPANDATA.CODE_FUNCTION, frame.f_code.co_name)
else:
span.set_attribute(SPANDATA.CODE_FUNCTION, frame.f_code.co_name)
span.set_attribute(SPANDATA.CODE_FUNCTION, frame.f_code.co_name)


def add_query_source(
Expand Down Expand Up @@ -394,7 +382,7 @@ def add_query_source(


def add_http_request_source(
span: "Union[sentry_sdk.tracing.Span, sentry_sdk.traces.StreamedSpan]",
span: "sentry_sdk.traces.StreamedSpan",
) -> None:
"""
Adds OTel compatible source code information to a span for an outgoing HTTP request
Expand All @@ -403,26 +391,14 @@ def add_http_request_source(
if not client.is_active():
return

if isinstance(span, Span):
# In the StreamedSpan case, we need to add the extra span information before
# the span finishes, so it's expected that this will be None. In the Span case,
# it should already be finished.
if span.timestamp is None:
return

if span.start_timestamp is None:
return

should_add_request_source = client.options.get("enable_http_request_source", True)
if not should_add_request_source:
return

if isinstance(span, StreamedSpan):
end_timestamp = span.end_timestamp
else:
end_timestamp = span.timestamp

end_timestamp = end_timestamp or datetime.now(timezone.utc)
end_timestamp = span.end_timestamp or datetime.now(timezone.utc)

duration = end_timestamp - span.start_timestamp
threshold = client.options.get("http_request_source_threshold_ms", 0)
Expand Down Expand Up @@ -1525,7 +1501,6 @@ def _matches(rule: "Any", value: "Any") -> bool:
BAGGAGE_HEADER_NAME,
LOW_QUALITY_TRANSACTION_SOURCES,
SENTRY_TRACE_HEADER_NAME,
Span,
)

if TYPE_CHECKING:
Expand Down
Loading