Merge master into feature/emr

Author: aws-toolkit-automation

package-lock.json

@@ -39,7 +39,7 @@
         "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.287",
+        "@aws-toolkits/telemetry": "^1.0.289",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

package.json

@@ -263,6 +263,7 @@ export async function preTransformationUploadCode() {
 
             transformByQState.setPayloadFilePath(payloadFilePath)
             uploadId = await uploadPayload(payloadFilePath)
+            telemetry.record({ codeTransformJobId: uploadId }) // uploadId is re-used as jobId
         })
     } catch (err) {
         const errorMessage = (err as Error).message
@@ -735,15 +736,15 @@ export async function postTransformationJob() {
         const mavenVersionInfoMessage = `${versionInfo[0]} (${transformByQState.getMavenName()})`
         const javaVersionInfoMessage = `${versionInfo[1]} (${transformByQState.getMavenName()})`
 
-        // Note: IntelliJ implementation of ResultStatusMessage includes additional metadata such as jobId.
         telemetry.codeTransform_totalRunTime.emit({
             buildSystemVersion: mavenVersionInfoMessage,
             codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+            codeTransformJobId: transformByQState.getJobId(),
             codeTransformResultStatusMessage: resultStatusMessage,
             codeTransformRunTimeLatency: durationInMs,
             codeTransformLocalJavaVersion: javaVersionInfoMessage,
             result: resultStatusMessage === TransformByQStatus.Succeeded ? MetadataResult.Pass : MetadataResult.Fail,
-            reason: resultStatusMessage,
+            reason: `${resultStatusMessage}-${chatMessage}`,
         })
     }
 
@@ -825,6 +826,7 @@ export async function stopTransformByQ(jobId: string) {
     await telemetry.codeTransform_jobIsCancelledByUser.run(async () => {
         telemetry.record({
             codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+            codeTransformJobId: jobId,
         })
         if (transformByQState.isRunning()) {
             getLogger().info('CodeTransformation: User requested to stop transformation. Stopping transformation.')

packages/core/src/codewhisperer/commands/startTransformByQ.ts

@@ -536,9 +536,9 @@ export class ProposedTransformationExplorer {
             diffModel.saveChanges()
             telemetry.codeTransform_submitSelection.emit({
                 codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                codeTransformJobId: transformByQState.getJobId(),
                 userChoice: `acceptChanges-${patchFilesDescriptions?.content[diffModel.currentPatchIndex].name}`,
             })
-            telemetry.ui_click.emit({ elementId: 'transformationHub_acceptChanges' })
             if (transformByQState.getMultipleDiffs()) {
                 void vscode.window.showInformationMessage(
                     CodeWhispererConstants.changesAppliedNotificationMultipleDiffs(
@@ -596,7 +596,6 @@ export class ProposedTransformationExplorer {
         vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.rejectChanges', async () => {
             diffModel.rejectChanges()
             await reset()
-            telemetry.ui_click.emit({ elementId: 'transformationHub_rejectChanges' })
 
             transformByQState.getChatControllers()?.transformationFinished.fire({
                 tabID: ChatSessionManager.Instance.getSession().tabID,

packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts

@@ -18,7 +18,11 @@ import { isTestFile } from './codeParsingUtil'
 import { getFileDistance } from '../../../shared/filesystemUtilities'
 import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities'
 import { getLogger } from '../../../shared/logger/logger'
-import { CodeWhispererSupplementalContext, CodeWhispererSupplementalContextItem } from '../../models/model'
+import {
+    CodeWhispererSupplementalContext,
+    CodeWhispererSupplementalContextItem,
+    SupplementalContextStrategy,
+} from '../../models/model'
 import { LspController } from '../../../amazonq/lsp/lspController'
 import { waitUntil } from '../../../shared/utilities/timeoutUtils'
 
@@ -75,14 +79,18 @@ export async function fetchSupplementalContextForSrc(
 
     // opentabs context will use bm25 and users' open tabs to fetch supplemental context
     if (supplementalContextConfig === 'opentabs') {
+        const supContext = (await fetchOpentabsContext(editor, cancellationToken)) ?? []
         return {
-            supplementalContextItems: (await fetchOpentabsContext(editor, cancellationToken)) ?? [],
-            strategy: 'opentabs',
+            supplementalContextItems: supContext,
+            strategy: supContext.length === 0 ? 'Empty' : 'opentabs',
         }
     }
 
     // codemap will use opentabs context plus repomap if it's present
     if (supplementalContextConfig === 'codemap') {
+        let strategy: SupplementalContextStrategy = 'Empty'
+        let hasCodemap: boolean = false
+        let hasOpentabs: boolean = false
         const opentabsContextAndCodemap = await waitUntil(
             async function () {
                 const result: CodeWhispererSupplementalContextItem[] = []
@@ -91,20 +99,30 @@ export async function fetchSupplementalContextForSrc(
 
                 if (codemap && codemap.length > 0) {
                     result.push(...codemap)
+                    hasCodemap = true
                 }
 
                 if (opentabsContext && opentabsContext.length > 0) {
                     result.push(...opentabsContext)
+                    hasOpentabs = true
                 }
 
                 return result
             },
             { timeout: supplementalContextTimeoutInMs, interval: 5, truthy: false }
         )
 
+        if (hasCodemap) {
+            strategy = 'codemap'
+        } else if (hasOpentabs) {
+            strategy = 'opentabs'
+        } else {
+            strategy = 'Empty'
+        }
+
         return {
             supplementalContextItems: opentabsContextAndCodemap ?? [],
-            strategy: 'codemap',
+            strategy: strategy,
         }
     }
 
@@ -133,9 +151,10 @@ export async function fetchSupplementalContextForSrc(
             }
         }
 
+        const supContext = opentabsContext ?? []
         return {
-            supplementalContextItems: opentabsContext ?? [],
-            strategy: 'opentabs',
+            supplementalContextItems: supContext,
+            strategy: supContext.length === 0 ? 'Empty' : 'opentabs',
         }
     }