[Screenshotting] instrument for benchmark tests using new EventLogger class

x-pack/plugins/screenshotting/common/index.ts

@@ -14,3 +14,5 @@ export {
   SCREENSHOTTING_EXPRESSION,
   SCREENSHOTTING_EXPRESSION_INPUT,
 } from './expression';
+
+export const PLUGIN_ID = 'screenshotting';

x-pack/plugins/screenshotting/server/formats/pdf/index.ts

@@ -5,13 +5,14 @@
  * 2.0.
  */
 
-import { groupBy } from 'lodash';
 import type { Values } from '@kbn/utility-types';
-import type { Logger, PackageInfo } from '@kbn/core/server';
+import { groupBy } from 'lodash';
+import type { PackageInfo } from '@kbn/core/server';
 import type { LayoutParams } from '../../../common';
 import { LayoutTypes } from '../../../common';
 import type { Layout } from '../../layouts';
-import type { CaptureOptions, CaptureResult, CaptureMetrics } from '../../screenshots';
+import type { CaptureMetrics, CaptureOptions, CaptureResult } from '../../screenshots';
+import { Actions, EventLogger } from '../../screenshots/event_logger';
 import { pngsToPdf } from './pdf_maker';
 
 /**
@@ -92,7 +93,7 @@ function getTimeRange(results: CaptureResult['results']) {
 }
 
 export async function toPdf(
-  logger: Logger,
+  eventLogger: EventLogger,
   packageInfo: PackageInfo,
   layout: Layout,
   { logo, title }: PdfScreenshotOptions,
@@ -106,7 +107,7 @@ export async function toPdf(
       layout,
       logo,
       packageInfo,
-      logger,
+      eventLogger,
     });
 
     return {
@@ -119,7 +120,8 @@ export async function toPdf(
       renderErrors: results.flatMap(({ renderErrors }) => renderErrors ?? []),
     };
   } catch (error) {
-    logger.error(`Could not generate the PDF buffer!`);
+    eventLogger.kbnLogger.error(`Could not generate the PDF buffer!`);
+    eventLogger.error(error, Actions.PDF);
 
     throw error;
   }

x-pack/plugins/screenshotting/server/formats/pdf/pdf_maker/index.ts

@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import type { Logger, PackageInfo } from '@kbn/core/server';
-import { PdfMaker } from './pdfmaker';
+import type { PackageInfo } from '@kbn/core/server';
 import type { Layout } from '../../../layouts';
-import { getTracker } from './tracker';
 import type { CaptureResult } from '../../../screenshots';
+import { EventLogger } from '../../../screenshots/event_logger';
+import { PdfMaker } from './pdfmaker';
 
 interface PngsToPdfArgs {
   results: CaptureResult['results'];
   layout: Layout;
   packageInfo: PackageInfo;
-  logger: Logger;
+  eventLogger: EventLogger;
   logo?: string;
   title?: string;
 }
@@ -26,37 +26,34 @@ export async function pngsToPdf({
   logo,
   title,
   packageInfo,
-  logger,
+  eventLogger,
 }: PngsToPdfArgs): Promise<{ buffer: Buffer; pages: number }> {
-  const pdfMaker = new PdfMaker(layout, logo, packageInfo, logger);
-  const tracker = getTracker();
+  eventLogger.pdfStart();
+  const pdfMaker = new PdfMaker(layout, logo, packageInfo, eventLogger.kbnLogger);
   if (title) {
     pdfMaker.setTitle(title);
   }
   results.forEach((result) => {
     result.screenshots.forEach((png) => {
-      tracker.startAddImage();
+      eventLogger.addPdfImageStart();
       pdfMaker.addImage(png.data, {
         title: png.title ?? undefined,
         description: png.description ?? undefined,
       });
-      tracker.endAddImage();
+      eventLogger.addPdfImageEnd();
     });
   });
 
   let buffer: Uint8Array | null = null;
   try {
-    tracker.startCompile();
+    eventLogger.compilePdfStart();
     buffer = await pdfMaker.generate();
-    tracker.endCompile();
+    eventLogger.compilePdfEnd();
 
     const byteLength = buffer?.byteLength ?? 0;
-    logger.debug(`PDF buffer byte length: ${byteLength}`);
-    tracker.setByteLength(byteLength);
+    eventLogger.pdfEnd({ byteLengthPdf: byteLength, pdfPages: pdfMaker.getPageCount() });
   } catch (err) {
     throw err;
-  } finally {
-    tracker.end();
   }
 
   return { buffer: Buffer.from(buffer.buffer), pages: pdfMaker.getPageCount() };

x-pack/plugins/screenshotting/server/plugin.ts

@@ -83,9 +83,13 @@ export class ScreenshottingPlugin implements Plugin<void, ScreenshottingStart, S
 
     this.screenshots = (async () => {
       const browserDriverFactory = await this.browserDriverFactory;
-      const logger = this.logger.get('screenshot');
-
-      return new Screenshots(browserDriverFactory, logger, this.packageInfo, http, this.config);
+      return new Screenshots(
+        browserDriverFactory,
+        this.logger,
+        this.packageInfo,
+        http,
+        this.config
+      );
     })();
     // Already handled in `browserDriverFactory`
     this.screenshots.catch(() => {});