Merge branch 'rli/move-q-tel-helper-otel' into rli/move-cw-tel-service-otel

Author: rli

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

@@ -72,7 +72,6 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
     // When chat panel is focused
     fun recordEnterFocusChat() {
         Telemetry.amazonq.enterFocusChat.use { it.passive(true) }
-
     }
 
     // When chat panel is unfocused
@@ -178,7 +177,6 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
                 .cwsprChatRequestLength(data.message.length.toLong())
                 .cwsprChatConversationType(CwsprChatConversationType.Chat)
                 .credentialStartUrl(getStartUrl(project))
-
         }
     }
 
@@ -297,11 +295,16 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
             }
 
             is IncomingCwcMessage.ChatItemFeedback -> {
+                span.cwsprChatInteractionType(CwsprChatInteractionType.Unknown)
                 recordFeedback(message)
                 null
             }
 
-            else -> null
+            else -> {
+                span.cwsprChatInteractionType(CwsprChatInteractionType.Unknown)
+
+                null
+            }
         }?.let {
             // override request and add customizationArn if it's not null, else return itself
             customization?.let { myCustomization ->
@@ -409,7 +412,6 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
 
         fun recordOpenChat() {
             Telemetry.amazonq.openChat.use { it.passive(true) }
-
         }
 
         fun recordCloseChat() {

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/TelemetryHelperTest.kt

@@ -22,6 +22,7 @@ import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.stub
+import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import software.amazon.awssdk.awscore.DefaultAwsResponseMetadata
 import software.amazon.awssdk.awscore.util.AwsHeader.AWS_REQUEST_ID
@@ -608,7 +609,7 @@ class TelemetryHelperTest {
 
         // Toolkit telemetry
         argumentCaptor<MetricEvent> {
-            verify(mockBatcher).enqueue(capture())
+            verify(mockBatcher, times(2)).enqueue(capture())
             val event = firstValue.data.find { it.name == "feedback_result" }
             assertNotNull(event)
             assertThat(event).matches { it.metadata["result"] == "Succeeded" }