ui_metric -> np

elastic · Apr 16, 2020 · edd291d · edd291d
1 parent b32eb43
commit edd291d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/x-pack/legacy/plugins/canvas/public/application.tsx b/x-pack/legacy/plugins/canvas/public/application.tsx
@@ -30,6 +30,7 @@ import { VALUE_CLICK_TRIGGER, ActionByType } from '../../../../../src/plugins/ui
 /* eslint-disable */
 import { ACTION_VALUE_CLICK } from '../../../../../src/plugins/data/public/actions/value_click_action';
 /* eslint-enable */
+import { init as initStatsReporter } from './lib/ui_metric';
 
 import { CapabilitiesStrings } from '../i18n';
 const { ReadOnlyBadge: strings } = CapabilitiesStrings;
@@ -121,6 +122,10 @@ export const initializeCanvas = async (
     startPlugins.uiActions.attachAction(VALUE_CLICK_TRIGGER, emptyAction);
   }
 
+  if (setupPlugins.usageCollection) {
+    initStatsReporter(setupPlugins.usageCollection.reportUiStats);
+  }
+
   return canvasStore;
 };
 

diff --git a/x-pack/legacy/plugins/canvas/public/legacy.ts b/x-pack/legacy/plugins/canvas/public/legacy.ts
@@ -24,6 +24,7 @@ const shimSetupPlugins: CanvasSetupDeps = {
   data: npSetup.plugins.data,
   expressions: npSetup.plugins.expressions,
   home: npSetup.plugins.home,
+  usageCollection: npSetup.plugins.usageCollection,
 };
 const shimStartPlugins: CanvasStartDeps = {
   ...npStart.plugins,

diff --git a/x-pack/legacy/plugins/canvas/public/lib/ui_metric.ts b/x-pack/legacy/plugins/canvas/public/lib/ui_metric.ts
@@ -4,10 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  createUiStatsReporter,
-  METRIC_TYPE,
-} from '../../../../../../src/legacy/core_plugins/ui_metric/public';
+import { UiStatsMetricType, METRIC_TYPE } from '@kbn/analytics';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
 
-export const trackCanvasUiMetric = createUiStatsReporter('canvas');
 export { METRIC_TYPE };
+
+export let reportUiStats: UsageCollectionSetup['reportUiStats'] | undefined;
+
+export function init(_reportUiStats: UsageCollectionSetup['reportUiStats']): void {
+  reportUiStats = _reportUiStats;
+}
+
+export function trackCanvasUiMetric(metricType: UiStatsMetricType, name: string | string[]) {
+  if (!reportUiStats) {
+    return;
+  }
+
+  reportUiStats('canvas', metricType, name);
+}
diff --git a/x-pack/legacy/plugins/canvas/public/plugin.tsx b/x-pack/legacy/plugins/canvas/public/plugin.tsx
@@ -13,6 +13,7 @@ import { ExpressionsSetup, ExpressionsStart } from '../../../../../src/plugins/e
 import { DataPublicPluginSetup } from '../../../../../src/plugins/data/public';
 import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
 import { EmbeddableStart } from '../../../../../src/plugins/embeddable/public';
+import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/public';
 import { Start as InspectorStart } from '../../../../../src/plugins/inspector/public';
 // @ts-ignore untyped local
 import { argTypeSpecs } from './expression_types/arg_types';
@@ -32,12 +33,14 @@ export interface CanvasSetupDeps {
   data: DataPublicPluginSetup;
   expressions: ExpressionsSetup;
   home: HomePublicPluginSetup;
+  usageCollection?: UsageCollectionSetup;
 }
 
 export interface CanvasStartDeps {
   embeddable: EmbeddableStart;
   expressions: ExpressionsStart;
   inspector: InspectorStart;
+
   uiActions: UiActionsStart;
   __LEGACY: {
     absoluteToParsedUrl: (url: string, basePath: string) => any;