[Reporting] Remove EventLog Dependency

x-pack/plugins/event_log/generated/mappings.json

@@ -309,19 +309,6 @@
                         }
                     }
                 },
-                "reporting": {
-                    "properties": {
-                        "id": {
-                            "type": "keyword"
-                        },
-                        "jobType": {
-                            "type": "keyword"
-                        },
-                        "byteSize": {
-                            "type": "long"
-                        }
-                    }
-                },
                 "saved_objects": {
                     "type": "nested",
                     "properties": {

x-pack/plugins/event_log/generated/schemas.ts

@@ -140,13 +140,6 @@ export const EventSchema = schema.maybe(
             ),
           })
         ),
-        reporting: schema.maybe(
-          schema.object({
-            id: ecsString(),
-            jobType: ecsString(),
-            byteSize: ecsNumber(),
-          })
-        ),
         saved_objects: schema.maybe(
           schema.arrayOf(
             schema.object({

x-pack/plugins/event_log/scripts/mappings.js

@@ -91,20 +91,6 @@ exports.EcsCustomPropertyMappings = {
           },
         },
       },
-      // reporting specific fields
-      reporting: {
-        properties: {
-          id: {
-            type: 'keyword',
-          },
-          jobType: {
-            type: 'keyword',
-          },
-          byteSize: {
-            type: 'long',
-          },
-        },
-      },
       // array of saved object references, for "linking" via search
       saved_objects: {
         type: 'nested',

x-pack/plugins/reporting/kibana.json

@@ -18,7 +18,6 @@
     "licensing",
     "uiActions",
     "taskManager",
-    "eventLog",
     "embeddable",
     "screenshotting",
     "screenshotMode",

x-pack/plugins/reporting/server/core.ts

@@ -21,7 +21,6 @@ import type {
 import type { PluginStart as DataPluginStart } from 'src/plugins/data/server';
 import type { FieldFormatsStart } from 'src/plugins/field_formats/server';
 import { KibanaRequest, ServiceStatusLevels } from '../../../../src/core/server';
-import type { IEventLogService } from '../../event_log/server';
 import type { PluginSetupContract as FeaturesPluginSetup } from '../../features/server';
 import type { LicensingPluginStart } from '../../licensing/server';
 import type { ScreenshotResult, ScreenshottingStart } from '../../screenshotting/server';
@@ -40,7 +39,6 @@ import { ExecuteReportTask, MonitorReportsTask, ReportTaskParams } from './lib/t
 import type { ReportingPluginRouter, ScreenshotOptions } from './types';
 
 export interface ReportingInternalSetup {
-  eventLog: IEventLogService;
   basePath: Pick<BasePath, 'set'>;
   router: ReportingPluginRouter;
   features: FeaturesPluginSetup;
@@ -390,7 +388,7 @@ export class ReportingCore {
   }
 
   public getEventLogger(report: IReport, task?: { id: string }) {
-    const ReportingEventLogger = reportingEventLoggerFactory(this.pluginSetupDeps!.eventLog);
+    const ReportingEventLogger = reportingEventLoggerFactory(this.logger);
     return new ReportingEventLogger(report, task);
   }
 }

x-pack/plugins/reporting/server/lib/event_logger/adapter.test.ts

@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { LogMeta } from 'kibana/server';
+import { createMockLevelLogger } from '../../test_helpers';
+import { EcsLogAdapter } from './adapter';
+
+describe('EcsLogAdapter', () => {
+  const logger = createMockLevelLogger();
+  beforeAll(() => {
+    jest
+      .spyOn(global.Date, 'now')
+      .mockImplementationOnce(() => new Date('2021-04-12T16:00:00.000Z').valueOf())
+      .mockImplementationOnce(() => new Date('2021-04-12T16:02:00.000Z').valueOf());
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('captures a log event', () => {
+    const eventLogger = new EcsLogAdapter(logger, { event: { provider: 'test-adapting' } });
+
+    const event = { kibana: { reporting: { wins: 5000 } } } as object & LogMeta; // an object that extends LogMeta
+    eventLogger.logEvent('hello world', event);
+
+    expect(logger.debug).toBeCalledWith('hello world', ['events'], {
+      event: {
+        duration: undefined,
+        end: undefined,
+        provider: 'test-adapting',
+        start: undefined,
+      },
+      kibana: {
+        reporting: {
+          wins: 5000,
+        },
+      },
+    });
+  });
+
+  it('captures timings between start and complete', () => {
+    const eventLogger = new EcsLogAdapter(logger, { event: { provider: 'test-adapting' } });
+    eventLogger.startTiming();
+
+    const event = { kibana: { reporting: { wins: 9000 } } } as object & LogMeta; // an object that extends LogMeta
+    eventLogger.logEvent('hello duration', event);
+
+    expect(logger.debug).toBeCalledWith('hello duration', ['events'], {
+      event: {
+        duration: 120000000000,
+        end: '2021-04-12T16:02:00.000Z',
+        provider: 'test-adapting',
+        start: '2021-04-12T16:00:00.000Z',
+      },
+      kibana: {
+        reporting: {
+          wins: 9000,
+        },
+      },
+    });
+  });
+});

x-pack/plugins/reporting/server/lib/event_logger/adapter.ts

@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import deepMerge from 'deepmerge';
+import { LogMeta } from 'src/core/server';
+import { LevelLogger } from '../level_logger';
+import { IReportingEventLogger } from './logger';
+
+/** @internal */
+export class EcsLogAdapter implements IReportingEventLogger {
+  start?: Date;
+  end?: Date;
+
+  /**
+   * This class provides a logging system to Reporting code, using a shape similar to the EventLog service.
+   * The logging action causes ECS data with Reporting metrics sent to DEBUG logs.
+   *
+   * @param {LevelLogger} logger - Reporting's wrapper of the core logger
+   * @param {Partial<LogMeta>} properties - initial ECS data with template for Reporting metrics
+   */
+  constructor(private logger: LevelLogger, private properties: Partial<LogMeta>) {}
+
+  logEvent(message: string, properties: LogMeta) {
+    if (this.start && !this.end) {
+      this.end = new Date(Date.now());
+    }
+
+    let duration: number | undefined;
+    if (this.end && this.start) {
+      duration = (this.end.valueOf() - this.start.valueOf()) * 1000000; // nanoseconds
+    }
+
+    // add the derived properties for timing between "start" and "complete" logging calls
+    const newProperties: LogMeta = deepMerge(this.properties, {
+      event: {
+        duration,
+        start: this.start?.toISOString(),
+        end: this.end?.toISOString(),
+      },
+    });
+
+    // sends an ECS object with Reporting metrics to the DEBUG logs
+    this.logger.debug(message, ['events'], deepMerge(newProperties, properties));
+  }
+
+  startTiming() {
+    this.start = new Date(Date.now());
+  }
+
+  stopTiming() {
+    this.end = new Date(Date.now());
+  }
+}

x-pack/plugins/reporting/server/lib/event_logger/index.ts

@@ -5,9 +5,6 @@
  * 2.0.
  */
 
-import { IEventLogService } from '../../../../event_log/server';
-import { PLUGIN_ID } from '../../../common/constants';
-
 export enum ActionType {
   SCHEDULE_TASK = 'schedule-task',
   CLAIM_TASK = 'claim-task',
@@ -16,7 +13,5 @@ export enum ActionType {
   SAVE_REPORT = 'save-report',
   RETRY = 'retry',
   FAIL_REPORT = 'fail-report',
-}
-export function registerEventLogProviderActions(eventLog: IEventLogService) {
-  eventLog.registerProviderActions(PLUGIN_ID, Object.values(ActionType));
+  EXECUTE_ERROR = 'execute-error',
 }