change existing uses

Author: Hweinstock

packages/core/src/applicationcomposer/messageHandlers/generateResourceHandler.ts

@@ -86,13 +86,13 @@ async function generateResource(cfnType: string) {
         // TODO-STARLING - Revisit to see if timeout still needed prior to launch
         const data = await timeout(amazonqApi.chatApi.chat(request), TIMEOUT)
         const initialResponseTime = globals.clock.Date.now() - startTime
-        getLogger().debug(`CW Chat initial response: ${JSON.stringify(data, undefined, 2)}, ${initialResponseTime} ms`)
+        getLogger().debug(`CW Chat initial response: %O, ${initialResponseTime} ms`, data)
         if (data['$metadata']) {
             metadata = data['$metadata']
         }
 
         if (data.generateAssistantResponseResponse === undefined) {
-            getLogger().debug(`Error: Unexpected model response: ${JSON.stringify(data, undefined, 2)}`)
+            getLogger().debug(`Error: Unexpected model response: %O`, data)
             throw new Error('No model response')
         }
 
@@ -141,12 +141,15 @@ async function generateResource(cfnType: string) {
             `CW Chat Debug message:
              cfnType = "${cfnType}",
              conversationId = ${conversationId},
-             metadata = \n${JSON.stringify(metadata, undefined, 2)},
-             supplementaryWebLinks = \n${JSON.stringify(supplementaryWebLinks, undefined, 2)},
-             references = \n${JSON.stringify(references, undefined, 2)},
+             metadata = %O,
+             supplementaryWebLinks = %O,
+             references = %O,
              response = "${response}",
              initialResponse = ${initialResponseTime} ms,
-             elapsed time = ${elapsedTime} ms`
+             elapsed time = ${elapsedTime} ms`,
+            metadata,
+            supplementaryWebLinks,
+            references
         )
 
         return {
@@ -163,7 +166,7 @@ async function generateResource(cfnType: string) {
         getLogger().debug(`CW Chat error: ${error.name} - ${error.message}`)
         if (error.$metadata) {
             const { requestId, cfId, extendedRequestId } = error.$metadata
-            getLogger().debug(JSON.stringify({ requestId, cfId, extendedRequestId }, undefined, 2))
+            getLogger().debug('%O', { requestId, cfId, extendedRequestId })
         }
 
         throw error

packages/core/src/codewhisperer/service/recommendationHandler.ts

@@ -220,10 +220,7 @@ export class RecommendationHandler {
              * Validate request
              */
             if (!EditorContext.validateRequest(request)) {
-                getLogger().verbose(
-                    'Invalid Request : ',
-                    JSON.stringify(request, undefined, EditorContext.getTabSize())
-                )
+                getLogger().verbose('Invalid Request: %O', request)
                 const languageName = request.fileContext.programmingLanguage.languageName
                 if (!runtimeLanguageContext.isLanguageSupported(languageName)) {
                     errorMessage = `${languageName} is currently not supported by Amazon Q inline suggestions`

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -651,11 +651,7 @@ export class ChatController {
 
         const request = triggerPayloadToChatRequest(triggerPayload)
         const session = this.sessionStorage.getSession(tabID)
-        getLogger().info(
-            `request from tab: ${tabID} conversationID: ${session.sessionIdentifier} request: ${JSON.stringify(
-                request
-            )}`
-        )
+        getLogger().info(`request from tab: ${tabID} conversationID: ${session.sessionIdentifier} request: %O`, request)
         let response: GenerateAssistantResponseCommandOutput | undefined = undefined
         session.createNewTokenSource()
         try {
@@ -668,7 +664,8 @@ export class ChatController {
             getLogger().info(
                 `response to tab: ${tabID} conversationID: ${session.sessionIdentifier} requestID: ${
                     response.$metadata.requestId
-                } metadata: ${JSON.stringify(response.$metadata)}`
+                } metadata: %O`,
+                response.$metadata
             )
             await this.messenger.sendAIResponse(response, session, tabID, triggerID, triggerPayload)
         } catch (e: any) {

packages/core/src/shared/crashMonitoring.ts

@@ -297,7 +297,7 @@ class CrashChecker {
                     // Example is if I hit the red square in the debug menu, it is a non-graceful shutdown. But the regular
                     // 'x' button in the Debug IDE instance is a graceful shutdown.
                     if (ext.isDebug) {
-                        devLogger?.debug(`crashMonitoring: DEBUG instance crashed: ${JSON.stringify(ext)}`)
+                        devLogger?.debug(`crashMonitoring: DEBUG instance crashed: %O`, ext)
                         return
                     }
 
@@ -318,7 +318,10 @@ class CrashChecker {
                 // Sanity check: ENSURE THAT AFTER === ACTUAL or this implies that our data is out of sync
                 const afterActual = (await state.getAllExts()).map((i) => truncateUuid(i.sessionId))
                 devLogger?.debug(
-                    `crashMonitoring: CHECKED: Result of cleaning up crashed instances\nBEFORE: ${JSON.stringify(before)}\nAFTER:  ${JSON.stringify(after)}\nACTUAL: ${JSON.stringify(afterActual)}`
+                    `crashMonitoring: CHECKED: Result of cleaning up crashed instances\nBEFORE: %O \nAFTER:  %O \nACTUAL: %O`,
+                    before,
+                    after,
+                    afterActual
                 )
             }
 

packages/core/src/shared/featureConfig.ts

@@ -110,7 +110,7 @@ export class FeatureConfigProvider {
                     })
                 })
             })
-            getLogger().info('AB Testing Cohort Assignments %s', JSON.stringify(response.featureEvaluations))
+            getLogger().info('AB Testing Cohort Assignments %O', response.featureEvaluations)
 
             const customizationArnOverride = this.featureConfigs.get(Features.customizationArnOverride)?.value
                 ?.stringValue

packages/core/src/shared/sam/debugger/awsSamDebugger.ts

@@ -308,7 +308,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                     }
                 }
             }
-            getLogger().verbose(`provideDebugConfigurations: debugconfigs: ${JSON.stringify(configs)}`)
+            getLogger().verbose(`provideDebugConfigurations: debugconfigs: %O`, configs)
         }
 
         return configs
@@ -445,7 +445,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
             } else if (rv.message) {
                 void vscode.window.showInformationMessage(rv.message)
             }
-            getLogger().verbose(`SAM debug: config: ${JSON.stringify(config.name)}`)
+            getLogger().verbose(`SAM debug: config %s:`, config.name)
         }
 
         const editor = vscode.window.activeTextEditor

packages/core/src/shared/sam/debugger/pythonSamDebug.ts

@@ -49,7 +49,7 @@ async function makePythonDebugManifest(params: {
     if (await fileExists(manfestPath)) {
         manifestText = await readFileAsString(manfestPath)
     }
-    getLogger().debug(`pythonCodeLensProvider.makePythonDebugManifest params: ${JSON.stringify(params, undefined, 2)}`)
+    getLogger().debug(`pythonCodeLensProvider.makePythonDebugManifest params: %O`, params)
     // TODO: If another module name includes the string "ikp3db", this will be skipped...
     // HACK: Cloud9-created Lambdas hardcode ikp3db 1.1.4, which only functions with Python 3.6 (which we don't support)
     //       Remove any ikp3db dependency if it exists and manually add a non-pinned ikp3db dependency.

packages/core/src/shared/sam/localLambdaRunner.ts

@@ -452,16 +452,11 @@ export async function attachDebugger({
     },
     ...params
 }: AttachDebuggerContext): Promise<void> {
-    getLogger().debug(
-        `localLambdaRunner.attachDebugger: startDebugging with config: ${JSON.stringify(
-            {
-                name: params.debugConfig.name,
-                invokeTarget: params.debugConfig.invokeTarget,
-            },
-            undefined,
-            2
-        )}`
-    )
+    const obj = {
+        name: params.debugConfig.name,
+        invokeTarget: params.debugConfig.invokeTarget,
+    }
+    getLogger().debug(`localLambdaRunner.attachDebugger: startDebugging with config: %O`, obj)
 
     getLogger().info(localize('AWS.output.sam.local.attaching', 'Attaching debugger to SAM application...'))
 

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

@@ -470,7 +470,7 @@ export function filterTelemetryCacheEvents(input: any): MetricDatum[] {
                 !Object.prototype.hasOwnProperty.call(item, 'EpochTimestamp') ||
                 !Object.prototype.hasOwnProperty.call(item, 'Unit')
             ) {
-                getLogger().warn(`skipping invalid item in telemetry cache: ${JSON.stringify(item)}\n`)
+                getLogger().warn(`skipping invalid item in telemetry cache: %O\n`, item)
 
                 return false
             }

packages/core/src/shared/utilities/map.ts

@@ -43,7 +43,7 @@ export abstract class NestedMap<Key, Value = { [key: string]: any }> implements
     delete(key: Key, reason?: string): void {
         delete this.data[this.hash(key)]
         if (reason) {
-            getLogger().debug(`${this.name}: cleared cache, key: ${JSON.stringify(key)}, reason: ${reason}`)
+            getLogger().debug(`${this.name}: cleared cache, key: %O, reason: ${reason}`, key)
         }
     }