o11y 260.3.0 → 260.4.0

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

@@ -995,13 +995,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 +1021,7 @@ class ActivityImpl {
             try {
                 performance.mark(this._perfId);
             }
-            catch (_a) {
+            catch (_c) {
                 this._usePerf = false;
             }
         }
@@ -1032,6 +1035,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 +1051,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 +1181,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 +1237,15 @@ class ActivityNoOp {
     getErrorCount() {
         return 0;
     }
+    getParentActivity() {
+        return undefined;
+    }
+    isExternal() {
+        return false;
+    }
+    getExternalParentActivity() {
+        return undefined;
+    }
 }
 const activityNoOp = Object.freeze(new ActivityNoOp());
 
@@ -1648,6 +1676,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 +1690,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 +1706,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) {
@@ -1954,6 +1987,15 @@ class RootActivityNoOp {
     getErrorCount() {
         return 0;
     }
+    getParentActivity() {
+        return undefined;
+    }
+    isExternal() {
+        return false;
+    }
+    getExternalParentActivity() {
+        return undefined;
+    }
 }
 const rootActivityNoOp = Object.freeze(new RootActivityNoOp());
 
@@ -2709,7 +2751,7 @@ class ConsoleCollector {
     }
 }
 
-const version = '260.3.0';
+const version = '260.4.0';
 
 const idleDetector = new IdleDetectorImpl({
     logThreshold: 300,