Merge branch 'master' into process/track

Author: Hweinstock

buildspec/linuxE2ETests.yml

@@ -37,7 +37,7 @@ phases:
         commands:
             - export HOME=/home/codebuild-user
             # Ignore failure until throttling issues are fixed.
-            - xvfb-run npm run testE2E
+            - xvfb-run npm run testE2E; npm run mergeReports -- "$?"
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"

buildspec/linuxIntegrationTests.yml

@@ -92,7 +92,7 @@ phases:
     build:
         commands:
             - export HOME=/home/codebuild-user
-            - xvfb-run npm run testInteg
+            - xvfb-run npm run testInteg; npm run mergeReports -- "$?"
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"

buildspec/linuxTests.yml

@@ -41,7 +41,7 @@ phases:
                     # Ensure that "foo | run_and_report" fails correctly.
                     set -o pipefail
                     . buildspec/shared/common.sh
-                    2>&1 xvfb-run npm test --silent | run_and_report 2 \
+                    { 2>&1 xvfb-run npm test --silent; npm run mergeReports -- "$?"; } | run_and_report 2 \
                         'rejected promise not handled' \
                         'This typically indicates a bug. Read https://developer.mozilla.org/docs/Web/JavaScript/Guide/Using_promises#error_handling'
                 }

package.json

@@ -36,7 +36,8 @@
         "lintfix": "eslint -c .eslintrc.js --ignore-path .gitignore --ignore-pattern '**/*.json' --ignore-pattern '**/*.gen.ts' --ignore-pattern '**/types/*.d.ts' --ignore-pattern '**/src/testFixtures/**' --ignore-pattern '**/resources/js/graphStateMachine.js' --fix --ext .ts packages plugins",
         "clean": "npm run clean -w packages/ -w plugins/",
         "reset": "npm run clean && ts-node ./scripts/clean.ts node_modules && npm install",
-        "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
+        "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present",
+        "mergeReports": "ts-node ./scripts/mergeReports.ts"
     },
     "devDependencies": {
         "@aws-toolkits/telemetry": "^1.0.289",

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -50,7 +50,6 @@ import {
     CodeTransformJavaTargetVersionsAllowed,
     CodeTransformJavaSourceVersionsAllowed,
 } from '../../../shared/telemetry/telemetry'
-import { MetadataResult } from '../../../shared/telemetry/telemetryClient'
 import { CodeTransformTelemetryState } from '../../telemetry/codeTransformTelemetryState'
 import DependencyVersions from '../../models/dependencies'
 import { getStringHash } from '../../../shared/utilities/textUtilities'
@@ -364,15 +363,16 @@ export class GumbyController {
                 await this.handleUserLanguageUpgradeProjectChoice(message)
                 break
             case ButtonActions.CANCEL_TRANSFORMATION_FORM:
-                telemetry.codeTransform_submitSelection.emit({
-                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
-                    userChoice: 'Cancel',
-                    result: MetadataResult.Pass,
-                })
-                this.transformationFinished({
-                    message: CodeWhispererConstants.jobCancelledChatMessage,
-                    tabID: message.tabID,
-                    includeStartNewTransformationButton: true,
+                telemetry.codeTransform_submitSelection.run(() => {
+                    telemetry.record({
+                        codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                        userChoice: 'Cancel',
+                    })
+                    this.transformationFinished({
+                        message: CodeWhispererConstants.jobCancelledChatMessage,
+                        tabID: message.tabID,
+                        includeStartNewTransformationButton: true,
+                    })
                 })
                 break
             case ButtonActions.CONFIRM_SKIP_TESTS_FORM:

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

@@ -21,7 +21,6 @@ import { ExportResultArchiveStructure, downloadExportResultArchive } from '../..
 import { getLogger } from '../../../shared/logger'
 import { telemetry } from '../../../shared/telemetry/telemetry'
 import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
-import { MetadataResult } from '../../../shared/telemetry/telemetryClient'
 import * as CodeWhispererConstants from '../../models/constants'
 import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/codewhispererChatClient'
 import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
@@ -532,11 +531,13 @@ export class ProposedTransformationExplorer {
         })
 
         vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.acceptChanges', async () => {
-            diffModel.saveChanges()
-            telemetry.codeTransform_submitSelection.emit({
-                codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
-                codeTransformJobId: transformByQState.getJobId(),
-                userChoice: `acceptChanges-${patchFilesDescriptions?.content[diffModel.currentPatchIndex].name}`,
+            telemetry.codeTransform_submitSelection.run(() => {
+                diffModel.saveChanges()
+                telemetry.record({
+                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                    codeTransformJobId: transformByQState.getJobId(),
+                    userChoice: `acceptChanges-${patchFilesDescriptions?.content[diffModel.currentPatchIndex].name}`,
+                })
             })
             if (transformByQState.getMultipleDiffs()) {
                 void vscode.window.showInformationMessage(
@@ -580,35 +581,21 @@ export class ProposedTransformationExplorer {
                 // All patches have been applied, reset the state
                 await reset()
             }
-
-            telemetry.codeTransform_viewArtifact.emit({
-                codeTransformArtifactType: 'ClientInstructions',
-                codeTransformVCSViewerSrcComponents: 'toastNotification',
-                codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
-                codeTransformJobId: transformByQState.getJobId(),
-                codeTransformStatus: transformByQState.getStatus(),
-                userChoice: 'Submit',
-                result: MetadataResult.Pass,
-            })
         })
 
         vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.rejectChanges', async () => {
-            diffModel.rejectChanges()
-            await reset()
-
+            await telemetry.codeTransform_submitSelection.run(async () => {
+                diffModel.rejectChanges()
+                await reset()
+                telemetry.record({
+                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                    codeTransformJobId: transformByQState.getJobId(),
+                    userChoice: 'rejectChanges',
+                })
+            })
             transformByQState.getChatControllers()?.transformationFinished.fire({
                 tabID: ChatSessionManager.Instance.getSession().tabID,
             })
-
-            telemetry.codeTransform_viewArtifact.emit({
-                codeTransformArtifactType: 'ClientInstructions',
-                codeTransformVCSViewerSrcComponents: 'toastNotification',
-                codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
-                codeTransformJobId: transformByQState.getJobId(),
-                codeTransformStatus: transformByQState.getStatus(),
-                userChoice: 'Cancel',
-                result: MetadataResult.Pass,
-            })
         })
     }
 }

packages/core/src/test/techdebt.test.ts

@@ -46,6 +46,6 @@ describe('tech debt', function () {
         // Monitor telemtry to determine removal or snooze
         // toolkit_showNotification.id = sessionSeparation
         // auth_modifyConnection.action = deleteProfile OR auth_modifyConnection.source contains CodeCatalyst
-        fixByDate('2025-01-06', 'Remove the edge case code from the commit that this test is a part of.')
+        fixByDate('2025-06-06', 'Remove the edge case code from the commit that this test is a part of.')
     })
 })

packages/core/src/test/testRunner.ts

@@ -65,7 +65,8 @@ export async function runTests(
     }
 
     const root = getRoot()
-    const outputFile = path.resolve(root, '../../', '.test-reports', 'report.xml')
+    // output the report to the individual package
+    const outputFile = path.resolve(root, '.test-reports', 'report.xml')
     const colorOutput = !process.env['AWS_TOOLKIT_TEST_NO_COLOR']
 
     // Create the mocha test

scripts/mergeReports.ts

@@ -0,0 +1,71 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as fs from 'fs'
+import * as path from 'path'
+import * as xml2js from 'xml2js'
+
+/**
+ * Merge all of the packages/ test reports into a single directory
+ */
+async function mergeReports() {
+    console.log('Merging test reports')
+
+    const packagesDir = `${__dirname}/../packages`
+
+    // Get all packages/* directories
+    const packageDirs = fs.readdirSync(packagesDir).map((dir) => path.join(packagesDir, dir))
+
+    // Find report.xml files in .test-reports subdirectories
+    const testReports = packageDirs
+        .map((dir) => `${dir}/.test-reports/report.xml`)
+        .filter((file) => fs.existsSync(file))
+
+    const mergedReport = {
+        testsuites: {
+            testsuite: [],
+        },
+    }
+
+    // Collect all test reports into a single merged test report object
+    for (const file of testReports) {
+        const content = fs.readFileSync(file)
+        const result: { testsuites: { testsuite: [] } } = await xml2js.parseStringPromise(content)
+        if (result.testsuites && result.testsuites.testsuite) {
+            mergedReport.testsuites.testsuite.push(...result.testsuites.testsuite)
+        }
+    }
+
+    const builder = new xml2js.Builder()
+    const xml = builder.buildObject(mergedReport)
+
+    /**
+     * Create the new test reports directory and write the test report
+     */
+    const reportsDir = path.join(__dirname, '..', '.test-reports')
+
+    // Create reports directory if it doesn't exist
+    if (!fs.existsSync(reportsDir)) {
+        fs.mkdirSync(reportsDir, { recursive: true })
+    }
+
+    fs.writeFileSync(`${reportsDir}/report.xml`, xml)
+
+    const exitCodeArg = process.argv[2]
+    if (exitCodeArg) {
+        /**
+         * Retrieves the exit code from the previous test run execution.
+         *
+         * This allows us to:
+         * 1. Merge and upload test reports regardless of the test execution status
+         * 2. Preserve the original test run exit code
+         * 3. Report the test status back to CI
+         */
+        const exitCode = parseInt(exitCodeArg || '0', 10)
+        process.exit(exitCode)
+    }
+}
+
+mergeReports()