o11y 246.5.0 → 248.1.2

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

@@ -1,19 +1,6 @@
+import { simpleSchema, errorSchema, activitySchema, instrumentedEventSchema, idleDetectorReportSchema } from 'o11y_schema/sf_instrumentation';
 import { utility, PublicSafety, schemaUtil, metricsUtility } from 'o11y/shared';
 
-const activity={namespace:"sf.instrumentation",name:"Activity",pbjsSchema:{"nested":{"sf":{"nested":{"instrumentation":{"nested":{"Activity":{"reserved":[[5,5],[7,7]],"fields":{"duration":{"id":3,"type":"double"},"stopReason":{"id":6,"type":"string"},"isRoot":{"id":8,"type":"bool"},"timerOverridden":{"id":12,"type":"uint32"},"name":{"options":{"(meta.max_length)":25},"id":2,"type":"string"},"isSampled":{"id":11,"type":"bool"},"preRootId":{"id":9,"type":"string"},"id":{"id":1,"type":"string"},
-"userPayload":{"id":4,"type":"Payload"},"errorCount":{"id":10,"type":"uint32"},"parentId":{"id":13,"type":"string"}}},"Payload":{"fields":{"payload":{"id":2,"type":"bytes"},"schemaName":{"id":1,"type":"string"}}}}}}}}}};
-
-const error={namespace:"sf.instrumentation",name:"Error",pbjsSchema:{"nested":{"sf":{"nested":{"instrumentation":{"nested":{"Error":{"reserved":[[5,5],[7,7]],"fields":{"activityId":{"id":6,"type":"string"},"stack":{"id":3,"type":"string"},"name":{"id":1,"type":"string"},"message":{"options":{"(meta.max_length)":200},"id":2,"type":"string"},"userPayload":{"id":4,"type":"Payload"}}},"Payload":{"fields":{"payload":{"id":2,"type":"bytes"},"schemaName":{"id":1,"type":"string"}}}}}}}}}};
-
-const idle_detector_report={namespace:"sf.instrumentation",name:"IdleDetectorReport",pbjsSchema:{"nested":{"sf":{"nested":{"instrumentation":{"nested":{"IdleDetectorReport":{"fields":{"listenerCount":{"id":3,"type":"uint32"},"busyTasks":{"rule":"repeated","id":5,"type":"string"},"busyDurations":{"rule":"repeated","id":6,"type":"double"},"pollableCount":{"id":4,"type":"uint32"},"pollCounts":{"rule":"repeated","id":8,"type":"double"},"logThreshold":{"id":2,"type":"double"},"maxDuration":{"id":1,
-"type":"double"},"pollables":{"rule":"repeated","id":7,"type":"string"}}}}}}}}}};
-
-const instrumented_event={namespace:"sf.instrumentation",name:"InstrumentedEvent",pbjsSchema:{"nested":{"sf":{"nested":{"instrumentation":{"nested":{"MouseEvent":{"fields":{"cancelable":{"id":5,"type":"bool"},"ctrlKey":{"id":9,"type":"bool"},"type":{"id":25,"type":"string"},"button":{"id":3,"type":"uint32"},"offsetX":{"id":17,"type":"uint32"},"eventPhase":{"id":12,"type":"uint32"},"shiftKey":{"id":23,"type":"bool"},"offsetY":{"id":18,"type":"uint32"},"composed":{"id":8,"type":"bool"},"altKey":{"id":1,
-"type":"bool"},"isTrusted":{"id":13,"type":"bool"},"buttons":{"id":4,"type":"uint32"},"movementY":{"id":16,"type":"uint32"},"clientY":{"id":7,"type":"uint32"},"clientX":{"id":6,"type":"uint32"},"movementX":{"id":15,"type":"uint32"},"defaultPrevented":{"id":10,"type":"bool"},"metaKey":{"id":14,"type":"bool"},"timeStamp":{"id":24,"type":"double"},"bubbles":{"id":2,"type":"bool"},"detail":{"id":11,"type":"int64"},"pageY":{"id":20,"type":"uint32"},"pageX":{"id":19,"type":"uint32"},"screenX":{"id":21,
-"type":"uint32"},"screenY":{"id":22,"type":"uint32"}}},"InstrumentedEvent":{"oneofs":{"event":{"oneof":["mouseEvent"]}},"reserved":[[4,4],"xpath",[6,6],[8,8]],"fields":{"mouseEvent":{"id":7,"type":"MouseEvent"},"auto":{"id":3,"type":"bool"},"parentComponent":{"id":2,"type":"string"},"ownerComponent":{"id":1,"type":"string"},"userPayload":{"id":5,"type":"Payload"},"simplePath":{"id":9,"type":"string"}}},"Payload":{"fields":{"payload":{"id":2,"type":"bytes"},"schemaName":{"id":1,"type":"string"}}}}}}}}}};
-
-const simple={namespace:"sf.instrumentation",name:"Simple",pbjsSchema:{"nested":{"sf":{"nested":{"instrumentation":{"nested":{"Simple":{"fields":{"text":{"options":{"(meta.max_length)":25},"id":1,"type":"string"}}}}}}}}}};
-
 class TaskerImpl {
     get isBusy() {
         return this._isOk ? this._busyCount > 0 : undefined;
@@ -814,19 +801,31 @@ class ActivityNoOp {
 const activityNoOp = Object.freeze(new ActivityNoOp());
 
 class DomEventHelpers {
-    getInstrumentedEventData(eventData, handledBy, userPayload) {
+    getInstrumentedEventData(domEventDataField, domEventData, handledBy, userPayload) {
         var _a;
         const instrumentedEvent = {
             ownerComponent: handledBy.tagName,
             parentComponent: ((_a = handledBy.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) || undefined,
-            event: eventData,
             simplePath: utility.getXpath(handledBy)
         };
+        switch (domEventDataField) {
+            case 0:
+                instrumentedEvent.baseEvent = domEventData;
+                break;
+            case 1:
+                instrumentedEvent.mouseEvent = domEventData;
+                break;
+        }
         if (userPayload) {
             instrumentedEvent.userPayload = schemaUtil.makePayload(userPayload.schema, userPayload.payload, true);
         }
         return instrumentedEvent;
     }
+    getEventData(e) {
+        return {
+            type: e.type
+        };
+    }
     getMouseEventData(e) {
         return {
             altKey: e.altKey,
@@ -1379,7 +1378,7 @@ class InstrumentationImpl {
             increment: (increment) => this._incrementError(increment)
         });
         this._metrics = this._initMetrics();
-        const simpleTextOptions = schemaUtil.getOptions(simple, 'Simple', 'text');
+        const simpleTextOptions = schemaUtil.getOptions(simpleSchema, 'Simple', 'text');
         this._simpleTextMaxLength = simpleTextOptions
             ? simpleTextOptions['(meta.max_length)']
             : maxStringLengthAppLimit;
@@ -1396,7 +1395,7 @@ class InstrumentationImpl {
     _wrapUserPayload(userSchemaOrText, userData, onlyIfBoth = false) {
         let userSchema;
         if (typeof userSchemaOrText === 'string') {
-            userSchema = simple;
+            userSchema = simpleSchema;
             if (userSchemaOrText) {
                 userData = {
                     text: userSchemaOrText.substring(0, this._simpleTextMaxLength)
@@ -1447,9 +1446,9 @@ class InstrumentationImpl {
     }
     _errorInternal(err, userSchemaOrText, userData, activityId, rootActivityId) {
         const loggedTimestamp = utility.time().tsNow;
-        let error$1;
+        let error;
         if (err instanceof Error) {
-            error$1 = err;
+            error = err;
         }
         else {
             let msg;
@@ -1459,17 +1458,17 @@ class InstrumentationImpl {
             else {
                 msg = err.toString();
             }
-            error$1 = new Error(msg);
+            error = new Error(msg);
         }
         const userPayload = this._wrapUserPayload(userSchemaOrText, userData, true);
         const errorData = {
-            name: error$1.name,
-            message: error$1.message,
-            stack: error$1.stack,
+            name: error.name,
+            message: error.message,
+            stack: error.stack,
             userPayload,
             activityId
         };
-        return this._logInternal(this.name, error, errorData, loggedTimestamp, rootActivityId);
+        return this._logInternal(this.name, errorSchema, errorData, loggedTimestamp, rootActivityId);
     }
     startActivity(name, options) {
         return this._safety.tryCatchReturn(() => {
@@ -1512,7 +1511,7 @@ class InstrumentationImpl {
         this._logActivity(activityData, detail.startTimestamp, detail.rootId);
     }
     _logActivity(activityData, startTimestamp, rootId) {
-        this._logInternal(this.name, activity, activityData, startTimestamp, rootId);
+        this._logInternal(this.name, activitySchema, activityData, startTimestamp, rootId);
     }
     _handleActivityError(error, detail) {
         this._errorInternal(error, detail.userSchemaOrText, detail.userData, detail.id, detail.rootId);
@@ -1552,10 +1551,14 @@ class InstrumentationImpl {
                     if (acd) {
                         acd.markEventHandled(mouseEvent);
                     }
-                    const mouseEventData = domEventHelpers.getMouseEventData(mouseEvent);
-                    const instrumentedEvent = domEventHelpers.getInstrumentedEventData(mouseEventData, htmlElement, userPayload);
+                    const captureMouse = options === null || options === void 0 ? void 0 : options.captureMouseData;
+                    const instrumentedEvent = domEventHelpers.getInstrumentedEventData(captureMouse
+                        ? 1
+                        : 0, captureMouse
+                        ? domEventHelpers.getMouseEventData(mouseEvent)
+                        : domEventHelpers.getEventData(mouseEvent), htmlElement, userPayload);
                     instrumentedEvent.auto = options === null || options === void 0 ? void 0 : options._auto;
-                    this._logInternal(this.name, instrumented_event, instrumentedEvent, tsNow, rootId);
+                    this._logInternal(this.name, instrumentedEventSchema, instrumentedEvent, tsNow, rootId);
                     break;
                 }
                 default:
@@ -2077,6 +2080,7 @@ class NextgenImpl {
         this._opMode = 'default';
         this._isSender = false;
         this._isReceiver = false;
+        this._decimalPoints = 2;
     }
     registerApp(name, options) {
         var _a;
@@ -2091,6 +2095,9 @@ class NextgenImpl {
         this._initOpMode(options === null || options === void 0 ? void 0 : options.operationMode);
         this._isSender = this._opMode === 'sender';
         this._isReceiver = this._opMode === 'receiver';
+        if ((options === null || options === void 0 ? void 0 : options.decimalPoints) !== undefined) {
+            this._decimalPoints = options.decimalPoints;
+        }
         this._clientSessionId = ((_a = options === null || options === void 0 ? void 0 : options.clientSessionId) === null || _a === void 0 ? void 0 : _a.toString()) || utility.generateUniqueId();
         this._appInstr = new AppInstrumentationImpl(this, name, options === null || options === void 0 ? void 0 : options.allowMultipleRootActivities);
         this._instruments.set(name, this._appInstr);
@@ -2173,6 +2180,11 @@ class NextgenImpl {
         if (!this._isSender) {
             data = utility.clone(data);
         }
+        if (typeof this._decimalPoints === 'number') {
+            utility.roundNumbersInObject(data, this._decimalPoints);
+            utility.roundNumbersInObject(pagePayload === null || pagePayload === void 0 ? void 0 : pagePayload.payload, this._decimalPoints);
+            utility.roundNumbersInObject(appPayload === null || appPayload === void 0 ? void 0 : appPayload.payload, this._decimalPoints);
+        }
         const logMeta = {
             timestamp,
             rootId,
@@ -2398,12 +2410,12 @@ class ConsoleCollector {
     }
 }
 
-const version = '246.5.0';
+const version = '248.1.2';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,
     reportListener: (report) => {
-        idleDetectorInstr === null || idleDetectorInstr === void 0 ? void 0 : idleDetectorInstr.log(idle_detector_report, report);
+        idleDetectorInstr === null || idleDetectorInstr === void 0 ? void 0 : idleDetectorInstr.log(idleDetectorReportSchema, report);
     },
     errorListener: (e, text) => {
         idleDetectorInstr === null || idleDetectorInstr === void 0 ? void 0 : idleDetectorInstr.error(e, text);