avoid error when logging invalid response error (#75757)

elastic · Aug 24, 2020 · 9fa43b4 · 9fa43b4
1 parent 3dea444
commit 9fa43b4
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/src/core/server/elasticsearch/client/configure_client.test.ts b/src/core/server/elasticsearch/client/configure_client.test.ts
@@ -157,6 +157,44 @@ describe('configureClient', () => {
       `);
     });
 
+    it('logs default error info when the error response body is empty', () => {
+      const client = configureClient(config, { logger, scoped: false });
+
+      let response = createApiResponse({
+        statusCode: 400,
+        headers: {},
+        body: {
+          error: {},
+        },
+      });
+      client.emit('response', new errors.ResponseError(response), response);
+
+      expect(loggingSystemMock.collect(logger).error).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            "[ResponseError]: Response Error",
+          ],
+        ]
+      `);
+
+      logger.error.mockClear();
+
+      response = createApiResponse({
+        statusCode: 400,
+        headers: {},
+        body: {} as any,
+      });
+      client.emit('response', new errors.ResponseError(response), response);
+
+      expect(loggingSystemMock.collect(logger).error).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            "[ResponseError]: Response Error",
+          ],
+        ]
+      `);
+    });
+
     it('logs each queries if `logQueries` is true', () => {
       const client = configureClient(
         createFakeConfig({

diff --git a/src/core/server/elasticsearch/client/configure_client.ts b/src/core/server/elasticsearch/client/configure_client.ts
@@ -21,7 +21,6 @@ import { stringify } from 'querystring';
 import { Client } from '@elastic/elasticsearch';
 import { Logger } from '../../logging';
 import { parseClientOptions, ElasticsearchClientConfig } from './client_config';
-import { isResponseError } from './errors';
 
 export const configureClient = (
   config: ElasticsearchClientConfig,
@@ -39,10 +38,8 @@ const addLogging = (client: Client, logger: Logger, logQueries: boolean) => {
   client.on('response', (error, event) => {
     if (error) {
       const errorMessage =
-        // error details for response errors provided by elasticsearch
-        isResponseError(error)
-          ? `[${event.body.error.type}]: ${event.body.error.reason}`
-          : `[${error.name}]: ${error.message}`;
+        // error details for response errors provided by elasticsearch, defaults to error name/message
+        `[${event.body?.error?.type ?? error.name}]: ${event.body?.error?.reason ?? error.message}`;
 
       logger.error(errorMessage);
     }