Skip to content

Commit 10c1cf4

Browse files
Merge master into feature/emr
2 parents 97dd820 + a4662aa commit 10c1cf4

File tree

19 files changed

+198
-49
lines changed

19 files changed

+198
-49
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ module.exports = {
162162
'aws-toolkits/no-incorrect-once-usage': 'error',
163163
'aws-toolkits/no-string-exec-for-child-process': 'error',
164164
'aws-toolkits/no-console-log': 'error',
165-
165+
'aws-toolkits/no-json-stringify-in-log': 'error',
166166
'no-restricted-imports': [
167167
'error',
168168
{

packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,20 +111,15 @@ export class InlineChatProvider {
111111

112112
const request = triggerPayloadToChatRequest(triggerPayload)
113113
const session = this.sessionStorage.getSession(tabID)
114-
getLogger().info(
115-
`request from tab: ${tabID} conversationID: ${session.sessionIdentifier} request: ${JSON.stringify(
116-
request
117-
)}`
118-
)
114+
getLogger().info(`request from tab: ${tabID} conversationID: ${session.sessionIdentifier} request: %O`, request)
119115

120116
let response: GenerateAssistantResponseCommandOutput | undefined = undefined
121117
session.createNewTokenSource()
122118
try {
123119
response = await session.chatSso(request)
124120
getLogger().info(
125-
`response to tab: ${tabID} conversationID: ${session.sessionIdentifier} requestID: ${response.$metadata.requestId} metadata: ${JSON.stringify(
126-
response.$metadata
127-
)}`
121+
`response to tab: ${tabID} conversationID: ${session.sessionIdentifier} requestID: ${response.$metadata.requestId} metadata: %O`,
122+
response.$metadata
128123
)
129124
} catch (e: any) {
130125
this.processException(e, tabID)

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ async function generateResource(cfnType: string) {
8686
// TODO-STARLING - Revisit to see if timeout still needed prior to launch
8787
const data = await timeout(amazonqApi.chatApi.chat(request), TIMEOUT)
8888
const initialResponseTime = globals.clock.Date.now() - startTime
89-
getLogger().debug(`CW Chat initial response: ${JSON.stringify(data, undefined, 2)}, ${initialResponseTime} ms`)
89+
getLogger().debug(`CW Chat initial response: %O, ${initialResponseTime} ms`, data)
9090
if (data['$metadata']) {
9191
metadata = data['$metadata']
9292
}
9393

9494
if (data.generateAssistantResponseResponse === undefined) {
95-
getLogger().debug(`Error: Unexpected model response: ${JSON.stringify(data, undefined, 2)}`)
95+
getLogger().debug(`Error: Unexpected model response: %O`, data)
9696
throw new Error('No model response')
9797
}
9898

@@ -141,12 +141,15 @@ async function generateResource(cfnType: string) {
141141
`CW Chat Debug message:
142142
cfnType = "${cfnType}",
143143
conversationId = ${conversationId},
144-
metadata = \n${JSON.stringify(metadata, undefined, 2)},
145-
supplementaryWebLinks = \n${JSON.stringify(supplementaryWebLinks, undefined, 2)},
146-
references = \n${JSON.stringify(references, undefined, 2)},
144+
metadata = %O,
145+
supplementaryWebLinks = %O,
146+
references = %O,
147147
response = "${response}",
148148
initialResponse = ${initialResponseTime} ms,
149-
elapsed time = ${elapsedTime} ms`
149+
elapsed time = ${elapsedTime} ms`,
150+
metadata,
151+
supplementaryWebLinks,
152+
references
150153
)
151154

152155
return {
@@ -163,7 +166,7 @@ async function generateResource(cfnType: string) {
163166
getLogger().debug(`CW Chat error: ${error.name} - ${error.message}`)
164167
if (error.$metadata) {
165168
const { requestId, cfId, extendedRequestId } = error.$metadata
166-
getLogger().debug(JSON.stringify({ requestId, cfId, extendedRequestId }, undefined, 2))
169+
getLogger().debug('%O', { requestId, cfId, extendedRequestId })
167170
}
168171

169172
throw error

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,7 @@ export class RecommendationHandler {
220220
* Validate request
221221
*/
222222
if (!EditorContext.validateRequest(request)) {
223-
getLogger().verbose(
224-
'Invalid Request : ',
225-
JSON.stringify(request, undefined, EditorContext.getTabSize())
226-
)
223+
getLogger().verbose('Invalid Request: %O', request)
227224
const languageName = request.fileContext.programmingLanguage.languageName
228225
if (!runtimeLanguageContext.isLanguageSupported(languageName)) {
229226
errorMessage = `${languageName} is currently not supported by Amazon Q inline suggestions`

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -650,11 +650,7 @@ export class ChatController {
650650

651651
const request = triggerPayloadToChatRequest(triggerPayload)
652652
const session = this.sessionStorage.getSession(tabID)
653-
getLogger().info(
654-
`request from tab: ${tabID} conversationID: ${session.sessionIdentifier} request: ${JSON.stringify(
655-
request
656-
)}`
657-
)
653+
getLogger().info(`request from tab: ${tabID} conversationID: ${session.sessionIdentifier} request: %O`, request)
658654
let response: MessengerResponseType | undefined = undefined
659655
session.createNewTokenSource()
660656
try {
@@ -679,7 +675,8 @@ export class ChatController {
679675
getLogger().info(
680676
`response to tab: ${tabID} conversationID: ${session.sessionIdentifier} requestID: ${
681677
response.$metadata.requestId
682-
} metadata: ${JSON.stringify(response.$metadata)}`
678+
} metadata: %O`,
679+
response.$metadata
683680
)
684681
await this.messenger.sendAIResponse(response, session, tabID, triggerID, triggerPayload)
685682
} catch (e: any) {

packages/core/src/shared/crashMonitoring.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ class CrashChecker {
297297
// Example is if I hit the red square in the debug menu, it is a non-graceful shutdown. But the regular
298298
// 'x' button in the Debug IDE instance is a graceful shutdown.
299299
if (ext.isDebug) {
300-
devLogger?.debug(`crashMonitoring: DEBUG instance crashed: ${JSON.stringify(ext)}`)
300+
devLogger?.debug(`crashMonitoring: DEBUG instance crashed: %O`, ext)
301301
return
302302
}
303303

@@ -318,7 +318,10 @@ class CrashChecker {
318318
// Sanity check: ENSURE THAT AFTER === ACTUAL or this implies that our data is out of sync
319319
const afterActual = (await state.getAllExts()).map((i) => truncateUuid(i.sessionId))
320320
devLogger?.debug(
321-
`crashMonitoring: CHECKED: Result of cleaning up crashed instances\nBEFORE: ${JSON.stringify(before)}\nAFTER: ${JSON.stringify(after)}\nACTUAL: ${JSON.stringify(afterActual)}`
321+
`crashMonitoring: CHECKED: Result of cleaning up crashed instances\nBEFORE: %O \nAFTER: %O \nACTUAL: %O`,
322+
before,
323+
after,
324+
afterActual
322325
)
323326
}
324327

packages/core/src/shared/env/resolveEnv.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ async function doResolveUnixShellEnv(timeout: Timeout): Promise<typeof process.e
246246
}
247247
}
248248

249-
getLogger().debug(`getUnixShellEnvironment#spawn:${JSON.stringify(shellArgs)}, command:${command}`)
249+
getLogger().debug(`getUnixShellEnvironment#spawn:%O, command:${command}`, shellArgs)
250250

251251
const child = new ChildProcess(systemShellUnix, [...shellArgs, command], {
252252
spawnOptions: {

packages/core/src/shared/featureConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export class FeatureConfigProvider {
110110
})
111111
})
112112
})
113-
getLogger().info('AB Testing Cohort Assignments %s', JSON.stringify(response.featureEvaluations))
113+
getLogger().info('AB Testing Cohort Assignments %O', response.featureEvaluations)
114114

115115
const customizationArnOverride = this.featureConfigs.get(Features.customizationArnOverride)?.value
116116
?.stringValue

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
308308
}
309309
}
310310
}
311-
getLogger().verbose(`provideDebugConfigurations: debugconfigs: ${JSON.stringify(configs)}`)
311+
getLogger().verbose(`provideDebugConfigurations: debugconfigs: %O`, configs)
312312
}
313313

314314
return configs
@@ -449,7 +449,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
449449
} else if (rv.message) {
450450
void vscode.window.showInformationMessage(rv.message)
451451
}
452-
getLogger().verbose(`SAM debug: config: ${JSON.stringify(config.name)}`)
452+
getLogger().verbose(`SAM debug: config %s:`, config.name)
453453
}
454454

455455
const editor = vscode.window.activeTextEditor

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

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

0 commit comments

Comments
 (0)