character counts for history and each message in history

fix

Author: chungjac

packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts

@@ -48,6 +48,7 @@ import { AdditionalContextPrompt } from '../../../amazonq/lsp/types'
 import { getUserPromptsDirectory, promptFileExtension } from '../../constants'
 import { isInDirectory } from '../../../shared/filesystemUtilities'
 import { CustomFormActionMessage } from '../../view/connector/connector'
+import { Database } from '../../../shared/db/chatDb/chatDb'
 
 export function logSendTelemetryEventFailure(error: any) {
     let requestId: string | undefined
@@ -539,6 +540,11 @@ export class CWCTelemetryHelper {
 
         const contextCounts = this.getAdditionalContextCounts(triggerPayload)
 
+        const chatHistoryDb = Database.getInstance()
+        const historyMessages = chatHistoryDb.getMessages(tabID)
+        const { total: chatHistoryCharacterCount, individualCounts: chatHistoryMessageCharacterCounts } =
+            Database.getInstance().calculateDetailedCharacterCount(historyMessages)
+
         const event: AmazonqAddMessage = {
             result: 'Succeeded',
             cwsprChatConversationId: this.getConversationId(message.tabID) ?? '',
@@ -595,8 +601,13 @@ export class CWCTelemetryHelper {
             cwsprChatWorkspaceContextLength: triggerPayload.contextLengths.workspaceContextLength,
             cwsprChatWorkspaceContextTruncatedLength: triggerPayload.contextLengths.truncatedWorkspaceContextLength,
             traceId,
+            cwsprChatHistoryCharacterCount: chatHistoryCharacterCount,
+            cwsprChatHistoryMessageCharacterCounts: chatHistoryMessageChåaracterCounts,
         }
 
+        // for testing: will removeå
+        // const total2 = chatHistoryDb.calculateCharacterCount(historyMessages)
+
         telemetry.amazonq_addMessage.emit(event)
         const language = this.isProgrammingLanguageSupported(triggerPayload.fileLanguage)
             ? { languageName: triggerPayload.fileLanguage as string }

packages/core/src/shared/db/chatDb/chatDb.ts

@@ -416,34 +416,53 @@ export class Database {
         return messages
     }
 
+    // character counts for history and each message in history for telemetry purposes
+    calculateDetailedCharacterCount(allMessages: Message[]): { total: number; individualCounts: number[] } {
+        const individualCounts: number[] = []
+        let total = 0
+
+        for (const message of allMessages) {
+            const messageCount = this.calculateMessageCharacterCount(message)
+            individualCounts.push(messageCount)
+            total += messageCount
+        }
+
+        this.logger.debug(`Current history characters: ${total}`)
+        return { total, individualCounts }
+    }
+
     private calculateCharacterCount(allMessages: Message[]): number {
         let count = 0
         for (const message of allMessages) {
-            // Count characters of all message text
-            count += message.body.length
-
-            // Count characters in tool uses
-            if (message.toolUses) {
-                try {
-                    for (const toolUse of message.toolUses) {
-                        count += JSON.stringify(toolUse).length
-                    }
-                } catch (e) {
-                    this.logger.error(`Error counting toolUses: ${String(e)}`)
+            count += this.calculateMessageCharacterCount(message)
+        }
+        this.logger.debug(`Current history characters: ${count}`)
+        return count
+    }
+
+    private calculateMessageCharacterCount(message: Message): number {
+        let count = message.body.length
+
+        // Count characters in tool uses
+        if (message.toolUses) {
+            try {
+                for (const toolUse of message.toolUses) {
+                    count += JSON.stringify(toolUse).length
                 }
+            } catch (e) {
+                this.logger.error(`Error counting toolUses: ${String(e)}`)
             }
-            // Count characters in tool results
-            if (message.userInputMessageContext?.toolResults) {
-                try {
-                    for (const toolResul of message.userInputMessageContext.toolResults) {
-                        count += JSON.stringify(toolResul).length
-                    }
-                } catch (e) {
-                    this.logger.error(`Error counting toolResults: ${String(e)}`)
+        }
+        // Count characters in tool results
+        if (message.userInputMessageContext?.toolResults) {
+            try {
+                for (const toolResul of message.userInputMessageContext.toolResults) {
+                    count += JSON.stringify(toolResul).length
                 }
+            } catch (e) {
+                this.logger.error(`Error counting toolResults: ${String(e)}`)
             }
         }
-        this.logger.debug(`Current history characters: ${count}`)
         return count
     }