update scope

Author: leigaol

packages/core/src/codewhisperer/util/diagnosticsUtil.ts

@@ -85,22 +85,23 @@ export function getDiagnosticsType(message: string): string {
     return 'OTHER'
 }
 
+/**
+ * Generates a unique MD5 hash key for a VS Code diagnostic object.
+ *
+ * @param diagnostic - A VS Code Diagnostic object containing information about a code diagnostic
+ * @returns A 32-character hexadecimal MD5 hash string that uniquely identifies the diagnostic
+ *
+ * @description
+ * Creates a deterministic hash by combining the diagnostic's message, severity, code, and source.
+ * This hash can be used as a unique identifier for deduplication or tracking purposes.
+ * Note: range is not in the hashed string because a diagnostic can move and its range can change within the editor
+ */
 function getDiagnosticKey(diagnostic: vscode.Diagnostic): string {
     const jsonStr = JSON.stringify({
         message: diagnostic.message,
         severity: diagnostic.severity,
         code: diagnostic.code,
         source: diagnostic.source,
-        range: {
-            start: {
-                line: diagnostic.range.start.line,
-                character: diagnostic.range.start.character,
-            },
-            end: {
-                line: diagnostic.range.end.line,
-                character: diagnostic.range.end.character,
-            },
-        },
     })
 
     return crypto.createHash('md5').update(jsonStr).digest('hex')

packages/core/src/codewhisperer/util/telemetryHelper.ts

@@ -31,6 +31,7 @@ import { CodeAnalysisScope as CodeAnalysisScopeClientSide } from '../models/cons
 import { Session } from '../../amazonqTest/chat/session/session'
 import { sleep } from '../../shared/utilities/timeoutUtils'
 import { getDiagnosticsDifferences, getDiagnosticsOfCurrentFile, toIdeDiagnostics } from './diagnosticsUtil'
+import { Auth } from '../../auth'
 
 export class TelemetryHelper {
     // Some variables for client component latency
@@ -457,7 +458,7 @@ export class TelemetryHelper {
                     )
                 })
 
-        if (userTriggerDecisionEvent.suggestionState === 'ACCEPT') {
+        if (userTriggerDecisionEvent.suggestionState === 'ACCEPT' && Auth.instance.isInternalAmazonUser()) {
             // wait 1 seconds for the user installed 3rd party LSP
             // to update its diagnostics.
             void sleep(1000).then(() => {
@@ -469,10 +470,10 @@ export class TelemetryHelper {
                 userTriggerDecisionEvent.removedIdeDiagnostics = diagnosticDiff.removed.map((it) =>
                     toIdeDiagnostics(it)
                 )
-                sendEvent()
+                void sendEvent()
             })
         } else {
-            sendEvent()
+            void sendEvent()
         }
     }
 

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

@@ -53,6 +53,7 @@ import {
     getDiagnosticsOfCurrentFile,
     toIdeDiagnostics,
 } from '../../../codewhisperer/util/diagnosticsUtil'
+import { Auth } from '../../../auth'
 
 export function logSendTelemetryEventFailure(error: any) {
     let requestId: string | undefined
@@ -374,7 +375,7 @@ export class CWCTelemetryHelper {
         }
         telemetry.amazonq_interactWithMessage.emit({ ...event, ...additionalContextInfo })
 
-        let interactWithMessageEvent: CodeWhispererUserClient.ChatInteractWithMessageEvent = {
+        const interactWithMessageEvent: CodeWhispererUserClient.ChatInteractWithMessageEvent = {
             conversationId: event.cwsprChatConversationId,
             messageId: event.cwsprChatMessageId,
             interactionType: this.getCWClientTelemetryInteractionType(event.cwsprChatInteractionType),
@@ -386,7 +387,7 @@ export class CWCTelemetryHelper {
                 ?.cwsprChatHasProjectContext,
             customizationArn: undefinedIfEmpty(getSelectedCustomization().arn),
         }
-        if (interactWithMessageEvent.interactionType === 'INSERT_AT_CURSOR') {
+        if (interactWithMessageEvent.interactionType === 'INSERT_AT_CURSOR' && Auth.instance.isInternalAmazonUser()) {
             // wait 1 seconds for the user installed 3rd party LSP
             // to update its diagnostics.
             void sleep(1000).then(() => {