o11y 244.3.0 → 244.5.4

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

@@ -15,6 +15,9 @@ const instrumented_event={namespace:"sf.instrumentation",name:"InstrumentedEvent
 const simple={namespace:"sf.instrumentation",name:"Simple",pbjsSchema:{"nested":{"sf":{"nested":{"instrumentation":{"nested":{"Simple":{"fields":{"text":{"options":{"(meta.max_length)":25},"id":1,"type":"string"}}}}}}}}}};
 
 class TaskerImpl {
+    get isBusy() {
+        return this._isOk ? this._busyCount > 0 : undefined;
+    }
     constructor(name, initialCount, _doneCallback, _overDoneCallback) {
         this.name = name;
         this._doneCallback = _doneCallback;
@@ -23,9 +26,6 @@ class TaskerImpl {
         this._isOk = true;
         this._busyCount = initialCount;
     }
-    get isBusy() {
-        return this._isOk ? this._busyCount > 0 : undefined;
-    }
     add() {
         if (this._isOk) {
             this._busyCount += 1;
@@ -354,6 +354,10 @@ class Tracing {
                 Tracing._global.XMLHttpRequest = Tracing._originalXhr;
                 Tracing._originalXhr = undefined;
             }
+            if (Tracing._originalXhrOpen) {
+                Tracing._global.XMLHttpRequest.prototype.open = Tracing._originalXhrOpen;
+                Tracing._originalXhrOpen = undefined;
+            }
             if (Tracing._originalXhrSend) {
                 Tracing._global.XMLHttpRequest.prototype.send = Tracing._originalXhrSend;
                 Tracing._originalXhrSend = undefined;
@@ -371,6 +375,28 @@ class Tracing {
             Tracing._isNetworkInstrumentationEnabled = true;
         }
     }
+    static _getTraceHeaders(activity, options, method, url) {
+        let traceHeaders = activity.getTraceHeaders(options);
+        if (typeof (options === null || options === void 0 ? void 0 : options.headerProcessor) === 'function') {
+            traceHeaders = options.headerProcessor({
+                method,
+                url,
+                defaultHeaders: traceHeaders
+            });
+        }
+        else if (typeof window === 'object') {
+            let newUrl;
+            try {
+                newUrl = new URL(url);
+            }
+            catch (_a) {
+            }
+            if (newUrl && newUrl.host !== window.location.host) {
+                traceHeaders = undefined;
+            }
+        }
+        return traceHeaders || {};
+    }
     _overrideFetch(instr, logErrors, activityName, useTracing, options, tasker) {
         Tracing._originalFetch = Tracing._global.fetch;
         const o11yFetch = async (url, reqOptions, ...restArgs) => {
@@ -380,7 +406,7 @@ class Tracing {
                 activity = instr.startActivity(activityName || defaultActivityNameForFetch);
                 if (useTracing) {
                     reqOptions = reqOptions || {};
-                    const traceHeaders = activity.getTraceHeaders(options);
+                    const traceHeaders = Tracing._getTraceHeaders(activity, options, reqOptions.method, url === null || url === void 0 ? void 0 : url.toString());
                     reqOptions.headers = Object.assign(reqOptions.headers || {}, traceHeaders);
                 }
                 return await Tracing._originalFetch.call(Tracing._global, url, reqOptions, ...restArgs);
@@ -405,16 +431,25 @@ class Tracing {
     }
     _overrideXhr(instr, logErrors, activityName, useTracing, options, tasker) {
         Tracing._originalXhr = Tracing._global.XMLHttpRequest;
+        Tracing._originalXhrOpen = Tracing._originalXhr.prototype.open;
         Tracing._originalXhrSend = Tracing._originalXhr.prototype.send;
+        Tracing._originalXhr.prototype.open = function (method, url, async, username, password) {
+            this._o11y = {
+                method,
+                url: url === null || url === void 0 ? void 0 : url.toString()
+            };
+            Tracing._originalXhrOpen.call(this, method, url, async, username, password);
+        };
         Tracing._originalXhr.prototype.send = function (...args) {
             let activity;
             try {
                 tasker === null || tasker === void 0 ? void 0 : tasker.add();
                 const xhr = this;
-                xhr._o11yActivity = activity = instr.startActivity(activityName || defaultActivityNameForXhrSend);
+                xhr._o11y = xhr._o11y || {};
+                xhr._o11y.activity = activity = instr.startActivity(activityName || defaultActivityNameForXhrSend);
                 if (useTracing) {
-                    const headers = activity.getTraceHeaders(options);
-                    Object.entries(headers).forEach((entry) => {
+                    const traceHeaders = Tracing._getTraceHeaders(activity, options, xhr._o11y.method, xhr._o11y.url);
+                    Object.entries(traceHeaders).forEach((entry) => {
                         xhr.setRequestHeader(entry[0], entry[1]);
                     });
                 }
@@ -438,13 +473,14 @@ class Tracing {
             construct(target) {
                 const newXhr = new target();
                 newXhr.addEventListener('load', () => {
-                    var _a;
-                    (_a = newXhr._o11yActivity) === null || _a === void 0 ? void 0 : _a.stop();
+                    var _a, _b;
+                    (_b = (_a = newXhr._o11y) === null || _a === void 0 ? void 0 : _a.activity) === null || _b === void 0 ? void 0 : _b.stop();
                     tasker === null || tasker === void 0 ? void 0 : tasker.done();
                 });
                 newXhr.addEventListener('error', (__err) => {
+                    var _a;
                     const error = new Error('XHR Network-Level Error');
-                    const activity = newXhr._o11yActivity;
+                    const activity = (_a = newXhr._o11y) === null || _a === void 0 ? void 0 : _a.activity;
                     if (activity) {
                         if (logErrors) {
                             activity.error(error);
@@ -457,8 +493,8 @@ class Tracing {
                     tasker === null || tasker === void 0 ? void 0 : tasker.done();
                 });
                 newXhr.addEventListener('abort', () => {
-                    const activity = newXhr._o11yActivity;
-                    activity === null || activity === void 0 ? void 0 : activity.discard();
+                    var _a, _b;
+                    (_b = (_a = newXhr._o11y) === null || _a === void 0 ? void 0 : _a.activity) === null || _b === void 0 ? void 0 : _b.discard();
                     tasker === null || tasker === void 0 ? void 0 : tasker.done();
                 });
                 return newXhr;
@@ -1753,18 +1789,6 @@ const maxInstrumentationLength = 80;
 const truncatedText = '_CUT';
 const maxInstrumentationLengthBeforeTruncated = maxInstrumentationLength - truncatedText.length;
 class NextgenImpl {
-    constructor(_idleDetector) {
-        this._idleDetector = _idleDetector;
-        this._logCollectors = new Set();
-        this._instruments = new Map();
-        this._seqBySchema = new Map();
-        this._sequence = 0;
-        this._forceDisabledLogCollectors = new Set();
-        this._logCollectorFailures = new Map();
-        this._isBufferingEnabled = false;
-        this._buffer = [];
-        this._logCollectionListeners = new Set();
-    }
     get pagePayloadProvider() {
         return this._pagePayloadProvider;
     }
@@ -1777,7 +1801,20 @@ class NextgenImpl {
     set appPayloadProvider(provider) {
         this._appPayloadProvider = provider;
     }
+    constructor(_idleDetector) {
+        this._idleDetector = _idleDetector;
+        this._logCollectors = new Set();
+        this._instruments = new Map();
+        this._seqBySchema = new Map();
+        this._sequence = 0;
+        this._forceDisabledLogCollectors = new Set();
+        this._logCollectorFailures = new Map();
+        this._isBufferingEnabled = false;
+        this._buffer = [];
+        this._logCollectionListeners = new Set();
+    }
     registerApp(name, options) {
+        var _a;
         utility.requireArgument(name, 'name', 'string');
         if (this._appInstr) {
             throw new Error('An app has already been registered with instrumentation.');
@@ -1786,10 +1823,11 @@ class NextgenImpl {
         if (instr) {
             throw new Error(`The instrumentation name ${name} is already taken`);
         }
+        this._clientSessionId = ((_a = options === null || options === void 0 ? void 0 : options.clientSessionId) === null || _a === void 0 ? void 0 : _a.toString()) || utility.generateUniqueId();
         this._appInstr = new AppInstrumentationImpl(this, name, options === null || options === void 0 ? void 0 : options.allowMultipleRootActivities);
         this._instruments.set(name, this._appInstr);
         this._isBufferingEnabled = options === null || options === void 0 ? void 0 : options.enableBuffering;
-        const tracing = new Tracing(this._appInstr, this._idleDetector);
+        const tracing = new Tracing(this.getInstrumentation('Network'), this._idleDetector);
         return {
             log: this._appInstr.log.bind(this._appInstr),
             error: this._appInstr.error.bind(this._appInstr),
@@ -1808,7 +1846,8 @@ class NextgenImpl {
             activateClickTracker: this.activateClickTracker.bind(this),
             deactivateClickTracker: this.deactivateClickTracker.bind(this),
             disableBuffering: this.disableBuffering.bind(this),
-            promptLogCollection: this.promptLogCollection.bind(this)
+            promptLogCollection: this.promptLogCollection.bind(this),
+            getClientSessionId: this.getClientSessionId.bind(this)
         };
     }
     getInstrumentation(name) {
@@ -1846,7 +1885,8 @@ class NextgenImpl {
             pagePayload: pagePayload ? utility.clone(pagePayload) : undefined,
             appPayload: appPayload ? utility.clone(appPayload) : undefined,
             loggerAppName: this.appName,
-            connectionType: utility.getConnectionType()
+            connectionType: utility.getConnectionType(),
+            clientSessionId: this._clientSessionId
         };
         if (this._isBufferingEnabled) {
             this._buffer.push({ schema, data: utility.clone(data), logMeta });
@@ -1967,20 +2007,23 @@ class NextgenImpl {
             }
         }
     }
+    getClientSessionId() {
+        return this._clientSessionId;
+    }
 }
 NextgenImpl._collectorFailureLimit = 5;
 
 class Index {
-    constructor(_idleDetector) {
-        this._idleDetector = _idleDetector;
-        utility.requireArgument(_idleDetector, '_idleDetector');
-    }
     get _lazyNextGen() {
         if (!this._nextgen) {
             this._nextgen = new NextgenImpl(this._idleDetector);
         }
         return this._nextgen;
     }
+    constructor(_idleDetector) {
+        this._idleDetector = _idleDetector;
+        utility.requireArgument(_idleDetector, '_idleDetector');
+    }
     registerInstrumentedApp(name, options) {
         if (!options || options.isProduction !== false) {
             utility.markProduction();
@@ -2036,7 +2079,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '244.3.0';
+const version = '244.5.4';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,