o11y 250.2.0 → 250.4.0

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

@@ -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;
@@ -708,7 +713,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 +729,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,
+                        requestId: xhr._o11y.requestId,
                         activityDuration
                     });
                 }
@@ -745,6 +750,13 @@ class Tracing {
             };
             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;
@@ -2519,7 +2531,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '250.2.0';
+const version = '250.4.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,