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

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

Browse Source 
Revert "Tempo: Always use time range even if timeShiftEnabled is false (#85477)"

This reverts commit e91136338a.
This commit is contained in:
Joey 2024-05-21 10:03:31 +01:00 committed by GitHub
parent 6bf69d141e
commit a398188e69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 14 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]
);
expect(request.range.from.unix()).toBe(dateTime(new Date(2022, 8, 13, 16, 0, 0, 0)).unix());
expect(request.range.to.unix()).toBe(dateTime(new Date(2022, 8, 13, 16, 15, 0, 0)).unix());
expect(request.range.from.unix()).toBe(dateTime(0).unix());
expect(request.range.to.unix()).toBe(dateTime(0).unix());
});
});

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

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