From 92b2b60ad5ddbe8bfbfb0676749e2a7176860adc Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@budzenski.me>
Date: Mon, 28 Dec 2020 15:11:01 -0600
Subject: [PATCH] [logging/json] use merge from kbn/std (#86330)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../server/logging/layouts/json_layout.ts     | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/core/server/logging/layouts/json_layout.ts b/src/core/server/logging/layouts/json_layout.ts
index 7573d0b83741..34c3c325e732 100644
--- a/src/core/server/logging/layouts/json_layout.ts
+++ b/src/core/server/logging/layouts/json_layout.ts
@@ -18,7 +18,7 @@
  */
 
 import moment from 'moment-timezone';
-import { merge } from 'lodash';
+import { merge } from '@kbn/std';
 import { schema } from '@kbn/config-schema';
 import { LogRecord, Layout } from '@kbn/logging';
 
@@ -53,22 +53,19 @@ export class JsonLayout implements Layout {
   }
 
   public format(record: LogRecord): string {
-    return JSON.stringify(
-      merge(
-        {
-          '@timestamp': moment(record.timestamp).format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
-          message: record.message,
-          error: JsonLayout.errorToSerializableObject(record.error),
-          log: {
-            level: record.level.id.toUpperCase(),
-            logger: record.context,
-          },
-          process: {
-            pid: record.pid,
-          },
-        },
-        record.meta
-      )
-    );
+    const log = {
+      '@timestamp': moment(record.timestamp).format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+      message: record.message,
+      error: JsonLayout.errorToSerializableObject(record.error),
+      log: {
+        level: record.level.id.toUpperCase(),
+        logger: record.context,
+      },
+      process: {
+        pid: record.pid,
+      },
+    };
+    const output = record.meta ? merge(log, record.meta) : log;
+    return JSON.stringify(output);
   }
 }