Skip to content

fix(waterfall): Prefer specific root events in trace root lookup #104050

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(waterfall): Prefer specific root events in trace root lookup #104050

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
083e2c7
fix(waterfall): Prefer frontend root events in trace root lookup
Lms24 Nov 26, 2025
8bc150a
remove eap-specific logic
Lms24 Nov 28, 2025
84578da
extract op lookup and check
Lms24 Nov 28, 2025
82e5ee6
fall back to first root event (instead of last)
Lms24 Nov 28, 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
40 changes: 23 additions & 17 deletions static/app/views/performance/newTraceDetails/traceApi/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import type {OurLogsResponseItem} from 'sentry/views/explore/logs/types';
import type {TraceRootEventQueryResults} from 'sentry/views/performance/newTraceDetails/traceApi/useTraceRootEvent';
import {
isEAPTraceNode,
isEAPTransaction,
isRootEvent,
isTraceNode,
isTraceSplitResult,
Expand Down Expand Up @@ -57,7 +56,8 @@ export const getRepresentativeTraceEvent = (
return {type: 'uptime_check', event: traceChild.value};
}

let rootEvent: TraceTree.TraceEvent | null = null;
let preferredRootEvent: TraceTree.TraceEvent | null = null;
let firstRootEvent: TraceTree.TraceEvent | null = null;
let candidateEvent: TraceTree.TraceEvent | null = null;
let firstEvent: TraceTree.TraceEvent | null = null;

Expand All @@ -67,15 +67,12 @@ export const getRepresentativeTraceEvent = (
: [...traceNode.value.transactions, ...traceNode.value.orphan_errors];
for (const event of events) {
if (isRootEvent(event)) {
rootEvent = event;

if (!isEAP) {
// For non-EAP traces, we return the first root event.
break;
if (!firstRootEvent) {
firstRootEvent = event;
}

if (isEAPTransaction(event)) {
// If we find a root EAP transaction, we can stop looking and use it for the title.
if (hasPreferredOp(event)) {
preferredRootEvent = event;
break;
}
// Otherwise we keep looking for a root eap transaction. If we don't find one, we use other roots, like standalone spans.
Expand All @@ -85,13 +82,7 @@ export const getRepresentativeTraceEvent = (
// with an op that we care about, we can use it for the title. We keep looking for
// a root.
!candidateEvent &&
CANDIDATE_TRACE_TITLE_OPS.includes(
'transaction.op' in event
? event['transaction.op']
: 'op' in event
? event.op
: ''
)
hasPreferredOp(event)
) {
candidateEvent = event;
continue;
Expand All @@ -103,7 +94,7 @@ export const getRepresentativeTraceEvent = (
}

return {
event: rootEvent ?? candidateEvent ?? firstEvent,
event: preferredRootEvent ?? firstRootEvent ?? candidateEvent ?? firstEvent,
type: 'span',
};
};
Expand All @@ -119,3 +110,18 @@ export const isValidEventUUID = (id: string): boolean => {
/^[0-9a-f]{8}[0-9a-f]{4}[1-5][0-9a-f]{3}[89ab][0-9a-f]{3}[0-9a-f]{12}$/i;
return uuidRegex.test(id);
};

/**
* Prefer "special" root events over generic root events when generating a title
* for the waterfall view. Picking these improves contextual navigation for linked
* traces, resulting in more meaningful waterfall titles.
*/
function hasPreferredOp(event: TraceTree.TraceEvent): boolean {
const op =
'op' in event
? event.op
: 'transaction.op' in event
? event['transaction.op']
: undefined;
return !!op && CANDIDATE_TRACE_TITLE_OPS.includes(op);
}
Loading