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 data source: Fix service map query error when a duration data frame has no data (#76269)

Browse Source 
* fix tempo service graph req when data frame is empty

* also report error to Faro
This commit is contained in:
Domas
2023-10-10 17:57:05 +03:00
committed by GitHub
parent 810fbc3327
commit b75b747881
3 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/query/state/runRequest.ts
View File

@@ -18,7 +18,7 @@ import {
PanelData,
TimeRange,
} from '@grafana/data';
import { config, toDataQueryError } from '@grafana/runtime';
import { config, toDataQueryError, logError } from '@grafana/runtime';
import { isExpressionReference } from '@grafana/runtime/src/utils/DataSourceWithBackend';
import { backendSrv } from 'app/core/services/backend_srv';
import { queryIsEmpty } from 'app/core/utils/query';
@@ -156,8 +156,8 @@ export function runRequest(
}),
// handle errors
catchError((err) => {
const errLog = typeof err === 'string' ? err : JSON.stringify(err);
console.error('runRequest.catchError', errLog);
console.error('runRequest.catchError', err);
logError(err);
return of({
...state.panelData,
state: LoadingState.Error,

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

@@ -987,7 +987,15 @@ const backendSrvWithPrometheus = {
return {
query() {
return of({
data: [rateMetric, errorRateMetric, durationMetric, totalsPromMetric, secondsPromMetric, failedPromMetric],
data: [
rateMetric,
errorRateMetric,
durationMetric,
emptyDurationMetric,
totalsPromMetric,
secondsPromMetric,
failedPromMetric,
],
});
},
};
@@ -1079,6 +1087,12 @@ const durationMetric = createDataFrame({
],
});
const emptyDurationMetric = createDataFrame({
refId:
'histogram_quantile(.9, sum(rate(traces_spanmetrics_latency_bucket{span_name=~"HTTP GET - root"}[$__range])) by (le))',
fields: [],
});
const totalsPromMetric = createDataFrame({
refId: 'traces_service_graph_request_total',
fields: [

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

@@ -1187,30 +1187,33 @@ function getServiceGraphView(
});
}
if (duration.length > 0 && duration[0].fields?.length > 1) {
if (duration.length > 0) {
let durationObj: any = {};
duration.map((d) => {
const delimiter = d.refId?.includes('span_name=~"') ? 'span_name=~"' : 'span_name="';
const name = d.refId?.split(delimiter)[1].split('"}')[0];
durationObj[name] = { value: d.fields[1].values[0] };
});
df.fields.push({
...duration[0].fields[1],
name: 'Duration (p90)',
values: getRateAlignedValues({ ...rate }, durationObj),
config: {
links: [
makePromLink(
'Duration',
buildLinkExpr(buildExpr(durationMetric, 'span_name="${__data.fields[0]}"', request)),
datasourceUid,
false
),
],
unit: 's',
},
duration.forEach((d) => {
if (d.fields.length > 1) {
const delimiter = d.refId?.includes('span_name=~"') ? 'span_name=~"' : 'span_name="';
const name = d.refId?.split(delimiter)[1].split('"}')[0];
durationObj[name] = { value: d.fields[1].values[0] };
}
});
if (Object.keys(durationObj).length > 0) {
df.fields.push({
...duration[0].fields[1],
name: 'Duration (p90)',
values: getRateAlignedValues({ ...rate }, durationObj),
config: {
links: [
makePromLink(
'Duration',
buildLinkExpr(buildExpr(durationMetric, 'span_name="${__data.fields[0]}"', request)),
datasourceUid,
false
),
],
unit: 's',
},
});
}
}
if (df.fields.length > 0 && df.fields[0].values) {