Skip to content

chore(ray): Remove transaction-based tracing #7308

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
alexander-alderman-webb merged 3 commits into from
Aug 31, 2026
Merged

chore(ray): Remove transaction-based tracing #7308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efce6de
chore(ray): Remove transaction-based tracing
alexander-alderman-webb Aug 31, 2026
dfc11ac
adapt comment
alexander-alderman-webb Aug 31, 2026
caf668b
Merge branch 'major/3.0' into webb/ray/remove-transactions
alexander-alderman-webb Aug 31, 2026
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
176 changes: 60 additions & 116 deletions sentry_sdk/integrations/ray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
import sys

import sentry_sdk
from sentry_sdk.consts import OP, SPANSTATUS
from sentry_sdk.consts import OP
from sentry_sdk.integrations import DidNotEnable, Integration, _check_minimum_version
from sentry_sdk.traces import SegmentNameSource
from sentry_sdk.tracing import TransactionSource
from sentry_sdk.tracing_utils import has_span_streaming_enabled
from sentry_sdk.utils import (
event_from_exception,
logger,
Expand Down Expand Up @@ -91,52 +89,26 @@ def new_func(
) -> "Any":
_check_sentry_initialized()

span_streaming = has_span_streaming_enabled(
sentry_sdk.get_client().options
)
if span_streaming:
sentry_sdk.traces.continue_trace(_sentry_tracing or {})

function_name = qualname_from_function(user_f)
with sentry_sdk.traces.start_span(
name="unknown Ray task"
if function_name is None
else function_name,
attributes={
"sentry.op": OP.QUEUE_TASK_RAY,
"sentry.origin": RayIntegration.origin,
"sentry.segment.name.source": SegmentNameSource.TASK,
},
parent_span=None,
):
try:
result = user_f(*f_args, **f_kwargs)
except Exception:
exc_info = sys.exc_info()
_capture_exception(exc_info)
reraise(*exc_info)

return result
else:
transaction = sentry_sdk.continue_trace(
_sentry_tracing or {},
op=OP.QUEUE_TASK_RAY,
name=qualname_from_function(user_f),
origin=RayIntegration.origin,
source=TransactionSource.TASK,
)

with sentry_sdk.start_transaction(transaction) as transaction:
try:
result = user_f(*f_args, **f_kwargs)
transaction.set_status(SPANSTATUS.OK)
except Exception:
transaction.set_status(SPANSTATUS.INTERNAL_ERROR)
exc_info = sys.exc_info()
_capture_exception(exc_info)
reraise(*exc_info)

return result
sentry_sdk.traces.continue_trace(_sentry_tracing or {})

function_name = qualname_from_function(user_f)
with sentry_sdk.traces.start_span(
name="unknown Ray task" if function_name is None else function_name,
attributes={
"sentry.op": OP.QUEUE_TASK_RAY,
"sentry.origin": RayIntegration.origin,
"sentry.segment.name.source": SegmentNameSource.TASK,
},
parent_span=None,
):
try:
result = user_f(*f_args, **f_kwargs)
except Exception:
exc_info = sys.exc_info()
_capture_exception(exc_info)
reraise(*exc_info)

return result

_insert_sentry_tracing_in_signature(new_func)

Expand All @@ -152,73 +124,45 @@ def _remote_method_with_header_propagation(
"""
Ray Client
"""
span_streaming = has_span_streaming_enabled(
sentry_sdk.get_client().options
)
if span_streaming:
function_name = qualname_from_function(user_f)

if sentry_sdk.traces.get_current_span() is None:
tracing = {
k: v
for k, v in sentry_sdk.get_current_scope().iter_trace_propagation_headers()
}
try:
result = old_remote_method(
*args, **kwargs, _sentry_tracing=tracing
)
except Exception:
exc_info = sys.exc_info()
_capture_exception(exc_info)
reraise(*exc_info)

return result

with sentry_sdk.traces.start_span(
name="unknown Ray task"
if function_name is None
else function_name,
attributes={
"sentry.op": OP.QUEUE_SUBMIT_RAY,
"sentry.origin": RayIntegration.origin,
},
):
tracing = {
k: v
for k, v in sentry_sdk.get_current_scope().iter_trace_propagation_headers()
}
try:
result = old_remote_method(
*args, **kwargs, _sentry_tracing=tracing
)
except Exception:
exc_info = sys.exc_info()
_capture_exception(exc_info)
reraise(*exc_info)

return result
else:
with sentry_sdk.start_span(
op=OP.QUEUE_SUBMIT_RAY,
name=qualname_from_function(user_f),
origin=RayIntegration.origin,
) as span:
tracing = {
k: v
for k, v in sentry_sdk.get_current_scope().iter_trace_propagation_headers()
}
try:
result = old_remote_method(
*args, **kwargs, _sentry_tracing=tracing
)
span.set_status(SPANSTATUS.OK)
except Exception:
span.set_status(SPANSTATUS.INTERNAL_ERROR)
exc_info = sys.exc_info()
_capture_exception(exc_info)
reraise(*exc_info)

return result
function_name = qualname_from_function(user_f)

if sentry_sdk.traces.get_current_span() is None:
tracing = {
k: v
for k, v in sentry_sdk.get_current_scope().iter_trace_propagation_headers()
}
try:
result = old_remote_method(
*args, **kwargs, _sentry_tracing=tracing
)
except Exception:
exc_info = sys.exc_info()
_capture_exception(exc_info)
reraise(*exc_info)

return result

with sentry_sdk.traces.start_span(
name="unknown Ray task" if function_name is None else function_name,
attributes={
"sentry.op": OP.QUEUE_SUBMIT_RAY,
"sentry.origin": RayIntegration.origin,
},
):
tracing = {
k: v
for k, v in sentry_sdk.get_current_scope().iter_trace_propagation_headers()
}
try:
result = old_remote_method(
*args, **kwargs, _sentry_tracing=tracing
)
except Exception:
exc_info = sys.exc_info()
_capture_exception(exc_info)
reraise(*exc_info)

return result

rv.remote = _remote_method_with_header_propagation

Expand Down
Loading
Loading