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

Tempo: Always use time range even if timeShiftEnabled is false (#85477)

Browse Source 
* Tempo: Always use time range even if timeShiftEnabled is false

* Fix unused import and failing test
This commit is contained in:
Olivier Giniaux 2024-05-20 10:28:07 +02:00 committed by GitHub
parent fe991a9a7b
commit e91136338a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/tempo/datasource.test.ts
View File

@ -434,8 +434,8 @@ describe('Tempo data source', () => {
[{ refId: 'refid1', queryType: 'traceql', query: '' } as TempoQuery] [{ refId: 'refid1', queryType: 'traceql', query: '' } as TempoQuery]
); );
expect(request.range.from.unix()).toBe(dateTime(0).unix()); expect(request.range.from.unix()).toBe(dateTime(new Date(2022, 8, 13, 16, 0, 0, 0)).unix());
expect(request.range.to.unix()).toBe(dateTime(0).unix()); expect(request.range.to.unix()).toBe(dateTime(new Date(2022, 8, 13, 16, 15, 0, 0)).unix());
}); });
}); });

25
public/app/plugins/datasource/tempo/datasource.ts
View File

@ -12,7 +12,6 @@ import {
DataQueryResponseData, DataQueryResponseData,
DataSourceGetTagValuesOptions, DataSourceGetTagValuesOptions,
DataSourceInstanceSettings, DataSourceInstanceSettings,
dateTime,
FieldType, FieldType,
LoadingState, LoadingState,
rangeUtil, rangeUtil,
@ -666,18 +665,18 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
targets, targets,
}; };
if (this.traceQuery?.timeShiftEnabled) { request.range = options.range && {
request.range = options.range && { ...options.range,
...options.range, from: this.traceQuery?.timeShiftEnabled
from: options.range.from.subtract( ? options.range.from.subtract(
rangeUtil.intervalToMs(this.traceQuery?.spanStartTimeShift || '30m'), rangeUtil.intervalToMs(this.traceQuery?.spanStartTimeShift || '30m'),
'milliseconds' 'milliseconds'
), )
to: options.range.to.add(rangeUtil.intervalToMs(this.traceQuery?.spanEndTimeShift || '30m'), 'milliseconds'), : options.range.from,
}; to: this.traceQuery?.timeShiftEnabled
} else { ? options.range.to.add(rangeUtil.intervalToMs(this.traceQuery?.spanEndTimeShift || '30m'), 'milliseconds')
request.range = { from: dateTime(0), to: dateTime(0), raw: { from: dateTime(0), to: dateTime(0) } }; : options.range.to,
} };
return request; return request;
} }