fix typing and crashing problems

elastic · Nov 20, 2019 · 320618f · 320618f
1 parent 5381830
commit 320618f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/x-pack/legacy/plugins/oss_telemetry/index.ts b/x-pack/legacy/plugins/oss_telemetry/index.ts
@@ -31,7 +31,8 @@ export const ossTelemetry: LegacyPluginInitializer = kibana => {
         taskManager: server.plugins.task_manager,
         __LEGACY: {
           config: server.config(),
-          xpackMainStatus: server.plugins.xpack_main.status.plugin,
+          xpackMainStatus: ((server.plugins.xpack_main as unknown) as { status: any }).status
+            .plugin,
           telemetry: server.usage,
         },
       });

diff --git a/...cy/plugins/oss_telemetry/server/lib/collectors/visualizations/register_usage_collector.ts b/...cy/plugins/oss_telemetry/server/lib/collectors/visualizations/register_usage_collector.ts
@@ -9,12 +9,9 @@ import { getUsageCollector } from './get_usage_collector';
 import { OssTelemetrySetupDependencies } from '../../../plugin';
 
 export function registerVisualizationsCollector(
-  {
-    makeUsageCollector,
-    register,
-  }: OssTelemetrySetupDependencies['__LEGACY']['telemetry']['collectorSet'],
+  collectorSet: OssTelemetrySetupDependencies['__LEGACY']['telemetry']['collectorSet'],
   taskManager: TaskManagerPluginSetupContract | undefined
 ): void {
-  const collector = makeUsageCollector(getUsageCollector(taskManager));
-  register(collector);
+  const collector = collectorSet.makeUsageCollector(getUsageCollector(taskManager));
+  collectorSet.register(collector);
 }
diff --git a/x-pack/legacy/plugins/xpack_main/xpack_main.d.ts b/x-pack/legacy/plugins/xpack_main/xpack_main.d.ts
@@ -9,11 +9,8 @@ import { Feature, FeatureWithAllOrReadPrivileges } from '../../../plugins/featur
 import { XPackInfo, XPackInfoOptions } from './server/lib/xpack_info';
 export { XPackFeature } from './server/lib/xpack_info';
 
-export type XPackStatus = any;
-
 export interface XPackMainPlugin {
   info: XPackInfo;
-  status: XPackStatus;
   createXPackInfo(options: XPackInfoOptions): XPackInfo;
   getFeatures(): Feature[];
   registerFeature(feature: FeatureWithAllOrReadPrivileges): void;