parse metricUnit in util

Author: samgst-amazon

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt

@@ -19,6 +19,7 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.ConnectionMetadata
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.SsoProfileData
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.TelemetryParsingUtil
 import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import java.time.Instant
@@ -28,13 +29,8 @@ import java.util.concurrent.CompletableFuture
  * Concrete implementation of [AmazonQLanguageClient] to handle messages sent from server
  */
 class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageClient {
-    override fun telemetryEvent(`object`: Any) {
-        when (`object`) {
-            is Map<*, *> -> handleTelemetryMap(`object`)
-        }
-    }
 
-    private fun handleTelemetryMap(telemetryMap: MutableMap<*, *>) {
+    private fun handleTelemetryMap(telemetryMap: Map<*, *>) {
         try {
             val name = telemetryMap["name"] as? String ?: return
 
@@ -44,7 +40,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
             TelemetryService.getInstance().record(project) {
                 datum(name) {
                     createTime(Instant.now())
-                    unit(telemetryMap["unit"] as? MetricUnit ?: MetricUnit.NONE)
+                    unit(TelemetryParsingUtil.parseMetricUnit(telemetryMap["unit"]))
                     value(telemetryMap["value"] as? Double ?: 1.0)
                     passive(telemetryMap["passive"] as? Boolean ?: false)
 
@@ -62,6 +58,12 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
         }
     }
 
+    override fun telemetryEvent(`object`: Any) {
+        when (`object`) {
+            is Map<*, *> -> handleTelemetryMap(`object`)
+        }
+    }
+
     override fun publishDiagnostics(diagnostics: PublishDiagnosticsParams) {
         println(diagnostics)
     }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/TelemetryParsingUtil.kt

@@ -0,0 +1,17 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.util
+
+import software.amazon.awssdk.services.toolkittelemetry.model.MetricUnit
+
+object TelemetryParsingUtil {
+
+    fun parseMetricUnit(value: Any?): MetricUnit {
+        return when (value) {
+            is String -> MetricUnit.fromValue(value) ?: MetricUnit.NONE
+            is MetricUnit -> value
+            else -> MetricUnit.NONE
+        }
+    }
+}

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImplTest.kt

@@ -5,6 +5,8 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp
 
 import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.ToNumberPolicy
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.testFramework.ApplicationExtension
@@ -252,6 +254,47 @@ class AmazonQLanguageClientImplTest {
         assertThat(datum.metadata).contains(entry("key1", "value1"))
     }
 
+    @Test
+    fun `test GSON deserialization behavior for telemetryEvent`() {
+        val gson = GsonBuilder()
+            .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
+            .create()
+
+        val jsonString = """
+        {
+            "name": "test_event",
+            "value": 3.0,
+            "passive": true,
+            "unit": "Milliseconds",
+            "data": {
+                "key1": "value1"
+            }
+        }
+        """.trimIndent()
+
+        val result = gson.fromJson(jsonString, Map::class.java)
+
+        val telemetryService = mockk<TelemetryService>(relaxed = true)
+        mockkObject(TelemetryService)
+        every { TelemetryService.getInstance() } returns telemetryService
+
+        val builderCaptor = slot<MetricEvent.Builder.() -> Unit>()
+        every { telemetryService.record(project, capture(builderCaptor)) } returns Unit
+
+        sut.telemetryEvent(result)
+
+        val builder = DefaultMetricEvent.builder()
+        builderCaptor.captured.invoke(builder)
+
+        val metricEvent = builder.build()
+        val datum = metricEvent.data.first()
+
+        assertThat(datum.passive).isTrue()
+        assertThat(datum.unit).isEqualTo(MetricUnit.MILLISECONDS)
+        assertThat(datum.value).isEqualTo(3.0)
+        assertThat(datum.metadata).contains(entry("key1", "value1"))
+    }
+
     @Test
     fun `getConnectionMetadata returns connection metadata with start URL for bearer token connection`() {
         val mockConnectionManager = mockk<ToolkitConnectionManager>()