[APM] Fix timeout in APM setup (#58727) (#58781)

* [APM] Fix timeout in APM setup * Update plugin.ts
elastic · Feb 27, 2020 · 0479d0d · 0479d0d
1 parent f8116fb
commit 0479d0d
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 36 deletions.
diff --git a/src/plugins/apm_oss/server/index.ts b/src/plugins/apm_oss/server/index.ts
@@ -19,7 +19,7 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 import { PluginInitializerContext } from '../../../core/server';
-import { APMOSSPlugin, APMOSSPluginSetup } from './plugin';
+import { APMOSSPlugin } from './plugin';
 
 export const config = {
   schema: schema.object({
@@ -39,4 +39,4 @@ export function plugin(initializerContext: PluginInitializerContext) {
 
 export type APMOSSConfig = TypeOf<typeof config.schema>;
 
-export { APMOSSPlugin as Plugin, APMOSSPluginSetup };
+export { APMOSSPluginSetup } from './plugin';
diff --git a/src/plugins/apm_oss/server/plugin.ts b/src/plugins/apm_oss/server/plugin.ts
@@ -20,10 +20,6 @@ import { Plugin, CoreSetup, PluginInitializerContext } from 'src/core/server';
 import { Observable } from 'rxjs';
 import { APMOSSConfig } from './';
 
-export interface APMOSSPluginSetup {
-  config$: Observable<APMOSSConfig>;
-}
-
 export class APMOSSPlugin implements Plugin<APMOSSPluginSetup> {
   constructor(private readonly initContext: PluginInitializerContext) {
     this.initContext = initContext;
@@ -40,3 +36,7 @@ export class APMOSSPlugin implements Plugin<APMOSSPluginSetup> {
   start() {}
   stop() {}
 }
+
+export interface APMOSSPluginSetup {
+  config$: Observable<APMOSSConfig>;
+}
diff --git a/x-pack/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts b/x-pack/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts
@@ -62,8 +62,7 @@ export const getDynamicIndexPattern = async ({
     cache.set(CACHE_KEY, undefined);
     const notExists = e.output?.statusCode === 404;
     if (notExists) {
-      // eslint-disable-next-line no-console
-      console.error(
+      context.logger.error(
         `Could not get dynamic index pattern because indices "${indexPatternTitle}" don't exist`
       );
       return;

diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
@@ -4,17 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IClusterClient } from 'src/core/server';
+import { IClusterClient, Logger } from 'src/core/server';
 import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
 import { APMConfig } from '../../..';
 import { getApmIndicesConfig } from '../apm_indices/get_apm_indices';
 
 export async function createApmAgentConfigurationIndex({
   esClient,
-  config
+  config,
+  logger
 }: {
   esClient: IClusterClient;
   config: APMConfig;
+  logger: Logger;
 }) {
   try {
     const index = getApmIndicesConfig(config).apmAgentConfigurationIndex;
@@ -32,8 +34,7 @@ export async function createApmAgentConfigurationIndex({
       );
     }
   } catch (e) {
-    // eslint-disable-next-line no-console
-    console.error('Could not create APM Agent configuration:', e.message);
+    logger.error(`Could not create APM Agent configuration: ${e.message}`);
   }
 }
 

diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
@@ -5,12 +5,12 @@
  */
 import { PluginInitializerContext, Plugin, CoreSetup } from 'src/core/server';
 import { Observable, combineLatest, AsyncSubject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 import { Server } from 'hapi';
 import { once } from 'lodash';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { APMOSSPluginSetup } from '../../../../src/plugins/apm_oss/server';
 import { makeApmUsageCollector } from './lib/apm_telemetry';
-import { Plugin as APMOSSPlugin } from '../../../../src/plugins/apm_oss/server';
 import { createApmAgentConfigurationIndex } from './lib/settings/agent_configuration/create_agent_config_index';
 import { createApmApi } from './routes/create_apm_api';
 import { getApmIndices } from './lib/settings/apm_indices/get_apm_indices';
@@ -33,26 +33,23 @@ export interface APMPluginContract {
 
 export class APMPlugin implements Plugin<APMPluginContract> {
   legacySetup$: AsyncSubject<LegacySetup>;
-  currentConfig: APMConfig;
   constructor(private readonly initContext: PluginInitializerContext) {
     this.initContext = initContext;
     this.legacySetup$ = new AsyncSubject();
-    this.currentConfig = {} as APMConfig;
   }
 
   public async setup(
     core: CoreSetup,
     plugins: {
-      apm_oss: APMOSSPlugin extends Plugin<infer TSetup> ? TSetup : never;
+      apm_oss: APMOSSPluginSetup;
       home: HomeServerPluginSetup;
       licensing: LicensingPluginSetup;
       cloud?: CloudSetup;
       usageCollection?: UsageCollectionSetup;
     }
   ) {
-    const config$ = this.initContext.config.create<APMXPackConfig>();
     const logger = this.initContext.logger.get('apm');
-
+    const config$ = this.initContext.config.create<APMXPackConfig>();
     const mergedConfig$ = combineLatest(plugins.apm_oss.config$, config$).pipe(
       map(([apmOssConfig, apmConfig]) => mergeConfigs(apmOssConfig, apmConfig))
     );
@@ -61,28 +58,26 @@ export class APMPlugin implements Plugin<APMPluginContract> {
       createApmApi().init(core, { config$: mergedConfig$, logger, __LEGACY });
     });
 
-    await new Promise(resolve => {
-      mergedConfig$.subscribe(async config => {
-        this.currentConfig = config;
-        await createApmAgentConfigurationIndex({
-          esClient: core.elasticsearch.dataClient,
-          config
-        });
-        resolve();
-      });
+    const currentConfig = await mergedConfig$.pipe(take(1)).toPromise();
+
+    // create agent configuration index without blocking setup lifecycle
+    createApmAgentConfigurationIndex({
+      esClient: core.elasticsearch.dataClient,
+      config: currentConfig,
+      logger
     });
 
     plugins.home.tutorials.registerTutorial(
       tutorialProvider({
-        isEnabled: this.currentConfig['xpack.apm.ui.enabled'],
-        indexPatternTitle: this.currentConfig['apm_oss.indexPattern'],
+        isEnabled: currentConfig['xpack.apm.ui.enabled'],
+        indexPatternTitle: currentConfig['apm_oss.indexPattern'],
         cloud: plugins.cloud,
         indices: {
-          errorIndices: this.currentConfig['apm_oss.errorIndices'],
-          metricsIndices: this.currentConfig['apm_oss.metricsIndices'],
-          onboardingIndices: this.currentConfig['apm_oss.onboardingIndices'],
-          sourcemapIndices: this.currentConfig['apm_oss.sourcemapIndices'],
-          transactionIndices: this.currentConfig['apm_oss.transactionIndices']
+          errorIndices: currentConfig['apm_oss.errorIndices'],
+          metricsIndices: currentConfig['apm_oss.metricsIndices'],
+          onboardingIndices: currentConfig['apm_oss.onboardingIndices'],
+          sourcemapIndices: currentConfig['apm_oss.sourcemapIndices'],
+          transactionIndices: currentConfig['apm_oss.transactionIndices']
         }
       })
     );
@@ -108,7 +103,7 @@ export class APMPlugin implements Plugin<APMPluginContract> {
       getApmIndices: async () =>
         getApmIndices({
           savedObjectsClient: await getInternalSavedObjectsClient(core),
-          config: this.currentConfig
+          config: currentConfig
         })
     };
   }