From f73f88e0f32de21550cdb4c9d7fa2a6fd111a64e Mon Sep 17 00:00:00 2001
From: Andre Pereira <adrapereira@gmail.com>
Date: Tue, 25 Mar 2025 11:53:38 +0000
Subject: [PATCH] Tempo: Fix undefined access to error message (#102771)

Nullish check when getting error
---
 .../app/plugins/datasource/tempo/datasource.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts
index 5b91b5f25e9..a0da5493bd5 100644
--- a/public/app/plugins/datasource/tempo/datasource.ts
+++ b/public/app/plugins/datasource/tempo/datasource.ts
@@ -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'),
             });
           })
         )