[v9.3.x] Traces: Fix for multiple $__tags in trace to metrics (#60294)

Traces: Fix for multiple $__tags in trace to metrics (#59641)

* Fix interpolation of multiple  in query

* Add another  to test case

(cherry picked from commit bf8814749e)

Co-authored-by: Joey Tawadrous <90795735+joey-grafana@users.noreply.github.com>
This commit is contained in:
Grot (@grafanabot)
2022-12-14 10:40:18 +00:00
committed by GitHub
co-authored by Joey Tawadrous
parent b884c106e9
commit 21c1d14e91
2 changed files with 3 additions and 3 deletions
@@ -512,7 +512,7 @@ describe('createSpanLinkFactory', () => {
splitOpenFn,
traceToMetricsOptions: {
datasourceUid: 'prom1Uid',
queries: [{ name: 'Named Query', query: 'metric{$__tags}[5m]' }],
queries: [{ name: 'Named Query', query: 'metric{$__tags, $__tags}[5m]' }],
tags: [
{ key: 'job', value: '' },
{ key: 'k8s.pod', value: 'pod' },
@@ -535,7 +535,7 @@ describe('createSpanLinkFactory', () => {
expect(links).toBeDefined();
expect(links!.metricLinks![0]!.href).toBe(
`/explore?left=${encodeURIComponent(
'{"range":{"from":"2020-10-14T01:00:00.000Z","to":"2020-10-14T01:00:01.000Z"},"datasource":"prom1Uid","queries":[{"expr":"metric{job=\\"tns/app\\", pod=\\"sample-pod\\"}[5m]","refId":"A"}],"panelsState":{}}'
'{"range":{"from":"2020-10-14T01:00:00.000Z","to":"2020-10-14T01:00:01.000Z"},"datasource":"prom1Uid","queries":[{"expr":"metric{job=\\"tns/app\\", pod=\\"sample-pod\\", job=\\"tns/app\\", pod=\\"sample-pod\\"}[5m]","refId":"A"}],"panelsState":{}}'
)}`
);
});
@@ -455,7 +455,7 @@ function buildMetricsQuery(query: TraceToMetricQuery, tags: Array<KeyValue<strin
}, [] as string[]);
const labelsQuery = labels?.join(', ');
expr = expr.replace('$__tags', labelsQuery);
expr = expr.replace(/\$__tags/g, labelsQuery);
}
return expr;