From 43a0afeac4fccfb12b2e87914dbedd2aa148b5ec Mon Sep 17 00:00:00 2001 From: Hamas Shafiq Date: Tue, 8 Nov 2022 16:39:21 +0000 Subject: [PATCH] Tempo: Fix start time column sorting when using search (#56635) --- .../app/plugins/datasource/tempo/resultTransformer.test.ts | 5 +---- public/app/plugins/datasource/tempo/resultTransformer.ts | 7 ------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/public/app/plugins/datasource/tempo/resultTransformer.test.ts b/public/app/plugins/datasource/tempo/resultTransformer.test.ts index 9893f50bc93..007e928bf19 100644 --- a/public/app/plugins/datasource/tempo/resultTransformer.test.ts +++ b/public/app/plugins/datasource/tempo/resultTransformer.test.ts @@ -113,11 +113,8 @@ describe('createTableFrameFromSearch()', () => { expect(frame.fields[1].name).toBe('traceName'); expect(frame.fields[1].values.get(0)).toBe('c10d7ca4e3a00354 '); - // expect time in ago format if startTime less than 1 hour expect(frame.fields[2].name).toBe('startTime'); - expect(frame.fields[2].values.get(0)).toBe('15 minutes ago'); - - // expect time in format if startTime greater than 1 hour + expect(frame.fields[2].values.get(0)).toBe('2022-01-28 03:00:28'); expect(frame.fields[2].values.get(1)).toBe('2022-01-27 22:56:06'); expect(frame.fields[3].name).toBe('duration'); diff --git a/public/app/plugins/datasource/tempo/resultTransformer.ts b/public/app/plugins/datasource/tempo/resultTransformer.ts index 3c96d574bb2..37e9d324f91 100644 --- a/public/app/plugins/datasource/tempo/resultTransformer.ts +++ b/public/app/plugins/datasource/tempo/resultTransformer.ts @@ -611,13 +611,6 @@ function transformToTraceData(data: TraceSearchMetadata) { let startTime = !isNaN(traceStartTime) ? dateTimeFormat(traceStartTime) : ''; - if (Math.abs(differenceInHours(new Date(traceStartTime), Date.now())) <= 1) { - startTime = formatDistance(new Date(traceStartTime), Date.now(), { - addSuffix: true, - includeSeconds: true, - }); - } - return { traceID: data.traceID, startTime: startTime,