Merge pull request #2444 from devtron-labs/feat/telemtry-events-main

fix: Panic in orchestrator in /orchestrator/telemetry/event
devtron-labs · Feb 5, 2025 · d06cfdf · d06cfdf
2 parents 3b09bfe + be5814c
commit d06cfdf
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.6.0-patch-1",
+        "@devtron-labs/devtron-fe-common-lib": "1.6.0-patch-2",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

diff --git a/src/components/onboardingGuide/OnboardingGuide.tsx b/src/components/onboardingGuide/OnboardingGuide.tsx
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import React, { useEffect } from 'react'
+import { useEffect } from 'react'
 import { NavLink } from 'react-router-dom'
-import { AppListConstants, ModuleNameMap } from '@devtron-labs/devtron-fe-common-lib'
+import { AppListConstants, ModuleNameMap, handlePostHogEventUpdate } from '@devtron-labs/devtron-fe-common-lib'
 import HelmCollage from '../../assets/img/guided-helm-collage.png'
 import HelmCluster from '../../assets/img/guided-helm-cluster.png'
 import DeployCICD from '../../assets/img/guide-onboard.png'
 import { SERVER_MODE, URLS } from '../../config'
 import { ReactComponent as ArrowRight } from '../../assets/icons/ic-arrow-right.svg'
-import { handlePostHogEventUpdate, LOGIN_COUNT, POSTHOG_EVENT_ONBOARDING } from './onboarding.utils'
+import { LOGIN_COUNT, POSTHOG_EVENT_ONBOARDING } from './onboarding.utils'
 import GuideCommonHeader from './GuideCommonHeader'
 import { OnboardingGuideProps } from './OnboardingGuide.type'
 import { updateLoginCount } from '../../services/service'
@@ -55,19 +55,19 @@ export default function OnboardingGuide({ loginCount, serverMode, isGettingStart
             : `${URLS.STACK_MANAGER_DISCOVER_MODULES_DETAILS}?id=${ModuleNameMap.CICD}`
     }
 
-    const onClickHelmChart = (e) => {
-        handlePostHogEventUpdate(e, POSTHOG_EVENT_ONBOARDING.BROWSE_HELM_CHART)
+    const onClickHelmChart = () => {
+        handlePostHogEventUpdate(POSTHOG_EVENT_ONBOARDING.BROWSE_HELM_CHART)
     }
 
-    const onClickCluster = (e) => {
-        handlePostHogEventUpdate(e, POSTHOG_EVENT_ONBOARDING.CONNECT_CLUSTER)
+    const onClickCluster = () => {
+        handlePostHogEventUpdate(POSTHOG_EVENT_ONBOARDING.CONNECT_CLUSTER)
     }
 
-    const onClickedCICD = (e) => {
+    const onClickedCICD = () => {
         if (serverMode === SERVER_MODE.FULL) {
-            handlePostHogEventUpdate(e, POSTHOG_EVENT_ONBOARDING.DEPLOY_CUSTOM_APP_CI_CD)
+            handlePostHogEventUpdate(POSTHOG_EVENT_ONBOARDING.DEPLOY_CUSTOM_APP_CI_CD)
         } else {
-            handlePostHogEventUpdate(e, POSTHOG_EVENT_ONBOARDING.INSTALL_CUSTOM_CI_CD)
+            handlePostHogEventUpdate(POSTHOG_EVENT_ONBOARDING.INSTALL_CUSTOM_CI_CD)
         }
     }
 

diff --git a/src/components/onboardingGuide/onboarding.utils.ts b/src/components/onboardingGuide/onboarding.utils.ts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import { updatePostHogEvent } from '../../services/service'
-
 export const POSTHOG_EVENT_ONBOARDING = {
     PREVIEW: 'Preview',
     DEPLOY_CUSTOM_APP_CI_CD: 'Deploy custom app using CI/CD pipelines',
@@ -34,13 +32,3 @@ export const LOGIN_COUNT = 'login-count'
 
 export const MAX_LOGIN_COUNT = 5
 
-export const handlePostHogEventUpdate = (e, eventName?: string): void => {
-    const payload = {
-        eventType: eventName || e.target?.dataset.posthog,
-        key: LOGIN_COUNT,
-        value: '',
-        active: true,
-    }
-    updatePostHogEvent(payload)
-}
-
diff --git a/src/config/constants.ts b/src/config/constants.ts
@@ -208,7 +208,6 @@ export const Routes = {
     NODE_LIST: 'k8s/capacity/node/list',
     TAINTS_EDIT: 'k8s/capacity/node/taints/edit',
     HELM_APP_TEMPLATE_CHART: 'application/template-chart',
-    TELEMETRY_EVENT: 'telemetry/event',
     DEPLOYMENT_STATUS: 'app/deployment-status/timeline',
     HELM_DEPLOYMENT_STATUS_TIMELINE_INSTALLED_APP: 'app-store/deployment-status/timeline',
     MANUAL_SYNC: 'app/deployment-status/manual-sync',

diff --git a/src/services/service.ts b/src/services/service.ts
@@ -469,10 +469,6 @@ export function updateLoginCount(payload): Promise<LoginCountType> {
     return post(`${Routes.ATTRIBUTES_USER}/${Routes.UPDATE}`, payload)
 }
 
-export function updatePostHogEvent(payload): Promise<ResponseType> {
-    return post(Routes.TELEMETRY_EVENT, payload)
-}
-
 export const validateContainerConfiguration = (request: any): Promise<any> => {
     const URL = `${Routes.DOCKER_REGISTRY_CONFIG}/validate`
     return post(URL, request)

diff --git a/yarn.lock b/yarn.lock
@@ -981,10 +981,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected]1":
-  version "1.6.0-patch-1"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.6.0-patch-1.tgz#a538c5152d7fcf8626cb1468bf81d4f080f698da"
-  integrity sha512-I4uSNqP2+4O4OOzsxxYUDBCRzi82P/iBdEkT+gfF0mQWRcxEEl+dIlZgRD9LE7EEvHFjLOhkUlQbfKjLuQ53Bg==
+"@devtron-labs/[email protected]2":
+  version "1.6.0-patch-2"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.6.0-patch-2.tgz#b4669d105b42b8813e6f94ae496345f62805086d"
+  integrity sha512-WpuZJz0+Re05ijEFk8ruSsxCiUzM80Dfh9ynRrzbBbsq8LOF99eM0CUAgvAiplcX4iPpKYlmFzUv9S3fC/eRng==
   dependencies:
     "@types/react-dates" "^21.8.6"
     ansi_up "^5.2.1"