o11y 248.14.0 → 248.16.0

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

@@ -303,14 +303,19 @@ class FuzzyMapper {
 
 const basicInitiatorTypes = ['fetch', 'xmlhttprequest'];
 class PerformanceObservability {
-    constructor(_instr, _logPerformanceActivityName, logLevel) {
+    constructor(_instr, fuzzyMapRange, _skipUrls, _logPerformanceActivityName, logLevel) {
         this._instr = _instr;
+        this._skipUrls = _skipUrls;
         this._logPerformanceActivityName = _logPerformanceActivityName;
-        this._fuzzyMapper = new FuzzyMapper(50);
         this._isStarted = false;
+        utility.requireArgument(_instr, '_instr', 'object');
+        utility.requireArgument(fuzzyMapRange, 'fuzzyMapRange', 'number');
+        utility.requireArgumentIfDefined(_skipUrls, '_skipUrls', Array);
+        utility.requireArgumentIfDefined(_logPerformanceActivityName, '_logPerformanceActivityName', 'string');
+        utility.requireArgumentIfDefined(logLevel, 'logLevel', 'string');
         this._hasPerf =
             typeof performance !== 'undefined' && typeof PerformanceObserver === 'function';
-        this._boundOobserverCallback = this._logPerformanceEntries.bind(this);
+        this._boundObserverCallback = this._logPerformanceEntries.bind(this);
         if (!logLevel || logLevel.toLowerCase() === 'full') {
             this._logLevel = 1;
         }
@@ -320,6 +325,7 @@ class PerformanceObservability {
         else {
             throw new Error(`Invalid log level: ${logLevel}`);
         }
+        this._fuzzyMapper = new FuzzyMapper(fuzzyMapRange);
     }
     get isStarted() {
         return this._isStarted;
@@ -333,9 +339,9 @@ class PerformanceObservability {
         }
         if (!this._isStarted) {
             this._isStarted = true;
-            this._navigationObserver = new PerformanceObserver(this._boundOobserverCallback);
+            this._navigationObserver = new PerformanceObserver(this._boundObserverCallback);
             this._navigationObserver.observe({ type: 'navigation', buffered: true });
-            this._resourceObserver = new PerformanceObserver(this._boundOobserverCallback);
+            this._resourceObserver = new PerformanceObserver(this._boundObserverCallback);
             this._resourceObserver.observe({ type: 'resource', buffered: true });
         }
     }
@@ -389,6 +395,18 @@ class PerformanceObservability {
         return rt;
     }
     _shouldInclude(entry) {
+        var _a;
+        const isFiltered = (_a = this._skipUrls) === null || _a === void 0 ? void 0 : _a.some((skipUrl) => {
+            if (skipUrl instanceof RegExp) {
+                return skipUrl.test(entry.name);
+            }
+            else {
+                return entry.name === skipUrl;
+            }
+        });
+        if (isFiltered) {
+            return false;
+        }
         if (this._logLevel === 1) {
             return true;
         }
@@ -428,9 +446,9 @@ class PerformanceObservability {
         }
         for (const entry of list.getEntriesByType('resource')) {
             const rt = entry;
+            const requestInfo = this._fuzzyMapper.pop(rt.name, rt.startTime);
             if (this._shouldInclude(rt)) {
                 const payload = this._resourceEntryToResourceTiming(rt);
-                const requestInfo = this._fuzzyMapper.pop(rt.name, rt.startTime);
                 Object.assign(payload, {
                     srvReqId: requestInfo === null || requestInfo === void 0 ? void 0 : requestInfo.requestId,
                     xhrDelay: requestInfo
@@ -455,6 +473,8 @@ const headerParentSpanId = 'X-B3-ParentSpanId';
 const headerRequestId = 'X-SFDC-Request-Id';
 const defaultActivityNameForFetch = 'fetch';
 const defaultActivityNameForXhrSend = 'xhr_send';
+const defaultTimingActivityName = 'perf-timing';
+const defaultFuzzyMapRange = 50;
 class Tracing {
     constructor(_instr, _idleDetector) {
         this._instr = _instr;
@@ -553,7 +573,7 @@ class Tracing {
             Tracing._isNetworkInstrumentationEnabled = false;
         }
     }
-    _enableNetworkInstrumentation(instr, logErrors, activityName, useTracing, options, tasker, logPerformance, logPerformanceActivityName) {
+    _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);
             Tracing._isNetworkInstrumentationEnabled = true;
@@ -563,7 +583,7 @@ class Tracing {
             Tracing._isNetworkInstrumentationEnabled = true;
         }
         if (logPerformance) {
-            Tracing._performanceObservability = new PerformanceObservability(instr, logPerformanceActivityName, logPerformance === true ? 'full' : logPerformance);
+            Tracing._performanceObservability = new PerformanceObservability(instr, fuzzyMapRange, skipUrls, logPerformanceActivityName, logPerformance === true ? 'full' : logPerformance);
             Tracing._performanceObservability.start();
             Tracing._isNetworkInstrumentationEnabled = true;
         }
@@ -801,7 +821,7 @@ class Tracing {
             if (utility.definedValueOrDefault(tracingOptions.useTasker, true)) {
                 tasker = (_a = this._idleDetector) === null || _a === void 0 ? void 0 : _a.declareNotifierTaskMulti('o11y network');
             }
-            this._enableNetworkInstrumentation(utility.definedValueOrDefault(tracingOptions.instrumentation, this._instr), utility.definedValueOrDefault(tracingOptions.logErrors, true), tracingOptions.activityName, utility.definedValueOrDefault(tracingOptions.useTracing, true), tracingOptions.tracingHeadersOptions, tasker, utility.definedValueOrDefault(tracingOptions.logPerformance, true), utility.definedValueOrDefault(tracingOptions.logPerformanceActivityName, 'perf-timing'));
+            this._enableNetworkInstrumentation(utility.definedValueOrDefault(tracingOptions.instrumentation, this._instr), utility.definedValueOrDefault(tracingOptions.logErrors, true), tracingOptions.activityName, utility.definedValueOrDefault(tracingOptions.useTracing, true), tracingOptions.tracingHeadersOptions, tasker, utility.definedValueOrDefault(tracingOptions.logPerformance, true), utility.definedValueOrDefault(tracingOptions.logPerformanceActivityName, defaultTimingActivityName), utility.definedValueOrDefault(tracingOptions.skipUrls, []), utility.definedValueOrDefault(tracingOptions.fuzzyMapRange, defaultFuzzyMapRange));
         }
     }
     resetRequestCounter() {
@@ -2499,7 +2519,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '248.14.0';
+const version = '248.16.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,