o11y 248.10.0 → 248.11.0

package/dist/modules/o11y/client/client.js

@@ -1,5 +1,5 @@
-import { networkSchema, simpleSchema, errorSchema, activitySchema, instrumentedEventSchema, idleDetectorReportSchema } from 'o11y_schema/sf_instrumentation';
-import { utility, PublicSafety, schemaUtil, maxStringLengthAppLimit, metricsUtility, payloadUtility } from 'o11y/shared';
+import { networkSchema, simpleSchema, payloadDiagsSchema, errorSchema, activitySchema, instrumentedEventSchema, idleDetectorReportSchema } from 'o11y_schema/sf_instrumentation';
+import { utility, PublicSafety, schemaUtil, maxStringLengthAppLimit, payloadUtility, metricsUtility } from 'o11y/shared';
 
 class TaskerImpl {
     get isBusy() {
@@ -1497,7 +1497,16 @@ class InstrumentationImpl {
         });
     }
     _logInternal(loggerName, schema, data, timestamp, rootId) {
-        return this._nextGen.addLog(loggerName, schema, data, timestamp, rootId);
+        const sequence = this._nextGen.addLog(loggerName, schema, data, timestamp, rootId);
+        if (!utility.isProduction) {
+            const extraFields = payloadUtility.getExtraFields(schema, data);
+            if (!utility.isProduction && extraFields.length > 0) {
+                this.error('Extra fields', payloadDiagsSchema, {
+                    extras: extraFields
+                });
+            }
+        }
+        return sequence;
     }
     error(error, userSchemaOrText, userData, options) {
         return this._safety.tryCatch(() => {
@@ -2401,6 +2410,7 @@ class Index {
 }
 const time = utility.time.bind(utility);
 
+const lightningLoggerSchemaId = 'sfcore.customCmp.CustomComponentLog';
 const bgColorMap = {
     Error: 'Crimson',
     Activity: 'CadetBlue',
@@ -2417,29 +2427,75 @@ const defaultColor = 'black';
 const defaultBgColor = 'Gainsboro';
 class ConsoleCollector {
     constructor(environment) {
+        this._simpleFilters = new Set();
+        this._regexFilters = [];
         if (environment) {
             this._log('ConsoleCollector', environment);
         }
     }
     collect(schema, data, logMeta) {
+        const id = schemaUtil.getSchemaId(schema);
+        if (!this._shouldLog(id)) {
+            return;
+        }
+        if (id === lightningLoggerSchemaId) {
+            this._logCustom(data);
+            return;
+        }
         let label, color, bgColor;
-        if (schema.namespace === 'sf.instrumentation') {
+        if (schemaUtil.isInternal(schema)) {
             label = schema.name;
             color = colorMap[schema.name] || defaultColor;
             bgColor = bgColorMap[schema.name] || defaultBgColor;
         }
         else {
-            label = schemaUtil.getSchemaId(schema);
+            label = id;
         }
         this._log(label, data, logMeta, color, bgColor);
     }
+    _shouldLog(schemaId) {
+        if (this._simpleFilters.size == 0 && this._regexFilters.length == 0) {
+            return true;
+        }
+        return (this._simpleFilters.has(schemaId) || this._regexFilters.some((r) => r.test(schemaId)));
+    }
+    addFilter(filter) {
+        if (filter instanceof RegExp) {
+            this._regexFilters.push(filter);
+        }
+        else {
+            this._simpleFilters.add(filter);
+        }
+    }
+    removeFilter(filter) {
+        if (filter instanceof RegExp) {
+            const index = this._regexFilters.findIndex((r) => r.source === filter.source);
+            if (index >= 0) {
+                this._regexFilters.splice(index, 1);
+            }
+        }
+        else {
+            this._simpleFilters.delete(filter);
+        }
+    }
+    clearFilters() {
+        this._simpleFilters.clear();
+        this._regexFilters.splice(0, this._regexFilters.length);
+    }
+    getFilters() {
+        const filters = Array.from(this._simpleFilters);
+        return filters.concat(this._regexFilters).sort();
+    }
     _log(label, first, second, color = defaultColor, bgColor = defaultBgColor) {
         const css = `color:${color};background-color:${bgColor}`;
         console.log(`%cO11Y%c ${label}`, 'color:white;background-color:#FF6600;font-weight:bold', css, first || '', second || '');
     }
+    _logCustom(data) {
+        console.log('%clightning/logger', 'color:white;background-color:#00a1e0;font-weight:bold', data || '');
+    }
 }
 
-const version = '248.10.0';
+const version = '248.11.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,