o11y 254.4.0 → 254.6.0

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

@@ -515,6 +515,7 @@ const defaultActivityNameForFetch = 'fetch';
 const defaultActivityNameForXhrSend = 'xhr_send';
 const defaultTimingActivityName = 'perf-timing';
 const defaultFuzzyMapRange = 50;
+const o11yInfoForXHR = new WeakMap();
 class Tracing {
     constructor(_instr, _idleDetector) {
         this._instr = _instr;
@@ -799,12 +800,13 @@ class Tracing {
         Tracing._originalXhrSend = Tracing._originalXhr.prototype.send;
         function postProcess(xhr, failedAtInit) {
             var _a;
-            if (xhr._o11y) {
-                const activity = xhr._o11y.activity;
-                const activityDuration = Tracing._endActivity(activity, xhr._o11y.url, xhr._o11y.method);
+            const _o11y = o11yInfoForXHR.get(xhr);
+            if (_o11y) {
+                const activity = _o11y.activity;
+                const activityDuration = Tracing._endActivity(activity, _o11y.url, _o11y.method);
                 if (!failedAtInit && ((_a = Tracing._performanceObservability) === null || _a === void 0 ? void 0 : _a.isStarted)) {
-                    Tracing._performanceObservability.addEntry(xhr._o11y.absoluteUrl, xhr._o11y.sendTime, {
-                        requestId: xhr._o11y.requestId,
+                    Tracing._performanceObservability.addEntry(_o11y.absoluteUrl, _o11y.sendTime, {
+                        requestId: _o11y.requestId,
                         activityDuration,
                         activityId: activity === null || activity === void 0 ? void 0 : activity.getId(),
                         errorCount: activity === null || activity === void 0 ? void 0 : activity.getErrorCount(),
@@ -814,42 +816,49 @@ class Tracing {
             }
         }
         Tracing._originalXhr.prototype.open = function (method, url, __async, __username, __password) {
-            this._o11y = {
+            const _o11y = {
                 method,
                 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);
+            o11yInfoForXHR.set(this, _o11y);
+            _o11y.absoluteUrl = utility.tryGetAbsoluteUrl(_o11y.url);
+            _o11y.suspendInstrumentation = Tracing._shouldSkipUrl(skipUrls, _o11y.absoluteUrl);
             Tracing._originalXhrOpen.apply(this, arguments);
         };
         Tracing._originalXhr.prototype.setRequestHeader = function (name, value) {
             var _a;
             if (((_a = name === null || name === void 0 ? void 0 : name.toLowerCase) === null || _a === void 0 ? void 0 : _a.call(name)) === headerRequestId.toLowerCase()) {
-                this._o11y.requestId = value;
+                const _o11y = o11yInfoForXHR.get(this);
+                if (_o11y) {
+                    _o11y.requestId = value;
+                }
             }
             Tracing._originalXhrSetRequestHeader.apply(this, arguments);
         };
         Tracing._originalXhr.prototype.send = function (...args) {
-            var _a;
             let activity;
             const xhr = this;
+            let _o11y = o11yInfoForXHR.get(xhr);
+            if (!_o11y) {
+                _o11y = {};
+                o11yInfoForXHR.set(xhr, _o11y);
+            }
             try {
                 tasker === null || tasker === void 0 ? void 0 : tasker.add();
-                xhr._o11y = xhr._o11y || {};
-                if (!xhr._o11y.suspendInstrumentation) {
-                    xhr._o11y.activity = activity = instr.startActivity(activityName || defaultActivityNameForXhrSend);
+                if (!_o11y.suspendInstrumentation) {
+                    _o11y.activity = activity = instr.startActivity(activityName || defaultActivityNameForXhrSend);
                 }
                 if (useTracing) {
-                    const traceHeaders = Tracing._getTraceHeaders(activity, instr, options, xhr._o11y.method, xhr._o11y.absoluteUrl);
+                    const traceHeaders = Tracing._getTraceHeaders(activity, instr, options, _o11y.method, _o11y.absoluteUrl);
                     Object.entries(traceHeaders).forEach((entry) => {
                         xhr.setRequestHeader(entry[0], entry[1]);
                     });
                 }
-                xhr._o11y.sendTime = utility.perfNow();
+                _o11y.sendTime = utility.perfNow();
                 Tracing._originalXhrSend.call(this, ...args);
             }
             catch (ex) {
-                if (logErrors && !((_a = xhr._o11y) === null || _a === void 0 ? void 0 : _a.suspendInstrumentation)) {
+                if (logErrors && !(_o11y === null || _o11y === void 0 ? void 0 : _o11y.suspendInstrumentation)) {
                     if (activity) {
                         activity.error(ex);
                     }
@@ -870,11 +879,11 @@ class Tracing {
                     tasker === null || tasker === void 0 ? void 0 : tasker.done();
                 });
                 newXhr.addEventListener('error', (__err) => {
-                    var _a, _b;
+                    const _o11y = o11yInfoForXHR.get(newXhr) || {};
                     try {
-                        if (logErrors && !((_a = newXhr._o11y) === null || _a === void 0 ? void 0 : _a.suspendInstrumentation)) {
+                        if (logErrors && !(_o11y === null || _o11y === void 0 ? void 0 : _o11y.suspendInstrumentation)) {
                             const error = new Error('XHR Network-Level Error');
-                            const activity = (_b = newXhr._o11y) === null || _b === void 0 ? void 0 : _b.activity;
+                            const activity = _o11y === null || _o11y === void 0 ? void 0 : _o11y.activity;
                             if (activity) {
                                 activity.error(error);
                             }
@@ -889,8 +898,9 @@ class Tracing {
                     }
                 });
                 newXhr.addEventListener('abort', () => {
-                    var _a, _b;
-                    (_b = (_a = newXhr._o11y) === null || _a === void 0 ? void 0 : _a.activity) === null || _b === void 0 ? void 0 : _b.discard();
+                    var _a;
+                    const _o11y = o11yInfoForXHR.get(newXhr) || {};
+                    (_a = _o11y === null || _o11y === void 0 ? void 0 : _o11y.activity) === null || _a === void 0 ? void 0 : _a.discard();
                     tasker === null || tasker === void 0 ? void 0 : tasker.done();
                 });
                 return newXhr;
@@ -2699,7 +2709,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '254.4.0';
+const version = '254.6.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,

package/dist/modules/o11y/client/client.js-meta.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <isExposed>true</isExposed>
+    <capabilities>
+        <capability>lightning__ServerRenderable</capability>
+    </capabilities>
+</LightningComponentBundle>