public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v10.1.x] Tempo: Only get span_names when they are in the response (#72785)

Browse Source 
Tempo: Only get span_names when they are in the response (#72663)

* Only get span names when they are in the response

* Find span_name field/labels

(cherry picked from commit b4c55765fe)

Co-authored-by: Joey <90795735+joey-grafana@users.noreply.github.com>
This commit is contained in:
grafana-delivery-bot[bot]
2023-08-03 08:19:09 +01:00
committed by GitHub
co-authored by Joey
parent c30f9216b1
commit d7a65cb7ca
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/tempo/datasource.ts
+8 -5
View File
@@ -11,6 +11,7 @@ import {
DataSourceApi,
DataSourceInstanceSettings,
dateTime,
Field,
FieldType,
isValidGoDuration,
LoadingState,
@@ -650,14 +651,16 @@ function errorAndDurationQuery(
let durationsBySpanName: string[] = [];
let labels = [];
if (request.app === CoreApp.Explore) {
if (rateResponse.data[0][0]?.fields[1]?.values) {
labels = rateResponse.data[0][0]?.fields[1]?.values;
if (rateResponse.data[0][0] && request.app === CoreApp.Explore) {
const spanNameField = rateResponse.data[0][0].fields.find((field: Field) => field.name === 'span_name');
if (spanNameField && spanNameField.values) {
labels = spanNameField.values;
}
} else if (rateResponse.data[0]) {
rateResponse.data[0].map((df: DataFrame) => {
if (df.fields[1]?.labels && df.fields[1]?.labels['span_name']) {
labels.push(df.fields[1]?.labels['span_name']);
const spanNameLabels = df.fields.find((field: Field) => field.labels?.['span_name']);
if (spanNameLabels) {
labels.push(spanNameLabels.labels?.['span_name']);
}
});
}