From ff5a56d1e077cf36a636be91f165c172d700e24b Mon Sep 17 00:00:00 2001 From: Joe Farro Date: Sat, 3 Aug 2019 22:44:29 -0400 Subject: [PATCH] Show seconds in trace start time, re PR #403 Signed-off-by: Joe Farro --- .../TracePage/TracePageHeader/TracePageHeader.css | 8 ++++++++ .../TracePage/TracePageHeader/TracePageHeader.tsx | 13 ++++++++++++- packages/jaeger-ui/src/utils/date.tsx | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.css b/packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.css index 1450ba471c..338ca8110f 100644 --- a/packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.css +++ b/packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.css @@ -96,6 +96,14 @@ limitations under the License. padding: 0.25rem 0.5rem; } +.TracePageHeader--overviewItem--valueDetail { + color: #aaa; +} + +.TracePageHeader--overviewItem--value:hover > .TracePageHeader--overviewItem--valueDetail { + color: unset; +} + .TracePageHeader--archiveIcon { font-size: 1.78em; margin-right: 0.15em; diff --git a/packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.tsx b/packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.tsx index b0c72d8af9..ec4e9f2611 100644 --- a/packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.tsx +++ b/packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.tsx @@ -68,7 +68,18 @@ export const HEADER_ITEMS = [ { key: 'timestamp', label: 'Trace Start', - renderer: (trace: Trace) => formatDatetime(trace.startTime), + renderer: (trace: Trace) => { + const dateStr = formatDatetime(trace.startTime); + const match = dateStr.match(/^(.+)(:\d\d\.\d+)$/); + return match ? ( + + {match[1]} + {match[2]} + + ) : ( + dateStr + ); + }, }, { key: 'duration', diff --git a/packages/jaeger-ui/src/utils/date.tsx b/packages/jaeger-ui/src/utils/date.tsx index 0a98a69436..61c0142722 100644 --- a/packages/jaeger-ui/src/utils/date.tsx +++ b/packages/jaeger-ui/src/utils/date.tsx @@ -22,7 +22,7 @@ const YESTERDAY = 'Yesterday'; export const STANDARD_DATE_FORMAT = 'YYYY-MM-DD'; export const STANDARD_TIME_FORMAT = 'HH:mm'; -export const STANDARD_DATETIME_FORMAT = 'LLL'; +export const STANDARD_DATETIME_FORMAT = 'MMMM D YYYY, HH:mm:ss.SSS'; export const ONE_MILLISECOND = 1000; export const ONE_SECOND = 1000 * ONE_MILLISECOND; export const DEFAULT_MS_PRECISION = Math.log10(ONE_MILLISECOND);