support delaying Kibana shutdown to ensure all APM data is received

elastic · Aug 3, 2021 · 3fe1d05 · 3fe1d05
1 parent b033f4f
commit 3fe1d05
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
@@ -201,6 +201,7 @@ export const schema = Joi.object()
           })
           .default(),
         env: Joi.object().unknown().default(),
+        delayShutdown: Joi.number(),
       })
       .default(),
 

diff --git a/packages/kbn-test/src/functional_tests/tasks.js b/packages/kbn-test/src/functional_tests/tasks.js
@@ -100,6 +100,12 @@ export async function runTests(options) {
         await runFtr({ configPath, options: opts });
       } finally {
         try {
+          const delay = config.get('kbnTestServer.delayShutdown');
+          if (typeof delay === 'number') {
+            log.info('Delaying shutdown of Kibana for', delay, 'ms');
+            await new Promise((r) => setTimeout(r, delay));
+          }
+
           await procs.stop('kibana');
         } finally {
           if (es) {

diff --git a/x-pack/test/performance/config.ts b/x-pack/test/performance/config.ts
@@ -49,6 +49,8 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
           .filter(([, v]) => !!v)
           .reduce((acc, [k, v]) => (acc ? `${acc},${k}=${v}` : `${k}=${v}`), ''),
       },
+      // delay shutdown by 15 seconds to ensure that APM can report the data it collects during test execution
+      delayShutdown: 15_000,
     },
   };
 }