Allow reporting CSV export usage when browser driver factory can not be initialized

tsullivan · tsullivan · commit febb1d3bb2ce · 2022-12-29T15:45:25.000-07:00
diff --git a/x-pack/plugins/reporting/server/core.ts b/x-pack/plugins/reporting/server/core.ts
@@ -47,7 +47,7 @@ export interface ReportingInternalSetup {
 }
 
 export interface ReportingInternalStart {
-  browserDriverFactory: HeadlessChromiumDriverFactory;
+  browserDriverFactory: HeadlessChromiumDriverFactory | null;
   store: ReportingStore;
   savedObjects: SavedObjectsServiceStart;
   uiSettings: UiSettingsServiceStart;
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/observable.ts b/x-pack/plugins/reporting/server/lib/screenshots/observable.ts
@@ -48,14 +48,18 @@ const DEFAULT_SETUP_RESULT = {
 
 export function getScreenshots$(
   captureConfig: CaptureConfig,
-  browserDriverFactory: HeadlessChromiumDriverFactory,
+  browserDriverFactory: HeadlessChromiumDriverFactory | null,
   options: ScreenshotObservableOpts
 ): Rx.Observable<ScreenshotResults[]> {
   const apmTrans = apm.startTransaction('screenshot-pipeline', REPORTING_TRANSACTION_TYPE);
   const { layout } = options;
   const apmCreatePage = apmTrans?.startSpan('create-page', 'wait');
   const { browserTimezone, logger } = options;
 
+  if (!browserDriverFactory) {
+    throw new Error(`Browser driver factory is not initialized!`);
+  }
+
   return browserDriverFactory
     .createPage(
       {
diff --git a/x-pack/plugins/reporting/server/plugin.ts b/x-pack/plugins/reporting/server/plugin.ts
@@ -8,7 +8,7 @@
 import type { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/server';
 import { PLUGIN_ID } from '../common/constants';
 import { ReportingCore } from './';
-import { initializeBrowserDriverFactory } from './browsers';
+import { HeadlessChromiumDriverFactory, initializeBrowserDriverFactory } from './browsers';
 import { buildConfig, registerUiSettings, ReportingConfigType } from './config';
 import { registerDeprecations } from './deprecations';
 import { LevelLogger, ReportingStore } from './lib';
@@ -98,7 +98,12 @@ export class ReportingPlugin
     (async () => {
       await reportingCore.pluginSetsUp();
 
-      const browserDriverFactory = await initializeBrowserDriverFactory(reportingCore, this.logger);
+      let browserDriverFactory: HeadlessChromiumDriverFactory | null = null;
+      try {
+        browserDriverFactory = await initializeBrowserDriverFactory(reportingCore, this.logger);
+      } catch (err) {
+        this.logger.error(err);
+      }
       const store = new ReportingStore(reportingCore, this.logger);
 
       await reportingCore.pluginStart({

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export interface ReportingInternalSetup {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`export interface ReportingInternalStart {`
`50`		`- browserDriverFactory: HeadlessChromiumDriverFactory;`
	`50`	`+ browserDriverFactory: HeadlessChromiumDriverFactory \| null;`
`51`	`51`	`store: ReportingStore;`
`52`	`52`	`savedObjects: SavedObjectsServiceStart;`
`53`	`53`	`uiSettings: UiSettingsServiceStart;`