feat(telemetry): add registration info to auth events (#5439)

* feat(telemetry): add registration info to auth events

- For easier analysis, auth events (auth_userState, auth_addConnection, aws_refreshCredentials, aws_loginWithBrowser) will now contain start url, region, registration client id, and registration expiration time.

* fix package-lock.json

* remove redundant telemetry dependency

Author: hayemaxi

package-lock.json

@@ -39,6 +39,7 @@
         "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
     },
     "devDependencies": {
+        "@aws-toolkits/telemetry": "^1.0.239",
         "@playwright/browser-chromium": "^1.43.1",
         "@types/vscode": "^1.68.0",
         "@types/vscode-webview": "^1.57.1",
@@ -68,7 +69,6 @@
         "webpack-merge": "^5.10.0"
     },
     "dependencies": {
-        "@aws-toolkits/telemetry": "^1.0.232",
         "vscode-nls": "^5.2.0",
         "vscode-nls-dev": "^4.0.4"
     }

package.json

@@ -3,7 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AuthUtils, CredentialsStore, LoginManager, SsoConnection, initializeAuth } from 'aws-core-vscode/auth'
+import {
+    AuthUtils,
+    CredentialsStore,
+    LoginManager,
+    getTelemetryMetadataForConn,
+    initializeAuth,
+    isAnySsoConnection,
+} from 'aws-core-vscode/auth'
 import {
     AuthUtil,
     activate as activateCodeWhisperer,
@@ -149,10 +156,15 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
         }
 
         const authState = (await AuthUtil.instance.getChatAuthState()).codewhispererChat
+        const currConn = AuthUtil.instance.conn
+        if (currConn !== undefined && !isAnySsoConnection(currConn)) {
+            getLogger().error(`Current Amazon Q connection is not SSO, type is: %s`, currConn?.type)
+        }
+
         telemetry.record({
             authStatus: authState === 'connected' || authState === 'expired' ? authState : 'notConnected',
-            authEnabledConnections: AuthUtils.getAuthFormIdsFromConnection(AuthUtil.instance.conn).join(','),
-            authScopes: ((AuthUtil.instance.conn as SsoConnection)?.scopes ?? []).join(','),
+            authEnabledConnections: AuthUtils.getAuthFormIdsFromConnection(currConn).join(','),
+            ...(await getTelemetryMetadataForConn(currConn)),
         })
     })
 }

packages/amazonq/src/extension.ts

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

packages/core/package.json

@@ -742,6 +742,7 @@ export class Auth implements AuthService, ConnectionManager {
             state: profile.metadata.connectionState,
             label: profile.metadata?.label ?? this.getSsoProfileLabel(profile),
             getToken: () => this.getToken(id, provider),
+            getRegistration: () => provider.getClientRegistration(),
         }
     }