Merge pull request #5656 from flexion/devex-fix-logger-response-conte…

…xt-to-staging Fix format of response object in our logs
ustaxcourt · Dec 18, 2024 · 49803be · 49803be
2 parents df3f8d1 + f4d5498
commit 49803be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/web-api/src/logger.test.ts b/web-api/src/logger.test.ts
@@ -61,11 +61,12 @@ describe('logger', () => {
     const instance = req.locals.logger;
 
     instance.info = jest.fn();
+    jest.spyOn(instance, 'addContext');
 
     res.end();
 
-    expect(instance.info).toHaveBeenCalledWith(
-      expect.any(String),
+    expect(instance.info).toHaveBeenCalledWith(expect.any(String));
+    expect(instance.addContext).toHaveBeenCalledWith(
       expect.objectContaining({
         response: expect.objectContaining({
           statusCode: 200,

diff --git a/web-api/src/logger.ts b/web-api/src/logger.ts
@@ -43,13 +43,15 @@ export const expressLogger = (req, res, next) => {
     end.apply(this, arguments);
     const responseTimeMs = new Date() - req.locals.startTime;
 
-    logger.info(`Request ended: ${req.method} ${req.url}`, {
+    logger.addContext({
       response: {
         responseSize: parseInt(res.get('content-length') ?? '0'),
         responseTimeMs,
         statusCode: res.statusCode,
       },
     });
+
+    logger.info(`Request ended: ${req.method} ${req.url}`);
     logger.clearContext();
   };