Skip to content

chore(huey): drop transaction based tracing #7243

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

Draft
pnagre05 wants to merge 1 commit into
base: major/3.0
Choose a base branch
from
+313 −523
Draft

chore(huey): drop transaction based tracing #7243

Show file tree
Hide file tree
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
94 changes: 28 additions & 66 deletions sentry_sdk/integrations/huey.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
from typing import TYPE_CHECKING

import sentry_sdk
from sentry_sdk.api import continue_trace, get_baggage, get_traceparent
from sentry_sdk.consts import OP, SPANDATA, SPANSTATUS
from sentry_sdk.api import get_baggage, get_traceparent
from sentry_sdk.consts import OP, SPANDATA
from sentry_sdk.integrations import DidNotEnable, Integration, _check_minimum_version
from sentry_sdk.scope import should_send_default_pii
from sentry_sdk.traces import SegmentNameSource, SpanStatus, StreamedSpan
from sentry_sdk.tracing import (
BAGGAGE_HEADER_NAME,
SENTRY_TRACE_HEADER_NAME,
TransactionSource,
)
from sentry_sdk.tracing_utils import has_span_streaming_enabled
from sentry_sdk.utils import (
SENSITIVE_DATA_SUBSTITUTE,
_register_control_flow_exception,
Expand Down Expand Up @@ -81,38 +79,26 @@ def _sentry_enqueue(
else:
span_name = item.name

is_span_streaming_enabled = has_span_streaming_enabled(
sentry_sdk.get_client().options
)

no_headers_types = (PeriodicTask,) + tuple(
t for t in [HueyGroup, HueyChord] if t is not None
)

if is_span_streaming_enabled and sentry_sdk.traces.get_current_span() is None:
if sentry_sdk.traces.get_current_span() is None:
if not isinstance(item, no_headers_types):
item.kwargs["sentry_headers"] = {
BAGGAGE_HEADER_NAME: get_baggage(),
SENTRY_TRACE_HEADER_NAME: get_traceparent(),
}
return old_enqueue(self, item)

if is_span_streaming_enabled:
span_ctx = sentry_sdk.traces.start_span(
name=span_name,
attributes={
"sentry.op": OP.QUEUE_SUBMIT_HUEY,
"sentry.origin": HueyIntegration.origin,
SPANDATA.MESSAGING_DESTINATION_NAME: self.name,
},
)
else:
span_ctx = sentry_sdk.start_span(
op=OP.QUEUE_SUBMIT_HUEY,
name=span_name,
origin=HueyIntegration.origin,
)
span_ctx.set_data(SPANDATA.MESSAGING_DESTINATION_NAME, self.name)
span_ctx = sentry_sdk.traces.start_span(
name=span_name,
attributes={
"sentry.op": OP.QUEUE_SUBMIT_HUEY,
"sentry.origin": HueyIntegration.origin,
SPANDATA.MESSAGING_DESTINATION_NAME: self.name,
},
)

with span_ctx:
if not isinstance(item, no_headers_types):
Expand Down Expand Up @@ -166,20 +152,12 @@ def event_processor(event: "Event", hint: "Hint") -> "Optional[Event]":

def _capture_exception(exc_info: "ExcInfo") -> None:
scope = sentry_sdk.get_current_scope()
is_span_streaming_enabled = has_span_streaming_enabled(
sentry_sdk.get_client().options
)

if exc_info[0] in HUEY_CONTROL_FLOW_EXCEPTIONS:
if not is_span_streaming_enabled:
scope.transaction.set_status(SPANSTATUS.ABORTED)
elif type(scope._span) is StreamedSpan:
if type(scope._span) is StreamedSpan:
scope._span._segment.status = SpanStatus.OK
return

if not is_span_streaming_enabled:
scope.transaction.set_status(SPANSTATUS.INTERNAL_ERROR)
elif type(scope._span) is StreamedSpan:
if type(scope._span) is StreamedSpan:
scope._span._segment.status = SpanStatus.ERROR

event, hint = event_from_exception(
Expand Down Expand Up @@ -219,39 +197,23 @@ def _sentry_execute(
scope.add_event_processor(_make_event_processor(task))

sentry_headers = task.kwargs.pop("sentry_headers", None)
is_span_streaming_enabled = has_span_streaming_enabled(
sentry_sdk.get_client().options
headers = sentry_headers or {}
sentry_sdk.traces.continue_trace(headers)
span_ctx = sentry_sdk.traces.start_span(
name=task.name,
attributes={
"sentry.op": OP.QUEUE_TASK_HUEY,
"sentry.origin": HueyIntegration.origin,
"sentry.segment.name.source": SegmentNameSource.TASK,
SPANDATA.MESSAGING_DESTINATION_NAME: self.name,
"messaging.message.id": task.id,
"messaging.message.system": "huey",
"messaging.message.retry.count": (task.default_retries or 0)
- task.retries,
},
parent_span=None,
)

if is_span_streaming_enabled:
headers = sentry_headers or {}
sentry_sdk.traces.continue_trace(headers)
span_ctx = sentry_sdk.traces.start_span(
name=task.name,
attributes={
"sentry.op": OP.QUEUE_TASK_HUEY,
"sentry.origin": HueyIntegration.origin,
"sentry.segment.name.source": SegmentNameSource.TASK,
SPANDATA.MESSAGING_DESTINATION_NAME: self.name,
"messaging.message.id": task.id,
"messaging.message.system": "huey",
"messaging.message.retry.count": (task.default_retries or 0)
- task.retries,
},
parent_span=None,
)
else:
transaction = continue_trace(
sentry_headers or {},
name=task.name,
op=OP.QUEUE_TASK_HUEY,
source=TransactionSource.TASK,
origin=HueyIntegration.origin,
)
transaction.set_status(SPANSTATUS.OK)
span_ctx = sentry_sdk.start_transaction(transaction)
span_ctx.set_data(SPANDATA.MESSAGING_DESTINATION_NAME, self.name)

if not getattr(task, "_sentry_is_patched", False):
task.execute = _wrap_task_execute(task.execute)
task._sentry_is_patched = True
Expand Down
Loading