From b6166282bb5506f8872c6e5e35a9bc36b1944df2 Mon Sep 17 00:00:00 2001
From: Ricardo Neves <3121786+RicardoNeves@users.noreply.github.com>
Date: Tue, 20 Sep 2022 15:04:20 +0100
Subject: [PATCH] feat: Added hostname to node request info. (#633)

---
 .../format-node-request/formatNodeRequest.spec.js          | 6 ++++++
 .../kununu-logger/format-node-request/index.js             | 1 +
 .../middlewares/expressLogger/application.schema.json      | 7 ++++++-
 packages/kununu-utils/package.json                         | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/kununu-utils/kununu-logger/format-node-request/formatNodeRequest.spec.js b/packages/kununu-utils/kununu-logger/format-node-request/formatNodeRequest.spec.js
index 5686e097..fa427c2a 100644
--- a/packages/kununu-utils/kununu-logger/format-node-request/formatNodeRequest.spec.js
+++ b/packages/kununu-utils/kununu-logger/format-node-request/formatNodeRequest.spec.js
@@ -15,6 +15,7 @@ const metrics = {any_metric: 'any_metric_result'};
 
 beforeAll(() => {
   advanceTo(new Date(2019, 1, 1, 0, 0, 0));
+  process.env.HOSTNAME = 'dummy-hostname-id';
 });
 
 beforeEach(() => {
@@ -28,6 +29,7 @@ afterEach(() => {
 
 afterAll(() => {
   clear();
+  process.env.HOSTNAME = undefined;
 });
 
 describe('formatNodeRequest custom format', () => {
@@ -81,6 +83,7 @@ describe('formatNodeRequest custom format', () => {
       context: {
         any_context: 'any_context_result',
       },
+      debugContainerHostname: 'dummy-hostname-id',
       http: {
         method: 'GET',
         referer: '/referer',
@@ -107,6 +110,7 @@ describe('formatNodeRequest custom format', () => {
       context: {
         any_context: 'any_context_result',
       },
+      debugContainerHostname: 'dummy-hostname-id',
     }));
   });
 
@@ -127,6 +131,7 @@ describe('formatNodeRequest custom format', () => {
       context: {
         any_context: 'any_context_result',
       },
+      debugContainerHostname: 'dummy-hostname-id',
     }));
   });
 
@@ -138,6 +143,7 @@ describe('formatNodeRequest custom format', () => {
       level: false,
       datetime: '2019-02-01T00:00:00.000Z',
       channel: 'app',
+      debugContainerHostname: 'dummy-hostname-id',
     }));
   });
 });
diff --git a/packages/kununu-utils/kununu-logger/format-node-request/index.js b/packages/kununu-utils/kununu-logger/format-node-request/index.js
index cacc287d..f9736a33 100644
--- a/packages/kununu-utils/kununu-logger/format-node-request/index.js
+++ b/packages/kununu-utils/kununu-logger/format-node-request/index.js
@@ -34,6 +34,7 @@ const formatNodeRequest = ({
     channel,
     metrics,
     context,
+    debugContainerHostname: process.env.HOSTNAME,
   };
 
   // Add http object when req or res have entries
diff --git a/packages/kununu-utils/middlewares/expressLogger/application.schema.json b/packages/kununu-utils/middlewares/expressLogger/application.schema.json
index f557432f..fac21b0f 100644
--- a/packages/kununu-utils/middlewares/expressLogger/application.schema.json
+++ b/packages/kununu-utils/middlewares/expressLogger/application.schema.json
@@ -23,7 +23,12 @@
       "type": "string",
       "format": "date-time",
       "examples": [ "2019-05-02T06:59:01.345464+00:00" ]
-    }, 
+    },
+
+    "debugContainerHostname": {
+      "description": "The value used by the HOSTNAME env var",
+      "type": "string"
+    },
 
     "extra": {
       "description": "Extra data to be passed which is not implicitly within the context of the log.  This can be unstructured data.",
diff --git a/packages/kununu-utils/package.json b/packages/kununu-utils/package.json
index ca0d00ed..14eceb27 100644
--- a/packages/kununu-utils/package.json
+++ b/packages/kununu-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kununu/kununu-utils",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Utility functions used within kununu client applications",
   "main": "dist",
   "devDependencies": {