From 5b0061c85bedc73c06365dec609a0c3ca8ae06b6 Mon Sep 17 00:00:00 2001 From: Joe Farro Date: Thu, 11 Oct 2018 19:54:30 -0400 Subject: [PATCH 1/2] Use correct duration format for scatter plot Signed-off-by: Joe Farro --- .../src/components/SearchTracePage/SearchResults/ScatterPlot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.js b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.js index d8ebe65bb1..132cf6e7f2 100644 --- a/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.js +++ b/packages/jaeger-ui/src/components/SearchTracePage/SearchResults/ScatterPlot.js @@ -37,7 +37,7 @@ function ScatterPlotImpl(props) { height={200} > moment(t).format('hh:mm:ss a')} /> - formatDuration(t, 'milliseconds')} /> + formatDuration(t)} /> Date: Fri, 12 Oct 2018 12:34:01 -0400 Subject: [PATCH 2/2] Fix issue with unit test Signed-off-by: Joe Farro --- packages/jaeger-ui/src/api/jaeger.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jaeger-ui/src/api/jaeger.test.js b/packages/jaeger-ui/src/api/jaeger.test.js index 037774d6a6..9f0b060eb7 100644 --- a/packages/jaeger-ui/src/api/jaeger.test.js +++ b/packages/jaeger-ui/src/api/jaeger.test.js @@ -28,7 +28,7 @@ import fetchMock from 'isomorphic-fetch'; import traceGenerator from '../demo/trace-generators'; import JaegerAPI, { getMessageFromError } from './jaeger'; -const generatedTraces = traceGenerator.traces({ traces: 5 }); +const generatedTraces = traceGenerator.traces({ numberOfTraces: 5 }); it('fetchTrace() should fetch with the id', () => { fetchMock.mockClear();