Merge pull request #152 from codacy/improve-analytics

feat: add org and provider to telemetry CF-1936

Author: nedaKaighobadi

src/common/telemetry.ts

@@ -1,14 +1,15 @@
 import * as vscode from 'vscode'
 import { Analytics } from '@segment/analytics-node'
 import { EventProperties } from '@segment/analytics-core'
-import { User } from '../api/client'
+import { Organization, User } from '../api/client'
 import { SEGMENT_WRITE_KEY } from '../env-secrets'
 import { v4 as uuidv4 } from 'uuid'
 
 class TelemetryClient {
   private analytics: Analytics | undefined
   private userId: string | undefined
   private anonymousId: string | undefined
+  private organization: Organization | undefined
 
   constructor() {
     if (SEGMENT_WRITE_KEY) {
@@ -25,10 +26,11 @@ class TelemetryClient {
     }
   }
 
-  public identify(user: User) {
+  public identify(user: User, organization?: Organization) {
     if (!vscode.env.isTelemetryEnabled || !this.analytics || !this.anonymousId) return
 
     this.userId = user.id.toString()
+    this.organization = organization
 
     this.analytics.identify({
       userId: this.userId,
@@ -49,6 +51,9 @@ class TelemetryClient {
       properties: {
         ide: vscode.env.appName.toLowerCase(),
         os: process.platform,
+        organization: this.organization?.name,
+        provider: this.organization?.provider,
+        organization_id: this.organization?.identifier,
         ...properties,
       },
     })

src/extension.ts

@@ -269,7 +269,7 @@ export async function activate(context: vscode.ExtensionContext) {
         initializeApi()
 
         Account.current().then((user) => {
-          if (user) Telemetry.identify(user)
+          if (user) Telemetry.identify(user, codacyCloud.organization)
         })
 
         if (gitProvider?.repositories.length) {

src/git/CodacyCloud.ts

@@ -576,6 +576,10 @@ export class CodacyCloud implements vscode.Disposable {
     return this._params
   }
 
+  get organization() {
+    return this._organization?.organization
+  }
+
   get lastAnalysedCommit() {
     return this._repository?.lastAnalysedCommit
   }