Elgato_dark/hyperdx
1
0
Fork 0
mirror of https://github.com/hyperdxio/hyperdx synced 2026-04-21 13:37:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix: Dont clobber spands in waterfall when multiple spans have duplicate span id (#1396)

Browse source 
Resolves HDX-2885
This commit is contained in:
Mike Shi 2025-11-24 07:27:21 -08:00 committed by GitHub
parent e3643ccfc0
commit 36cf8665cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/nasty-mangos-cross.md Normal file
View file

@ -0,0 +1,5 @@
---
"@hyperdx/app": patch
---
fix: Don't clobber spans in trace waterfall when multiple spans have duplicate span ids

46
packages/app/src/components/DBTraceWaterfallChart.tsx
View file

@ -465,7 +465,8 @@ export function DBTraceWaterfallChartContainer({
);
}, [traceRowsData]);
const rootNodes: Node[] = [];
const nodesMap = new Map();
const nodesMap = new Map(); // Maps result.id (or placeholder id) -> Node
const spanIdMap = new Map(); // Maps SpanId -> result.id of FIRST node with that SpanId
for (const result of rows ?? []) {
const { type, SpanId, ParentSpanId } = result;
@ -480,11 +481,26 @@ export function DBTraceWaterfallChartContainer({
const curNode = {
...result,
children: [],
// In case we were created already previously, inherit the children built so far
...nodesMap.get(nodeSpanId),
};
if (type === SourceKind.Trace && !nodesMap.has(nodeSpanId)) {
nodesMap.set(nodeSpanId, curNode);
if (type === SourceKind.Trace) {
// Check if this is the first node with this SpanId
if (!spanIdMap.has(nodeSpanId)) {
// First occurrence - this becomes the canonical node for this SpanId
spanIdMap.set(nodeSpanId, result.id);
// Check if there's a placeholder parent waiting for this SpanId
const placeholderId = `placeholder-${nodeSpanId}`;
const placeholder = nodesMap.get(placeholderId);
if (placeholder) {
// Inherit children from placeholder
curNode.children = placeholder.children || [];
// Remove placeholder
nodesMap.delete(placeholderId);
}
}
// Always add to nodesMap with unique result.id
nodesMap.set(result.id, curNode);
}
// root if: is trace event, and (has no parent or parent id is not valid)
@ -495,11 +511,23 @@ export function DBTraceWaterfallChartContainer({
if (isRootNode) {
rootNodes.push(curNode);
} else {
const parentNode = nodesMap.get(nodeParentSpanId) ?? {
children: [],
};
// Look up parent by SpanId
const parentResultId = spanIdMap.get(nodeParentSpanId);
let parentNode = parentResultId
? nodesMap.get(parentResultId)
: undefined;
if (!parentNode) {
// Parent doesn't exist yet, create placeholder
const placeholderId = `placeholder-${nodeParentSpanId}`;
parentNode = nodesMap.get(placeholderId);
if (!parentNode) {
parentNode = { children: [] } as any;
nodesMap.set(placeholderId, parentNode);
}
}
parentNode.children.push(curNode);
nodesMap.set(nodeParentSpanId, parentNode);
}
}