o11y 244.4.8 → 244.7.0

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

@@ -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,16 +375,56 @@ class Tracing {
             Tracing._isNetworkInstrumentationEnabled = true;
         }
     }
+    static _getTraceHeaders(activity, options, method, url) {
+        let traceHeaders = (activity === null || activity === void 0 ? void 0 : 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) => {
             let activity;
             try {
                 tasker === null || tasker === void 0 ? void 0 : tasker.add();
-                activity = instr.startActivity(activityName || defaultActivityNameForFetch);
+                const ofo = reqOptions === null || reqOptions === void 0 ? void 0 : reqOptions.o11y;
+                if (!(ofo === null || ofo === void 0 ? void 0 : ofo.skipInstr)) {
+                    activity = instr.startActivity(activityName || defaultActivityNameForFetch);
+                }
+                else {
+                    Tracing._reqIndex += 1;
+                    try {
+                        if (typeof url === 'string') {
+                            const urlObj = new URL(url);
+                            const kv = `o11y=${Tracing._reqIndex}`;
+                            urlObj.search += urlObj.search.startsWith('?') ? `&${kv}` : kv;
+                            url = urlObj.toString();
+                        }
+                    }
+                    catch (_a) { }
+                }
+                if (reqOptions) {
+                    delete reqOptions.o11y;
+                }
                 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 +449,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 +491,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 +511,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;
@@ -469,8 +523,8 @@ class Tracing {
     networkInstrumentation(options) {
         var _a;
         utility.requireArgument(options, 'options', ['boolean', 'object']);
+        this._disableNetworkInstrumentation();
         if (options) {
-            this._disableNetworkInstrumentation();
             const tracingOptions = typeof options === 'object' ? options : {};
             let tasker = undefined;
             if (utility.definedValueOrDefault(tracingOptions.useTasker, true)) {
@@ -478,13 +532,14 @@ class Tracing {
             }
             this._enableNetworkInstrumentation(utility.definedValueOrDefault(tracingOptions.instrumentation, this._instr), utility.definedValueOrDefault(tracingOptions.logErrors, true), tracingOptions.activityName, utility.definedValueOrDefault(tracingOptions.useTracing, true), tracingOptions.tracingHeadersOptions, tasker);
         }
-        else {
-            this._disableNetworkInstrumentation();
-        }
+    }
+    resetRequestCounter() {
+        Tracing._reqIndex = 0;
     }
 }
 Tracing._global = utility.getGlobal();
 Tracing._isNetworkInstrumentationEnabled = false;
+Tracing._reqIndex = 0;
 
 var TimerOverride;
 (function (TimerOverride) {
@@ -1791,7 +1846,7 @@ class NextgenImpl {
         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),
@@ -2043,7 +2098,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '244.4.8';
+const version = '244.7.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,