Improve logging

Author: opieter-aws

packages/core/src/codewhisperer/util/authUtil.ts

@@ -65,6 +65,8 @@ export interface IAuthProvider {
  */
 export class AuthUtil implements IAuthProvider {
     public readonly profileName = VSCODE_EXTENSION_ID.amazonq
+    protected logger = getLogger('amazonqAuth')
+
     public readonly regionProfileManager: RegionProfileManager
 
     // IAM login currently not supported
@@ -278,7 +280,7 @@ export class AuthUtil implements IAuthProvider {
     }
 
     private async cacheChangedHandler(event: cacheChangedEvent) {
-        getLogger().debug(`Auth: Cache change event received: ${event}`)
+        this.logger.debug(`Cache change event received: ${event}`)
         if (event === 'delete') {
             await this.logout()
         } else if (event === 'create') {
@@ -292,7 +294,7 @@ export class AuthUtil implements IAuthProvider {
             await this.lspAuth.updateBearerToken(params!)
             return
         } else {
-            getLogger().info(`codewhisperer: connection changed to ${e.state}`)
+            this.logger.info(`codewhisperer: connection changed to ${e.state}`)
             await this.refreshState(e.state)
         }
     }
@@ -416,15 +418,15 @@ export class AuthUtil implements IAuthProvider {
                 new CancellationTokenSource().token
             )
             if (token) {
-                getLogger().info(`codewhisperer: existing LSP auth connection found. Skipping migration`)
+                this.logger.info('existing LSP auth connection found. Skipping migration')
                 await memento.update(key, undefined)
                 return
             }
         } catch {
-            getLogger().info(`codewhisperer: unable to get token from LSP auth, proceeding migration`)
+            this.logger.info('unable to get token from LSP auth, proceeding migration')
         }
 
-        getLogger().info(`codewhisperer: checking for old SSO connections`)
+        this.logger.info('checking for old SSO connections')
         for (const [id, p] of Object.entries(profiles)) {
             if (p.type === 'sso' && hasExactScopes(p.scopes ?? [], amazonQScopes)) {
                 toImport = p
@@ -436,7 +438,7 @@ export class AuthUtil implements IAuthProvider {
         }
 
         if (toImport && profileId) {
-            getLogger().info(`codewhisperer: migrating SSO connection to LSP identity server...`)
+            this.logger.info('migrating SSO connection to LSP identity server...')
 
             const registrationKey = {
                 startUrl: toImport.startUrl,
@@ -466,13 +468,13 @@ export class AuthUtil implements IAuthProvider {
             try {
                 await fs.rename(fromRegistrationFile, toRegistrationFile)
                 await fs.rename(fromTokenFile, toTokenFile)
-                getLogger().debug('Successfully renamed registration and token files')
+                this.logger.debug('Successfully renamed registration and token files')
             } catch (err) {
-                getLogger().error(`Failed to rename files during migration: ${err}`)
+                this.logger.error(`Failed to rename files during migration: ${err}`)
                 throw err
             }
 
-            getLogger().info(`codewhisperer: successfully migrated SSO connection to LSP identity server`)
+            this.logger.info('successfully migrated SSO connection to LSP identity server')
             await memento.update(key, undefined)
         }
     }

packages/core/src/shared/logger/logger.ts

@@ -21,6 +21,7 @@ export type LogTopic =
     | 'nextEditPrediction'
     | 'resourceCache'
     | 'telemetry'
+    | 'amazonqAuth'
 
 class ErrorLog {
     constructor(