Send provider data to telemetry only if databaseId present

Author: kchepikava

redisinsight/ui/src/constants/telemetry.ts

@@ -1,18 +1,4 @@
-import { TelemetryEvent, TelemetryPageView } from 'uiSrc/telemetry'
-
 export enum ReleaseNotesSource {
   helpCenter = 'Help Center',
   updateNotification = 'Update notification'
 }
-
-export const eventsWithExcludedProvider: string[] = [
-  TelemetryPageView.DATABASES_LIST_PAGE,
-  TelemetryPageView.SETTINGS_PAGE,
-  TelemetryEvent.NOTIFICATIONS_HISTORY_OPENED,
-  TelemetryEvent.CONFIG_DATABASES_DATABASE_LIST_SEARCHED,
-  TelemetryEvent.INSIGHTS_PANEL_OPENED,
-  TelemetryEvent.INSIGHTS_PANEL_CLOSED,
-  TelemetryEvent.INSIGHTS_PANEL_TAB_CHANGED,
-  TelemetryEvent.CONFIG_DATABASES_REDIS_IMPORT_CLICKED,
-  TelemetryEvent.CONFIG_DATABASES_CLICKED
-]

redisinsight/ui/src/pages/rdi/pipeline-management/pages/config/Config.spec.tsx

@@ -64,6 +64,9 @@ describe('Config', () => {
 
     expect(sendPageViewTelemetry).toBeCalledWith({
       name: TelemetryPageView.RDI_CONFIG,
+      eventData: {
+        rdiInstanceId: 'rdiInstanceId',
+      }
     })
   })
 

redisinsight/ui/src/pages/rdi/pipeline-management/pages/config/Config.tsx

@@ -38,6 +38,9 @@ const Config = () => {
   useEffect(() => {
     sendPageViewTelemetry({
       name: TelemetryPageView.RDI_CONFIG,
+      eventData: {
+        rdiInstanceId
+      }
     })
 
     return () => {

redisinsight/ui/src/pages/rdi/pipeline-management/pages/job/JobWrapper.tsx

@@ -40,6 +40,9 @@ const JobWrapper = () => {
   useEffect(() => {
     sendPageViewTelemetry({
       name: TelemetryPageView.RDI_JOBS,
+      eventData: {
+        rdiInstanceId
+      }
     })
   }, [])
 

redisinsight/ui/src/pages/rdi/pipeline-management/pages/job/JobsWrapper.spec.tsx

@@ -56,6 +56,9 @@ describe('JobWrapper', () => {
 
     expect(sendPageViewTelemetry).toBeCalledWith({
       name: TelemetryPageView.RDI_JOBS,
+      eventData: {
+        rdiInstanceId: 'rdiInstanceId',
+      }
     })
   })
 

redisinsight/ui/src/pages/rdi/statistics/StatisticsPage.spec.tsx

@@ -140,7 +140,10 @@ describe('StatisticsPage', () => {
     render(<StatisticsPage />)
 
     expect(sendPageViewTelemetry).toBeCalledWith({
-      name: TelemetryPageView.RDI_STATUS
+      name: TelemetryPageView.RDI_STATUS,
+      eventData: {
+        rdiInstanceId: 'rdiInstanceId',
+      }
     })
   })
 

redisinsight/ui/src/pages/rdi/statistics/StatisticsPage.tsx

@@ -70,7 +70,10 @@ const StatisticsPage = () => {
     dispatch(fetchRdiStatistics(rdiInstanceId))
 
     sendPageViewTelemetry({
-      name: TelemetryPageView.RDI_STATUS
+      name: TelemetryPageView.RDI_STATUS,
+      eventData: {
+        rdiInstanceId
+      }
     })
   }, [])
 

redisinsight/ui/src/telemetry/interfaces.ts

@@ -8,6 +8,7 @@ export interface ITelemetryIdentify {
 
 export type EventData = {
   [key: string]: any
+  databaseId?: string
   provider?: string
 }
 

redisinsight/ui/src/telemetry/telemetryUtils.ts

@@ -11,7 +11,6 @@ import { KeyViewType } from 'uiSrc/slices/interfaces/keys'
 import { IModuleSummary, ITelemetrySendEvent, ITelemetrySendPageView, RedisModulesKeyType } from 'uiSrc/telemetry/interfaces'
 import { apiService } from 'uiSrc/services'
 import { store } from 'uiSrc/slices/store'
-import { eventsWithExcludedProvider } from 'uiSrc/constants/telemetry'
 import { AdditionalRedisModule } from 'apiSrc/modules/database/models/additional.redis.module'
 import {
   IRedisModulesSummary,
@@ -21,7 +20,10 @@ import {
 import { TelemetryEvent } from './events'
 import { checkIsAnalyticsGranted } from './checkAnalytics'
 
-export const getProvider = (): Maybe<string> => get(store.getState(), 'connections.instances.connectedInstance.provider')
+export const getProvider = (dbId: string): Maybe<string> => {
+  const instance = get(store.getState(), 'connections.instances.connectedInstance')
+  return (instance.id === dbId) ? instance.provider : undefined
+}
 
 const TELEMETRY_EMPTY_VALUE = 'none'
 
@@ -32,8 +34,8 @@ const sendEventTelemetry = async ({ event, eventData = {}, traits = {} }: ITelem
       return
     }
 
-    if (!eventData.provider && !eventsWithExcludedProvider.includes(event)) {
-      eventData.provider = getProvider()
+    if (!eventData.provider && eventData.databaseId) {
+      eventData.provider = getProvider(eventData.databaseId)
     }
     await apiService.post(`${ApiEndpoints.ANALYTICS_SEND_EVENT}`,
       { event, eventData, traits })
@@ -42,16 +44,17 @@ const sendEventTelemetry = async ({ event, eventData = {}, traits = {} }: ITelem
   }
 }
 
-const sendPageViewTelemetry = async ({ name, eventData = {} }: ITelemetrySendPageView) => {
+const sendPageViewTelemetry = async ({ name, databaseId, eventData = {} }: ITelemetrySendPageView) => {
   try {
     const isAnalyticsGranted = checkIsAnalyticsGranted()
     if (!isAnalyticsGranted) {
       return
     }
-    if (!eventData.provider && !eventsWithExcludedProvider.includes(name)) {
-      eventData.provider = getProvider()
+    if (!eventData.provider && databaseId) {
+      eventData.provider = getProvider(databaseId)
     }
-    await apiService.post(`${ApiEndpoints.ANALYTICS_SEND_PAGE}`, { event: name, eventData })
+    await apiService.post(`${ApiEndpoints.ANALYTICS_SEND_PAGE}`,
+      { event: name, eventData: { ...eventData, databaseId } })
   } catch (e) {
     // continue regardless of error
   }