From 731c3e918daab329d184f83b5ad2fc0f7f6c472d Mon Sep 17 00:00:00 2001
From: Lukas Siatka <lukasz.siatka@grafana.com>
Date: Wed, 27 May 2020 15:44:41 +0200
Subject: [PATCH] Chore: fixes jaeger duration value in cascader option label -
 using milliseconds now instead of microseconds (#25129)

(cherry picked from commit 03a5e5348d150c7426e14897e3d9c58c60154637)
---
 public/app/plugins/datasource/jaeger/QueryField.test.tsx | 2 +-
 public/app/plugins/datasource/jaeger/QueryField.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/jaeger/QueryField.test.tsx b/public/app/plugins/datasource/jaeger/QueryField.test.tsx
index 944a13864ca..b5e00114a2e 100644
--- a/public/app/plugins/datasource/jaeger/QueryField.test.tsx
+++ b/public/app/plugins/datasource/jaeger/QueryField.test.tsx
@@ -67,7 +67,7 @@ describe('JaegerQueryField', function() {
 
     wrapper.update();
     expect(wrapper.find(ButtonCascader).props().options[0].children[1].children[0]).toEqual({
-      label: 'rootOp [99 ms]',
+      label: 'rootOp [0.099 ms]',
       value: '12345',
     });
   });
diff --git a/public/app/plugins/datasource/jaeger/QueryField.tsx b/public/app/plugins/datasource/jaeger/QueryField.tsx
index 75afee9ce29..6023fe63925 100644
--- a/public/app/plugins/datasource/jaeger/QueryField.tsx
+++ b/public/app/plugins/datasource/jaeger/QueryField.tsx
@@ -21,7 +21,7 @@ function findRootSpan(spans: Span[]): Span | undefined {
 function getLabelFromTrace(trace: TraceData & { spans: Span[] }): string {
   const rootSpan = findRootSpan(trace.spans);
   if (rootSpan) {
-    return `${rootSpan.operationName} [${rootSpan.duration} ms]`;
+    return `${rootSpan.operationName} [${rootSpan.duration / 1000} ms]`;
   }
   return trace.traceID;
 }