o11y 260.3.0 → 260.5.0

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

@@ -511,10 +511,18 @@ const headerSpanId = 'X-B3-SpanId';
 const headerSampled = 'X-B3-Sampled';
 const headerParentSpanId = 'X-B3-ParentSpanId';
 const headerRequestId = 'X-SFDC-Request-Id';
+const headerBaggage = 'baggage';
 const defaultActivityNameForFetch = 'fetch';
 const defaultActivityNameForXhrSend = 'xhr_send';
 const defaultTimingActivityName = 'perf-timing';
 const defaultFuzzyMapRange = 50;
+const userSettableHeaders = [
+    headerBaggage,
+    headerTraceId,
+    headerSpanId,
+    headerParentSpanId,
+    headerSampled
+];
 const o11yInfoForXHR = new WeakMap();
 class Tracing {
     constructor(_instr, _idleDetector) {
@@ -553,6 +561,18 @@ class Tracing {
         }
         return text;
     }
+    static setHeaders(headers) {
+        if (headers === undefined) {
+            Tracing._userHeaders = {};
+            return;
+        }
+        Object.entries(headers).forEach(([key]) => {
+            if (!userSettableHeaders.includes(key)) {
+                delete headers[key];
+            }
+        });
+        Tracing._userHeaders = headers;
+    }
     static getHeaders(traceId, spanId, isSampled, options) {
         utility.requireArgument(spanId, 'spanId', 'string');
         const useB3Headers = options === null || options === void 0 ? void 0 : options.useB3Headers;
@@ -668,6 +688,13 @@ class Tracing {
                 traceHeaders = undefined;
             }
         }
+        if (Tracing._userHeaders && Object.keys(Tracing._userHeaders).length > 0) {
+            traceHeaders = { ...traceHeaders };
+            Object.entries(Tracing._userHeaders).forEach(([key, value]) => {
+                traceHeaders[key] = value;
+            });
+            Tracing._userHeaders = undefined;
+        }
         return traceHeaders || {};
     }
     static _extractHeader(headerName, input, init) {
@@ -995,13 +1022,16 @@ const stopReason = {
     discarded
 };
 class ActivityImpl {
-    constructor(_name, _rootId, _onStopped, _onError, timeout, id, _isSampled, _startPerfTime, _noRerooting) {
+    constructor(_name, _rootId, _onStopped, _onError, timeout, id, _isSampled, _startPerfTime, _noRerooting, _isExternal, _parentActivity) {
+        var _a, _b;
         this._name = _name;
         this._rootId = _rootId;
         this._onStopped = _onStopped;
         this._onError = _onError;
         this._isSampled = _isSampled;
         this._noRerooting = _noRerooting;
+        this._isExternal = _isExternal;
+        this._parentActivity = _parentActivity;
         this._isRoot = false;
         this._errorCount = 0;
         this._timerOverridden = TimerOverride.none;
@@ -1018,7 +1048,7 @@ class ActivityImpl {
             try {
                 performance.mark(this._perfId);
             }
-            catch (_a) {
+            catch (_c) {
                 this._usePerf = false;
             }
         }
@@ -1032,6 +1062,9 @@ class ActivityImpl {
             }, timeout);
         }
         this._safety = new PublicSafety();
+        this._externalParentActivity = ((_a = this._parentActivity) === null || _a === void 0 ? void 0 : _a.isExternal())
+            ? this._parentActivity
+            : (_b = this._parentActivity) === null || _b === void 0 ? void 0 : _b.getExternalParentActivity();
     }
     get id() {
         return this._id;
@@ -1045,6 +1078,16 @@ class ActivityImpl {
     get stopReason() {
         return this._stopReason;
     }
+    getParentActivity() {
+        return this._parentActivity;
+    }
+    isExternal() {
+        var _a;
+        return (_a = this._isExternal) !== null && _a !== void 0 ? _a : false;
+    }
+    getExternalParentActivity() {
+        return this._externalParentActivity;
+    }
     error(error, userSchemaOrText, userData) {
         this._safety.tryCatch(() => {
             this._errorCount += 1;
@@ -1165,7 +1208,10 @@ class ActivityImpl {
             errorCount: this._errorCount,
             isSampled: this.getIsSampled(),
             timerOverridden: this._timerOverridden,
-            noRerooting: this._noRerooting
+            noRerooting: this._noRerooting,
+            isExternal: this._isExternal,
+            parentActivity: this._parentActivity,
+            externalParentActivity: this._externalParentActivity
         };
     }
     getTraceHeaders(options) {
@@ -1218,6 +1264,15 @@ class ActivityNoOp {
     getErrorCount() {
         return 0;
     }
+    getParentActivity() {
+        return undefined;
+    }
+    isExternal() {
+        return false;
+    }
+    getExternalParentActivity() {
+        return undefined;
+    }
 }
 const activityNoOp = Object.freeze(new ActivityNoOp());
 
@@ -1648,6 +1703,7 @@ class InstrumentationImpl {
             var _a;
             utility.requireArgument(name, 'name');
             utility.requireArgumentIfDefined(options, 'options', 'object');
+            const parentActivity = utility.validateParentActivityType(options === null || options === void 0 ? void 0 : options.isExternal, options === null || options === void 0 ? void 0 : options.parentActivity);
             let context;
             let noRerooting = (options === null || options === void 0 ? void 0 : options.perfStartOverride) !== undefined;
             const rootId = (_a = options === null || options === void 0 ? void 0 : options.instrumentationContext) === null || _a === void 0 ? void 0 : _a.rootId;
@@ -1661,11 +1717,12 @@ class InstrumentationImpl {
             else {
                 context = this._nextGen.getDefaultInstrumentationContext();
             }
-            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);
+            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, options === null || options === void 0 ? void 0 : options.isExternal, parentActivity);
             return activity;
         }, activityNoOp, { op: 'startActivity' });
     }
     _getActivityData(detail) {
+        var _a, _b;
         const userPayload = this._wrapUserPayload(detail.userSchemaOrText, detail.userData, true);
         return {
             id: detail.id,
@@ -1676,7 +1733,10 @@ class InstrumentationImpl {
             errorCount: detail.errorCount,
             isSampled: detail.isSampled,
             timerOverridden: detail.timerOverridden,
-            isRerooted: detail.isRerooted
+            isRerooted: detail.isRerooted,
+            isExternal: detail.isExternal,
+            parentId: (_a = detail.parentActivity) === null || _a === void 0 ? void 0 : _a.getId(),
+            externalParentId: (_b = detail.externalParentActivity) === null || _b === void 0 ? void 0 : _b.getId()
         };
     }
     _handleActivityStop(detail) {
@@ -1851,6 +1911,10 @@ class InstrumentationImpl {
             act.stop((_c = options === null || options === void 0 ? void 0 : options.stopPayload) === null || _c === void 0 ? void 0 : _c.schema, (_d = options === null || options === void 0 ? void 0 : options.stopPayload) === null || _d === void 0 ? void 0 : _d.payload, options === null || options === void 0 ? void 0 : options.stopOptions);
         }
     }
+    invokeNetworkCallWithHeaders(apiCall, params, headers) {
+        Tracing.setHeaders(headers);
+        return apiCall(...params);
+    }
 }
 InstrumentationImpl.defaultAppName = 'APP_NOT_REGISTERED';
 
@@ -1954,6 +2018,15 @@ class RootActivityNoOp {
     getErrorCount() {
         return 0;
     }
+    getParentActivity() {
+        return undefined;
+    }
+    isExternal() {
+        return false;
+    }
+    getExternalParentActivity() {
+        return undefined;
+    }
 }
 const rootActivityNoOp = Object.freeze(new RootActivityNoOp());
 
@@ -2355,6 +2428,7 @@ class NextgenImpl {
             registerForLogPrompt: this._appInstr.registerForLogPrompt.bind(this._appInstr),
             activity: this._appInstr.activity.bind(this._appInstr),
             activityAsync: this._appInstr.activityAsync.bind(this._appInstr),
+            invokeNetworkCallWithHeaders: this._appInstr.invokeNetworkCallWithHeaders.bind(this._appInstr),
             startRootActivity: this._appInstr.startRootActivity.bind(this._appInstr),
             registerLogCollector: this._isSender ? noOpFunc : this.registerLogCollector.bind(this),
             registerMetricsCollector: this._isSender
@@ -2709,7 +2783,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '260.3.0';
+const version = '260.5.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,