o11y 260.23.0 → 262.4.0

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

@@ -442,6 +442,25 @@ class PerformanceObservability {
         return (basicInitiatorTypes.indexOf(entry.initiatorType) >= 0 ||
             entry.entryType === 'navigation');
     }
+    _calculateXhrDelay(rt, requestInfo) {
+        if (!requestInfo) {
+            return undefined;
+        }
+        if (rt.initiatorType === 'fetch') {
+            if (rt.responseStart === 0) {
+                return -1;
+            }
+            if (requestInfo.activityDuration !== undefined) {
+                const timeUntilFetchReadyToResolve = rt.responseStart - rt.startTime;
+                return requestInfo.activityDuration - timeUntilFetchReadyToResolve;
+            }
+            return undefined;
+        }
+        if (requestInfo.activityDuration !== undefined) {
+            return requestInfo.activityDuration - rt.duration;
+        }
+        return undefined;
+    }
     _logActivity(schema, payload, activityId, errorCount) {
         const startOptions = {
             id: activityId
@@ -490,7 +509,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.duration : undefined
+                    xhrDelay: this._calculateXhrDelay(rt, requestInfo)
                 });
                 if (payload.responseStatus === undefined) {
                     payload.responseStatus = requestInfo === null || requestInfo === void 0 ? void 0 : requestInfo.responseStatus;
@@ -788,13 +807,14 @@ 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(absoluteUrl, fetchTime, {
+                        const metadata = {
                             requestId,
                             activityDuration,
                             activityId: activity === null || activity === void 0 ? void 0 : activity.getId(),
                             errorCount: activity === null || activity === void 0 ? void 0 : activity.getErrorCount(),
                             responseStatus: response === null || response === void 0 ? void 0 : response.status
-                        });
+                        };
+                        Tracing._performanceObservability.addEntry(absoluteUrl, fetchTime, metadata);
                     }
                 }
                 finally {