Skip to content
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

feat: add correlate span logs in traces waterfall chart #605

Open
wants to merge 3 commits into
base: v2
Choose a base branch
from
+300 −192
Open

feat: add correlate span logs in traces waterfall chart #605

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c2c758
feat: support coorelate logs in trace windows
Feb 10, 2025
a868d77
support trace tab and update depend on comment
Feb 13, 2025
e02a2ed
revert schema change
Feb 13, 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
5 changes: 5 additions & 0 deletions .changeset/lemon-walls-collect.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not a huge fan of overloading this query param, esp if the rowWhere is for a log but put in the "traceRowWhere" - the naming wouldn't make sense.

I think it might be better to introduce another query param for logRowWhere? We could rename this query param but it'd technically be a breaking change (technically this schema change is already a breaking change, URLs are supposed to be stable in our app).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I agree with you we should not overload traceRowWhere, it should only return trace relate param, however I think it is a little too overcomplicate to make two queryState for returning focus param.

I think I will change the name to spanRowWhere, it makes more sense since span can be log or trace.

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should reflect the correct event type name

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure which part you mean, do you mean Span Details?

</Text>
<RowDataPanel source={traceSourceData} rowId={traceRowWhere} />
<RowDataPanel
source={
traceRowWhere?.type === SourceKind.Log && parentSourceData
? parentSourceData
LYHuang marked this conversation as resolved.
Show resolved Hide resolved
: traceSourceData
}
rowId={traceRowWhere?.id}
/>
</>
)}
{traceSourceData != null && !traceRowWhere && (
Expand Down
Loading
Loading