o11y 252.6.0 → 252.8.0

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

@@ -1,5 +1,5 @@
 import { networkSchema, simpleSchema, payloadDiagsSchema, errorSchema, activitySchema, instrumentedEventSchema, idleDetectorReportSchema } from 'o11y_schema/sf_instrumentation';
-import { utility, PublicSafety, schemaUtil, maxStringLengthAppLimit, payloadUtility, metricsUtility } from 'o11y/shared';
+import { utility, PublicSafety, schemaUtil, UpCounterImpl, maxStringLengthAppLimit, payloadUtility, metricsUtility, co11y } from 'o11y/shared';
 
 class TaskerImpl {
     get isBusy() {
@@ -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;
@@ -961,7 +999,7 @@ class ActivityImpl {
                 error = new Error(error);
             }
             this._onError(error, this._getDetail(userSchemaOrText, userData));
-        });
+        }, { op: 'activity.error' });
     }
     stop(userSchemaOrText, userData, options) {
         this._safety.tryCatch(() => {
@@ -990,7 +1028,7 @@ class ActivityImpl {
                 }
             }
             this._stopInternal(userSchemaOrText, userData, options);
-        });
+        }, { op: 'activity.stop' });
     }
     _overrideTimer(perfStartTime, perfStopTime) {
         if (perfStartTime !== undefined) {
@@ -1049,13 +1087,13 @@ class ActivityImpl {
         this._safety.tryCatch(() => {
             this._stopReason = this._stopReason || stopReason.discarded;
             this.stop();
-        });
+        }, { op: 'activity.discard' });
     }
     terminate(userSchemaOrText, userData, options) {
         this._safety.tryCatch(() => {
             this._stopReason = this._stopReason || stopReason.terminated;
             this.stop(userSchemaOrText, userData, options);
-        });
+        }, { op: 'activity.terminate' });
     }
     getIsSampled() {
         return this._isSampled || false;
@@ -1249,56 +1287,6 @@ class BucketHistogramImpl {
     }
 }
 
-class UpCounterImpl {
-    constructor(_name, _ownerName, _ownerAppName, _tags, createdOn, lastUpdatedOn, value) {
-        this._name = _name;
-        this._ownerName = _ownerName;
-        this._ownerAppName = _ownerAppName;
-        this._tags = _tags;
-        this._value = 0;
-        this._createdOn = createdOn === undefined ? utility.time().tsNow : createdOn;
-        if (lastUpdatedOn !== undefined) {
-            this._lastUpdatedOn = lastUpdatedOn;
-        }
-        if (value !== undefined) {
-            this._value = value;
-        }
-    }
-    getName() {
-        return this._name;
-    }
-    getCreatedOn() {
-        return this._createdOn;
-    }
-    getLastUpdatedOn() {
-        return this._lastUpdatedOn;
-    }
-    getData() {
-        return this._value;
-    }
-    increment(value = 1) {
-        if (typeof value === 'number' && value > 0) {
-            this._value += Math.round(value);
-            this._lastUpdatedOn = utility.time().tsNow;
-            return;
-        }
-        throw new Error('UpCounter can only increment positive numbers.');
-    }
-    reset() {
-        this._lastUpdatedOn = undefined;
-        this._value = 0;
-    }
-    getOwnerName() {
-        return this._ownerName;
-    }
-    getOwnerAppName() {
-        return this._ownerAppName;
-    }
-    getTags() {
-        return this._tags;
-    }
-}
-
 class ValueRecorderImpl {
     constructor(_name, _ownerName, _ownerAppName, _tags, createdOn, lastUpdatedOn, values) {
         this._name = _name;
@@ -1537,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;
@@ -1547,7 +1538,7 @@ class InstrumentationImpl {
             if (userPayload === null || userPayload === void 0 ? void 0 : userPayload.payload) {
                 this._logInternal(this.name, userPayload.schema, userPayload.payload, timestamp, this._getEffectiveRootId(options));
             }
-        });
+        }, { op: 'log' });
     }
     _logInternal(loggerName, schema, data, timestamp, rootId) {
         const sequence = this._nextGen.addLog(loggerName, schema, data, timestamp, rootId);
@@ -1571,7 +1562,7 @@ class InstrumentationImpl {
             utility.requireArgumentIfDefined(options, 'options', 'object');
             const rootId = this._getEffectiveRootId(options);
             this._errorInternal(error, userSchemaOrText, userData, undefined, rootId);
-        });
+        }, { op: 'error' });
     }
     _errorInternal(err, userSchemaOrText, userData, activityId, rootActivityId) {
         const loggedTimestamp = utility.time().tsNow;
@@ -1619,7 +1610,7 @@ class InstrumentationImpl {
             }
             const activity = new ActivityImpl(name, context.rootId, this._onActivityStoppedCallback, this._onActivityErrorCallback, maxActivityDurationMsecs, options === null || options === void 0 ? void 0 : options.id, context.isRootActivitySampled, options === null || options === void 0 ? void 0 : options.perfStartOverride, noRerooting);
             return activity;
-        }, activityNoOp);
+        }, activityNoOp, { op: 'startActivity' });
     }
     _getActivityData(detail) {
         const userPayload = this._wrapUserPayload(detail.userSchemaOrText, detail.userData, true);
@@ -1697,7 +1688,7 @@ class InstrumentationImpl {
                 default:
                     throw new Error(utility.notImplemented);
             }
-        });
+        }, { op: 'domEvent' });
     }
     incrementCounter(operation, increment = 1, hasError = false, tags = {}) {
         this._safety.tryCatch(() => {
@@ -1715,7 +1706,7 @@ class InstrumentationImpl {
                 ]);
             });
             this._metrics.incrementCounter(operation, increment, hasError, tags);
-        });
+        }, { op: 'incrementCounter' });
     }
     trackValue(operation, value, hasError = false, tags = {}) {
         this._safety.tryCatch(() => {
@@ -1733,7 +1724,7 @@ class InstrumentationImpl {
                 ]);
             });
             this._metrics.trackValue(operation, value, hasError, tags);
-        });
+        }, { op: 'trackValue' });
     }
     bucketValue(operation, value, buckets = [], hasError = false, tags = {}) {
         this._safety.tryCatch(() => {
@@ -1755,7 +1746,7 @@ class InstrumentationImpl {
                 ]);
             });
             this._metrics.bucketValue(operation, value, buckets, hasError, tags);
-        });
+        }, { op: 'bucketValue' });
     }
     getUpCounters() {
         return this._metrics.getUpCounters().filter((m) => m.getLastUpdatedOn());
@@ -1942,7 +1933,7 @@ class AppInstrumentationImpl extends InstrumentationImpl {
                 this._singleRootActivity = newRootActivity;
             }
             return newRootActivity;
-        }, rootActivityNoOp);
+        }, rootActivityNoOp, { op: 'startRootActivity' });
     }
     _handleRootActivityStop(detail) {
         const historyEntry = this._rootActivityHistory.findById(detail.id);
@@ -2268,6 +2259,7 @@ class NextgenImpl {
         if (instr) {
             throw new Error(`The instrumentation name ${name} is already taken`);
         }
+        co11y.setOwnerAppName(name);
         this._initOpMode(options === null || options === void 0 ? void 0 : options.operationMode);
         this._isSender = this._opMode === 'sender';
         this._isReceiver = this._opMode === 'receiver';
@@ -2492,18 +2484,27 @@ class NextgenImpl {
     }
     _getAllUpCounters() {
         var _a;
-        const arrOfArrs = Array.from(this._instruments.values()).map((instr) => instr.getUpCounters());
-        return arrOfArrs.reduce((pv, cv) => pv.concat(cv), ((_a = this._metricsStore) === null || _a === void 0 ? void 0 : _a.getUpCounters()) || []);
+        return (((_a = this._metricsStore) === null || _a === void 0 ? void 0 : _a.getUpCounters()) || [])
+            .concat(Array.from(this._instruments.values())
+            .map((instr) => instr.getUpCounters())
+            .flat())
+            .concat(co11y.getUpCounters());
     }
     _getAllValueRecorders() {
         var _a;
-        const arrOfArrs = Array.from(this._instruments.values()).map((instr) => instr.getValueRecorders());
-        return arrOfArrs.reduce((pv, cv) => pv.concat(cv), ((_a = this._metricsStore) === null || _a === void 0 ? void 0 : _a.getValueRecorders()) || []);
+        return (((_a = this._metricsStore) === null || _a === void 0 ? void 0 : _a.getValueRecorders()) || [])
+            .concat(Array.from(this._instruments.values())
+            .map((instr) => instr.getValueRecorders())
+            .flat())
+            .concat(co11y.getValueRecorders());
     }
     _getAllBucketHistograms() {
         var _a;
-        const arrOfArrs = Array.from(this._instruments.values()).map((instr) => instr.getBucketHistograms());
-        return arrOfArrs.reduce((pv, cv) => pv.concat(cv), ((_a = this._metricsStore) === null || _a === void 0 ? void 0 : _a.getBucketHistograms()) || []);
+        return (((_a = this._metricsStore) === null || _a === void 0 ? void 0 : _a.getBucketHistograms()) || [])
+            .concat(Array.from(this._instruments.values())
+            .map((instr) => instr.getBucketHistograms())
+            .flat())
+            .concat(co11y.getBucketHistograms());
     }
     registerForLogPrompt(listener) {
         this._logCollectionListeners.add(listener);
@@ -2654,7 +2655,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '252.6.0';
+const version = '252.8.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,