Merge master into feature/sdkv3

Author: aws-toolkit-automation

package-lock.json

@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.311",
+        "@aws-toolkits/telemetry": "^1.0.312",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

package.json

@@ -384,20 +384,24 @@ export async function uploadArtifactToS3(
         headersObj['x-amz-server-side-encryption-aws-kms-key-id'] = resp.kmsKeyArn
     }
 
+    let requestId: string | undefined = undefined
+    let id2: string | undefined = undefined
+    let responseCode: string = ''
+
     try {
         const response = await request.fetch('PUT', resp.uploadUrl, {
             body: readFileSync(fileName),
             headers: resp?.requestHeaders ?? headersObj,
         }).response
         logger.debug(`StatusCode: ${response.status}, Text: ${response.statusText}`)
+        requestId = response.headers?.get('x-amz-request-id') ?? undefined
+        id2 = response.headers?.get('x-amz-id-2') ?? undefined
+        responseCode = response.status.toString()
     } catch (error) {
         if (span && error instanceof RequestError) {
-            const requestId = error.response.headers.get('x-amz-request-id') ?? undefined
-            span.record({
-                requestId: requestId,
-                requestServiceType: 's3',
-                httpStatusCode: error.code.toString(),
-            })
+            requestId = error.response.headers.get('x-amz-request-id') ?? undefined
+            id2 = error.response.headers.get('x-amz-id-2') ?? undefined
+            responseCode = error.code.toString()
         }
         let errorMessage = ''
         const isCodeScan = featureUseCase === FeatureUseCase.CODE_SCAN
@@ -419,6 +423,16 @@ export async function uploadArtifactToS3(
             ChatSessionManager.Instance.getSession().startTestGenerationRequestId = error.requestId
         }
         throw isCodeScan ? new UploadArtifactToS3Error(errorMessage) : new UploadTestArtifactToS3Error(errorMessage)
+    } finally {
+        getLogger().debug(`Upload to S3 response details: x-amz-request-id: ${requestId}, x-amz-id-2: ${id2}`)
+        if (span) {
+            span.record({
+                requestId: requestId,
+                requestId2: id2,
+                requestServiceType: 's3',
+                httpStatusCode: responseCode,
+            })
+        }
     }
 }