fix(amazonq): update Client Name, User Agent #4710

Author: leigaol

packages/core/src/auth/sso/ssoAccessTokenProvider.ts

@@ -321,7 +321,7 @@ export class DeviceFlowAuthorization extends SsoAccessTokenProvider {
     override async registerClient(): Promise<ClientRegistration> {
         const companyName = getIdeProperties().company
         return this.oidc.registerClient({
-            clientName: isCloud9() ? `${companyName} Cloud9` : `${companyName} Toolkit for VSCode`,
+            clientName: isCloud9() ? `${companyName} Cloud9` : `${companyName} IDE Extensions for VSCode`,
             clientType: clientRegistrationType,
             scopes: this.profile.scopes,
         })
@@ -387,7 +387,8 @@ class AuthFlowAuthorization extends SsoAccessTokenProvider {
     override async registerClient(): Promise<ClientRegistration> {
         const companyName = getIdeProperties().company
         return this.oidc.registerClient({
-            clientName: isCloud9() ? `${companyName} Cloud9` : `${companyName} Toolkit for VSCode`,
+            // All AWS extensions (Q, Toolkit) for a given IDE use the same client name.
+            clientName: isCloud9() ? `${companyName} Cloud9` : `${companyName} IDE Extensions for VSCode`,
             clientType: clientRegistrationType,
             scopes: this.profile.scopes,
             grantTypes: [authorizationGrantType, refreshGrantType],

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

@@ -16,6 +16,7 @@ import { Result } from './telemetry.gen'
 import { MetricDatum } from './clienttelemetry'
 import { isValidationExemptMetric } from './exemptMetrics'
 import { isCloud9, isSageMaker } from '../../shared/extensionUtilities'
+import { VSCODE_EXTENSION_ID } from '../utilities'
 
 const legacySettingsTelemetryValueDisable = 'Disable'
 const legacySettingsTelemetryValueEnable = 'Enable'
@@ -77,7 +78,10 @@ export async function getUserAgent(
     opt?: { includePlatform?: boolean; includeClientId?: boolean },
     globalState = globals.context.globalState
 ): Promise<string> {
-    const pairs = [`AWS-Toolkit-For-VSCode/${extensionVersion}`]
+    const pairs =
+        globals.context.extension.id === VSCODE_EXTENSION_ID.amazonq
+            ? [`AmazonQ-For-VSCode/${extensionVersion}`]
+            : [`AWS-Toolkit-For-VSCode/${extensionVersion}`]
 
     if (opt?.includePlatform) {
         pairs.push(platformPair())