Skip to content

Commit

Permalink
fix: the unknown blank height in spanTree
Browse files Browse the repository at this point in the history
  • Loading branch information
smbera authored and Jianhao Chen committed Jan 10, 2025
1 parent c106f1c commit 8c35934
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 12 deletions.
1 change: 0 additions & 1 deletion frontend/src/container/GantChart/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ function GanttChart(props: GanttChartProps): JSX.Element {
export interface ITraceMetaData {
globalEnd: number;
globalStart: number;
levels: number;
spread: number;
totalSpans: number;
}
Expand Down
1 change: 0 additions & 1 deletion frontend/src/container/Timeline/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ interface TimelineProps {
globalEnd: number;
spread: number;
totalSpans: number;
levels: number;
};
globalTraceMetadata: ITraceMetaData;
setIntervalUnit: Dispatch<SetStateAction<IIntervalUnit>>;
Expand Down
6 changes: 1 addition & 5 deletions frontend/src/container/TraceDetail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import SubTreeMessage from './SubTree';
import {
formUrlParams,
getSortedData,
getTreeLevelsCount,
IIntervalUnit,
INTERVAL_UNITS,
} from './utils';
Expand Down Expand Up @@ -179,10 +178,7 @@ function TraceDetail({ response }: TraceDetailProps): JSX.Element {
<TraceFlameGraph
key={tree.id}
treeData={tree}
traceMetaData={{
...traceMetaData,
levels: getTreeLevelsCount(tree),
}}
traceMetaData={traceMetaData}
hoveredSpanId={activeHoverId}
selectedSpanId={activeSelectedId}
onSpanHover={setActiveHoverId}
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/container/TraceFlameGraph/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint-disable react/no-unstable-nested-components */
import Color from 'color';
import { ITraceMetaData } from 'container/GantChart';
import { getTreeLevelsCount } from 'container/TraceDetail/utils';
import { useIsDarkMode } from 'hooks/useDarkMode';
import {
Dispatch,
Expand Down Expand Up @@ -102,13 +103,14 @@ function TraceFlameGraph(props: {
missingSpanTree: boolean;
}): JSX.Element {
const { treeData, traceMetaData, onSpanHover, missingSpanTree } = props;
const levels = useMemo(() => getTreeLevelsCount(treeData), [treeData]);

if (!treeData || treeData.id === 'empty' || !traceMetaData) {
return <div />;
}
const { onSpanSelect, hoveredSpanId, selectedSpanId } = props;

const { globalStart, spread, levels } = traceMetaData;
const { globalStart, spread } = traceMetaData;
function RenderSpanRecursive({
level = 0,
spanData,
Expand Down
4 changes: 0 additions & 4 deletions frontend/src/utils/getSpanTreeMetadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@ export const getSpanTreeMetadata = (
let globalStart = Number.POSITIVE_INFINITY;
let globalEnd = Number.NEGATIVE_INFINITY;
let totalSpans = 0;
let levels = 1;

const traverse = (treeNode: ITraceTree, level = 0): void => {
if (!treeNode) {
return;
}
totalSpans += 1;
levels = Math.max(levels, level);
const { startTime, value } = treeNode;
if (startTime !== null && value !== null) {
const endTime = startTime + value / 1e6;
Expand All @@ -45,7 +43,6 @@ export const getSpanTreeMetadata = (
globalEnd,
spread: globalEnd - globalStart,
totalSpans,
levels,
treesData,
};
};
Expand All @@ -55,6 +52,5 @@ interface GetSpanTreeMetaData {
globalEnd: number;
spread: number;
totalSpans: number;
levels: number;
treesData: ITraceForest;
}

0 comments on commit 8c35934

Please sign in to comment.