o11y 252.7.0 → 252.8.0

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

@@ -584,11 +584,11 @@ class Tracing {
     }
     _enableNetworkInstrumentation(instr, logErrors, activityName, useTracing, options, tasker, logPerformance, logPerformanceActivityName, skipUrls, fuzzyMapRange) {
         if (typeof Tracing._global.fetch === 'function') {
-            this._overrideFetch(instr, logErrors, activityName, useTracing, options, tasker);
+            this._overrideFetch(instr, logErrors, activityName, useTracing, options, tasker, skipUrls);
             Tracing._isNetworkInstrumentationEnabled = true;
         }
         if (typeof Tracing._global.XMLHttpRequest === 'function') {
-            this._overrideXhr(instr, logErrors, activityName, useTracing, options, tasker);
+            this._overrideXhr(instr, logErrors, activityName, useTracing, options, tasker, skipUrls);
             Tracing._isNetworkInstrumentationEnabled = true;
         }
         if (logPerformance) {
@@ -597,8 +597,20 @@ class Tracing {
             Tracing._isNetworkInstrumentationEnabled = true;
         }
     }
-    static _getTraceHeaders(activity, options, method, url) {
-        let traceHeaders = (activity === null || activity === void 0 ? void 0 : activity.getTraceHeaders(options)) || {};
+    static _getTraceHeaders(activity, tracingInstr, options, method, url) {
+        let traceHeaders;
+        if (activity) {
+            traceHeaders = activity.getTraceHeaders(options) || {};
+        }
+        else {
+            const context = tracingInstr.internalInstrumentationContext;
+            if (context === null || context === void 0 ? void 0 : context.rootId) {
+                traceHeaders = Tracing.getHeaders(context.rootId, utility.generateUniqueId(), context.isRootActivitySampled, options);
+            }
+            else {
+                traceHeaders = {};
+            }
+        }
         if (typeof (options === null || options === void 0 ? void 0 : options.headerProcessor) === 'function') {
             traceHeaders = options.headerProcessor({
                 method,
@@ -635,7 +647,7 @@ class Tracing {
         }
         return undefined;
     }
-    _overrideFetch(instr, logErrors, activityName, useTracing, tracingHeadersOptions, tasker) {
+    _overrideFetch(instr, logErrors, activityName, useTracing, tracingHeadersOptions, tasker, skipUrls) {
         Tracing._originalFetch = Tracing._global.fetch;
         const o11yFetch = async (resource, options, ...restArgs) => {
             var _a;
@@ -644,14 +656,18 @@ class Tracing {
             let absoluteUrl;
             let method;
             let fetchTime;
+            let suspendInstrumentation = false;
             try {
                 tasker === null || tasker === void 0 ? void 0 : tasker.add();
                 method = options === null || options === void 0 ? void 0 : options.method;
                 const ofo = options === null || options === void 0 ? void 0 : options.o11y;
-                if (!(ofo === null || ofo === void 0 ? void 0 : ofo.skipInstr)) {
+                const isSkipInstrSet = ofo === null || ofo === void 0 ? void 0 : ofo.skipInstr;
+                suspendInstrumentation =
+                    isSkipInstrSet || Tracing._shouldSkipUrl(skipUrls, resource);
+                if (!suspendInstrumentation) {
                     activity = instr.startActivity(activityName || defaultActivityNameForFetch);
                 }
-                else {
+                else if (isSkipInstrSet) {
                     Tracing._reqIndex += 1;
                     try {
                         if (resource instanceof URL) {
@@ -677,7 +693,7 @@ class Tracing {
                         url = resource.url;
                         absoluteUrl = utility.tryGetAbsoluteUrl(url);
                     }
-                    const traceHeaders = Tracing._getTraceHeaders(activity, tracingHeadersOptions, method, absoluteUrl);
+                    const traceHeaders = Tracing._getTraceHeaders(activity, instr, tracingHeadersOptions, method, absoluteUrl);
                     if (!this._applyTraceHeaders(resource, options, traceHeaders) &&
                         options === undefined) {
                         options = {
@@ -689,7 +705,7 @@ class Tracing {
                 return await Tracing._originalFetch.call(Tracing._global, resource, options, ...restArgs);
             }
             catch (ex) {
-                if (logErrors) {
+                if (logErrors && !suspendInstrumentation) {
                     if (activity) {
                         activity.error(ex);
                     }
@@ -735,7 +751,7 @@ class Tracing {
         }
         return undefined;
     }
-    _overrideXhr(instr, logErrors, activityName, useTracing, options, tasker) {
+    _overrideXhr(instr, logErrors, activityName, useTracing, options, tasker, skipUrls) {
         Tracing._originalXhr = Tracing._global.XMLHttpRequest;
         Tracing._originalXhrOpen = Tracing._originalXhr.prototype.open;
         Tracing._originalXhrSetRequestHeader = Tracing._originalXhr.prototype.setRequestHeader;
@@ -761,6 +777,7 @@ class Tracing {
                 url: url === null || url === void 0 ? void 0 : url.toString()
             };
             this._o11y.absoluteUrl = utility.tryGetAbsoluteUrl(this._o11y.url);
+            this._o11y.suspendInstrumentation = Tracing._shouldSkipUrl(skipUrls, this._o11y.absoluteUrl);
             Tracing._originalXhrOpen.apply(this, arguments);
         };
         Tracing._originalXhr.prototype.setRequestHeader = function (name, value) {
@@ -771,14 +788,17 @@ class Tracing {
             Tracing._originalXhrSetRequestHeader.apply(this, arguments);
         };
         Tracing._originalXhr.prototype.send = function (...args) {
+            var _a;
             let activity;
             const xhr = this;
             try {
                 tasker === null || tasker === void 0 ? void 0 : tasker.add();
                 xhr._o11y = xhr._o11y || {};
-                xhr._o11y.activity = activity = instr.startActivity(activityName || defaultActivityNameForXhrSend);
+                if (!xhr._o11y.suspendInstrumentation) {
+                    xhr._o11y.activity = activity = instr.startActivity(activityName || defaultActivityNameForXhrSend);
+                }
                 if (useTracing) {
-                    const traceHeaders = Tracing._getTraceHeaders(activity, options, xhr._o11y.method, xhr._o11y.absoluteUrl);
+                    const traceHeaders = Tracing._getTraceHeaders(activity, instr, options, xhr._o11y.method, xhr._o11y.absoluteUrl);
                     Object.entries(traceHeaders).forEach((entry) => {
                         xhr.setRequestHeader(entry[0], entry[1]);
                     });
@@ -787,7 +807,7 @@ class Tracing {
                 Tracing._originalXhrSend.call(this, ...args);
             }
             catch (ex) {
-                if (logErrors) {
+                if (logErrors && !((_a = xhr._o11y) === null || _a === void 0 ? void 0 : _a.suspendInstrumentation)) {
                     if (activity) {
                         activity.error(ex);
                     }
@@ -808,11 +828,11 @@ class Tracing {
                     tasker === null || tasker === void 0 ? void 0 : tasker.done();
                 });
                 newXhr.addEventListener('error', (__err) => {
-                    var _a;
+                    var _a, _b;
                     try {
-                        const error = new Error('XHR Network-Level Error');
-                        if (logErrors) {
-                            const activity = (_a = newXhr._o11y) === null || _a === void 0 ? void 0 : _a.activity;
+                        if (logErrors && !((_a = newXhr._o11y) === null || _a === void 0 ? void 0 : _a.suspendInstrumentation)) {
+                            const error = new Error('XHR Network-Level Error');
+                            const activity = (_b = newXhr._o11y) === null || _b === void 0 ? void 0 : _b.activity;
                             if (activity) {
                                 activity.error(error);
                             }
@@ -883,6 +903,24 @@ class Tracing {
         }
         return false;
     }
+    static _shouldSkipUrl(skipUrls, urlLike) {
+        var _a;
+        let url = urlLike;
+        if (urlLike instanceof URL) {
+            url = (_a = urlLike.toString) === null || _a === void 0 ? void 0 : _a.call(urlLike);
+        }
+        else if (urlLike instanceof Request) {
+            url = urlLike.url;
+        }
+        return skipUrls === null || skipUrls === void 0 ? void 0 : skipUrls.some((skipUrl) => {
+            if (skipUrl instanceof RegExp) {
+                return skipUrl.test(url);
+            }
+            else {
+                return url === skipUrl;
+            }
+        });
+    }
 }
 Tracing._global = utility.getGlobal();
 Tracing._isNetworkInstrumentationEnabled = false;
@@ -1487,6 +1525,9 @@ class InstrumentationImpl {
         var _a, _b;
         return ((_b = (_a = options === null || options === void 0 ? void 0 : options.instrumentationContext) === null || _a === void 0 ? void 0 : _a.rootId) !== null && _b !== void 0 ? _b : this._nextGen.getDefaultInstrumentationContext().rootId);
     }
+    get internalInstrumentationContext() {
+        return this._nextGen.getDefaultInstrumentationContext();
+    }
     log(userSchemaOrText, userData, options) {
         this._safety.tryCatch(() => {
             const timestamp = utility.time().tsNow;
@@ -2614,7 +2655,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '252.7.0';
+const version = '252.8.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,