From 7ddaf7a249d4762b5d608e4c48d78fe2ae0ca388 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Fri, 16 Mar 2018 17:34:45 +0100 Subject: [PATCH 1/2] Fix sending explain metrics --- src/internal-plugins/metrics/lib/rules.js | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/internal-plugins/metrics/lib/rules.js b/src/internal-plugins/metrics/lib/rules.js index 38b2a744fcd..5f6dc2cd12c 100644 --- a/src/internal-plugins/metrics/lib/rules.js +++ b/src/internal-plugins/metrics/lib/rules.js @@ -135,22 +135,24 @@ module.exports = [ resource: 'Explain', action: 'fetched', condition: () => true, - metadata: (state) => ({ - 'view mode': state.viewType, - 'execution time ms': state.executionTimeMillis, - 'in memory sort': state.inMemorySort, - 'is collection scan': state.isCollectionScan, - 'is covered': state.isCovered, - 'is multi key': state.isMultiKey, - 'is sharded': state.isSharded, - 'index type': state.indexType, - 'index': state.index, - 'number of docs returned': state.nReturned, - 'number of shards': state.numShards, - 'total docs examined': state.totalDocsExamined, - 'total keys examined': state.totalKeysExamined, - 'index used': state.usedIndex - }) + metadata: (state) => { + return { + 'view mode': state.viewType, + 'execution time ms': state.executionTimeMillis, + 'in memory sort': state.inMemorySort, + 'is collection scan': state.isCollectionScan, + 'is covered': state.isCovered, + 'is multi key': state.isMultiKey, + 'is sharded': state.isSharded, + 'index type': state.indexType, + 'index': state.index ? state.index.serialize() : null, + 'number of docs returned': state.nReturned, + 'number of shards': state.numShards, + 'total docs examined': state.totalDocsExamined, + 'total keys examined': state.totalKeysExamined, + 'index used': state.usedIndex + } + } }, { registryEvent: 'open-export', From 1c2239209a59b8ff4f6f155ac124bde9f4bc0c06 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Fri, 16 Mar 2018 17:39:46 +0100 Subject: [PATCH 2/2] Fix eslint --- src/internal-plugins/metrics/lib/rules.js | 34 +++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/internal-plugins/metrics/lib/rules.js b/src/internal-plugins/metrics/lib/rules.js index 5f6dc2cd12c..093929cddd4 100644 --- a/src/internal-plugins/metrics/lib/rules.js +++ b/src/internal-plugins/metrics/lib/rules.js @@ -135,24 +135,22 @@ module.exports = [ resource: 'Explain', action: 'fetched', condition: () => true, - metadata: (state) => { - return { - 'view mode': state.viewType, - 'execution time ms': state.executionTimeMillis, - 'in memory sort': state.inMemorySort, - 'is collection scan': state.isCollectionScan, - 'is covered': state.isCovered, - 'is multi key': state.isMultiKey, - 'is sharded': state.isSharded, - 'index type': state.indexType, - 'index': state.index ? state.index.serialize() : null, - 'number of docs returned': state.nReturned, - 'number of shards': state.numShards, - 'total docs examined': state.totalDocsExamined, - 'total keys examined': state.totalKeysExamined, - 'index used': state.usedIndex - } - } + metadata: (state) => ({ + 'view mode': state.viewType, + 'execution time ms': state.executionTimeMillis, + 'in memory sort': state.inMemorySort, + 'is collection scan': state.isCollectionScan, + 'is covered': state.isCovered, + 'is multi key': state.isMultiKey, + 'is sharded': state.isSharded, + 'index type': state.indexType, + 'index': state.index ? state.index.serialize() : null, + 'number of docs returned': state.nReturned, + 'number of shards': state.numShards, + 'total docs examined': state.totalDocsExamined, + 'total keys examined': state.totalKeysExamined, + 'index used': state.usedIndex + }) }, { registryEvent: 'open-export',