IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-10 23:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tempo: Fix start time column sorting when using search (#56635)

Browse Source
This commit is contained in:
Hamas Shafiq 2022-11-08 16:39:21 +00:00 committed by GitHub
parent 512584558f
commit 43a0afeac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/tempo/resultTransformer.test.ts
View File

@ -113,11 +113,8 @@ describe('createTableFrameFromSearch()', () => {
expect(frame.fields[1].name).toBe('traceName'); expect(frame.fields[1].name).toBe('traceName');
expect(frame.fields[1].values.get(0)).toBe('c10d7ca4e3a00354 '); 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].name).toBe('startTime');
expect(frame.fields[2].values.get(0)).toBe('15 minutes ago'); expect(frame.fields[2].values.get(0)).toBe('2022-01-28 03:00:28');
// expect time in format if startTime greater than 1 hour
expect(frame.fields[2].values.get(1)).toBe('2022-01-27 22:56:06'); expect(frame.fields[2].values.get(1)).toBe('2022-01-27 22:56:06');
expect(frame.fields[3].name).toBe('duration'); expect(frame.fields[3].name).toBe('duration');

7
public/app/plugins/datasource/tempo/resultTransformer.ts
View File

@ -611,13 +611,6 @@ function transformToTraceData(data: TraceSearchMetadata) {
let startTime = !isNaN(traceStartTime) ? dateTimeFormat(traceStartTime) : ''; 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 { return {
traceID: data.traceID, traceID: data.traceID,
startTime: startTime, startTime: startTime,