From d612947688ee7b95fbce90cff29a08bc110e9ce8 Mon Sep 17 00:00:00 2001 From: ricoberger Date: Thu, 29 Apr 2021 21:45:40 +0200 Subject: [PATCH] Visualize offset of spans in the Jaeger plugin We now visualize the offset of spans in the Jaeger plugin, by rendering a vertical line in the spans tree. --- CHANGELOG.md | 1 + app/src/plugins/jaeger/JaegerSpan.tsx | 35 ++++++++++++++++++-------- app/src/plugins/jaeger/JaegerSpans.tsx | 2 +- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ba077a3a..78e376a8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ NOTE: As semantic versioning states all 0.y.z releases can contain breaking chan - [#47](https://github.com/kobsio/kobs/pull/47): Display the legend at the Prometheus page as table and use color of selected metric in chart. - [#53](https://github.com/kobsio/kobs/pull/53): Improve Jaeger plugin, by allow filtering of services and operations and adding several actions for traces. - [#55](https://github.com/kobsio/kobs/pull/55): Allow a user to add a tag from a span as filter in the Jaeger plugin. +- [#57](https://github.com/kobsio/kobs/pull/57): Visualize the offset of spans in the Jaeger plugin. ## [v0.2.0](https://github.com/kobsio/kobs/releases/tag/v0.2.0) (2021-04-23) diff --git a/app/src/plugins/jaeger/JaegerSpan.tsx b/app/src/plugins/jaeger/JaegerSpan.tsx index 1d53ff0b5..5f93d59fb 100644 --- a/app/src/plugins/jaeger/JaegerSpan.tsx +++ b/app/src/plugins/jaeger/JaegerSpan.tsx @@ -8,19 +8,16 @@ import JaegerTag from 'plugins/jaeger/JaegerTag'; import 'plugins/jaeger/jaeger.css'; +const PADDING = 24; + export interface IJaegerSpanProps { name: string; span: ISpan; processes: IProcesses; - padding: number; + level: number; } -const JaegerSpan: React.FunctionComponent = ({ - name, - span, - processes, - padding, -}: IJaegerSpanProps) => { +const JaegerSpan: React.FunctionComponent = ({ name, span, processes, level }: IJaegerSpanProps) => { const [expanded, setExpanded] = useState(false); const time = ( @@ -47,13 +44,31 @@ const JaegerSpan: React.FunctionComponent = ({ ); + const treeOffset = []; + for (let index = 0; index < level; index++) { + if (index > 0) { + treeOffset.push( + , + ); + } + } + return ( + {treeOffset} setExpanded(!expanded)} isExpanded={expanded} > @@ -76,7 +91,7 @@ const JaegerSpan: React.FunctionComponent = ({ -
+
{processes[span.processID].tags.length > 0 ? (
Process: @@ -107,7 +122,7 @@ const JaegerSpan: React.FunctionComponent = ({ {span.childs ? span.childs.map((span, index) => ( - + )) : null} diff --git a/app/src/plugins/jaeger/JaegerSpans.tsx b/app/src/plugins/jaeger/JaegerSpans.tsx index 9fd8162b7..4c5ecf61d 100644 --- a/app/src/plugins/jaeger/JaegerSpans.tsx +++ b/app/src/plugins/jaeger/JaegerSpans.tsx @@ -38,7 +38,7 @@ const JaegerSpans: React.FunctionComponent = ({ name, trace } {spans.map((span, index) => ( - + ))}