From f613ebdea8bbd41186ba1c4329c03cda5495c761 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Mon, 7 Sep 2020 09:57:10 +0200
Subject: [PATCH] Legacy logging: fix remoteAddress being duplicated in
 userAgent field (#76751)

---
 src/legacy/server/logging/log_format.js           | 2 +-
 src/legacy/server/logging/log_format_json.test.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/legacy/server/logging/log_format.js b/src/legacy/server/logging/log_format.js
index 8a80cbef1a9c5..6edda8c4be907 100644
--- a/src/legacy/server/logging/log_format.js
+++ b/src/legacy/server/logging/log_format.js
@@ -91,7 +91,7 @@ export default class TransformObjStream extends Stream.Transform {
         method: event.method || '',
         headers: event.headers,
         remoteAddress: source.remoteAddress,
-        userAgent: source.remoteAddress,
+        userAgent: source.userAgent,
         referer: source.referer,
       };
 
diff --git a/src/legacy/server/logging/log_format_json.test.js b/src/legacy/server/logging/log_format_json.test.js
index 31e622ecae611..aee7e6e270a1c 100644
--- a/src/legacy/server/logging/log_format_json.test.js
+++ b/src/legacy/server/logging/log_format_json.test.js
@@ -65,12 +65,14 @@ describe('KbnLoggerJsonFormat', () => {
         },
       };
       const result = await createPromiseFromStreams([createListStream([event]), format]);
-      const { type, method, statusCode, message } = JSON.parse(result);
+      const { type, method, statusCode, message, req } = JSON.parse(result);
 
       expect(type).toBe('response');
       expect(method).toBe('GET');
       expect(statusCode).toBe(200);
       expect(message).toBe('GET /path/to/resource 200 12000ms - 13.0B');
+      expect(req.remoteAddress).toBe('127.0.0.1');
+      expect(req.userAgent).toBe('Test Thing');
     });
 
     it('ops', async () => {