Merge branch 'aws:master' into master

Author: neilk-aws

packages/amazonq/.changes/next-release/Bug Fix-f80cc751-cb9d-45b6-a03a-3aec945a4565.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/review: Invalid file path characters caused some detections to be skipped on Windows"
+}

packages/amazonq/test/e2e/amazonq/testGen.test.ts

@@ -194,9 +194,12 @@ describe('Amazon Q Test Generation', function () {
                         const viewDiffMessage = chatItems[5]
 
                         assert.deepStrictEqual(viewDiffMessage.type, 'answer')
-                        assert.deepStrictEqual(
-                            viewDiffMessage.body,
+                        const expectedEnding =
                             'Please see the unit tests generated below. Click “View diff” to review the changes in the code editor.'
+                        assert.strictEqual(
+                            viewDiffMessage.body?.includes(expectedEnding),
+                            true,
+                            `View diff message does not contain phrase: ${expectedEnding}`
                         )
                     })
                 })

packages/amazonq/test/unit/codewhisperer/commands/onAcceptance.test.ts

@@ -6,16 +6,8 @@
 import assert from 'assert'
 import * as vscode from 'vscode'
 import * as sinon from 'sinon'
-import {
-    onAcceptance,
-    AcceptedSuggestionEntry,
-    session,
-    CodeWhispererTracker,
-    RecommendationHandler,
-    AuthUtil,
-} from 'aws-core-vscode/codewhisperer'
+import { onAcceptance, AcceptedSuggestionEntry, session, CodeWhispererTracker } from 'aws-core-vscode/codewhisperer'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
-import { assertTelemetryCurried } from 'aws-core-vscode/test'
 
 describe('onAcceptance', function () {
     describe('onAcceptance', function () {
@@ -68,46 +60,5 @@ describe('onAcceptance', function () {
             assert.deepStrictEqual(actualArg.endPosition, new vscode.Position(1, 26))
             assert.strictEqual(actualArg.index, 0)
         })
-
-        it('Should report telemetry that records this user decision event', async function () {
-            const testStartUrl = 'testStartUrl'
-            sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
-            const mockEditor = createMockTextEditor()
-            session.requestIdList = ['test']
-            RecommendationHandler.instance.requestId = 'test'
-            session.sessionId = 'test'
-            session.startPos = new vscode.Position(1, 0)
-            mockEditor.selection = new vscode.Selection(new vscode.Position(1, 0), new vscode.Position(1, 0))
-            session.recommendations = [{ content: "print('Hello World!')" }]
-            session.setSuggestionState(0, 'Showed')
-            session.triggerType = 'OnDemand'
-            session.setCompletionType(0, session.recommendations[0])
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_userDecision')
-            await onAcceptance({
-                editor: mockEditor,
-                range: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 21)),
-                effectiveRange: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 26)),
-                acceptIndex: 0,
-                recommendation: "print('Hello World!')",
-                requestId: '',
-                sessionId: '',
-                triggerType: 'OnDemand',
-                completionType: 'Line',
-                language: 'python',
-                references: undefined,
-            })
-            assertTelemetry({
-                codewhispererRequestId: 'test',
-                codewhispererSessionId: 'test',
-                codewhispererPaginationProgress: 1,
-                codewhispererTriggerType: 'OnDemand',
-                codewhispererSuggestionIndex: 0,
-                codewhispererSuggestionState: 'Accept',
-                codewhispererSuggestionReferenceCount: 0,
-                codewhispererCompletionType: 'Line',
-                codewhispererLanguage: 'python',
-                credentialStartUrl: testStartUrl,
-            })
-        })
     })
 })

packages/amazonq/test/unit/codewhisperer/commands/onInlineAcceptance.test.ts

@@ -7,10 +7,7 @@ import assert from 'assert'
 import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
-import { assertTelemetryCurried } from 'aws-core-vscode/test'
-import { onInlineAcceptance, RecommendationHandler, AuthUtil, session } from 'aws-core-vscode/codewhisperer'
-import { globals } from 'aws-core-vscode/shared'
-import { extensionVersion } from 'aws-core-vscode/shared'
+import { onInlineAcceptance, RecommendationHandler, session } from 'aws-core-vscode/codewhisperer'
 
 describe('onInlineAcceptance', function () {
     describe('onInlineAcceptance', function () {
@@ -42,51 +39,5 @@ describe('onInlineAcceptance', function () {
             })
             assert.ok(spy.calledWith())
         })
-
-        it('Should report telemetry that records this user decision event', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                version: extensionVersion,
-            })
-
-            const testStartUrl = 'testStartUrl'
-            sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
-            const mockEditor = createMockTextEditor()
-            session.requestIdList = ['test']
-            RecommendationHandler.instance.requestId = 'test'
-            session.requestIdList = ['test']
-            session.sessionId = 'test'
-            session.startPos = new vscode.Position(1, 0)
-            mockEditor.selection = new vscode.Selection(new vscode.Position(1, 0), new vscode.Position(1, 0))
-            session.recommendations = [{ content: "print('Hello World!')" }]
-            session.setSuggestionState(0, 'Showed')
-            session.triggerType = 'OnDemand'
-            session.setCompletionType(0, session.recommendations[0])
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_userDecision')
-            await onInlineAcceptance({
-                editor: mockEditor,
-                range: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 21)),
-                effectiveRange: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 21)),
-                acceptIndex: 0,
-                recommendation: "print('Hello World!')",
-                requestId: '',
-                sessionId: '',
-                triggerType: 'OnDemand',
-                completionType: 'Line',
-                language: 'python',
-                references: undefined,
-            })
-            assertTelemetry({
-                codewhispererRequestId: 'test',
-                codewhispererSessionId: 'test',
-                codewhispererPaginationProgress: 1,
-                codewhispererTriggerType: 'OnDemand',
-                codewhispererSuggestionIndex: 0,
-                codewhispererSuggestionState: 'Accept',
-                codewhispererSuggestionReferenceCount: 0,
-                codewhispererCompletionType: 'Line',
-                codewhispererLanguage: 'python',
-                credentialStartUrl: testStartUrl,
-            })
-        })
     })
 })

packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts

@@ -150,41 +150,6 @@ describe('recommendationHandler', function () {
                 codewhispererSupplementalContextLength: 100,
             })
         })
-
-        it('should call telemetry function that records a Empty userDecision event', async function () {
-            const mockServerResult = {
-                recommendations: [],
-                nextToken: '',
-                $response: {
-                    requestId: 'test_request_empty',
-                    httpResponse: {
-                        headers: {
-                            'x-amzn-sessionid': 'test_request_empty',
-                        },
-                    },
-                },
-            }
-            const handler = new RecommendationHandler()
-            sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
-            sinon.stub(performance, 'now').returns(0.0)
-            session.startPos = new vscode.Position(1, 0)
-            session.requestIdList = ['test_request_empty']
-            session.startCursorOffset = 2
-            await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter')
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_userDecision')
-            assertTelemetry({
-                codewhispererRequestId: 'test_request_empty',
-                codewhispererSessionId: 'test_request_empty',
-                codewhispererPaginationProgress: 0,
-                codewhispererTriggerType: 'AutoTrigger',
-                codewhispererSuggestionIndex: -1,
-                codewhispererSuggestionState: 'Empty',
-                codewhispererSuggestionReferenceCount: 0,
-                codewhispererCompletionType: 'Line',
-                codewhispererLanguage: 'python',
-                credentialStartUrl: testStartUrl,
-            })
-        })
     })
 
     describe('isValidResponse', function () {

packages/amazonq/test/unit/codewhisperer/util/telemetryHelper.test.ts

@@ -282,41 +282,4 @@ describe('telemetryHelper', function () {
             assert.strictEqual(actual, 'Empty')
         })
     })
-
-    describe('recordUserDecisionTelemetry', function () {
-        beforeEach(async function () {
-            await resetCodeWhispererGlobalVariables()
-        })
-
-        it('Should call telemetry record for each recommendations with proper arguments', async function () {
-            const telemetryHelper = new TelemetryHelper()
-            const response = [{ content: "print('Hello')" }]
-            const requestIdList = ['test_x', 'test_x', 'test_y']
-            const sessionId = 'test_x'
-            session.triggerType = 'AutoTrigger'
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_userDecision')
-            const suggestionState = new Map<number, string>([[0, 'Showed']])
-            const completionTypes = new Map<number, CodewhispererCompletionType>([[0, 'Line']])
-            telemetryHelper.recordUserDecisionTelemetry(
-                requestIdList,
-                sessionId,
-                response,
-                0,
-                0,
-                completionTypes,
-                suggestionState
-            )
-            assertTelemetry({
-                codewhispererRequestId: 'test_x',
-                codewhispererSessionId: 'test_x',
-                codewhispererPaginationProgress: 0,
-                codewhispererTriggerType: 'AutoTrigger',
-                codewhispererSuggestionIndex: 0,
-                codewhispererSuggestionState: 'Accept',
-                codewhispererSuggestionReferenceCount: 0,
-                codewhispererCompletionType: 'Line',
-                codewhispererLanguage: 'python',
-            })
-        })
-    })
 })

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

@@ -161,25 +161,6 @@ export class TelemetryHelper {
     ) {
         const selectedCustomization = getSelectedCustomization()
 
-        telemetry.codewhisperer_userDecision.emit({
-            codewhispererCompletionType: 'Line',
-            codewhispererGettingStartedTask: session.taskType,
-            codewhispererLanguage: language,
-            codewhispererPaginationProgress: paginationIndex,
-            codewhispererRequestId: requestIdList[0],
-            codewhispererSessionId: sessionId ? sessionId : undefined,
-            codewhispererSuggestionIndex: -1,
-            codewhispererSuggestionState: 'Empty',
-            codewhispererSuggestionReferenceCount: 0,
-            codewhispererSuggestionReferences: undefined,
-            codewhispererSupplementalContextIsUtg: supplementalContextMetadata?.isUtg,
-            codewhispererSupplementalContextLength: supplementalContextMetadata?.contentsLength,
-            codewhispererSupplementalContextTimeout: supplementalContextMetadata?.isProcessTimeout,
-            codewhispererTriggerType: session.triggerType,
-            credentialStartUrl: AuthUtil.instance.startUrl,
-            traceId: this.traceId,
-        })
-
         telemetry.codewhisperer_userTriggerDecision.emit({
             codewhispererAutomatedTriggerType: session.autoTriggerType,
             codewhispererClassifierResult: this.classifierResult,
@@ -300,7 +281,6 @@ export class TelemetryHelper {
                 credentialStartUrl: AuthUtil.instance.startUrl,
                 traceId: this.traceId,
             }
-            telemetry.codewhisperer_userDecision.emit(event)
             events.push(event)
         }
 

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

@@ -24,6 +24,7 @@ import { FeatureUseCase } from '../models/constants'
 import { ChildProcess, ChildProcessOptions } from '../../shared/utilities/processUtils'
 import { ProjectZipError } from '../../amazonqTest/error'
 import { removeAnsi } from '../../shared/utilities/textUtilities'
+import { normalize } from '../../shared/utilities/pathUtils'
 
 export interface ZipMetadata {
     rootDir: string
@@ -123,7 +124,7 @@ export class ZipUtil {
             zip.addFile(zipEntryPath, Buffer.from(content, 'utf-8'))
 
             if (scope === CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND) {
-                const gitDiffContent = `+++ b/${path.normalize(zipEntryPath)}` // Sending file path in payload for LLM code review
+                const gitDiffContent = `+++ b/${normalize(zipEntryPath)}` // Sending file path in payload for LLM code review
                 zip.addFile(ZipConstants.codeDiffFilePath, Buffer.from(gitDiffContent, 'utf-8'))
             }
         } else {

packages/core/src/shared/telemetry/exemptMetrics.ts

@@ -25,7 +25,6 @@ const validationExemptMetrics: Set<string> = new Set([
     'codeTransform_jobStatusChanged',
     'codeTransform_logApiError',
     'codeTransform_logApiLatency',
-    'codewhisperer_userDecision',
     'codewhisperer_codeScanIssueHover',
     'codewhisperer_codePercentage',
     'codewhisperer_userModification',

packages/core/src/shared/telemetry/vscodeTelemetry.json

@@ -228,17 +228,6 @@
             "name": "executedCount",
             "type": "int",
             "description": "The number of executed operations"
-        },
-        {
-            "name": "amazonqUploadIntent",
-            "type": "string",
-            "description": "The intent of the upload",
-            "allowedValues": [
-                "TRANSFORMATION",
-                "TASK_ASSIST_PLANNING",
-                "AUTOMATIC_FILE_SECURITY_SCAN",
-                "FULL_PROJECT_SECURITY_SCAN"
-            ]
         }
     ],
     "metrics": [
@@ -885,27 +874,6 @@
                 }
             ]
         },
-        {
-            "name": "amazonq_createUpload",
-            "description": "Captures createUploadUrl invocation process",
-            "metadata": [
-                {
-                    "type": "amazonqConversationId"
-                },
-                {
-                    "type": "amazonqRepositorySize",
-                    "required": false
-                },
-                {
-                    "type": "amazonqUploadIntent",
-                    "required": false
-                },
-                {
-                    "type": "credentialStartUrl",
-                    "required": false
-                }
-            ]
-        },
         {
             "name": "ide_editCodeFile",
             "description": "User opened a code file with the given file extension. Client should DEDUPLICATE this metric (ideally hourly/daily). AWS-specific files should (also) emit `file_editAwsFile`.",
@@ -1158,34 +1126,6 @@
         {
             "name": "docdb_addRegion",
             "description": "User clicked on add region command"
-        },
-        {
-            "name": "codewhisperer_codeScanIssueDetected",
-            "description": "Called when a code scan issue is returned from the service",
-            "metadata": [
-                {
-                    "type": "autoDetected",
-                    "required": false
-                },
-                {
-                    "type": "codewhispererCodeScanJobId",
-                    "required": false
-                },
-                {
-                    "type": "detectorId"
-                },
-                {
-                    "type": "findingId"
-                },
-                {
-                    "type": "includesFix",
-                    "required": false
-                },
-                {
-                    "type": "ruleId",
-                    "required": false
-                }
-            ]
         }
     ]
 }