Skip to content

Commit

Permalink
feat: support coorelate logs in trace windows
Browse files Browse the repository at this point in the history
- Support searching coorelate span log in trace windows

Ref: hdx-1181
  • Loading branch information
Liang yung huang authored and Liang yung huang committed Feb 11, 2025
1 parent ff66cc3 commit 7c2c758
Show file tree
Hide file tree
Showing 5 changed files with 313 additions and 183 deletions.
5 changes: 5 additions & 0 deletions .changeset/lemon-walls-collect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@hyperdx/common-utils": patch
---

add correlate log in trace waterfall chart
1 change: 1 addition & 0 deletions packages/app/src/TimelineChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ type Row = {
label: React.ReactNode;
events: TimelineEventT[];
style?: any;
type?: string;
className?: string;
};

Expand Down
17 changes: 13 additions & 4 deletions packages/app/src/components/DBTracePanel.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect, useState } from 'react';
import { parseAsJson, parseAsString, useQueryState } from 'nuqs';
import { useForm } from 'react-hook-form';
import { SourceKind } from '@hyperdx/common-utils/dist/types';
import {
ActionIcon,
Box,
Expand Down Expand Up @@ -56,7 +57,7 @@ export default function DBTracePanel({

const [traceRowWhere, setTraceRowWhere] = useQueryState(
'traceRowWhere',
parseAsString,
parseAsJson<{ id: string; type: string }>(),
);

const {
Expand Down Expand Up @@ -186,13 +187,14 @@ export default function DBTracePanel({
)}
<Divider my="sm" />
{sourceFormModalOpened && <TableSourceForm sourceId={watch('source')} />}
{traceSourceData?.kind === 'trace' && (
{traceSourceData?.kind === SourceKind.Trace && (
<DBTraceWaterfallChartContainer
traceTableModel={traceSourceData}
logTableModel={parentSourceData}
traceId={traceId}
dateRange={dateRange}
focusDate={focusDate}
highlightedRowWhere={traceRowWhere}
highlightedRowWhere={traceRowWhere?.id}
onClick={setTraceRowWhere}
/>
)}
Expand All @@ -202,7 +204,14 @@ export default function DBTracePanel({
<Text size="sm" c="dark.2" my="sm">
Span Details
</Text>
<RowDataPanel source={traceSourceData} rowId={traceRowWhere} />
<RowDataPanel
source={
traceRowWhere?.type === SourceKind.Log && parentSourceData
? parentSourceData
: traceSourceData
}
rowId={traceRowWhere?.id}
/>
</>
)}
{traceSourceData != null && !traceRowWhere && (
Expand Down
Loading

0 comments on commit 7c2c758

Please sign in to comment.