o11y 254.2.0 → 254.4.0

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

@@ -247,16 +247,18 @@ class IdleDetectorImpl {
     }
 }
 
-const navigation_timing={namespace:"sfcore.performance",name:"NavigationTiming",pbjsSchema:{"nested":{"sfcore":{"nested":{"performance":{"nested":{"NavigationTiming":{"oneofs":{"_xhrDelay":{"oneof":["xhrDelay"]},"_renderBlockingStatus":{"oneof":["renderBlockingStatus"]},"_firstInterimResponseStart":{"oneof":["firstInterimResponseStart"]},"_srvDuration":{"oneof":["srvDuration"]},"_isCdnCached":{"oneof":["isCdnCached"]},"_dbDuration":{"oneof":["dbDuration"]},"_reqBatchCount":{"oneof":["reqBatchCount"]}},
-"fields":{"redirectCount":{"id":37,"type":"uint32"},"encodedBodySize":{"id":21,"type":"uint32"},"reqActionNames":{"rule":"repeated","id":28,"type":"string"},"unloadEventEnd":{"id":40,"type":"double"},"responseEnd":{"id":19,"type":"double"},"domainLookupEnd":{"id":12,"type":"double"},"unloadEventStart":{"id":39,"type":"double"},"domContentLoadedEventStart":{"id":32,"type":"double"},"type":{"id":38,"type":"string"},"firstInterimResponseStart":{"options":{"proto3_optional":true},"id":18,"type":"double"},
-"duration":{"id":3,"type":"double"},"decodedBodySize":{"id":22,"type":"uint32"},"redirectStart":{"id":8,"type":"double"},"connectEnd":{"id":15,"type":"double"},"isCdnCached":{"options":{"proto3_optional":true},"id":24,"type":"bool"},"requestStart":{"id":16,"type":"double"},"startTime":{"id":2,"type":"double"},"fetchStart":{"id":10,"type":"double"},"domContentLoadedEventEnd":{"id":33,"type":"double"},"srvReqId":{"id":29,"type":"string"},"reqBatchCount":{"options":{"proto3_optional":true},"id":27,"type":"uint32"},
-"renderBlockingStatus":{"options":{"proto3_optional":true},"id":6,"type":"string"},"workerStart":{"id":7,"type":"double"},"responseStart":{"id":17,"type":"double"},"xhrDelay":{"options":{"proto3_optional":true},"id":30,"type":"double"},"domInteractive":{"id":34,"type":"double"},"domComplete":{"id":31,"type":"double"},"domainLookupStart":{"id":11,"type":"double"},"responseStatus":{"id":23,"type":"uint32"},"redirectEnd":{"id":9,"type":"double"},"transferSize":{"id":20,"type":"uint32"},"srvDuration":{"options":{"proto3_optional":true},
-"id":26,"type":"double"},"dbDuration":{"options":{"proto3_optional":true},"id":25,"type":"double"},"connectStart":{"id":13,"type":"double"},"loadEventStart":{"id":35,"type":"double"},"secureConnectionStart":{"id":14,"type":"double"},"name":{"id":1,"type":"string"},"nextHopProtocol":{"id":5,"type":"string"},"initiatorType":{"id":4,"type":"string"},"loadEventEnd":{"id":36,"type":"double"}}}}}}}}}};
+const navigation_timing={namespace:"sfcore.performance",name:"NavigationTiming",pbjsSchema:{"nested":{"sfcore":{"nested":{"performance":{"nested":{"NavigationTiming":{"oneofs":{"_xhrDelay":{"oneof":["xhrDelay"]},"_renderBlockingStatus":{"oneof":["renderBlockingStatus"]},"_firstInterimResponseStart":{"oneof":["firstInterimResponseStart"]},"_srvDuration":{"oneof":["srvDuration"]},"_isCdnCached":{"oneof":["isCdnCached"]},"_responseStatus":{"oneof":["responseStatus"]},"_dbDuration":{"oneof":["dbDuration"]},
+"_reqBatchCount":{"oneof":["reqBatchCount"]}},"fields":{"redirectCount":{"id":37,"type":"uint32"},"encodedBodySize":{"id":21,"type":"uint32"},"reqActionNames":{"rule":"repeated","id":28,"type":"string"},"unloadEventEnd":{"id":40,"type":"double"},"responseEnd":{"id":19,"type":"double"},"domainLookupEnd":{"id":12,"type":"double"},"unloadEventStart":{"id":39,"type":"double"},"domContentLoadedEventStart":{"id":32,"type":"double"},"type":{"id":38,"type":"string"},"firstInterimResponseStart":{"options":{"proto3_optional":true},
+"id":18,"type":"double"},"duration":{"id":3,"type":"double"},"decodedBodySize":{"id":22,"type":"uint32"},"redirectStart":{"id":8,"type":"double"},"connectEnd":{"id":15,"type":"double"},"isCdnCached":{"options":{"proto3_optional":true},"id":24,"type":"bool"},"requestStart":{"id":16,"type":"double"},"startTime":{"id":2,"type":"double"},"fetchStart":{"id":10,"type":"double"},"domContentLoadedEventEnd":{"id":33,"type":"double"},"srvReqId":{"id":29,"type":"string"},"reqBatchCount":{"options":{"proto3_optional":true},
+"id":27,"type":"uint32"},"renderBlockingStatus":{"options":{"proto3_optional":true},"id":6,"type":"string"},"workerStart":{"id":7,"type":"double"},"responseStart":{"id":17,"type":"double"},"xhrDelay":{"options":{"proto3_optional":true},"id":30,"type":"double"},"domInteractive":{"id":34,"type":"double"},"domComplete":{"id":31,"type":"double"},"domainLookupStart":{"id":11,"type":"double"},"responseStatus":{"options":{"proto3_optional":true},"id":23,"type":"uint32"},"redirectEnd":{"id":9,"type":"double"},
+"logEvent":{"id":41,"type":"string"},"transferSize":{"id":20,"type":"uint32"},"srvDuration":{"options":{"proto3_optional":true},"id":26,"type":"double"},"dbDuration":{"options":{"proto3_optional":true},"id":25,"type":"double"},"connectStart":{"id":13,"type":"double"},"loadEventStart":{"id":35,"type":"double"},"secureConnectionStart":{"id":14,"type":"double"},"name":{"id":1,"type":"string"},"nextHopProtocol":{"id":5,"type":"string"},"initiatorType":{"id":4,"type":"string"},"loadEventEnd":{"id":36,
+"type":"double"}}}}}}}}}};
 
-const resource_timing={namespace:"sfcore.performance",name:"ResourceTiming",pbjsSchema:{"nested":{"sfcore":{"nested":{"performance":{"nested":{"ResourceTiming":{"oneofs":{"_xhrDelay":{"oneof":["xhrDelay"]},"_renderBlockingStatus":{"oneof":["renderBlockingStatus"]},"_firstInterimResponseStart":{"oneof":["firstInterimResponseStart"]},"_srvDuration":{"oneof":["srvDuration"]},"_isCdnCached":{"oneof":["isCdnCached"]},"_dbDuration":{"oneof":["dbDuration"]},"_reqBatchCount":{"oneof":["reqBatchCount"]}},
-"fields":{"encodedBodySize":{"id":21,"type":"uint32"},"reqActionNames":{"rule":"repeated","id":28,"type":"string"},"responseEnd":{"id":19,"type":"double"},"domainLookupEnd":{"id":12,"type":"double"},"firstInterimResponseStart":{"options":{"proto3_optional":true},"id":18,"type":"double"},"duration":{"id":3,"type":"double"},"decodedBodySize":{"id":22,"type":"uint32"},"redirectStart":{"id":8,"type":"double"},"connectEnd":{"id":15,"type":"double"},"isCdnCached":{"options":{"proto3_optional":true},"id":24,
-"type":"bool"},"requestStart":{"id":16,"type":"double"},"startTime":{"id":2,"type":"double"},"fetchStart":{"id":10,"type":"double"},"srvReqId":{"id":29,"type":"string"},"reqBatchCount":{"options":{"proto3_optional":true},"id":27,"type":"uint32"},"renderBlockingStatus":{"options":{"proto3_optional":true},"id":6,"type":"string"},"workerStart":{"id":7,"type":"double"},"responseStart":{"id":17,"type":"double"},"xhrDelay":{"options":{"proto3_optional":true},"id":30,"type":"double"},"domainLookupStart":{"id":11,
-"type":"double"},"responseStatus":{"id":23,"type":"uint32"},"redirectEnd":{"id":9,"type":"double"},"transferSize":{"id":20,"type":"uint32"},"srvDuration":{"options":{"proto3_optional":true},"id":26,"type":"double"},"dbDuration":{"options":{"proto3_optional":true},"id":25,"type":"double"},"connectStart":{"id":13,"type":"double"},"secureConnectionStart":{"id":14,"type":"double"},"name":{"id":1,"type":"string"},"nextHopProtocol":{"id":5,"type":"string"},"initiatorType":{"id":4,"type":"string"}}}}}}}}}};
+const resource_timing={namespace:"sfcore.performance",name:"ResourceTiming",pbjsSchema:{"nested":{"sfcore":{"nested":{"performance":{"nested":{"ResourceTiming":{"oneofs":{"_xhrDelay":{"oneof":["xhrDelay"]},"_renderBlockingStatus":{"oneof":["renderBlockingStatus"]},"_firstInterimResponseStart":{"oneof":["firstInterimResponseStart"]},"_srvDuration":{"oneof":["srvDuration"]},"_isCdnCached":{"oneof":["isCdnCached"]},"_responseStatus":{"oneof":["responseStatus"]},"_dbDuration":{"oneof":["dbDuration"]},
+"_reqBatchCount":{"oneof":["reqBatchCount"]}},"fields":{"encodedBodySize":{"id":21,"type":"uint32"},"reqActionNames":{"rule":"repeated","id":28,"type":"string"},"responseEnd":{"id":19,"type":"double"},"domainLookupEnd":{"id":12,"type":"double"},"firstInterimResponseStart":{"options":{"proto3_optional":true},"id":18,"type":"double"},"duration":{"id":3,"type":"double"},"decodedBodySize":{"id":22,"type":"uint32"},"redirectStart":{"id":8,"type":"double"},"connectEnd":{"id":15,"type":"double"},"isCdnCached":{"options":{"proto3_optional":true},
+"id":24,"type":"bool"},"requestStart":{"id":16,"type":"double"},"startTime":{"id":2,"type":"double"},"fetchStart":{"id":10,"type":"double"},"srvReqId":{"id":29,"type":"string"},"reqBatchCount":{"options":{"proto3_optional":true},"id":27,"type":"uint32"},"renderBlockingStatus":{"options":{"proto3_optional":true},"id":6,"type":"string"},"workerStart":{"id":7,"type":"double"},"responseStart":{"id":17,"type":"double"},"xhrDelay":{"options":{"proto3_optional":true},"id":30,"type":"double"},"domainLookupStart":{"id":11,
+"type":"double"},"responseStatus":{"options":{"proto3_optional":true},"id":23,"type":"uint32"},"redirectEnd":{"id":9,"type":"double"},"transferSize":{"id":20,"type":"uint32"},"srvDuration":{"options":{"proto3_optional":true},"id":26,"type":"double"},"dbDuration":{"options":{"proto3_optional":true},"id":25,"type":"double"},"connectStart":{"id":13,"type":"double"},"secureConnectionStart":{"id":14,"type":"double"},"name":{"id":1,"type":"string"},"nextHopProtocol":{"id":5,"type":"string"},"initiatorType":{"id":4,
+"type":"string"}}}}}}}}}};
 
 class FuzzyMapper {
     constructor(_fuzzyKeyRange) {
@@ -307,7 +309,22 @@ class PerformanceObservability {
         this._instr = _instr;
         this._skipUrls = _skipUrls;
         this._logPerformanceActivityName = _logPerformanceActivityName;
+        this._boundObserverCallback = this._logPerformanceEntries.bind(this);
+        this._boundNavigationTimingEventCallback = (event) => {
+            this._logNavigationEntries(event);
+        };
+        this._setTimeoutNavigationCallback = (event) => {
+            setTimeout(() => {
+                this._boundNavigationTimingEventCallback(event);
+            }, 0);
+        };
+        this._visibilityChangeNavigationCallback = (event) => {
+            if (document.visibilityState === 'hidden') {
+                this._boundNavigationTimingEventCallback(event);
+            }
+        };
         this._isStarted = false;
+        this._processedNavigationTiming = false;
         utility.requireArgument(_instr, '_instr', 'object');
         utility.requireArgument(fuzzyMapRange, 'fuzzyMapRange', 'number');
         utility.requireArgumentIfDefined(_skipUrls, '_skipUrls', Array);
@@ -315,7 +332,7 @@ class PerformanceObservability {
         utility.requireArgumentIfDefined(logLevel, 'logLevel', 'string');
         this._hasPerf =
             typeof performance !== 'undefined' && typeof PerformanceObserver === 'function';
-        this._boundObserverCallback = this._logPerformanceEntries.bind(this);
+        this._hasWindow = typeof window !== 'undefined';
         if (!logLevel || logLevel.toLowerCase() === 'full') {
             this._logLevel = 1;
         }
@@ -339,10 +356,9 @@ class PerformanceObservability {
         }
         if (!this._isStarted) {
             this._isStarted = true;
-            this._navigationObserver = new PerformanceObserver(this._boundObserverCallback);
-            this._navigationObserver.observe({ type: 'navigation', buffered: true });
             this._resourceObserver = new PerformanceObserver(this._boundObserverCallback);
             this._resourceObserver.observe({ type: 'resource', buffered: true });
+            this._addNavigationListeners();
         }
     }
     stop() {
@@ -350,13 +366,26 @@ class PerformanceObservability {
             this._resourceObserver.disconnect();
             this._resourceObserver = undefined;
         }
-        if (this._navigationObserver) {
-            this._navigationObserver.disconnect();
-            this._navigationObserver = undefined;
-        }
+        this._removeNavigationListeners();
         this._fuzzyMapper.clear();
         this._isStarted = false;
     }
+    _addNavigationListeners() {
+        if (!this._hasWindow) {
+            return;
+        }
+        window.addEventListener('load', this._setTimeoutNavigationCallback);
+        window.addEventListener('pagehide', this._boundNavigationTimingEventCallback);
+        document.addEventListener('visibilitychange', this._visibilityChangeNavigationCallback);
+    }
+    _removeNavigationListeners() {
+        if (!this._hasWindow) {
+            return;
+        }
+        window.removeEventListener('load', this._setTimeoutNavigationCallback);
+        window.removeEventListener('pagehide', this._boundNavigationTimingEventCallback);
+        document.removeEventListener('visibilitychange', this._visibilityChangeNavigationCallback);
+    }
     addEntry(absoluteUrl, perfTime, data) {
         this._fuzzyMapper.add(absoluteUrl, perfTime, data);
     }
@@ -426,30 +455,34 @@ class PerformanceObservability {
             .startActivity(this._logPerformanceActivityName, startOptions)
             .stop(schema, payload, stopOptions);
     }
-    _logPerformanceEntries(list) {
-        for (const entry of list.getEntriesByType('navigation')) {
+    _logNavigationEntries(event) {
+        if (this._processedNavigationTiming) {
+            return;
+        }
+        for (const entry of performance.getEntriesByType('navigation')) {
             const nt = entry;
             if (this._shouldInclude(nt)) {
-                if (nt !== this._navTiming) {
-                    this._navTiming = nt;
-                    const payload = this._resourceEntryToResourceTiming(nt);
-                    const navOnly = {
-                        domComplete: nt.domComplete,
-                        domContentLoadedEventStart: nt.domContentLoadedEventStart,
-                        domContentLoadedEventEnd: nt.domContentLoadedEventEnd,
-                        domInteractive: nt.domInteractive,
-                        loadEventStart: nt.loadEventStart,
-                        loadEventEnd: nt.loadEventEnd,
-                        redirectCount: nt.redirectCount,
-                        type: nt.type,
-                        unloadEventStart: nt.unloadEventStart,
-                        unloadEventEnd: nt.unloadEventEnd
-                    };
-                    this._logActivity(navigation_timing, Object.assign(payload, navOnly));
-                }
-                break;
+                this._processedNavigationTiming = true;
+                const payload = this._resourceEntryToResourceTiming(nt);
+                const navOnly = {
+                    domComplete: nt.domComplete,
+                    domContentLoadedEventStart: nt.domContentLoadedEventStart,
+                    domContentLoadedEventEnd: nt.domContentLoadedEventEnd,
+                    domInteractive: nt.domInteractive,
+                    loadEventStart: nt.loadEventStart,
+                    loadEventEnd: nt.loadEventEnd,
+                    redirectCount: nt.redirectCount,
+                    type: nt.type,
+                    unloadEventStart: nt.unloadEventStart,
+                    unloadEventEnd: nt.unloadEventEnd,
+                    logEvent: event.type
+                };
+                this._logActivity(navigation_timing, Object.assign(payload, navOnly));
             }
+            break;
         }
+    }
+    _logPerformanceEntries(list) {
         for (const entry of list.getEntriesByType('resource')) {
             const rt = entry;
             const requestInfo = this._fuzzyMapper.pop(rt.name, rt.startTime);
@@ -520,9 +553,12 @@ class Tracing {
         return text;
     }
     static getHeaders(traceId, spanId, isSampled, options) {
-        utility.requireArgument(traceId, 'traceId', 'string');
         utility.requireArgument(spanId, 'spanId', 'string');
         const useB3Headers = options === null || options === void 0 ? void 0 : options.useB3Headers;
+        const headers = {};
+        if (traceId === undefined) {
+            return headers;
+        }
         traceId = this._conformTextAsId(traceId, (options === null || options === void 0 ? void 0 : options.traceIdEffectiveLength) !== undefined
             ? options.traceIdEffectiveLength
             : useB3Headers
@@ -533,7 +569,6 @@ class Tracing {
             options.parentSpanId !== undefined &&
             this._conformTextAsId(options.parentSpanId, defaultSpanIdLength)) ||
             undefined;
-        const headers = {};
         if (useB3Headers) {
             const isCompact = options === null || options === void 0 ? void 0 : options.useCompactHeader;
             if (isCompact) {
@@ -957,6 +992,7 @@ class ActivityImpl {
         this._onError = _onError;
         this._isSampled = _isSampled;
         this._noRerooting = _noRerooting;
+        this._isRoot = false;
         this._errorCount = 0;
         this._timerOverridden = TimerOverride.none;
         const { tsNow, perfNow } = utility.time();
@@ -1124,7 +1160,7 @@ class ActivityImpl {
     }
     getTraceHeaders(options) {
         const spanId = this.id;
-        const traceId = this._rootId || spanId;
+        const traceId = this._isRoot ? this.id : this._rootId;
         return Tracing.getHeaders(traceId, spanId, this.getIsSampled(), options);
     }
     getStartTimestamp() {
@@ -1862,6 +1898,7 @@ class RootActivityHistoryImpl {
 class RootActivityImpl extends ActivityImpl {
     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);
+        this._isRoot = true;
     }
     get preRootId() {
         return this._preRootId;
@@ -2662,7 +2699,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '254.2.0';
+const version = '254.4.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,