[jb] add track for sent closed heartbeat

Author: akosyakov

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodClientProjectSessionTracker.kt

@@ -10,7 +10,6 @@ import com.intellij.idea.StartupUtil
 import com.intellij.notification.NotificationAction
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.Disposable
-import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.client.ClientProjectSession
 import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.thisLogger
@@ -20,7 +19,6 @@ import com.intellij.openapi.fileTypes.LanguageFileType
 import com.intellij.remoteDev.util.onTerminationOrNow
 import com.intellij.util.application
 import com.jetbrains.rd.util.lifetime.Lifetime
-import io.gitpod.gitpodprotocol.api.entities.RemoteTrackMessage
 import io.gitpod.gitpodprotocol.api.entities.WorkspaceInstancePort
 import io.gitpod.supervisor.api.Info
 import io.gitpod.supervisor.api.Status
@@ -42,8 +40,6 @@ class GitpodClientProjectSessionTracker(
     private val manager = service<GitpodManager>()
 
     private lateinit var info: Info.WorkspaceInfoResponse
-    private val versionName = ApplicationInfo.getInstance().versionName
-    private val fullVersion = ApplicationInfo.getInstance().fullVersion
     private val lifetime = Lifetime.Eternal.createNested()
 
     override fun dispose() {
@@ -58,7 +54,7 @@ class GitpodClientProjectSessionTracker(
         }
     }
 
-    private fun isExposedServedPort(port: Status.PortsStatus?) : Boolean {
+    private fun isExposedServedPort(port: Status.PortsStatus?): Boolean {
         if (port === null) {
             return false
         }
@@ -186,6 +182,7 @@ class GitpodClientProjectSessionTracker(
             delay(1000L)
         }
     }
+
     init {
         lifetime.onTerminationOrNow {
             portsObserveJob.cancel()
@@ -216,22 +213,9 @@ class GitpodClientProjectSessionTracker(
         })
     }
 
-    fun trackEvent(eventName: String, props: Map<String, Any?>) {
-        val event = RemoteTrackMessage().apply {
-            event = eventName
-            properties = mapOf(
-                    "sessionId" to session.clientId.value,
-                    "instanceId" to info.instanceId,
-                    "workspaceId" to info.workspaceId,
-                    "appName" to versionName,
-                    "appVersion" to fullVersion,
-                    "timestamp" to System.currentTimeMillis()
-            ).plus(props)
-        }
-        if (manager.devMode) {
-            thisLogger().warn("gitpod: $event")
-        } else {
-            manager.client.server.trackEvent(event)
-        }
+    private fun trackEvent(eventName: String, props: Map<String, Any?>) {
+        manager.trackEvent(eventName, mapOf(
+                "sessionId" to session.clientId.value
+        ).plus(props))
     }
 }

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodManager.kt

@@ -9,6 +9,7 @@ import com.intellij.notification.NotificationAction
 import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.Disposable
+import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.extensions.PluginId
@@ -19,6 +20,7 @@ import com.jetbrains.rd.util.lifetime.Lifetime
 import git4idea.config.GitVcsApplicationSettings
 import io.gitpod.gitpodprotocol.api.GitpodClient
 import io.gitpod.gitpodprotocol.api.GitpodServerLauncher
+import io.gitpod.gitpodprotocol.api.entities.RemoteTrackMessage
 import io.gitpod.jetbrains.remote.services.HeartbeatService
 import io.gitpod.jetbrains.remote.utils.Retrier.retry
 import io.gitpod.supervisor.api.*
@@ -327,4 +329,31 @@ class GitpodManager : Disposable {
             serverJob.cancel()
         }
     }
+
+    private val versionName = ApplicationInfo.getInstance().versionName
+    private val fullVersion = ApplicationInfo.getInstance().fullVersion
+
+    fun trackEvent(eventName: String, props: Map<String, Any?>) {
+        val timestamp = System.currentTimeMillis()
+        GlobalScope.launch {
+            val info = pendingInfo.await()
+            val event = RemoteTrackMessage().apply {
+                event = eventName
+                properties = mapOf(
+                        "instanceId" to info.instanceId,
+                        "workspaceId" to info.workspaceId,
+                        "appName" to versionName,
+                        "appVersion" to fullVersion,
+                        "timestamp" to timestamp,
+                        "product" to backendKind,
+                        "qualifier" to backendQualifier
+                ).plus(props)
+            }
+            if (devMode) {
+                thisLogger().warn("gitpod: $event")
+            } else {
+                client.server.trackEvent(event)
+            }
+        }
+    }
 }

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/services/HeartbeatService.kt

@@ -24,8 +24,8 @@ class HeartbeatService : Disposable {
         val info = manager.pendingInfo.await()
         val intervalInSeconds = 30
         var current = ControllerStatus(
-            connected = false,
-            secondsSinceLastActivity = 0
+                connected = false,
+                secondsSinceLastActivity = 0
         )
         while (isActive) {
             try {
@@ -41,6 +41,11 @@ class HeartbeatService : Disposable {
 
                 if (wasClosed != null) {
                     manager.client.server.sendHeartBeat(SendHeartBeatOptions(info.instanceId, wasClosed)).await()
+                    if (wasClosed) {
+                        manager.trackEvent("ide_close_signal", mapOf(
+                                "clientKind" to "jetbrains"
+                        ))
+                    }
                 }
             } catch (t: Throwable) {
                 thisLogger().error("gitpod: failed to check activity:", t)