Fixes APM trackEvent usage in NP context.

Kerry350 · Jan 27, 2020 · d3eec8b · d3eec8b
1 parent db3b578
commit d3eec8b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/...cy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/index.tsx b/...cy/plugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/index.tsx
@@ -34,6 +34,7 @@ import { isRumAgentName } from '../../../../../../common/agent_name';
 import { ALL_OPTION_VALUE } from '../../../../../../common/agent_configuration_constants';
 import { saveConfig } from './saveConfig';
 import { useApmPluginContext } from '../../../../../hooks/useApmPluginContext';
+import { useUiTracker } from '../../../../../../../../../plugins/infra/public';
 
 const defaultSettings = {
   TRANSACTION_SAMPLE_RATE: '1.0',
@@ -59,6 +60,9 @@ export function AddEditFlyout({
 
   const callApmApiFromHook = useCallApmApi();
 
+  // get a telemetry UI event tracker
+  const trackApmEvent = useUiTracker({ app: 'apm' });
+
   // config conditions (service)
   const [serviceName, setServiceName] = useState<string>(
     selectedConfig ? selectedConfig.service.name || ALL_OPTION_VALUE : ''
@@ -133,7 +137,8 @@ export function AddEditFlyout({
       transactionMaxSpans,
       configurationId: selectedConfig ? selectedConfig.id : undefined,
       agentName,
-      toasts
+      toasts,
+      trackApmEvent
     });
     setIsSaving(false);
     onSaved();

diff --git a/...lugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/saveConfig.ts b/...lugins/apm/public/components/app/Settings/AgentConfigurations/AddEditFlyout/saveConfig.ts
@@ -12,6 +12,7 @@ import {
   getOptionLabel,
   omitAllOption
 } from '../../../../../../common/agent_configuration_constants';
+import { UiTracker } from '../../../../../../../../../plugins/infra/public';
 
 interface Settings {
   transaction_sample_rate: number;
@@ -28,7 +29,8 @@ export async function saveConfig({
   transactionMaxSpans,
   configurationId,
   agentName,
-  toasts
+  toasts,
+  trackEvent
 }: {
   callApmApi: APMClient;
   serviceName: string;
@@ -39,9 +41,9 @@ export async function saveConfig({
   configurationId?: string;
   agentName?: string;
   toasts: NotificationsStart['toasts'];
+  trackEvent: UiTracker;
 }) {
-  // TODO: Migrate to useTrackMetric
-  // trackEvent({ app: 'apm', name: 'save_agent_configuration' });
+  trackEvent({ metric: 'save_agent_configuration' });
 
   try {
     const settings: Settings = {

diff --git a/x-pack/plugins/infra/public/hooks/use_track_metric.tsx b/x-pack/plugins/infra/public/hooks/use_track_metric.tsx
@@ -22,16 +22,24 @@ import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 type ObservabilityApp = 'infra_metrics' | 'infra_logs' | 'apm' | 'uptime';
 
 interface TrackOptions {
-  app: ObservabilityApp;
+  app?: ObservabilityApp;
   metricType?: UiStatsMetricType;
   delay?: number; // in ms
 }
 type EffectDeps = unknown[];
 
-type TrackMetricOptions = TrackOptions & { metric: string };
+export type TrackMetricOptions = TrackOptions & { metric: string };
+export type UiTracker = (options: TrackMetricOptions) => void;
 
 export { METRIC_TYPE };
 
+export function useUiTracker({ app: defaultApp }: { app?: ObservabilityApp } = {}) {
+  const { reportUiStats } = useKibana<any>().services?.usageCollection;
+  return ({ app = defaultApp, metric, metricType = METRIC_TYPE.COUNT }: TrackMetricOptions) => {
+    reportUiStats(app, metricType, metric);
+  };
+}
+
 export function useTrackMetric(
   { app, metric, metricType = METRIC_TYPE.COUNT, delay = 0 }: TrackMetricOptions,
   effectDependencies: EffectDeps = []

diff --git a/x-pack/plugins/infra/public/index.ts b/x-pack/plugins/infra/public/index.ts
@@ -16,6 +16,12 @@ export const plugin: PluginInitializer<
   return new Plugin(context);
 };
 
-export { useTrackPageview } from './hooks/use_track_metric';
+export {
+  useTrackPageview,
+  useUiTracker,
+  UiTracker,
+  TrackMetricOptions,
+  METRIC_TYPE,
+} from './hooks/use_track_metric';
 export { FORMATTERS } from './utils/formatters';
 export { InfraFormatterType } from './lib/lib';