Make the logger forward logs to DD

Author: yoannmoinet

packages/core/src/helpers/log.ts

@@ -3,7 +3,7 @@
 // Copyright 2019-Present Datadog, Inc.
 
 import { HOST_NAME } from '../constants';
-import type { GlobalData, LogOptions } from '../types';
+import type { GlobalData, DdLogOptions } from '../types';
 
 import { doRequest } from './request';
 
@@ -12,7 +12,7 @@ export const INTAKE_HOST = 'browser-http-intake.logs.datadoghq.com';
 
 export const getSendLog =
     (data: GlobalData) =>
-    ({ message, context }: LogOptions): Promise<void> => {
+    ({ message, context }: DdLogOptions): Promise<void> => {
         return doRequest({
             // Don't delay the build too much on error.
             retries: 2,

packages/core/src/types.ts

@@ -138,17 +138,19 @@ export type TimeLog = (
     opts?: { level?: LogLevel; start?: boolean | number; log?: boolean; tags?: LogTags },
 ) => TimeLogger;
 export type GetLogger = (name: string) => Logger;
+export type LogOptions = { forward?: boolean };
+export type LoggerFn = (text: any, opts?: LogOptions) => void;
 export type Logger = {
     getLogger: GetLogger;
     time: TimeLog;
-    error: (text: any) => void;
-    warn: (text: any) => void;
-    info: (text: any) => void;
-    debug: (text: any) => void;
+    error: LoggerFn;
+    warn: LoggerFn;
+    info: LoggerFn;
+    debug: LoggerFn;
 };
 type RestContext = string | string[] | number | boolean;
 export type LogData = Record<string, RestContext | Record<string, RestContext>>;
-export type LogOptions = {
+export type DdLogOptions = {
     message: string;
     context?: LogData;
 };
@@ -171,7 +173,7 @@ export type GlobalContext = {
     pluginNames: string[];
     plugins: (PluginOptions | CustomPluginOptions)[];
     queue: (promise: Promise<any>) => void;
-    sendLog: (args: LogOptions) => Promise<void>;
+    sendLog: (args: DdLogOptions) => Promise<void>;
     start: number;
     version: GlobalData['version'];
 };

packages/factory/src/helpers/logger.ts

@@ -2,6 +2,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2019-Present Datadog, Inc.
 
+import { getSendLog } from '@dd/core/helpers/log';
 import { cleanPluginName } from '@dd/core/helpers/plugins';
 import { formatDuration } from '@dd/core/helpers/strings';
 import type {
@@ -41,7 +42,7 @@ export const getLogFn = (
 ): LogFn => {
     // Will remove any "datadog-" prefix and "-plugin" suffix in the name string.
     const cleanedName = cleanName(name);
-    return (text: any, type: LogLevel = 'debug') => {
+    return (text, type = 'debug', { forward } = {}) => {
         // By default (debug) we print dimmed.
         let color = c.dim;
         let logFn = console.log;
@@ -77,6 +78,12 @@ export const getLogFn = (
             stores.warnings.push(content);
         }
 
+        if (forward) {
+            stores.queue.push(
+                getSendLog(data)({ message: content, context: { plugin: name, status: type } }),
+            );
+        }
+
         // Only log if the log level is high enough.
         if (logPriority[type] >= logPriority[logLevel]) {
             logFn(`${color(prefix)} ${content}`);
@@ -197,9 +204,9 @@ export const getLoggerFactory =
                 return logger(`${cleanName(name)}${NAME_SEP}${subName}`);
             },
             time: getTimeLogger(name, stores.timings, log),
-            error: (text: any) => log(text, 'error'),
-            warn: (text: any) => log(text, 'warn'),
-            info: (text: any) => log(text, 'info'),
-            debug: (text: any) => log(text, 'debug'),
+            error: (text: any, opts?: LogOptions) => log(text, 'error', opts),
+            warn: (text: any, opts?: LogOptions) => log(text, 'warn', opts),
+            info: (text: any, opts?: LogOptions) => log(text, 'info', opts),
+            debug: (text: any, opts?: LogOptions) => log(text, 'debug', opts),
         };
     };