IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-21 16:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tempo: Fix query history (#89991)

Browse Source 
Fix query history for Tempo queries
This commit is contained in:
Joey 2024-07-03 13:55:33 +01:00 committed by GitHub
parent 306ae8b4f5
commit 7b29242600
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { groupBy, startCase } from 'lodash';
import { groupBy } from 'lodash';
import { EMPTY, from, lastValueFrom, merge, Observable, of } from 'rxjs';
import { catchError, concatMap, map, mergeMap, toArray } from 'rxjs/operators';
import semver from 'semver';
@ -738,17 +738,12 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
}
getQueryDisplayText(query: TempoQuery) {
if (query.queryType !== 'nativeSearch') {
if (query.queryType === 'traceql' || query.queryType === 'traceId') {
return query.query ?? '';
}
const keys: Array<
keyof Pick<TempoQuery, 'serviceName' | 'spanName' | 'search' | 'minDuration' | 'maxDuration' | 'limit'>
> = ['serviceName', 'spanName', 'search', 'minDuration', 'maxDuration', 'limit'];
return keys
.filter((key) => query[key])
.map((key) => `${startCase(key)}: ${query[key]}`)
.join(', ');
const appliedQuery = this.applyVariables(query, {});
return generateQueryFromFilters(appliedQuery.filters);
}
}