Skip to content

Commit 8265db4

Browse files
committed
chore(middleware-logger): emit $metadata from output
1 parent a94d181 commit 8265db4

File tree

2 files changed

+3
-31
lines changed

2 files changed

+3
-31
lines changed

packages/middleware-logger/src/loggerMiddleware.spec.ts

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,7 @@ describe("loggerMiddleware", () => {
110110
commandName,
111111
input: mockInputLog,
112112
output: mockOutputLog,
113-
metadata: {
114-
statusCode: mockResponse.response.statusCode,
115-
requestId: mockResponse.response.headers["x-amzn-requestid"],
116-
extendedRequestId: mockResponse.response.headers["x-amz-id-2"],
117-
cfId: mockResponse.response.headers["x-amz-cf-id"],
118-
retry: {
119-
attempts: $metadata.attempts,
120-
totalDelay: $metadata.totalRetryDelay,
121-
},
122-
},
113+
metadata: $metadata,
123114
});
124115
});
125116

@@ -154,16 +145,7 @@ describe("loggerMiddleware", () => {
154145
expect(logger.info).toHaveBeenCalledWith({
155146
input: mockArgs.input,
156147
output: outputWithoutMetadata,
157-
metadata: {
158-
statusCode: customResponse.response.statusCode,
159-
requestId: requestIdBackup,
160-
extendedRequestId: undefined,
161-
cfId: undefined,
162-
retry: {
163-
attempts: $metadata.attempts,
164-
totalDelay: $metadata.totalRetryDelay,
165-
},
166-
},
148+
metadata: $metadata,
167149
});
168150
});
169151
});

packages/middleware-logger/src/loggerMiddleware.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,13 @@ export const loggerMiddleware = () => <Output extends MetadataBearer = MetadataB
2525
}
2626

2727
if (typeof logger.info === "function") {
28-
const httpResponse = response.response as HttpResponse;
2928
const { $metadata, ...outputWithoutMetadata } = response.output;
3029
logger.info({
3130
clientName,
3231
commandName,
3332
input: inputFilterSensitiveLog(args.input),
3433
output: outputFilterSensitiveLog(outputWithoutMetadata),
35-
metadata: {
36-
statusCode: httpResponse.statusCode,
37-
requestId: httpResponse.headers["x-amzn-requestid"] ?? httpResponse.headers["x-amzn-request-id"],
38-
extendedRequestId: httpResponse.headers["x-amz-id-2"],
39-
cfId: httpResponse.headers["x-amz-cf-id"],
40-
retry: {
41-
attempts: $metadata.attempts,
42-
totalDelay: $metadata.totalRetryDelay,
43-
},
44-
},
34+
metadata: $metadata,
4535
});
4636
}
4737

0 commit comments

Comments
 (0)