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

Tempo: Fix undefined access to error message (#102771)

Browse Source 
Nullish check when getting error
This commit is contained in:
Andre Pereira
2025-03-25 11:53:38 +00:00
committed by GitHub
parent 0ffb7518cd
commit f73f88e0f3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/tempo/datasource.ts
+9 -9
View File
@@ -264,7 +264,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
this._request('/api/status/buildinfo').pipe(
map((response) => response),
catchError((error) => {
console.error('Failure in retrieving build information', error.data.message);
console.error('Failure in retrieving build information', error?.data?.message);
return of({ error, data: { version: null } }); // unknown version
})
)
@@ -468,7 +468,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
statusCode: err.status,
statusText: err.statusText,
});
return of({ error: { message: getErrorMessage(err.data.message) }, data: [] });
return of({ error: { message: getErrorMessage(err?.data?.message) }, data: [] });
})
)
);
@@ -658,7 +658,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
statusCode: err.status,
statusText: err.statusText,
});
return of({ error: { message: getErrorMessage(err.data.message) }, data: [] });
return of({ error: { message: getErrorMessage(err?.data?.message) }, data: [] });
})
);
}
@@ -696,11 +696,11 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
streaming: false,
latencyMs: Math.round(performance.now() - startTime), // rounded to nearest millisecond
query: query ?? '',
error: getErrorMessage(err.data.message),
error: getErrorMessage(err?.data?.message),
statusCode: err.status,
statusText: err.statusText,
});
return of({ error: { message: getErrorMessage(err.data.message) }, data: [] });
return of({ error: { message: getErrorMessage(err?.data?.message) }, data: [] });
})
);
}
@@ -733,7 +733,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
streaming: true,
latencyMs: Math.round(performance.now() - startTime), // rounded to nearest millisecond
query: query ?? '',
error: getErrorMessage(error.data.message),
error: getErrorMessage(error?.data?.message),
statusCode: error.status,
statusText: error.statusText,
});
@@ -778,7 +778,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
streaming: true,
latencyMs: Math.round(performance.now() - startTime), // rounded to nearest millisecond
query: query ?? '',
error: getErrorMessage(error.data.message),
error: getErrorMessage(error?.data?.message),
statusCode: error.status,
statusText: error.statusText,
});
@@ -850,7 +850,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
catchError((err) => {
return of({
status: 'error',
message: getErrorMessage(err.data.message, 'Unable to connect with Tempo'),
message: getErrorMessage(err?.data?.message, 'Unable to connect with Tempo'),
});
})
)
@@ -896,7 +896,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
catchError((err) => {
return of({
status: 'error',
message: getErrorMessage(err.data.message, 'Test for streaming failed, consider disabling streaming'),
message: getErrorMessage(err?.data?.message, 'Test for streaming failed, consider disabling streaming'),
});
})
)