From 5e2dbdaa6962a0c79a4bc18a620e9e757768d73d Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Wed, 22 Apr 2020 14:11:17 +0100
Subject: [PATCH] refact(NA): remove set loop from upgrade assistant usage
 collector (#63977)

* refact(NA): use default telemetry obj in the set loop

* chore(NA): fix typecheck

* fix(NA): test run with lodash has

* chore(NA): fix older lodash has

* chore(NA): remove lodash has usage
---
 .../lib/telemetry/usage_collector.test.ts     |  1 +
 .../server/lib/telemetry/usage_collector.ts   | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
index 2af1a9ac38e44f..24347b7799871f 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.test.ts
@@ -51,6 +51,7 @@ describe('Upgrade Assistant Usage Collector', () => {
                   'ui_reindex.open': 4,
                   'ui_reindex.start': 2,
                   'ui_reindex.stop': 1,
+                  'ui_reindex.not_defined': 1,
                 },
               };
             },
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
index 9c2946db7f0842..0c2e3a1e43f4aa 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { set } from 'lodash';
+import { get } from 'lodash';
 import {
   APICaller,
   ElasticsearchServiceStart,
@@ -84,16 +84,19 @@ export async function fetchUpgradeAssistantMetrics(
       return defaultTelemetrySavedObject;
     }
 
-    const upgradeAssistantTelemetrySOAttrsKeys = Object.keys(
-      upgradeAssistantTelemetrySavedObjectAttrs
-    );
-    const telemetryObj = defaultTelemetrySavedObject;
-
-    upgradeAssistantTelemetrySOAttrsKeys.forEach((key: string) => {
-      set(telemetryObj, key, upgradeAssistantTelemetrySavedObjectAttrs[key]);
-    });
-
-    return telemetryObj as UpgradeAssistantTelemetrySavedObject;
+    return {
+      ui_open: {
+        overview: get(upgradeAssistantTelemetrySavedObjectAttrs, 'ui_open.overview', 0),
+        cluster: get(upgradeAssistantTelemetrySavedObjectAttrs, 'ui_open.cluster', 0),
+        indices: get(upgradeAssistantTelemetrySavedObjectAttrs, 'ui_open.indices', 0),
+      },
+      ui_reindex: {
+        close: get(upgradeAssistantTelemetrySavedObjectAttrs, 'ui_reindex.close', 0),
+        open: get(upgradeAssistantTelemetrySavedObjectAttrs, 'ui_reindex.open', 0),
+        start: get(upgradeAssistantTelemetrySavedObjectAttrs, 'ui_reindex.start', 0),
+        stop: get(upgradeAssistantTelemetrySavedObjectAttrs, 'ui_reindex.stop', 0),
+      },
+    } as UpgradeAssistantTelemetrySavedObject;
   };
 
   return {