Skip to content

Commit 5669e87

Browse files
authored
telemetry(amazonq): add jobId to all metrics #6241
## Problem `jobId` missing in some metrics. ## Solution Add it.
1 parent 0371970 commit 5669e87

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

package-lock.json

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
4040
},
4141
"devDependencies": {
42-
"@aws-toolkits/telemetry": "^1.0.287",
42+
"@aws-toolkits/telemetry": "^1.0.289",
4343
"@playwright/browser-chromium": "^1.43.1",
4444
"@stylistic/eslint-plugin": "^2.11.0",
4545
"@types/he": "^1.2.3",

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ export async function preTransformationUploadCode() {
263263

264264
transformByQState.setPayloadFilePath(payloadFilePath)
265265
uploadId = await uploadPayload(payloadFilePath)
266+
telemetry.record({ codeTransformJobId: uploadId }) // uploadId is re-used as jobId
266267
})
267268
} catch (err) {
268269
const errorMessage = (err as Error).message
@@ -735,15 +736,15 @@ export async function postTransformationJob() {
735736
const mavenVersionInfoMessage = `${versionInfo[0]} (${transformByQState.getMavenName()})`
736737
const javaVersionInfoMessage = `${versionInfo[1]} (${transformByQState.getMavenName()})`
737738

738-
// Note: IntelliJ implementation of ResultStatusMessage includes additional metadata such as jobId.
739739
telemetry.codeTransform_totalRunTime.emit({
740740
buildSystemVersion: mavenVersionInfoMessage,
741741
codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
742+
codeTransformJobId: transformByQState.getJobId(),
742743
codeTransformResultStatusMessage: resultStatusMessage,
743744
codeTransformRunTimeLatency: durationInMs,
744745
codeTransformLocalJavaVersion: javaVersionInfoMessage,
745746
result: resultStatusMessage === TransformByQStatus.Succeeded ? MetadataResult.Pass : MetadataResult.Fail,
746-
reason: resultStatusMessage,
747+
reason: `${resultStatusMessage}-${chatMessage}`,
747748
})
748749
}
749750

@@ -825,6 +826,7 @@ export async function stopTransformByQ(jobId: string) {
825826
await telemetry.codeTransform_jobIsCancelledByUser.run(async () => {
826827
telemetry.record({
827828
codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
829+
codeTransformJobId: jobId,
828830
})
829831
if (transformByQState.isRunning()) {
830832
getLogger().info('CodeTransformation: User requested to stop transformation. Stopping transformation.')

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,9 +536,9 @@ export class ProposedTransformationExplorer {
536536
diffModel.saveChanges()
537537
telemetry.codeTransform_submitSelection.emit({
538538
codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
539+
codeTransformJobId: transformByQState.getJobId(),
539540
userChoice: `acceptChanges-${patchFilesDescriptions?.content[diffModel.currentPatchIndex].name}`,
540541
})
541-
telemetry.ui_click.emit({ elementId: 'transformationHub_acceptChanges' })
542542
if (transformByQState.getMultipleDiffs()) {
543543
void vscode.window.showInformationMessage(
544544
CodeWhispererConstants.changesAppliedNotificationMultipleDiffs(
@@ -596,7 +596,6 @@ export class ProposedTransformationExplorer {
596596
vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.rejectChanges', async () => {
597597
diffModel.rejectChanges()
598598
await reset()
599-
telemetry.ui_click.emit({ elementId: 'transformationHub_rejectChanges' })
600599

601600
transformByQState.getChatControllers()?.transformationFinished.fire({
602601
tabID: ChatSessionManager.Instance.getSession().tabID,

0 commit comments

Comments
 (0)