Process FOLLOWS_FROM spans in TraceView (jaegertracing#335)

* Process FOLLOWS_FROM spans in TraceView Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com> * Add test for FOLLOWS_FROM span relation for SpanTreeOffset Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
everett980 · Mar 7, 2019 · c5034fa · c5034fa
1 parent df9bafd
commit c5034fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.js
@@ -56,7 +56,6 @@ export class UnconnectedSpanTreeOffset extends React.PureComponent<SpanTreeOffse
     super(props);
 
     this.ancestorIds = spanAncestorIds(props.span);
-
     // Some traces have multiple root-level spans, this connects them all under one guideline and adds the
     // necessary padding for the collapse icon on root-level spans.
     this.ancestorIds.push('root');

diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.test.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/SpanTreeOffset.test.js
@@ -31,7 +31,8 @@ describe('SpanTreeOffset', () => {
   let wrapper;
 
   beforeEach(() => {
-    spanAncestorIdsSpy.mockReturnValue([parentSpanID, rootSpanID]);
+    // Mock implementation instead of Mock return value so that each call returns a new array (like normal)
+    spanAncestorIdsSpy.mockImplementation(() => [parentSpanID, rootSpanID]);
     props = {
       addHoverIndentGuideId: jest.fn(),
       hoverIndentGuideIds: new Set(),