o11y 248.53.0 → 250.1.0

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

@@ -357,8 +357,8 @@ class PerformanceObservability {
         this._fuzzyMapper.clear();
         this._isStarted = false;
     }
-    addEntry(url, perfTime, data) {
-        this._fuzzyMapper.add(url, perfTime, data);
+    addEntry(absoluteUrl, perfTime, data) {
+        this._fuzzyMapper.add(absoluteUrl, perfTime, data);
     }
     _resourceEntryToResourceTiming(prt) {
         var _a, _b;
@@ -451,9 +451,7 @@ class PerformanceObservability {
                 const payload = this._resourceEntryToResourceTiming(rt);
                 Object.assign(payload, {
                     srvReqId: requestInfo === null || requestInfo === void 0 ? void 0 : requestInfo.requestId,
-                    xhrDelay: requestInfo
-                        ? requestInfo.activityDuration - (rt.startTime + rt.duration)
-                        : undefined
+                    xhrDelay: requestInfo ? requestInfo.activityDuration - rt.duration : undefined
                 });
                 this._logActivity(resource_timing, payload);
             }
@@ -562,6 +560,11 @@ class Tracing {
                 Tracing._global.XMLHttpRequest.prototype.open = Tracing._originalXhrOpen;
                 Tracing._originalXhrOpen = undefined;
             }
+            if (Tracing._originalXhrSetRequestHeader) {
+                Tracing._global.XMLHttpRequest.prototype.setRequestHeader =
+                    Tracing._originalXhrSetRequestHeader;
+                Tracing._originalXhrSetRequestHeader = undefined;
+            }
             if (Tracing._originalXhrSend) {
                 Tracing._global.XMLHttpRequest.prototype.send = Tracing._originalXhrSend;
                 Tracing._originalXhrSend = undefined;
@@ -632,6 +635,7 @@ class Tracing {
             var _a;
             let activity;
             let url;
+            let absoluteUrl;
             let method;
             let fetchTime;
             try {
@@ -658,14 +662,16 @@ class Tracing {
                 }
                 options === null || options === void 0 ? true : delete options.o11y;
                 url = resource === null || resource === void 0 ? void 0 : resource.toString();
+                absoluteUrl = utility.tryGetAbsoluteUrl(url);
                 if (useTracing) {
                     if (resource instanceof Request) {
                         if (!method) {
                             method = resource.method;
                         }
                         url = resource.url;
+                        absoluteUrl = utility.tryGetAbsoluteUrl(url);
                     }
-                    const traceHeaders = Tracing._getTraceHeaders(activity, tracingHeadersOptions, method, url);
+                    const traceHeaders = Tracing._getTraceHeaders(activity, tracingHeadersOptions, method, absoluteUrl);
                     if (!this._applyTraceHeaders(resource, options, traceHeaders) &&
                         options === undefined) {
                         options = {
@@ -692,7 +698,7 @@ class Tracing {
                     const activityDuration = Tracing._endActivity(activity, url, method);
                     if ((_a = Tracing._performanceObservability) === null || _a === void 0 ? void 0 : _a.isStarted) {
                         const requestId = Tracing._extractHeader(headerRequestId, resource, options);
-                        Tracing._performanceObservability.addEntry(url, fetchTime, {
+                        Tracing._performanceObservability.addEntry(absoluteUrl, fetchTime, {
                             requestId,
                             activityDuration
                         });
@@ -708,7 +714,7 @@ class Tracing {
     static _endActivity(activity, url, method) {
         var _a;
         if (activity) {
-            if (activity.getErrorCount() == 0 || ((_a = Tracing._performanceObservability) === null || _a === void 0 ? void 0 : _a.isStarted)) {
+            if (((_a = Tracing._performanceObservability) === null || _a === void 0 ? void 0 : _a.isStarted) && activity.getErrorCount() == 0) {
                 activity.discard();
             }
             else {
@@ -724,15 +730,15 @@ class Tracing {
     _overrideXhr(instr, logErrors, activityName, useTracing, options, tasker) {
         Tracing._originalXhr = Tracing._global.XMLHttpRequest;
         Tracing._originalXhrOpen = Tracing._originalXhr.prototype.open;
+        Tracing._originalXhrSetRequestHeader = Tracing._originalXhr.prototype.setRequestHeader;
         Tracing._originalXhrSend = Tracing._originalXhr.prototype.send;
         function postProcess(xhr, failedAtInit) {
             var _a;
             if (xhr._o11y) {
                 const activityDuration = Tracing._endActivity(xhr._o11y.activity, xhr._o11y.url, xhr._o11y.method);
                 if (!failedAtInit && ((_a = Tracing._performanceObservability) === null || _a === void 0 ? void 0 : _a.isStarted)) {
-                    const requestId = xhr.getResponseHeader(headerRequestId);
-                    Tracing._performanceObservability.addEntry(xhr._o11y.url, xhr._o11y.sendTime, {
-                        requestId,
+                    Tracing._performanceObservability.addEntry(xhr._o11y.absoluteUrl, xhr._o11y.sendTime, {
+                        requestId: xhr._o11y.requestId,
                         activityDuration
                     });
                 }
@@ -743,8 +749,16 @@ class Tracing {
                 method,
                 url: url === null || url === void 0 ? void 0 : url.toString()
             };
+            this._o11y.absoluteUrl = utility.tryGetAbsoluteUrl(this._o11y.url);
             Tracing._originalXhrOpen.call(this, method, url, async, username, password);
         };
+        Tracing._originalXhr.prototype.setRequestHeader = function (name, value) {
+            var _a;
+            if (((_a = name === null || name === void 0 ? void 0 : name.toLowerCase) === null || _a === void 0 ? void 0 : _a.call(name)) === headerRequestId.toLowerCase()) {
+                this._o11y.requestId = value;
+            }
+            Tracing._originalXhrSetRequestHeader.call(this, name, value);
+        };
         Tracing._originalXhr.prototype.send = function (...args) {
             let activity;
             const xhr = this;
@@ -753,7 +767,7 @@ class Tracing {
                 xhr._o11y = xhr._o11y || {};
                 xhr._o11y.activity = activity = instr.startActivity(activityName || defaultActivityNameForXhrSend);
                 if (useTracing) {
-                    const traceHeaders = Tracing._getTraceHeaders(activity, options, xhr._o11y.method, xhr._o11y.url);
+                    const traceHeaders = Tracing._getTraceHeaders(activity, options, xhr._o11y.method, xhr._o11y.absoluteUrl);
                     Object.entries(traceHeaders).forEach((entry) => {
                         xhr.setRequestHeader(entry[0], entry[1]);
                     });
@@ -880,12 +894,13 @@ const stopReason = {
     discarded
 };
 class ActivityImpl {
-    constructor(_name, _rootId, _onStopped, _onError, timeout, id, _isSampled) {
+    constructor(_name, _rootId, _onStopped, _onError, timeout, id, _isSampled, _startPerfTime, _noRerooting) {
         this._name = _name;
         this._rootId = _rootId;
         this._onStopped = _onStopped;
         this._onError = _onError;
         this._isSampled = _isSampled;
+        this._noRerooting = _noRerooting;
         this._errorCount = 0;
         this._timerOverridden = TimerOverride.none;
         const { tsNow, perfNow } = utility.time();
@@ -907,6 +922,7 @@ class ActivityImpl {
         }
         this._startTimestamp = tsNow;
         this._startPerfTime = perfNow;
+        this._overrideTimer(_startPerfTime);
         if (timeout > 0) {
             this._timer = setTimeout(() => {
                 this._stopReason = this._stopReason || stopReason.timedout;
@@ -953,8 +969,9 @@ class ActivityImpl {
                 }
                 if (isStopTimeDefined &&
                     (perfStop < 0 ||
-                        perfStop < (isStartTimeDefined ? perfStart : this._startPerfTime))) {
-                    throw new Error('perfStopOverride, if defined, must be >= 0 and >= startTime');
+                        perfStop < (isStartTimeDefined ? perfStart : this._startPerfTime) ||
+                        perfStop > utility.time().perfNow + 100)) {
+                    throw new Error('perfStopOverride, if defined, must be >= 0 and >= startTime and <= now');
                 }
             }
             this._stopInternal(userSchemaOrText, userData, options);
@@ -1041,7 +1058,8 @@ class ActivityImpl {
             stopPerfTime: this._stopPerfTime,
             errorCount: this._errorCount,
             isSampled: this.getIsSampled(),
-            timerOverridden: this._timerOverridden
+            timerOverridden: this._timerOverridden,
+            noRerooting: this._noRerooting
         };
     }
     getTraceHeaders(options) {
@@ -1572,8 +1590,10 @@ class InstrumentationImpl {
             utility.requireArgument(name, 'name');
             utility.requireArgumentIfDefined(options, 'options', 'object');
             let context;
+            let noRerooting = (options === null || options === void 0 ? void 0 : options.perfStartOverride) !== undefined;
             const rootId = (_a = options === null || options === void 0 ? void 0 : options.instrumentationContext) === null || _a === void 0 ? void 0 : _a.rootId;
             if (rootId) {
+                noRerooting = true;
                 context = {
                     rootId,
                     isRootActivitySampled: options.instrumentationContext.isRootActivitySampled
@@ -1582,7 +1602,7 @@ class InstrumentationImpl {
             else {
                 context = this._nextGen.getDefaultInstrumentationContext();
             }
-            const activity = new ActivityImpl(name, context.rootId, this._onActivityStoppedCallback, this._onActivityErrorCallback, maxActivityDurationMsecs, undefined, context.isRootActivitySampled);
+            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);
             return activity;
         }, activityNoOp);
     }
@@ -1596,13 +1616,22 @@ class InstrumentationImpl {
             userPayload,
             errorCount: detail.errorCount,
             isSampled: detail.isSampled,
-            timerOverridden: detail.timerOverridden
+            timerOverridden: detail.timerOverridden,
+            isRerooted: detail.isRerooted
         };
     }
     _handleActivityStop(detail) {
         if (detail.stopReason === discarded) {
             return;
         }
+        if (!detail.isRoot && !detail.noRerooting) {
+            const rahe = this._nextGen.getRootActivityHistoryEntryByTime(detail.startPerfTime);
+            if ((!rahe && detail.rootId !== undefined) || (rahe && detail.rootId !== rahe.id)) {
+                detail.rootId = rahe === null || rahe === void 0 ? void 0 : rahe.id;
+                detail.isSampled = (rahe === null || rahe === void 0 ? void 0 : rahe.isSampled) || false;
+                detail.isRerooted = true;
+            }
+        }
         const activityData = this._getActivityData(detail);
         this._logActivity(activityData, detail.startTimestamp, detail.rootId);
     }
@@ -1726,9 +1755,17 @@ class InstrumentationImpl {
         utility.requireArgument(listener, 'listener', 'function');
         this._nextGen.registerForLogPrompt(listener);
     }
+    _getAsaOptions(options) {
+        return options
+            ? Object.assign({
+                instrumentationContext: options === null || options === void 0 ? void 0 : options.instrumentationContext
+            }, options.startOptions)
+            : undefined;
+    }
     activity(name, execute, options) {
         var _a, _b, _c, _d;
-        const act = this.startActivity(name, options);
+        const asaOptions = this._getAsaOptions(options);
+        const act = this.startActivity(name, asaOptions);
         try {
             return execute(act);
         }
@@ -1737,12 +1774,13 @@ class InstrumentationImpl {
             throw err;
         }
         finally {
-            act.stop((_c = options === null || options === void 0 ? void 0 : options.stopPayload) === null || _c === void 0 ? void 0 : _c.schema, (_d = options === null || options === void 0 ? void 0 : options.stopPayload) === null || _d === void 0 ? void 0 : _d.payload);
+            act.stop((_c = options === null || options === void 0 ? void 0 : options.stopPayload) === null || _c === void 0 ? void 0 : _c.schema, (_d = options === null || options === void 0 ? void 0 : options.stopPayload) === null || _d === void 0 ? void 0 : _d.payload, options === null || options === void 0 ? void 0 : options.stopOptions);
         }
     }
     async activityAsync(name, execute, options) {
         var _a, _b, _c, _d;
-        const act = this.startActivity(name, options);
+        const asaOptions = this._getAsaOptions(options);
+        const act = this.startActivity(name, asaOptions);
         try {
             return await execute(act);
         }
@@ -1751,15 +1789,66 @@ class InstrumentationImpl {
             throw err;
         }
         finally {
-            act.stop((_c = options === null || options === void 0 ? void 0 : options.stopPayload) === null || _c === void 0 ? void 0 : _c.schema, (_d = options === null || options === void 0 ? void 0 : options.stopPayload) === null || _d === void 0 ? void 0 : _d.payload);
+            act.stop((_c = options === null || options === void 0 ? void 0 : options.stopPayload) === null || _c === void 0 ? void 0 : _c.schema, (_d = options === null || options === void 0 ? void 0 : options.stopPayload) === null || _d === void 0 ? void 0 : _d.payload, options === null || options === void 0 ? void 0 : options.stopOptions);
         }
     }
 }
 InstrumentationImpl.defaultAppName = 'APP_NOT_REGISTERED';
 
+const GRACE = 0.1;
+const DEFAULT_LIMIT = 20;
+class RootActivityHistoryImpl {
+    constructor(limit) {
+        this._historyMap = new Map();
+        this._historyList = new Array();
+        if (utility.requireArgumentIfDefined(limit, 'limit', 'number')) {
+            limit = Math.ceil(limit);
+            if (limit <= 0) {
+                throw new Error('Limit must be a positive number');
+            }
+        }
+        else {
+            limit = DEFAULT_LIMIT;
+        }
+        this._graceCount = Math.max(1, Math.floor(limit * GRACE));
+        this._realLimit = 1 + limit + this._graceCount;
+    }
+    add(entry) {
+        if (this._historyMap.has(entry.id)) {
+            throw new Error(`RootActivityHistoryImpl.add: entry already exists for rootId: ${entry.id}`);
+        }
+        this._historyMap.set(entry.id, entry);
+        this._historyList.push(entry);
+        if (this._historyList.length === this._realLimit) {
+            const removed = this._historyList.splice(1, this._graceCount);
+            removed.forEach((e) => this._historyMap.delete(e.id));
+        }
+    }
+    get count() {
+        return this._historyList.length;
+    }
+    findById(rootId) {
+        return this._historyMap.get(rootId);
+    }
+    findByTime(atTime) {
+        let closest;
+        let closestDiff = Number.MAX_VALUE;
+        for (const entry of this._historyList) {
+            const startDelta = atTime - entry.startPerfTime;
+            const isDuringRoot = startDelta >= 0 &&
+                (entry.stopPerfTime === undefined || atTime < entry.stopPerfTime);
+            if (isDuringRoot && startDelta < closestDiff) {
+                closest = entry;
+                closestDiff = startDelta;
+            }
+        }
+        return closest;
+    }
+}
+
 class RootActivityImpl extends ActivityImpl {
-    constructor(name, onStopped, onError, rootId, _isSampled) {
-        super(name, undefined, onStopped, onError, undefined, rootId || utility.generateUniqueId(32), _isSampled);
+    constructor(name, onStopped, onError, rootId, isSampled, startPerfTime) {
+        super(name, undefined, onStopped, onError, undefined, rootId || utility.generateUniqueId(32), isSampled, startPerfTime);
     }
     get preRootId() {
         return this._preRootId;
@@ -1812,13 +1901,21 @@ class AppInstrumentationImpl extends InstrumentationImpl {
     constructor(_nextGen, _name, _allowMulti) {
         super(_nextGen, _name);
         this._allowMulti = _allowMulti;
+        this._rootActivityHistory = new RootActivityHistoryImpl();
         this._onRootActivityStoppedCallback = this._handleRootActivityStop.bind(this);
     }
-    startRootActivity(name, rootId, isSampled) {
+    startRootActivity(name, rootId, isSampled, options) {
         return this._safety.tryCatchReturn(() => {
             utility.requireArgument(name, 'name');
-            const newRootActivity = new RootActivityImpl(name, this._onRootActivityStoppedCallback, this._onActivityErrorCallback, rootId, isSampled);
+            const newRootActivity = new RootActivityImpl(name, this._onRootActivityStoppedCallback, this._onActivityErrorCallback, rootId, isSampled, options === null || options === void 0 ? void 0 : options.perfStartOverride);
             if (!this._allowMulti) {
+                const entry = {
+                    id: newRootActivity.getId(),
+                    name,
+                    startPerfTime: newRootActivity.getStartPerfTime(),
+                    isSampled: newRootActivity.getIsSampled()
+                };
+                this._rootActivityHistory.add(entry);
                 if (this._singleRootActivity && !this._singleRootActivity.isStopped) {
                     const preRootId = this._singleRootActivity.getId();
                     this._singleRootActivity.terminate();
@@ -1830,6 +1927,11 @@ class AppInstrumentationImpl extends InstrumentationImpl {
         }, rootActivityNoOp);
     }
     _handleRootActivityStop(detail) {
+        const historyEntry = this._rootActivityHistory.findById(detail.id);
+        if (historyEntry) {
+            historyEntry.stopPerfTime = detail.stopPerfTime;
+            historyEntry.startPerfTime = detail.startPerfTime;
+        }
         if (detail.stopReason === discarded) {
             return;
         }
@@ -1854,6 +1956,9 @@ class AppInstrumentationImpl extends InstrumentationImpl {
     _initMetrics() {
         return new MetricsImpl(this.name, () => this.name);
     }
+    getRootActivityHistoryEntry(atTime) {
+        return this._rootActivityHistory.findByTime(atTime);
+    }
 }
 
 const pathLimit = 5;
@@ -2219,6 +2324,10 @@ class NextgenImpl {
         var _a;
         return (_a = this._appInstr) === null || _a === void 0 ? void 0 : _a.name;
     }
+    getRootActivityHistoryEntryByTime(atTime) {
+        var _a;
+        return (_a = this._appInstr) === null || _a === void 0 ? void 0 : _a.getRootActivityHistoryEntry(atTime);
+    }
     addLog(loggerName, schema, data, timestamp, rootId) {
         var _a, _b, _c;
         payloadUtility.checkInputs(schema, data);
@@ -2519,7 +2628,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '248.53.0';
+const version = '250.1.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,