o11y 252.2.0 → 252.4.0

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

@@ -413,12 +413,18 @@ class PerformanceObservability {
         return (basicInitiatorTypes.indexOf(entry.initiatorType) >= 0 ||
             entry.entryType === 'navigation');
     }
-    _logActivity(schema, payload) {
-        const options = {
+    _logActivity(schema, payload, activityId, errorCount) {
+        const startOptions = {
+            id: activityId
+        };
+        const stopOptions = {
             perfStartOverride: payload.startTime,
-            perfStopOverride: payload.startTime + payload.duration
+            perfStopOverride: payload.startTime + payload.duration,
+            errorCount
         };
-        this._instr.startActivity(this._logPerformanceActivityName).stop(schema, payload, options);
+        this._instr
+            .startActivity(this._logPerformanceActivityName, startOptions)
+            .stop(schema, payload, stopOptions);
     }
     _logPerformanceEntries(list) {
         for (const entry of list.getEntriesByType('navigation')) {
@@ -453,7 +459,7 @@ class PerformanceObservability {
                     srvReqId: requestInfo === null || requestInfo === void 0 ? void 0 : requestInfo.requestId,
                     xhrDelay: requestInfo ? requestInfo.activityDuration - rt.duration : undefined
                 });
-                this._logActivity(resource_timing, payload);
+                this._logActivity(resource_timing, payload, requestInfo === null || requestInfo === void 0 ? void 0 : requestInfo.activityId, requestInfo === null || requestInfo === void 0 ? void 0 : requestInfo.errorCount);
             }
         }
     }
@@ -700,7 +706,9 @@ class Tracing {
                         const requestId = Tracing._extractHeader(headerRequestId, resource, options);
                         Tracing._performanceObservability.addEntry(absoluteUrl, fetchTime, {
                             requestId,
-                            activityDuration
+                            activityDuration,
+                            activityId: activity === null || activity === void 0 ? void 0 : activity.getId(),
+                            errorCount: activity === null || activity === void 0 ? void 0 : activity.getErrorCount()
                         });
                     }
                 }
@@ -714,7 +722,7 @@ class Tracing {
     static _endActivity(activity, url, method) {
         var _a;
         if (activity) {
-            if (((_a = Tracing._performanceObservability) === null || _a === void 0 ? void 0 : _a.isStarted) && activity.getErrorCount() == 0) {
+            if ((_a = Tracing._performanceObservability) === null || _a === void 0 ? void 0 : _a.isStarted) {
                 activity.discard();
             }
             else {
@@ -735,11 +743,14 @@ class Tracing {
         function postProcess(xhr, failedAtInit) {
             var _a;
             if (xhr._o11y) {
-                const activityDuration = Tracing._endActivity(xhr._o11y.activity, xhr._o11y.url, xhr._o11y.method);
+                const activity = xhr._o11y.activity;
+                const activityDuration = Tracing._endActivity(activity, xhr._o11y.url, xhr._o11y.method);
                 if (!failedAtInit && ((_a = Tracing._performanceObservability) === null || _a === void 0 ? void 0 : _a.isStarted)) {
                     Tracing._performanceObservability.addEntry(xhr._o11y.absoluteUrl, xhr._o11y.sendTime, {
                         requestId: xhr._o11y.requestId,
-                        activityDuration
+                        activityDuration,
+                        activityId: activity === null || activity === void 0 ? void 0 : activity.getId(),
+                        errorCount: activity === null || activity === void 0 ? void 0 : activity.getErrorCount()
                     });
                 }
             }
@@ -964,6 +975,10 @@ class ActivityImpl {
                 const isStartTimeDefined = utility.requireArgumentIfDefined(perfStart, 'options.perfStartOverride', 'number');
                 const perfStop = options.perfStopOverride;
                 const isStopTimeDefined = utility.requireArgumentIfDefined(perfStop, 'options.perfStopOverride', 'number');
+                const errorCount = options.errorCount;
+                if (utility.requireArgumentIfDefined(errorCount, 'options.errorCount', 'number')) {
+                    this._errorCount = errorCount;
+                }
                 if (isStartTimeDefined && perfStart < 0) {
                     throw new Error('perfStartOverride, if defined, must be >= 0');
                 }
@@ -1602,7 +1617,7 @@ class InstrumentationImpl {
             else {
                 context = this._nextGen.getDefaultInstrumentationContext();
             }
-            const activity = new ActivityImpl(name, context.rootId, this._onActivityStoppedCallback, this._onActivityErrorCallback, maxActivityDurationMsecs, undefined, context.isRootActivitySampled, options === null || options === void 0 ? void 0 : options.perfStartOverride, noRerooting);
+            const activity = new ActivityImpl(name, context.rootId, this._onActivityStoppedCallback, this._onActivityErrorCallback, maxActivityDurationMsecs, options === null || options === void 0 ? void 0 : options.id, context.isRootActivitySampled, options === null || options === void 0 ? void 0 : options.perfStartOverride, noRerooting);
             return activity;
         }, activityNoOp);
     }
@@ -1847,8 +1862,8 @@ class RootActivityHistoryImpl {
 }
 
 class RootActivityImpl extends ActivityImpl {
-    constructor(name, onStopped, onError, rootId, isSampled, startPerfTime) {
-        super(name, undefined, onStopped, onError, undefined, rootId || utility.generateUniqueId(32), isSampled, startPerfTime);
+    constructor(name, onStopped, onError, rootId, isSampled, startPerfTime, generatedRootIdLength) {
+        super(name, undefined, onStopped, onError, undefined, rootId || utility.generateUniqueId(generatedRootIdLength !== null && generatedRootIdLength !== void 0 ? generatedRootIdLength : 32), isSampled, startPerfTime);
     }
     get preRootId() {
         return this._preRootId;
@@ -1907,7 +1922,10 @@ class AppInstrumentationImpl extends InstrumentationImpl {
     startRootActivity(name, rootId, isSampled, options) {
         return this._safety.tryCatchReturn(() => {
             utility.requireArgument(name, 'name');
-            const newRootActivity = new RootActivityImpl(name, this._onRootActivityStoppedCallback, this._onActivityErrorCallback, rootId, isSampled, options === null || options === void 0 ? void 0 : options.perfStartOverride);
+            if ((options === null || options === void 0 ? void 0 : options.id) !== undefined) {
+                throw new Error('Cannot specify id for root activity, use rootId argument instead');
+            }
+            const newRootActivity = new RootActivityImpl(name, this._onRootActivityStoppedCallback, this._onActivityErrorCallback, rootId, isSampled, options === null || options === void 0 ? void 0 : options.perfStartOverride, this._nextGen.preferredRootIdLength);
             if (!this._allowMulti) {
                 const entry = {
                     id: newRootActivity.getId(),
@@ -2204,10 +2222,14 @@ class SenderCollector {
 }
 
 const maxInstrumentationLength = 80;
+const defaultRootIdLength = 32;
 const truncatedText = '_CUT';
 const maxInstrumentationLengthBeforeTruncated = maxInstrumentationLength - truncatedText.length;
 function noOpFunc() { }
 class NextgenImpl {
+    get preferredRootIdLength() {
+        return this._preferredRootIdLength;
+    }
     get pagePayloadProvider() {
         return this._pagePayloadProvider;
     }
@@ -2237,7 +2259,7 @@ class NextgenImpl {
         this._decimalPoints = 2;
     }
     registerApp(name, options) {
-        var _a;
+        var _a, _b;
         utility.requireArgument(name, 'name', 'string');
         if (this._appInstr) {
             throw new Error('An app has already been registered with instrumentation.');
@@ -2252,7 +2274,8 @@ class NextgenImpl {
         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._preferredRootIdLength = (_a = options === null || options === void 0 ? void 0 : options.preferredRootIdLength) !== null && _a !== void 0 ? _a : defaultRootIdLength;
+        this._clientSessionId = ((_b = options === null || options === void 0 ? void 0 : options.clientSessionId) === null || _b === void 0 ? void 0 : _b.toString()) || utility.generateUniqueId();
         this._appInstr = new AppInstrumentationImpl(this, name, options === null || options === void 0 ? void 0 : options.allowMultipleRootActivities);
         this._instruments.set(name, this._appInstr);
         if (this._isSender) {
@@ -2370,7 +2393,12 @@ class NextgenImpl {
             utility.roundNumbersInObject((_c = logMeta.appPayload) === null || _c === void 0 ? void 0 : _c.payload, this._decimalPoints);
         }
         if (this._isBufferingEnabled) {
-            this._buffer.push(payloadArgs);
+            const bufferedLog = {
+                schema,
+                data,
+                logMeta
+            };
+            this._buffer.push(bufferedLog);
         }
         this._multiplex(schema, data, logMeta);
         return this._sequence;
@@ -2527,11 +2555,9 @@ class Index {
         utility.requireArgument(_idleDetector, '_idleDetector');
     }
     registerInstrumentedApp(name, options) {
-        if (!options || options.isProduction !== false) {
-            utility.markProduction();
-        }
         const retVal = this._lazyNextGen.registerApp(name, options);
         if (options) {
+            utility.markProduction(options.isProduction);
             this._nextgen.appPayloadProvider = options.appPayloadProvider;
             this._nextgen.pagePayloadProvider = options.pagePayloadProvider;
         }
@@ -2628,7 +2654,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '252.2.0';
+const version = '252.4.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,