o11y 248.53.0 → 248.54.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;
@@ -562,6 +562,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 +637,7 @@ class Tracing {
             var _a;
             let activity;
             let url;
+            let absoluteUrl;
             let method;
             let fetchTime;
             try {
@@ -658,14 +664,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 +700,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 +716,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 +732,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 +751,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 +769,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]);
                     });
@@ -2519,7 +2535,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '248.53.0';
+const version = '248.54.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,