telemetry(amazonq): add metrics for stop code generation

Author: kelvin-klchu

packages/core/src/amazonq/webview/ui/apps/featureDevChatConnector.ts

@@ -10,7 +10,6 @@ import { CodeReference } from './amazonqCommonsConnector'
 import { FollowUpGenerator } from '../followUps/generator'
 import { getActions } from '../diffTree/actions'
 import { DiffTreeFileInfo } from '../diffTree/types'
-import { telemetry } from '../../../../shared/telemetry'
 
 interface ChatPayload {
     chatMessage: string
@@ -278,13 +277,10 @@ export class Connector {
     }
 
     onStopChatResponse = (tabID: string): void => {
-        telemetry.amazonq_stopCodeGeneration.run((span) => {
-            span.record({ tabID })
-            this.sendMessageToExtension({
-                tabID: tabID,
-                command: 'stop-response',
-                tabType: 'featuredev',
-            })
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'stop-response',
+            tabType: 'featuredev',
         })
     }
 

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -749,21 +749,24 @@ export class FeatureDevController {
     }
 
     private async stopResponse(message: any) {
-        this.messenger.sendAnswer({
-            message: i18n('AWS.amazonq.featureDev.pillText.stoppingCodeGeneration'),
-            type: 'answer-part',
-            tabID: message.tabID,
-        })
-        this.messenger.sendUpdatePlaceholder(
-            message.tabID,
-            i18n('AWS.amazonq.featureDev.pillText.stoppingCodeGeneration')
-        )
-        this.messenger.sendChatInputEnabled(message.tabID, false)
+        await telemetry.amazonq_stopCodeGeneration.run(async (span) => {
+            span.record({ tabID: message.tabID })
+            this.messenger.sendAnswer({
+                message: i18n('AWS.amazonq.featureDev.pillText.stoppingCodeGeneration'),
+                type: 'answer-part',
+                tabID: message.tabID,
+            })
+            this.messenger.sendUpdatePlaceholder(
+                message.tabID,
+                i18n('AWS.amazonq.featureDev.pillText.stoppingCodeGeneration')
+            )
+            this.messenger.sendChatInputEnabled(message.tabID, false)
 
-        const session = await this.sessionStorage.getSession(message.tabID)
-        if (session.state?.tokenSource) {
-            session.state?.tokenSource?.cancel()
-        }
+            const session = await this.sessionStorage.getSession(message.tabID)
+            if (session.state?.tokenSource) {
+                session.state?.tokenSource?.cancel()
+            }
+        })
     }
 
     private async tabOpened(message: any) {

packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts

@@ -404,4 +404,18 @@ describe('Controller', () => {
             })
         })
     })
+
+    describe('stopResponse', () => {
+        it('should emit amazonq_stopCodeGeneration telemetry', async () => {
+            const getSessionStub = sinon.stub(controllerSetup.sessionStorage, 'getSession').resolves(session)
+            controllerSetup.emitters.stopResponse.fire({ tabID, conversationID })
+            await waitUntil(() => {
+                return Promise.resolve(getSessionStub.callCount > 0)
+            }, {})
+            assertTelemetry('amazonq_stopCodeGeneration', {
+                tabID: tabID,
+                result: 'Succeeded',
+            })
+        })
+    })
 })