From ec0eb473efc5edb1f4780058b4b01b6bf5868b15 Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Wed, 24 Jun 2020 12:14:38 -0600
Subject: [PATCH] [7.8] [Maps] Remove extra layer of telemetry nesting under
 "attributes" (#66137) (#69754)

---
 .../plugins/maps/server/maps_telemetry/maps_telemetry.ts   | 7 +------
 x-pack/plugins/maps/common/constants.ts                    | 2 +-
 .../test/api_integration/apis/telemetry/telemetry_local.js | 7 ++++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.ts b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.ts
index 5b43550a45893d..a45e7324a2a85d 100644
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.ts
+++ b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.ts
@@ -15,7 +15,6 @@ import {
   SOURCE_TYPES,
   ES_GEO_FIELD_TYPE,
   MAP_SAVED_OBJECT_TYPE,
-  TELEMETRY_TYPE,
 } from '../../../../../plugins/maps/common/constants';
 import { LayerDescriptor } from '../../../../../plugins/maps/common/descriptor_types';
 import { MapSavedObject } from '../../../../../plugins/maps/common/map_saved_object_type';
@@ -183,9 +182,5 @@ export async function getMapsTelemetry(
   const settings: SavedObjectAttribute = {
     showMapVisualizationTypes: config().get('xpack.maps.showMapVisualizationTypes'),
   };
-  const mapsTelemetry = buildMapsTelemetry({ mapSavedObjects, indexPatternSavedObjects, settings });
-  return await savedObjectsClient.create(TELEMETRY_TYPE, mapsTelemetry, {
-    id: TELEMETRY_TYPE,
-    overwrite: true,
-  });
+  return buildMapsTelemetry({ mapSavedObjects, indexPatternSavedObjects, settings });
 }
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index 613e5074593899..1a8e0d58c15722 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -25,7 +25,7 @@ export const EMS_TILES_VECTOR_TILE_PATH = 'vector/tile';
 export const MAP_SAVED_OBJECT_TYPE = 'map';
 export const APP_ID = 'maps';
 export const APP_ICON = 'gisApp';
-export const TELEMETRY_TYPE = 'maps-telemetry';
+export const TELEMETRY_TYPE = APP_ID;
 
 export const MAP_APP_PATH = `app/${APP_ID}`;
 export const GIS_API_PATH = `api/${APP_ID}`;
diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry_local.js b/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
index f06af3baa2301c..9dbc3e1c8a5bb9 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
@@ -76,9 +76,10 @@ export default function ({ getService }) {
       expect(stats.stack_stats.kibana.plugins.apm.services_per_agent).to.be.an('object');
       expect(stats.stack_stats.kibana.plugins.infraops.last_24_hours).to.be.an('object');
       expect(stats.stack_stats.kibana.plugins.kql.defaultQueryLanguage).to.be.a('string');
-      expect(stats.stack_stats.kibana.plugins['maps-telemetry'].attributes.timeCaptured).to.be.a(
-        'string'
-      );
+      expect(stats.stack_stats.kibana.plugins.maps.timeCaptured).to.be.a('string');
+      expect(stats.stack_stats.kibana.plugins.maps.attributes).to.be(undefined);
+      expect(stats.stack_stats.kibana.plugins.maps.id).to.be(undefined);
+      expect(stats.stack_stats.kibana.plugins.maps.type).to.be(undefined);
 
       expect(stats.stack_stats.kibana.plugins.reporting.enabled).to.be(true);
       expect(stats.stack_stats.kibana.plugins.rollups.index_patterns).to.be.an('object');