From b3f18ee46f023da7b6d5cfa33438705be3c8d909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Ferna=CC=81ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Wed, 17 Feb 2021 11:34:05 +0100
Subject: [PATCH] [Usage Collection] Remove unused UI Metric APIs

---
 src/core/TESTING.md                               | 11 ++++++++---
 src/plugins/usage_collection/public/mocks.tsx     |  4 +---
 src/plugins/usage_collection/public/plugin.tsx    | 15 ++-------------
 .../public/application/services/ui_metric.ts      |  3 ++-
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/core/TESTING.md b/src/core/TESTING.md
index a0fd0a6ffc25526..ef6db57c1a9930c 100644
--- a/src/core/TESTING.md
+++ b/src/core/TESTING.md
@@ -830,6 +830,7 @@ data.
 
 ```typescript
 // src/plugins/myplugin/public/plugin.ts
+import { METRIC_TYPE } from '@kbn/analytics';
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
 import { DataPublicPluginSetup, DataPublicPluginStart } from '../../data/public';
 import { UsageCollectionSetup } from '../../usage_collection/public';
@@ -853,8 +854,10 @@ export class MyPlugin implements Plugin<MyPluginSetup, MyPluginStart, MyPluginSe
 
     // an example on using an optional dependency that will be tested
     if (usageCollection) {
-      usageCollection.allowTrackUserAgent(true);
+      usageCollection.reportUiCounter('my_plugin', METRIC_TYPE.LOADED, 'my_event');
     }
+    // or in a shorter version
+    usageCollection?.reportUiCounter('my_plugin', METRIC_TYPE.LOADED, 'my_event');
 
     return {};
   }
@@ -1074,6 +1077,8 @@ import { coreMock } from '../../../core/public/mocks';
 import { dataPluginMock } from '../../data/public/mocks';
 import { usageCollectionPluginMock } from '../../usage_collection/public/mocks';
 
+import { METRIC_TYPE } from '@kbn/analytics';
+
 import { MyPlugin } from './plugin';
 
 describe('Plugin', () => {
@@ -1090,8 +1095,8 @@ describe('Plugin', () => {
 
     plugin.setup(coreSetup, setupDeps);
 
-    expect(usageCollectionSetup.allowTrackUserAgent).toHaveBeenCalledTimes(1);
-    expect(usageCollectionSetup.allowTrackUserAgent).toHaveBeenCalledWith(true);
+    expect(usageCollectionSetup.reportUiCounter).toHaveBeenCalledTimes(2);
+    expect(usageCollectionSetup.reportUiCounter).toHaveBeenCalledWith('my_plugin', METRIC_TYPE.LOADED, 'my_event');
   });
 });
 ```
diff --git a/src/plugins/usage_collection/public/mocks.tsx b/src/plugins/usage_collection/public/mocks.tsx
index 72cefaf0264907d..268ed3316542ef7 100644
--- a/src/plugins/usage_collection/public/mocks.tsx
+++ b/src/plugins/usage_collection/public/mocks.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { ApplicationUsageTracker } from '@kbn/analytics';
-import { UsageCollectionSetup, METRIC_TYPE } from '.';
+import { UsageCollectionSetup } from '.';
 import { ApplicationUsageContext } from './components/track_application_view';
 
 export type Setup = jest.Mocked<UsageCollectionSetup>;
@@ -33,9 +33,7 @@ const createSetupContract = (): Setup => {
       ),
     },
     applicationUsageTracker: applicationUsageTrackerMock,
-    allowTrackUserAgent: jest.fn(),
     reportUiCounter: jest.fn(),
-    METRIC_TYPE,
   };
 
   return setupContract;
diff --git a/src/plugins/usage_collection/public/plugin.tsx b/src/plugins/usage_collection/public/plugin.tsx
index 6d1eb751d907a62..79260b17e0c8206 100644
--- a/src/plugins/usage_collection/public/plugin.tsx
+++ b/src/plugins/usage_collection/public/plugin.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { Reporter, METRIC_TYPE, ApplicationUsageTracker } from '@kbn/analytics';
+import { Reporter, ApplicationUsageTracker } from '@kbn/analytics';
 import type { Subscription } from 'rxjs';
 import React from 'react';
 import type {
@@ -35,15 +35,12 @@ export interface UsageCollectionSetup {
   components: {
     ApplicationUsageTrackingProvider: React.FC;
   };
-  allowTrackUserAgent: (allow: boolean) => void;
   applicationUsageTracker: IApplicationUsageTracker;
   reportUiCounter: Reporter['reportUiCounter'];
-  METRIC_TYPE: typeof METRIC_TYPE;
 }
 
 export interface UsageCollectionStart {
   reportUiCounter: Reporter['reportUiCounter'];
-  METRIC_TYPE: typeof METRIC_TYPE;
   applicationUsageTracker: Pick<
     ApplicationUsageTracker,
     'trackApplicationViewUsage' | 'flushTrackedView' | 'updateViewClickCounter'
@@ -57,7 +54,6 @@ export function isUnauthenticated(http: HttpSetup) {
 
 export class UsageCollectionPlugin implements Plugin<UsageCollectionSetup, UsageCollectionStart> {
   private applicationUsageTracker?: ApplicationUsageTracker;
-  private trackUserAgent: boolean = true;
   private subscriptions: Subscription[] = [];
   private reporter?: Reporter;
   private config: PublicConfigType;
@@ -88,11 +84,7 @@ export class UsageCollectionPlugin implements Plugin<UsageCollectionSetup, Usage
         ),
       },
       applicationUsageTracker,
-      allowTrackUserAgent: (allow: boolean) => {
-        this.trackUserAgent = allow;
-      },
       reportUiCounter: this.reporter.reportUiCounter,
-      METRIC_TYPE,
     };
   }
 
@@ -110,14 +102,11 @@ export class UsageCollectionPlugin implements Plugin<UsageCollectionSetup, Usage
       );
     }
 
-    if (this.trackUserAgent) {
-      this.reporter.reportUserAgent('kibana');
-    }
+    this.reporter.reportUserAgent('kibana');
 
     return {
       applicationUsageTracker: this.getPublicApplicationUsageTracker(),
       reportUiCounter: this.reporter.reportUiCounter,
-      METRIC_TYPE,
     };
   }
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts b/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts
index 3b22f898b695745..b982f8f4a7314d5 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/services/ui_metric.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { METRIC_TYPE } from '@kbn/analytics';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
 
 import { UIM_APP_NAME } from '../constants';
@@ -22,7 +23,7 @@ export class UiMetricService {
       return;
     }
 
-    const { reportUiCounter, METRIC_TYPE } = this.usageCollection;
+    const { reportUiCounter } = this.usageCollection;
     reportUiCounter(UIM_APP_NAME, METRIC_TYPE.COUNT, name);
   }