Skip to content

Commit

Permalink
Revert "chore(NA): add async import into infra plugin to reduce apm b…
Browse files Browse the repository at this point in the history
…undle size (elastic#63292)"

This reverts commit 30439f6.
  • Loading branch information
mistic committed Apr 29, 2020
1 parent f1d72ad commit 4974e85
Showing 1 changed file with 5 additions and 24 deletions.
29 changes: 5 additions & 24 deletions x-pack/plugins/infra/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/p
import { DataEnhancedSetup, DataEnhancedStart } from '../../data_enhanced/public';

import { TriggersAndActionsUIPublicPluginSetup } from '../../../plugins/triggers_actions_ui/public';
import { getAlertType as getMetricsAlertType } from './components/alerting/metrics/metric_threshold_alert_type';
import { getAlertType as getLogsAlertType } from './components/alerting/logs/log_threshold_alert_type';

export type ClientSetup = void;
export type ClientStart = void;
Expand Down Expand Up @@ -51,6 +53,9 @@ export class Plugin
setup(core: CoreSetup, pluginsSetup: ClientPluginsSetup) {
registerFeatures(pluginsSetup.home);

pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(getMetricsAlertType());
pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(getLogsAlertType());

core.application.register({
id: 'logs',
title: i18n.translate('xpack.infra.logs.pluginTitle', {
Expand All @@ -65,8 +70,6 @@ export class Plugin
const plugins = getMergedPlugins(pluginsSetup, pluginsStart as ClientPluginsStart);
const { startApp, composeLibs, LogsRouter } = await this.downloadAssets();

await this.registerLogsAlertType(pluginsSetup);

return startApp(
composeLibs(coreStart),
coreStart,
Expand All @@ -92,8 +95,6 @@ export class Plugin
const plugins = getMergedPlugins(pluginsSetup, pluginsStart as ClientPluginsStart);
const { startApp, composeLibs, MetricsRouter } = await this.downloadAssets();

await this.registerMetricsAlertType(pluginsSetup);

return startApp(
composeLibs(coreStart),
coreStart,
Expand Down Expand Up @@ -137,24 +138,4 @@ export class Plugin
MetricsRouter,
};
}

// NOTE: apm is importing from `infra/public` and async importing that
// allow us to reduce the apm bundle size
private async registerLogsAlertType(pluginsSetup: ClientPluginsSetup) {
const { getAlertType } = await import('./components/alerting/logs/log_threshold_alert_type');

if (!pluginsSetup.triggers_actions_ui.alertTypeRegistry.has(getAlertType().id)) {
pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(getAlertType());
}
}

private async registerMetricsAlertType(pluginsSetup: ClientPluginsSetup) {
const { getAlertType } = await import(
'./components/alerting/metrics/metric_threshold_alert_type'
);

if (!pluginsSetup.triggers_actions_ui.alertTypeRegistry.has(getAlertType().id)) {
pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(getAlertType());
}
}
}

0 comments on commit 4974e85

Please sign in to comment.