root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 243 Packages Projects Releases Wiki Activity

Tempo: Better fallbacks for metrics query (#83619) 

* Use query as fallback when there's one series and no labels. Use "" as the fallback for empty label values. Stop using the `promLabels` value from the Tempo response

* Set refId to remove mentions of promLabels

* Add quotes around the string value, add space after comma separator

* Use name as refId when possible
This commit is contained in:
Andre Pereira 2024-02-29 12:41:31 +00:00 committed by GitHub
parent 9f617191da
commit 036e19037e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -714,7 +714,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
}).pipe(
map((response) => {
return {
data: formatTraceQLMetrics(response.data),
data: formatTraceQLMetrics(queryValue, response.data),
};
}),
catchError((err) => {

32
public/app/plugins/datasource/tempo/resultTransformer.ts
View File

@ -633,21 +633,31 @@ function transformToTraceData(data: TraceSearchMetadata) {
}
const metricsValueToString = (value: ProtoValue): string => {
return '' + (value.stringValue || value.intValue || value.doubleValue || value.boolValue || '');
if (value.stringValue) {
return `"${value.stringValue}"`;
}
return '' + (value.intValue || value.doubleValue || value.boolValue || '""');
};
export function formatTraceQLMetrics(data: TraceqlMetricsResponse) {
const frames = data.series.map((series) => {
export function formatTraceQLMetrics(query: string, data: TraceqlMetricsResponse) {
const frames = data.series.map((series, index) => {
const labels: Labels = {};
series.labels.forEach((label) => {
series.labels?.forEach((label) => {
labels[label.key] = metricsValueToString(label.value);
});
const displayName =
series.labels.length === 1
? metricsValueToString(series.labels[0].value)
: `{${series.labels.map((label) => `${label.key}=${metricsValueToString(label.value)}`).join(',')}}`;
// If it's a single series, use the query as the displayName fallback
let name = data.series.length === 1 ? query : '';
if (series.labels) {
if (series.labels.length === 1) {
// For single label series, use the label value as the displayName to improve readability
name = metricsValueToString(series.labels[0].value);
} else {
// otherwise build a string using the label keys and values
name = `{${series.labels.map((label) => `${label.key}=${metricsValueToString(label.value)}`).join(', ')}}`;
}
}
return createDataFrame({
refId: series.promLabels,
refId: name || `A${index}`,
fields: [
{
name: 'time',
@ -655,12 +665,12 @@ export function formatTraceQLMetrics(data: TraceqlMetricsResponse) {
values: series.samples.map((sample) => parseInt(sample.timestampMs, 10)),
},
{
name: series.promLabels,
name: name,
labels,
type: FieldType.number,
values: series.samples.map((sample) => sample.value),
config: {
displayNameFromDS: displayName,
displayNameFromDS: name,
},
},
],