Code review

rudolf · rudolf · commit 4de37e22011a · 2020-10-02T14:16:40.000+02:00
diff --git a/src/core/server/core_usage_data/types.ts b/src/core/server/core_usage_data/types.ts
@@ -145,5 +145,5 @@ export interface CoreUsageDataStart {
    * Internal API for collecting Core usage data
    * @internal
    * */
-  getCoreUsageData(): CoreUsageData | null;
+  getCoreUsageData(): CoreUsageData;
 }
diff --git a/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts
@@ -25,7 +25,6 @@ import {
 } from '../../../../../core/server/core_usage_data/types';
 // telemetry_check is unable to check types which are re-exported, it only
 // works when pointed to the typescript file where the type was defined.
-import { KIBANA_STATS_TYPE } from '../../../common/constants';
 
 export function getCoreUsageCollector(
   usageCollection: UsageCollectionSetup,
@@ -118,20 +117,6 @@ export function getCoreUsageCollector(
     fetch() {
       return getCoreUsageDataService().getCoreUsageData();
     },
-
-    /*
-     * Format the response data into a model for internal upload
-     * 1. Make this data part of the "kibana_stats" type
-     * 2. Organize the payload in the usage namespace of the data payload (usage.index, etc)
-     */
-    formatForBulkUpload: (result) => {
-      return {
-        type: KIBANA_STATS_TYPE,
-        payload: {
-          core: result,
-        },
-      };
-    },
   });
 }
 
diff --git a/src/plugins/kibana_usage_collection/server/collectors/core/index.test.ts b/src/plugins/kibana_usage_collection/server/collectors/core/index.test.ts
@@ -50,13 +50,4 @@ describe('telemetry_core', () => {
   test('fetch', async () => {
     expect(await collector.fetch(callCluster)).toEqual(getCoreUsageDataReturnValue);
   });
-
-  test('formatForBulkUpload', async () => {
-    expect(collector.formatForBulkUpload!(getCoreUsageDataReturnValue)).toStrictEqual({
-      type: 'kibana_stats',
-      payload: {
-        core: getCoreUsageDataReturnValue,
-      },
-    });
-  });
 });
diff --git a/src/plugins/kibana_usage_collection/server/plugin.ts b/src/plugins/kibana_usage_collection/server/plugin.ts
@@ -90,7 +90,7 @@ export class KibanaUsageCollectionPlugin implements Plugin {
   ) {
     const getSavedObjectsClient = () => this.savedObjectsClient;
     const getUiSettingsClient = () => this.uiSettingsClient;
-    const getcoreUsageData = () => this.coreUsageData!;
+    const getCoreUsageDataService = () => this.coreUsageData!;
 
     registerOpsStatsCollector(usageCollection, metric$);
     registerKibanaUsageCollector(usageCollection, this.legacyConfig$);
@@ -103,6 +103,6 @@ export class KibanaUsageCollectionPlugin implements Plugin {
       getSavedObjectsClient
     );
     registerCspCollector(usageCollection, coreSetup.http);
-    registerCoreUsageCollector(usageCollection, getcoreUsageData);
+    registerCoreUsageCollector(usageCollection, getCoreUsageDataService);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -145,5 +145,5 @@ export interface CoreUsageDataStart {`
`145`	`145`	`* Internal API for collecting Core usage data`
`146`	`146`	`* @internal`
`147`	`147`	`* */`
`148`		`- getCoreUsageData(): CoreUsageData \| null;`
	`148`	`+ getCoreUsageData(): CoreUsageData;`
`149`	`149`	`}`