fix(amazonq): projectDetails not always emitted, add field to hold if user on Builder Id or IdC (#4663)

* fix(amazonq): fix telemetry

* address comments

---------

Co-authored-by: David Hasani <[email protected]>

Author: dhasani23

package-lock.json

@@ -4234,7 +4234,7 @@
     },
     "devDependencies": {
         "@aws-sdk/types": "^3.13.1",
-        "@aws-toolkits/telemetry": "^1.0.196",
+        "@aws-toolkits/telemetry": "^1.0.201",
         "@aws/fully-qualified-names": "^2.1.4",
         "@cspotcode/source-map-support": "^0.8.1",
         "@sinonjs/fake-timers": "^10.0.2",

packages/core/package.json

@@ -25,11 +25,14 @@ import {
 import { JDKVersion, transformByQState } from '../../../codewhisperer/models/model'
 import { JavaHomeNotSetError, NoJavaProjectsFoundError, NoMavenJavaProjectsFoundError } from '../../errors'
 import MessengerUtils, { ButtonActions, GumbyCommands } from './messenger/messengerUtils'
-import { TransformationCandidateProject } from '../../../codewhisperer/service/transformByQHandler'
+import { TransformationCandidateProject, getAuthType } from '../../../codewhisperer/service/transformByQHandler'
 import { CancelActionPositions } from '../../telemetry/codeTransformTelemetry'
 import fs from 'fs'
 import path from 'path'
 import { openUrl } from '../../../shared/utilities/vsCodeUtils'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { MetadataResult } from '../../../shared/telemetry/telemetryClient'
+import { codeTransformTelemetryState } from '../../telemetry/codeTransformTelemetryState'
 
 // These events can be interactions within the chat,
 // or elsewhere in the IDE
@@ -227,9 +230,14 @@ export class GumbyController {
         }
     }
 
-    // Any given project could have multiple candidate projects to transform --
-    // The user gets prompted to pick a specific one
+    // prompt user to pick project and specify source JDK version
     private async initiateTransformationOnProject(message: any) {
+        const authType = await getAuthType()
+        telemetry.codeTransform_jobIsStartedFromChatPrompt.emit({
+            codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
+            credentialSourceId: authType,
+            result: MetadataResult.Pass,
+        })
         const pathToProject: string = message.formSelectedValues['GumbyTransformProjectForm']
         const toJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkToForm']
         const fromJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkFromForm']

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

@@ -9,12 +9,8 @@
 import {
     CodeTransformJavaSourceVersionsAllowed,
     CodeTransformJavaTargetVersionsAllowed,
-    telemetry,
 } from '../../shared/telemetry/telemetry'
 import { JDKVersion } from '../../codewhisperer/models/model'
-import * as CodeWhispererConstants from '../../codewhisperer/models/constants'
-import { codeTransformTelemetryState } from './codeTransformTelemetryState'
-import { MetadataResult } from '../../shared/telemetry/telemetryClient'
 
 export const telemetryUndefined = 'undefined'
 
@@ -26,37 +22,6 @@ export enum CancelActionPositions {
     Chat = 'qChatPanel',
 }
 
-export enum StartActionPositions {
-    DevToolsSidePanel = 'devToolsStartButton',
-    BottomHubPanel = 'bottomPanelSideNavButton',
-    ChatPrompt = 'chatPrompt',
-}
-
-export const logCodeTransformInitiatedMetric = (source: string): void => {
-    const commonMetrics = {
-        codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
-    }
-
-    if (source === CodeWhispererConstants.transformTreeNode) {
-        telemetry.codeTransform_isDoubleClickedToTriggerUserModal.emit({
-            codeTransformStartSrcComponents: StartActionPositions.DevToolsSidePanel,
-            ...commonMetrics,
-            result: MetadataResult.Pass,
-        })
-    } else if (source === StartActionPositions.BottomHubPanel) {
-        telemetry.codeTransform_isDoubleClickedToTriggerUserModal.emit({
-            codeTransformStartSrcComponents: StartActionPositions.BottomHubPanel,
-            ...commonMetrics,
-            result: MetadataResult.Pass,
-        })
-    } else if (source === StartActionPositions.ChatPrompt) {
-        telemetry.codeTransform_jobIsStartedFromChatPrompt.emit({
-            ...commonMetrics,
-            result: MetadataResult.Pass,
-        })
-    }
-}
-
 export const JDKToTelemetryValue = (
     source?: JDKVersion
 ): CodeTransformJavaSourceVersionsAllowed | CodeTransformJavaTargetVersionsAllowed | undefined => {
@@ -67,6 +32,8 @@ export const JDKToTelemetryValue = (
             return 'JDK_11'
         case JDKVersion.JDK17:
             return 'JDK_17'
+        case JDKVersion.UNSUPPORTED:
+            return 'Other'
         default:
             return undefined
     }

packages/core/src/amazonqGumby/telemetry/codeTransformTelemetry.ts

@@ -191,12 +191,6 @@ export async function preTransformationUploadCode() {
     } catch (err) {
         const errorMessage = `Failed to upload code due to ${(err as Error).message}`
         getLogger().error(errorMessage)
-        telemetry.codeTransform_logGeneralError.emit({
-            codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
-            codeTransformApiErrorMessage: errorMessage,
-            result: MetadataResult.Fail,
-            reason: 'UploadArchiveFailed',
-        })
         throw err
     }
 
@@ -212,12 +206,6 @@ export async function startTransformationJob(uploadId: string) {
         jobId = await startJob(uploadId)
     } catch (error) {
         const errorMessage = CodeWhispererConstants.failedToStartJobMessage
-        telemetry.codeTransform_logGeneralError.emit({
-            codeTransformSessionId: codeTransformTelemetryState.getSessionId(),
-            codeTransformApiErrorMessage: errorMessage,
-            result: MetadataResult.Fail,
-            reason: 'StartJobFailed',
-        })
         transformByQState.setJobFailureErrorMessage(errorMessage)
         throw new Error('Start job failed')
     }