Review feedback

elastic · Jan 25, 2022 · 0a80dab · 0a80dab
1 parent 462e093
commit 0a80dab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/src/core/server/elasticsearch/client/log_query_and_deprecation.test.ts b/src/core/server/elasticsearch/client/log_query_and_deprecation.test.ts
@@ -540,14 +540,13 @@ describe('instrumentQueryAndDeprecationLogger', () => {
  });
  client.diagnostic.emit('response', new errors.ResponseError(response), response);
 
- // One debug log entry from 'elasticsearch.query' context
- expect(loggingSystemMock.collect(logger).debug.length).toEqual(1);
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+ // Test debug[1] since theree is one log entry from 'elasticsearch.query' context
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
  'Elasticsearch deprecation: 299 Elasticsearch-8.1.0 "GET /_path is deprecated"'
  );
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch('Origin:kibana');
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(/Stack trace:\n.*at/);
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch('Origin:kibana');
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(/Stack trace:\n.*at/);
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
  /Query:\n.*400\n.*GET \/_path\?hello\=dolly \[illegal_argument_exception\]: request \[\/_path\] contains unrecognized parameter: \[name\]/
  );
  });
@@ -573,7 +572,6 @@ describe('instrumentQueryAndDeprecationLogger', () => {
  });
  client.diagnostic.emit('response', null, response);
 
- expect(loggingSystemMock.collect(logger).info).toEqual([]);
  // Test debug[1] since theree is one log entry from 'elasticsearch.query' context
  expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
  'Elasticsearch deprecation: 299 Elasticsearch-8.1.0 "GET /_path is deprecated"'
@@ -608,14 +606,13 @@ describe('instrumentQueryAndDeprecationLogger', () => {
  });
  client.diagnostic.emit('response', null, response);
 
- // One debug log entry from 'elasticsearch.query' context
- expect(loggingSystemMock.collect(logger).debug.length).toEqual(1);
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+ // Test debug[1] since theree is one log entry from 'elasticsearch.query' context
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
  'Elasticsearch deprecation: 299 Elasticsearch-8.1.0 "GET /_path is deprecated"'
  );
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch('Origin:kibana');
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(/Stack trace:\n.*at/);
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch('Origin:kibana');
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(/Stack trace:\n.*at/);
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
  /Query:\n.*200\n.*GET \/_path\?hello\=dolly/
  );
  });

diff --git a/src/core/server/elasticsearch/client/log_query_and_deprecation.ts b/src/core/server/elasticsearch/client/log_query_and_deprecation.ts
@@ -139,12 +139,9 @@ export const instrumentEsQueryAndDeprecationLogger = ({
  // Strip the first 5 stack trace lines as these are irrelavent to finding the call site
  const stackTrace = new Error().stack?.split('\n').slice(5).join('\n');
 
- const deprecationMsg = `Elasticsearch deprecation: ${event.warnings}\nOrigin:${requestOrigin}\nStack trace:\n${stackTrace}\nQuery:\n${queryMsg}`;
- if (requestOrigin === 'kibana') {
- deprecationLogger.debug(deprecationMsg);
- } else {
- deprecationLogger.debug(deprecationMsg);
- }
+ deprecationLogger.debug(
+ `Elasticsearch deprecation: ${event.warnings}\nOrigin:${requestOrigin}\nStack trace:\n${stackTrace}\nQuery:\n${queryMsg}`
+ );
  }
  }
  });