From 5683b193c5e5d044d457ef742a106751ec70515d Mon Sep 17 00:00:00 2001
From: Konstantin Hudyakov <konstantin.hudyakov@jetbrains.com>
Date: Mon, 14 Apr 2025 15:58:52 +0300
Subject: [PATCH] [terminal] IJPL-182482 Add OS version field to the latency
 events

Not sure how different versions of OS can affect the latency in our case, but who knows, let's see.

GitOrigin-RevId: b53b9ded5e9cfe7def9982b6f47c233dfa8b6535
---
 .../fus/ReworkedTerminalUsageCollector.kt     | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/fus/ReworkedTerminalUsageCollector.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/fus/ReworkedTerminalUsageCollector.kt
index a475a919fa72..27e03b1273be 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/fus/ReworkedTerminalUsageCollector.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/fus/ReworkedTerminalUsageCollector.kt
@@ -45,52 +45,63 @@ object ReworkedTerminalUsageCollector : CounterUsagesCollector() {
                                                                EXIT_CODE_FIELD,
                                                                EXECUTION_TIME_FIELD)
 
+  private val osVersion: String by lazy {
+    Version.parseVersion(OS.CURRENT.version)?.toCompactString() ?: "unknown"
+  }
+
   private val frontendTypingLatencyEvent = GROUP.registerVarargEvent(
     "terminal.frontend.typing.latency",
     EVENT_ID_FIELD,
     DURATION_FIELD,
+    OS_VERSION_FIELD,
   )
 
   private val backendTypingLatencyEvent = GROUP.registerVarargEvent(
     "terminal.backend.typing.latency",
     EVENT_ID_FIELD,
     DURATION_FIELD,
+    OS_VERSION_FIELD,
   )
 
   private val backendOutputLatencyEvent = GROUP.registerVarargEvent(
     "terminal.backend.output.latency",
     EVENT_ID_FIELD,
     DURATION_FIELD,
+    OS_VERSION_FIELD,
   )
 
   private val frontendOutputLatencyEvent = GROUP.registerVarargEvent(
     "terminal.frontend.output.latency",
     EVENT_ID_FIELD,
     DURATION_FIELD,
+    OS_VERSION_FIELD,
   )
 
   private val backendTextBufferCollectionLatencyEvent = GROUP.registerVarargEvent(
     "terminal.backend.text.buffer.collection.latency",
     TEXT_LENGTH_FIELD,
     DURATION_FIELD,
+    OS_VERSION_FIELD,
   )
 
   private val backendDocumentUpdateLatencyEvent = GROUP.registerVarargEvent(
     "terminal.backend.document.update.latency",
     TEXT_LENGTH_FIELD,
     DURATION_FIELD,
+    OS_VERSION_FIELD,
   )
 
   private val frontendDocumentUpdateLatencyEvent = GROUP.registerVarargEvent(
     "terminal.frontend.document.update.latency",
     TEXT_LENGTH_FIELD,
     DURATION_FIELD,
+    OS_VERSION_FIELD,
   )
 
   @JvmStatic
   fun logLocalShellStarted(project: Project, shellCommand: Array<String>) {
     localShellStartedEvent.log(project,
-                               Version.parseVersion(OS.CURRENT.version)?.toCompactString() ?: "unknown",
+                               osVersion,
                                getShellNameForStat(shellCommand.firstOrNull()))
   }
 
@@ -113,7 +124,8 @@ object ReworkedTerminalUsageCollector : CounterUsagesCollector() {
   fun logFrontendTypingLatency(inputEventId: Int, duration: Duration) {
     frontendTypingLatencyEvent.log(
       EVENT_ID_FIELD with inputEventId,
-      DURATION_FIELD with duration
+      DURATION_FIELD with duration,
+      OS_VERSION_FIELD with osVersion,
     )
   }
 
@@ -121,7 +133,8 @@ object ReworkedTerminalUsageCollector : CounterUsagesCollector() {
   fun logBackendTypingLatency(inputEventId: Int, duration: Duration) {
     backendTypingLatencyEvent.log(
       EVENT_ID_FIELD with inputEventId,
-      DURATION_FIELD with duration
+      DURATION_FIELD with duration,
+      OS_VERSION_FIELD with osVersion,
     )
   }
 
@@ -129,7 +142,8 @@ object ReworkedTerminalUsageCollector : CounterUsagesCollector() {
   fun logBackendOutputLatency(eventId: Int, duration: Duration) {
     backendOutputLatencyEvent.log(
       EVENT_ID_FIELD with eventId,
-      DURATION_FIELD with duration
+      DURATION_FIELD with duration,
+      OS_VERSION_FIELD with osVersion,
     )
   }
 
@@ -137,28 +151,32 @@ object ReworkedTerminalUsageCollector : CounterUsagesCollector() {
   fun logFrontendOutputLatency(eventId: Int, duration: Duration) {
     frontendOutputLatencyEvent.log(
       EVENT_ID_FIELD with eventId,
-      DURATION_FIELD with duration
+      DURATION_FIELD with duration,
+      OS_VERSION_FIELD with osVersion,
     )
   }
 
   fun logBackendTextBufferCollectionLatency(textLength: Int, duration: Duration) {
     backendTextBufferCollectionLatencyEvent.log(
       TEXT_LENGTH_FIELD with textLength,
-      DURATION_FIELD with duration
+      DURATION_FIELD with duration,
+      OS_VERSION_FIELD with osVersion,
     )
   }
 
   fun logBackendDocumentUpdateLatency(textLength: Int, duration: Duration) {
     backendDocumentUpdateLatencyEvent.log(
       TEXT_LENGTH_FIELD with textLength,
-      DURATION_FIELD with duration
+      DURATION_FIELD with duration,
+      OS_VERSION_FIELD with osVersion,
     )
   }
 
   fun logFrontendDocumentUpdateLatency(textLength: Int, duration: Duration) {
     frontendDocumentUpdateLatencyEvent.log(
       TEXT_LENGTH_FIELD with textLength,
-      DURATION_FIELD with duration
+      DURATION_FIELD with duration,
+      OS_VERSION_FIELD with osVersion,
     )
   }
 }