From 7fc03dc1c171749167baad6aa6c4d21e732caa1f Mon Sep 17 00:00:00 2001
From: Camila Belo <camilaibs@gmail.com>
Date: Thu, 21 Nov 2024 16:00:16 +0100
Subject: [PATCH] =?UTF-8?q?refactor:=20more=20review=20suggestions=20?=
 =?UTF-8?q?=F0=9F=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Camila Belo <camilaibs@gmail.com>
---
 .../rootHttpRouter/http/MiddlewareFactory.test.ts     |  8 ++++----
 .../rootHttpRouter/http/MiddlewareFactory.ts          | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.test.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.test.ts
index cd9101bae4..1c99c0e020 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.test.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.test.ts
@@ -255,12 +255,12 @@ describe('MiddlewareFactory', () => {
         ),
         {
           type: 'incomingRequest',
-          date: 'Wed, 20 Nov 2024 00:00:00 GMT',
+          date: '2024-11-20T00:00:00.000Z',
           method: 'GET',
           url: '/',
           status: 200,
           httpVersion: '1.1',
-          contentLength: '11',
+          contentLength: 11,
         },
       );
     });
@@ -282,14 +282,14 @@ describe('MiddlewareFactory', () => {
         ),
         {
           type: 'incomingRequest',
-          date: 'Wed, 20 Nov 2024 00:00:00 GMT',
+          date: '2024-11-20T00:00:00.000Z',
           method: 'GET',
           url: '/',
           status: 200,
           httpVersion: '1.1',
           userAgent: 'test-agent',
           referrer: 'test-referrer',
-          contentLength: '11',
+          contentLength: 11,
         },
       );
     });
diff --git a/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.ts b/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.ts
index 55ca9e158a..070ffb19cf 100644
--- a/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.ts
+++ b/packages/backend-defaults/src/entrypoints/rootHttpRouter/http/MiddlewareFactory.ts
@@ -56,13 +56,14 @@ function getLogMeta(
   res: ServerResponse,
 ) {
   const status = Number(tokens.status(req, res));
+  const contentLength = Number(tokens.res(req, res, 'content-length'));
   return {
-    date: tokens.date(req, res, 'web'),
+    date: tokens.date(req, res, 'iso'),
     method: tokens.method(req, res),
     url: tokens.url(req, res),
     httpVersion: tokens['http-version'](req, res),
-    status: isNaN(status) ? undefined : status,
-    contentLength: tokens.res(req, res, 'content-length'),
+    status: isFinite(status) ? status : undefined,
+    contentLength: isFinite(contentLength) ? contentLength : undefined,
     referrer: tokens.referrer(req, res),
     userAgent: tokens.req(req, res, 'user-agent'),
   };
@@ -173,9 +174,7 @@ export class MiddlewareFactory {
             const { meta, message } = JSON.parse(json);
             logger.info(message.trimEnd(), {
               type: 'incomingRequest',
-              ...Object.entries(meta).reduce((rest, [key, value]) => {
-                return value ? { ...rest, [key]: value } : rest;
-              }, {}),
+              ...meta,
             });
           },
         },