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: Escape regex-sensitive characters in span name before building promql query (#66301)

Browse Source 
* Tempo: escape regex-sensitive characters in span name before building promql query

* Make gen-cue

* Add type

* Add tests

* Test

* Minor update

---------

Co-authored-by: Joey Tawadrous <joey.tawadrous@grafana.com>
This commit is contained in:
gordeevnm 2023-05-11 17:21:26 +03:00 committed by GitHub
parent 37de4a825b
commit 8b1afb594d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import {
makeServiceGraphViewRequest, makeServiceGraphViewRequest,
makeTempoLink, makeTempoLink,
getFieldConfig, getFieldConfig,
getEscapedSpanNames,
} from './datasource'; } from './datasource';
import mockJson from './mockJsonResponse.json'; import mockJson from './mockJsonResponse.json';
import mockServiceGraph from './mockServiceGraph.json'; import mockServiceGraph from './mockServiceGraph.json';
@ -589,6 +590,20 @@ describe('Tempo service graph view', () => {
expect(builtQuery).toBe('sum(rate(traces_spanmetrics_calls_total{}[$__rate_interval]))'); expect(builtQuery).toBe('sum(rate(traces_spanmetrics_calls_total{}[$__rate_interval]))');
}); });
it('should escape span names correctly', () => {
const spanNames = [
'/actuator/health/**',
'$type + [test]|HTTP POST - post',
'server.cluster.local:9090^/sample.test(.*)?',
];
let escaped = getEscapedSpanNames(spanNames);
expect(escaped).toEqual([
'/actuator/health/\\\\*\\\\*',
'\\\\$type \\\\+ \\\\[test\\\\]\\\\|HTTP POST - post',
'server\\\\.cluster\\\\.local:9090\\\\^/sample\\\\.test\\\\(\\\\.\\\\*\\\\)\\\\?',
]);
});
it('should get field config correctly', () => { it('should get field config correctly', () => {
let datasourceUid = 's4Jvz8Qnk'; let datasourceUid = 's4Jvz8Qnk';
let tempoDatasourceUid = 'EbPO1fYnz'; let tempoDatasourceUid = 'EbPO1fYnz';

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

@ -597,7 +597,7 @@ function errorAndDurationQuery(
let serviceGraphViewMetrics = []; let serviceGraphViewMetrics = [];
let errorRateBySpanName = ''; let errorRateBySpanName = '';
let durationsBySpanName: string[] = []; let durationsBySpanName: string[] = [];
const spanNames = rateResponse.data[0][0]?.fields[1]?.values ?? []; const spanNames = getEscapedSpanNames(rateResponse.data[0][0]?.fields[1]?.values ?? []);
if (spanNames.length > 0) { if (spanNames.length > 0) {
errorRateBySpanName = buildExpr(errorRateMetric, 'span_name=~"' + spanNames.join('|') + '"', request); errorRateBySpanName = buildExpr(errorRateMetric, 'span_name=~"' + spanNames.join('|') + '"', request);
@ -663,6 +663,10 @@ function makePromLink(title: string, expr: string, datasourceUid: string, instan
}; };
} }
export function getEscapedSpanNames(values: string[]) {
return values.map((value: string) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\\\$&'));
}
export function getFieldConfig( export function getFieldConfig(
datasourceUid: string, datasourceUid: string,
tempoDatasourceUid: string, tempoDatasourceUid: string,