grafana improvement

radicalbit · Aug 9, 2024 · a1180b4 · a1180b4
1 parent a38ae7c
commit a1180b4
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 13 deletions.
diff --git a/ui/src/api/utils.js b/ui/src/api/utils.js
@@ -1,3 +1,4 @@
+import { grafanaTracking } from '@Src/main';
 import axios from 'axios';
 
 export const customBaseQuery = () => async ({
@@ -23,6 +24,7 @@ export const customBaseQuery = () => async ({
     return { data: result.data };
   } catch (axiosError) {
     const err = axiosError;
+    grafanaTracking?.api.pushError(axiosError);
 
     return {
       error: { status: err.response?.status, data: err.response?.data },

diff --git a/ui/src/components/modals/add-new-model/step-four/form-fields.jsx b/ui/src/components/modals/add-new-model/step-four/form-fields.jsx
@@ -4,6 +4,7 @@ import {
   Select,
   Tooltip,
 } from '@radicalbit/radicalbit-design-system';
+import { grafanaTracking } from '@Src/main';
 import { useModalContext } from '../modal-context-provider';
 
 function Target() {
@@ -28,6 +29,7 @@ function Target() {
       write('target', JSON.parse(val));
     } catch (e) {
       console.error('Error in parsing Select.Option value: ', e);
+      grafanaTracking?.api.pushError(e);
     }
   };
 
@@ -124,6 +126,7 @@ function Timestamp() {
       write('timestamp', JSON.parse(val));
     } catch (e) {
       console.error('Error in parsing Select.Option value: ', e);
+      grafanaTracking?.api.pushError(e);
     }
   };
 
@@ -220,6 +223,7 @@ function Prediction() {
       write('prediction', JSON.parse(val));
     } catch (e) {
       console.error('Error in parsing Select.Option value: ', e);
+      grafanaTracking?.api.pushError(e);
     }
   };
 
@@ -319,6 +323,7 @@ function Probability() {
       write('predictionProba', JSON.parse(val));
     } catch (e) {
       console.error('Error in parsing Select.Option value: ', e);
+      grafanaTracking?.api.pushError(e);
     }
   };
 

diff --git a/ui/src/components/modals/add-new-model/step-two/use-handle-on-next.js b/ui/src/components/modals/add-new-model/step-two/use-handle-on-next.js
@@ -1,5 +1,6 @@
 import { modelsApiSlice } from '@State/models/api';
 import { useCallback } from 'react';
+import { grafanaTracking } from '@Src/main';
 import { useModalContext } from '../modal-context-provider';
 
 const { useInferSchemaMutation } = modelsApiSlice;
@@ -66,6 +67,7 @@ export default () => {
       } catch (e) {
         const parsedErrorMessage = parseErrorMessage(e);
         console.error(e);
+        grafanaTracking?.api.pushError(e);
 
         setError('silent.backend', parsedErrorMessage);
         write('file', { ...form.file, status: 'error', response: parsedErrorMessage });

diff --git a/ui/src/helpers/queryParams.js b/ui/src/helpers/queryParams.js
@@ -1,3 +1,5 @@
+import { grafanaTracking } from '@Src/main';
+
 const qs = (param) => new URLSearchParams(window.location.search).get(param);
 
 const qsContextConfiguration = () => {
@@ -26,6 +28,7 @@ const qsEncode64JSON = (search, param) => {
     return JSON.parse(qsAtob);
   } catch (e) {
     console.warn('Error in parsing qsEncode64JSON: ', e);
+    grafanaTracking?.api.pushError(e);
     return {};
   }
 };

diff --git a/ui/src/main.jsx b/ui/src/main.jsx
@@ -9,7 +9,28 @@ import App from './container/app';
 import { modelsRoutes } from './container/models/routes';
 import { store } from './store/configureStore';
 
+const getGrafanaTracking = (enableGrafanaTracking) => {
+  let tracking;
+
+  if (enableGrafanaTracking === 'true') {
+    if (tracking === undefined) {
+      tracking = initializeFaro({
+        url: 'https://telemetry.oss.radicalbit.ai',
+        apiKey: 'rbitoss-JpIYMVC677edETUbJN9Me3iLS7ngGaE2RYLzQWCOYVljUJh5JJk5o2FE',
+        app: { name: 'radicalbit-ai-monitoring' },
+        sessionTracking: {
+          enabled: true,
+          persistent: true,
+          maxSessionPersistenceTime: 31540000000, // 1 year
+        },
+      });
+    }
+  }
+  return tracking;
+};
+
 const enableGrafanaTracking = getCookieConsentValue('rbit-tracking');
+export const grafanaTracking = getGrafanaTracking(enableGrafanaTracking);
 
 const router = createBrowserRouter([
   {
@@ -22,19 +43,6 @@ const router = createBrowserRouter([
   },
 ]);
 
-if (enableGrafanaTracking === 'true') {
-  initializeFaro({
-    // required: the URL of the Grafana collector
-    url: 'https://telemetry.oss.radicalbit.ai',
-    apiKey: 'rbitoss-JpIYMVC677edETUbJN9Me3iLS7ngGaE2RYLzQWCOYVljUJh5JJk5o2FE',
-
-    // required: the identification label of your application
-    app: {
-      name: 'radicalbit-ai-monitoring',
-    },
-  });
-}
-
 const browserRouter = (enableGrafanaTracking === 'true') ? withFaroRouterInstrumentation(router) : router;
 
 ReactDOM.createRoot(document.getElementById('root')).render(

diff --git a/ui/src/store/state/context-configuration/thunks.js b/ui/src/store/state/context-configuration/thunks.js
@@ -3,6 +3,7 @@ import { qsSetEncode64JSON } from '@Helpers/queryParams';
 import { actions as notificationActions } from '@State/notification';
 import { createAsyncThunk } from '@reduxjs/toolkit';
 import { isEqual } from 'lodash';
+import { grafanaTracking } from '@Src/main';
 import contextConfigurationSelectors from './selectors';
 
 const { selectContextConfiguration } = contextConfigurationSelectors;
@@ -42,6 +43,7 @@ const changeContextConfiguration = createAsyncThunk(
       return fulfillWithValue(newConfiguration);
     } catch (e) {
       console.error(e);
+      grafanaTracking?.api.pushError(e);
       const notificationMessage = notificationErrorJson(e);
       dispatch(setNotificationMessage(notificationMessage));