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: Set APM table default span kind (#52851)

Browse Source 
* Add span kind server to query

* Updated test
This commit is contained in:
Joey Tawadrous 2022-07-27 15:48:09 +01:00 committed by GitHub
parent e2258120e7
commit dc0ef2913e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -487,7 +487,7 @@ describe('Tempo apm table', () => {
expect(builtQuery).toBe('sum(rate(traces_spanmetrics_calls_total{}[$__rate_interval]))'); expect(builtQuery).toBe('sum(rate(traces_spanmetrics_calls_total{}[$__rate_interval]))');
}); });
it('should build link expr correctly', () => { it('should get field config correctly', () => {
let datasourceUid = 's4Jvz8Qnk'; let datasourceUid = 's4Jvz8Qnk';
let tempoDatasourceUid = 'EbPO1fYnz'; let tempoDatasourceUid = 'EbPO1fYnz';
let targetField = '__data.fields.target'; let targetField = '__data.fields.target';
@ -694,12 +694,12 @@ const defaultSettings: DataSourceInstanceSettings<TempoJsonData> = {
}; };
const rateMetric = new MutableDataFrame({ const rateMetric = new MutableDataFrame({
refId: 'topk(5, sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name))', refId: 'topk(5, sum(rate(traces_spanmetrics_calls_total{span_kind="SPAN_KIND_SERVER"}[$__range])) by (span_name))',
fields: [ fields: [
{ name: 'Time', values: [1653725618609, 1653725618609] }, { name: 'Time', values: [1653725618609, 1653725618609] },
{ name: 'span_name', values: ['HTTP Client', 'HTTP GET - root'] }, { name: 'span_name', values: ['HTTP Client', 'HTTP GET - root'] },
{ {
name: 'Value #topk(5, sum(rate(traces_spanmetrics_calls_total{}[$__range])) by (span_name))', name: 'Value #topk(5, sum(rate(traces_spanmetrics_calls_total{span_kind="SPAN_KIND_SERVER"}[$__range])) by (span_name))',
values: [12.75164671814457, 12.121331111401608], values: [12.75164671814457, 12.121331111401608],
}, },
], ],

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

@ -43,6 +43,7 @@ import {
rateMetric, rateMetric,
durationMetric, durationMetric,
errorRateMetric, errorRateMetric,
defaultTableFilter,
} from './graphTransform'; } from './graphTransform';
import { import {
transformTrace, transformTrace,
@ -487,7 +488,7 @@ function rateQuery(
datasourceUid: string datasourceUid: string
) { ) {
const serviceMapRequest = makePromServiceMapRequest(request); const serviceMapRequest = makePromServiceMapRequest(request);
serviceMapRequest.targets = makeApmRequest([buildExpr(rateMetric, '', request)]); serviceMapRequest.targets = makeApmRequest([buildExpr(rateMetric, defaultTableFilter, request)]);
return queryPrometheus(serviceMapRequest, datasourceUid).pipe( return queryPrometheus(serviceMapRequest, datasourceUid).pipe(
toArray(), toArray(),
@ -660,7 +661,7 @@ function getApmTable(
) { ) {
let df: any = { fields: [] }; let df: any = { fields: [] };
const rate = rateResponse.data[0]?.filter((x: { refId: string }) => { const rate = rateResponse.data[0]?.filter((x: { refId: string }) => {
return x.refId === buildExpr(rateMetric, '', request); return x.refId === buildExpr(rateMetric, defaultTableFilter, request);
}); });
const errorRate = secondResponse.data.filter((x) => { const errorRate = secondResponse.data.filter((x) => {
return x.refId === errorRateBySpanName; return x.refId === errorRateBySpanName;

1
public/app/plugins/datasource/tempo/graphTransform.ts
View File

@ -148,6 +148,7 @@ export const durationMetric = {
expr: 'histogram_quantile(.9, sum(rate(traces_spanmetrics_latency_bucket{}[$__range])) by (le))', expr: 'histogram_quantile(.9, sum(rate(traces_spanmetrics_latency_bucket{}[$__range])) by (le))',
params: [], params: [],
}; };
export const defaultTableFilter = 'span_kind="SPAN_KIND_SERVER"';
export const serviceMapMetrics = [ export const serviceMapMetrics = [
secondsMetric, secondsMetric,