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

Fix: Explore Traces metrics queries in Safari (#98080)

Browse Source 
Fix explore traces in safari
This commit is contained in:
Joey 2024-12-17 14:54:25 +00:00 committed by GitHub
parent 8b8606326a
commit 03fcfd4e0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
grafana_version: config.buildInfo.version, grafana_version: config.buildInfo.version,
query: queryValue ?? '', query: queryValue ?? '',
}); });
subQueries.push(this.handleTraceQlMetricsQuery(options)); subQueries.push(this.handleTraceQlMetricsQuery(options, targets.traceql));
} else { } else {
reportInteraction('grafana_traces_traceql_queried', { reportInteraction('grafana_traces_traceql_queried', {
datasourceType: 'tempo', datasourceType: 'tempo',
@ -588,8 +588,11 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
} }
}; };
handleTraceQlMetricsQuery = (options: DataQueryRequest<TempoQuery>): Observable<DataQueryResponse> => { handleTraceQlMetricsQuery(
const validTargets = options.targets options: DataQueryRequest<TempoQuery>,
targets: TempoQuery[]
): Observable<DataQueryResponse> {
const validTargets = targets
.filter((t) => t.query) .filter((t) => t.query)
.map( .map(
(t): TempoQuery => ({ ...t, query: this.applyVariables(t, options.scopedVars).query, queryType: 'traceql' }) (t): TempoQuery => ({ ...t, query: this.applyVariables(t, options.scopedVars).query, queryType: 'traceql' })
@ -607,7 +610,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
return of({ error: { message: getErrorMessage(err.data.message) }, data: [] }); return of({ error: { message: getErrorMessage(err.data.message) }, data: [] });
}) })
); );
}; }
handleMetricsSummaryQuery = (target: TempoQuery, query: string, options: DataQueryRequest<TempoQuery>) => { handleMetricsSummaryQuery = (target: TempoQuery, query: string, options: DataQueryRequest<TempoQuery>) => {
reportInteraction('grafana_traces_metrics_summary_queried', { reportInteraction('grafana_traces_metrics_summary_queried', {