repro-nest 0.0.211 → 0.0.213

package/dist/index.js

@@ -103,6 +103,21 @@ function patchMongooseExecCapture(targetMongoose = mongoose) {
                 Qp.exec = function reproPatchedExec(...args) {
                     try {
                         this.__repro_is_query = true;
+                        const ctx = __TRACER__?.getCurrentSpanContext?.();
+                        const traceId = ctx?.traceId ?? __TRACER__?.getCurrentTraceId?.() ?? null;
+                        if (ctx || traceId) {
+                            Object.defineProperty(this, '__repro_span_context', {
+                                value: {
+                                    traceId,
+                                    spanId: ctx?.spanId ?? null,
+                                    parentSpanId: ctx?.parentSpanId ?? null,
+                                    depth: ctx?.depth ?? null,
+                                },
+                                configurable: true,
+                                writable: true,
+                                enumerable: false,
+                            });
+                        }
                     }
                     catch { }
                     const p = origExec.apply(this, args);
@@ -139,6 +154,21 @@ function patchMongooseExecCapture(targetMongoose = mongoose) {
                 Ap.exec = function reproPatchedAggExec(...args) {
                     try {
                         this.__repro_is_query = true;
+                        const ctx = __TRACER__?.getCurrentSpanContext?.();
+                        const traceId = ctx?.traceId ?? __TRACER__?.getCurrentTraceId?.() ?? null;
+                        if (ctx || traceId) {
+                            Object.defineProperty(this, '__repro_span_context', {
+                                value: {
+                                    traceId,
+                                    spanId: ctx?.spanId ?? null,
+                                    parentSpanId: ctx?.parentSpanId ?? null,
+                                    depth: ctx?.depth ?? null,
+                                },
+                                configurable: true,
+                                writable: true,
+                                enumerable: false,
+                            });
+                        }
                     }
                     catch { }
                     const p = origAggExec.apply(this, args);
@@ -459,17 +489,36 @@ exports.initReproTracing = initReproTracing;
 /** Optional helper if users want to check it. */
 function isReproTracingEnabled() { return __TRACER_READY; }
 exports.isReproTracingEnabled = isReproTracingEnabled;
-function captureSpanContext(source) {
+function captureSpanContextFromTracer(source) {
     try {
+        // Prefer a preserved store captured at the call-site for thenables (e.g., Mongoose Query),
+        // because the tracer intentionally detaches spans before the query is actually executed.
+        const promiseStore = source && source[Symbol.for('__repro_promise_store')];
+        if (promiseStore) {
+            const stack = Array.isArray(promiseStore.__repro_span_stack) ? promiseStore.__repro_span_stack : [];
+            const top = stack.length ? stack[stack.length - 1] : null;
+            const spanId = top && top.id != null ? top.id : null;
+            const parentSpanId = top && top.parentId != null
+                ? top.parentId
+                : (stack.length >= 2 ? (stack[stack.length - 2]?.id ?? null) : null);
+            const depth = top && top.depth != null
+                ? top.depth
+                : (typeof promiseStore.depth === 'number'
+                    ? promiseStore.depth
+                    : (stack.length ? stack.length : null));
+            const traceId = promiseStore.traceId ?? null;
+            if (traceId || spanId !== null || parentSpanId !== null) {
+                return { traceId, spanId, parentSpanId, depth: depth == null ? null : depth };
+            }
+        }
         const fromSource = source && source.__repro_span_context;
         if (fromSource) {
-            const span = {
+            return {
                 traceId: fromSource.traceId ?? null,
                 spanId: fromSource.spanId ?? null,
                 parentSpanId: fromSource.parentSpanId ?? null,
                 depth: fromSource.depth ?? null,
             };
-            return span;
         }
         const ctx = __TRACER__?.getCurrentSpanContext?.();
         if (ctx) {
@@ -493,10 +542,10 @@ function captureSpanContext(source) {
     catch { }
     return null;
 }
-function attachSpanContext(target, spanSource, fallbackSource) {
+function attachSpanContext(target, span) {
     if (!target)
         return target;
-    const ctx = spanSource ?? captureSpanContext(fallbackSource);
+    const ctx = span ?? captureSpanContextFromTracer();
     if (ctx) {
         try {
             target.spanContext = ctx;
@@ -1582,7 +1631,7 @@ function reproMongoosePlugin(cfg) {
                 wasNew: this.isNew,
                 before,
                 collection: resolveCollectionOrWarn(this, 'doc'),
-                spanContext: captureSpanContext(this),
+                spanContext: captureSpanContextFromTracer(this),
             };
             next();
         });
@@ -1596,7 +1645,7 @@ function reproMongoosePlugin(cfg) {
             const before = meta.before ?? null;
             const after = this.toObject({ depopulate: true });
             const collection = meta.collection || resolveCollectionOrWarn(this, 'doc');
-            const spanContext = captureSpanContext(this) || meta.spanContext || captureSpanContext();
+            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
             const query = meta.wasNew
                 ? { op: 'insertOne', doc: after }
                 : { filter: { _id: this._id }, update: buildMinimalUpdate(before, after), options: { upsert: false } };
@@ -1626,7 +1675,7 @@ function reproMongoosePlugin(cfg) {
                 this.__repro_before = await model.findOne(filter).lean().exec();
                 this.setOptions({ new: true });
                 this.__repro_collection = resolveCollectionOrWarn(this, 'query');
-                this.__repro_spanContext = captureSpanContext(this);
+                this.__repro_spanContext = captureSpanContextFromTracer(this);
             }
             catch { }
             next();
@@ -1638,7 +1687,7 @@ function reproMongoosePlugin(cfg) {
             const before = this.__repro_before ?? null;
             const after = res ?? null;
             const collection = this.__repro_collection || resolveCollectionOrWarn(this, 'query');
-            const spanContext = captureSpanContext(this) || this.__repro_spanContext || captureSpanContext();
+            const spanContext = this.__repro_spanContext || captureSpanContextFromTracer(this);
             const pk = after?._id ?? before?._id;
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, getCtx().sid, {
                 entries: [{
@@ -1664,7 +1713,7 @@ function reproMongoosePlugin(cfg) {
                 this.__repro_before = await this.model.findOne(filter).lean().exec();
                 this.__repro_collection = resolveCollectionOrWarn(this, 'query');
                 this.__repro_filter = filter;
-                this.__repro_spanContext = captureSpanContext(this);
+                this.__repro_spanContext = captureSpanContextFromTracer(this);
             }
             catch { }
             next();
@@ -1678,7 +1727,7 @@ function reproMongoosePlugin(cfg) {
                 return;
             const collection = this.__repro_collection || resolveCollectionOrWarn(this, 'query');
             const filter = this.__repro_filter ?? { _id: before._id };
-            const spanContext = captureSpanContext(this) || this.__repro_spanContext || captureSpanContext();
+            const spanContext = this.__repro_spanContext || captureSpanContextFromTracer(this);
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, getCtx().sid, {
                 entries: [{
                         actionId: getCtx().aid,
@@ -1727,7 +1776,7 @@ function reproMongoosePlugin(cfg) {
                         t0: Date.now(),
                         collection: this?.model?.collection?.name || 'unknown',
                         op,
-                        spanContext: null,
+                        spanContext: captureSpanContextFromTracer(this),
                         filter: sanitizeDbValue(this.getFilter?.() ?? this._conditions ?? undefined),
                         update: sanitizeDbValue(this.getUpdate?.() ?? this._update ?? undefined),
                         projection: sanitizeDbValue(this.projection?.() ?? this._fields ?? undefined),
@@ -1739,7 +1788,7 @@ function reproMongoosePlugin(cfg) {
                         t0: Date.now(),
                         collection: 'unknown',
                         op,
-                        spanContext: null,
+                        spanContext: captureSpanContextFromTracer(this),
                     };
                 }
                 next();
@@ -1750,7 +1799,7 @@ function reproMongoosePlugin(cfg) {
                     return;
                 const meta = this.__repro_qmeta || { t0: Date.now(), collection: 'unknown', op };
                 const resultMeta = summarizeQueryResult(op, res);
-                const spanContext = captureSpanContext(this) || meta.spanContext || captureSpanContext();
+                const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
                 emitDbQuery(cfg, sid, aid, {
                     collection: meta.collection,
                     op,
@@ -1759,7 +1808,6 @@ function reproMongoosePlugin(cfg) {
                     durMs: Date.now() - meta.t0,
                     t: alignedNow(),
                     spanContext,
-                    spanSource: this,
                 });
             });
         }
@@ -1772,14 +1820,14 @@ function reproMongoosePlugin(cfg) {
                     t0: Date.now(),
                     collection: this?.collection?.name || this?.model?.collection?.name || 'unknown',
                     docs: sanitizeDbValue(docs),
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                 };
             }
             catch {
                 this.__repro_insert_meta = {
                     t0: Date.now(),
                     collection: 'unknown',
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                 };
             }
             next();
@@ -1790,7 +1838,7 @@ function reproMongoosePlugin(cfg) {
                 return;
             const meta = this.__repro_insert_meta || { t0: Date.now(), collection: 'unknown' };
             const resultMeta = Array.isArray(docs) ? { inserted: docs.length } : summarizeQueryResult('insertMany', docs);
-            const spanContext = captureSpanContext(this) || meta.spanContext || captureSpanContext();
+            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
                 op: 'insertMany',
@@ -1799,7 +1847,6 @@ function reproMongoosePlugin(cfg) {
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
                 spanContext,
-                spanSource: this,
             });
         });
         schema.pre('bulkWrite', { document: false, query: false }, function (next, ops) {
@@ -1808,14 +1855,14 @@ function reproMongoosePlugin(cfg) {
                     t0: Date.now(),
                     collection: this?.collection?.name || this?.model?.collection?.name || 'unknown',
                     ops: sanitizeDbValue(ops),
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                 };
             }
             catch {
                 this.__repro_bulk_meta = {
                     t0: Date.now(),
                     collection: 'unknown',
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                 };
             }
             next();
@@ -1827,7 +1874,7 @@ function reproMongoosePlugin(cfg) {
             const meta = this.__repro_bulk_meta || { t0: Date.now(), collection: 'unknown' };
             const bulkResult = summarizeBulkResult(res);
             const resultMeta = { ...bulkResult, result: sanitizeResultForMeta(res?.result ?? res) };
-            const spanContext = captureSpanContext(this) || meta.spanContext || captureSpanContext();
+            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
                 op: 'bulkWrite',
@@ -1836,7 +1883,6 @@ function reproMongoosePlugin(cfg) {
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
                 spanContext,
-                spanSource: this,
             });
         });
         // Aggregate middleware (non-intrusive)
@@ -1848,7 +1894,7 @@ function reproMongoosePlugin(cfg) {
                         this?._model?.collection?.name ||
                         (this?.model && this.model.collection?.name) ||
                         'unknown',
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                     pipeline: sanitizeDbValue(this.pipeline?.() ?? this._pipeline ?? undefined),
                 };
             }
@@ -1857,7 +1903,7 @@ function reproMongoosePlugin(cfg) {
                     t0: Date.now(),
                     collection: 'unknown',
                     pipeline: undefined,
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                 };
             }
             next();
@@ -1868,7 +1914,7 @@ function reproMongoosePlugin(cfg) {
                 return;
             const meta = this.__repro_aggmeta || { t0: Date.now(), collection: 'unknown' };
             const resultMeta = summarizeQueryResult('aggregate', res);
-            const spanContext = captureSpanContext(this) || meta.spanContext || captureSpanContext();
+            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
                 op: 'aggregate',
@@ -1877,7 +1923,6 @@ function reproMongoosePlugin(cfg) {
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
                 spanContext,
-                spanSource: this,
             });
         });
     };
@@ -2002,7 +2047,7 @@ function emitDbQuery(cfg, sid, aid, payload) {
         durMs: payload.durMs ?? undefined,
         pk: null, before: null, after: null,
         error: payload.error ?? undefined,
-    }, payload?.spanContext, payload?.spanSource);
+    }, payload?.spanContext);
     post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, sid, {
         entries: [{
                 actionId: aid ?? null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repro-nest",
-  "version": "0.0.211",
+  "version": "0.0.213",
   "description": "Repro Nest SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -95,7 +95,24 @@ function patchMongooseExecCapture(targetMongoose: any = mongoose) {
             if (typeof origExec === 'function') {
                 Qp.__repro_exec_patched = true;
                 Qp.exec = function reproPatchedExec(this: any, ...args: any[]) {
-                    try { (this as any).__repro_is_query = true; } catch {}
+                    try {
+                        (this as any).__repro_is_query = true;
+                        const ctx = __TRACER__?.getCurrentSpanContext?.();
+                        const traceId = ctx?.traceId ?? __TRACER__?.getCurrentTraceId?.() ?? null;
+                        if (ctx || traceId) {
+                            Object.defineProperty(this, '__repro_span_context', {
+                                value: {
+                                    traceId,
+                                    spanId: ctx?.spanId ?? null,
+                                    parentSpanId: ctx?.parentSpanId ?? null,
+                                    depth: ctx?.depth ?? null,
+                                },
+                                configurable: true,
+                                writable: true,
+                                enumerable: false,
+                            });
+                        }
+                    } catch {}
                     const p = origExec.apply(this, args);
                     try {
                         if (p && typeof p.then === 'function') {
@@ -127,7 +144,24 @@ function patchMongooseExecCapture(targetMongoose: any = mongoose) {
             if (typeof origAggExec === 'function') {
                 Ap.__repro_agg_exec_patched = true;
                 Ap.exec = function reproPatchedAggExec(this: any, ...args: any[]) {
-                    try { (this as any).__repro_is_query = true; } catch {}
+                    try {
+                        (this as any).__repro_is_query = true;
+                        const ctx = __TRACER__?.getCurrentSpanContext?.();
+                        const traceId = ctx?.traceId ?? __TRACER__?.getCurrentTraceId?.() ?? null;
+                        if (ctx || traceId) {
+                            Object.defineProperty(this, '__repro_span_context', {
+                                value: {
+                                    traceId,
+                                    spanId: ctx?.spanId ?? null,
+                                    parentSpanId: ctx?.parentSpanId ?? null,
+                                    depth: ctx?.depth ?? null,
+                                },
+                                configurable: true,
+                                writable: true,
+                                enumerable: false,
+                            });
+                        }
+                    } catch {}
                     const p = origAggExec.apply(this, args);
                     try {
                         if (p && typeof p.then === 'function') {
@@ -648,17 +682,37 @@ export function initReproTracing(opts?: ReproTracingInitOptions) {
 /** Optional helper if users want to check it. */
 export function isReproTracingEnabled() { return __TRACER_READY; }
 
-function captureSpanContext(source?: any): SpanContext | null {
+function captureSpanContextFromTracer(source?: any): SpanContext | null {
     try {
+        // Prefer a preserved store captured at the call-site for thenables (e.g., Mongoose Query),
+        // because the tracer intentionally detaches spans before the query is actually executed.
+        const promiseStore = source && source[Symbol.for('__repro_promise_store')];
+        if (promiseStore) {
+            const stack = Array.isArray(promiseStore.__repro_span_stack) ? promiseStore.__repro_span_stack : [];
+            const top = stack.length ? stack[stack.length - 1] : null;
+            const spanId = top && top.id != null ? top.id : null;
+            const parentSpanId = top && top.parentId != null
+                ? top.parentId
+                : (stack.length >= 2 ? (stack[stack.length - 2]?.id ?? null) : null);
+            const depth = top && top.depth != null
+                ? top.depth
+                : (typeof promiseStore.depth === 'number'
+                    ? promiseStore.depth
+                    : (stack.length ? stack.length : null));
+            const traceId = promiseStore.traceId ?? null;
+            if (traceId || spanId !== null || parentSpanId !== null) {
+                return { traceId, spanId, parentSpanId, depth: depth == null ? null : depth };
+            }
+        }
+
         const fromSource = source && source.__repro_span_context;
         if (fromSource) {
-            const span: SpanContext = {
+            return {
                 traceId: fromSource.traceId ?? null,
                 spanId: fromSource.spanId ?? null,
                 parentSpanId: fromSource.parentSpanId ?? null,
                 depth: fromSource.depth ?? null,
             };
-            return span;
         }
 
         const ctx = __TRACER__?.getCurrentSpanContext?.();
@@ -682,9 +736,9 @@ function captureSpanContext(source?: any): SpanContext | null {
     return null;
 }
 
-function attachSpanContext<T extends Record<string, any>>(target: T, spanSource?: SpanContext | null, fallbackSource?: any): T {
+function attachSpanContext<T extends Record<string, any>>(target: T, span?: SpanContext | null): T {
     if (!target) return target;
-    const ctx = spanSource ?? captureSpanContext(fallbackSource);
+    const ctx = span ?? captureSpanContextFromTracer();
     if (ctx) {
         try { (target as any).spanContext = ctx; } catch {}
     }
@@ -1796,7 +1850,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                 wasNew: this.isNew,
                 before,
                 collection: resolveCollectionOrWarn(this, 'doc'),
-                spanContext: captureSpanContext(this),
+                spanContext: captureSpanContextFromTracer(this),
             };
             next();
         });
@@ -1810,7 +1864,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
             const before = meta.before ?? null;
             const after = this.toObject({ depopulate: true });
             const collection = meta.collection || resolveCollectionOrWarn(this, 'doc');
-            const spanContext = captureSpanContext(this) || meta.spanContext || captureSpanContext();
+            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
 
             const query = meta.wasNew
                 ? { op: 'insertOne', doc: after }
@@ -1842,7 +1896,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                 (this as any).__repro_before = await model.findOne(filter).lean().exec();
                 this.setOptions({ new: true });
                 (this as any).__repro_collection = resolveCollectionOrWarn(this, 'query');
-                (this as any).__repro_spanContext = captureSpanContext(this);
+                (this as any).__repro_spanContext = captureSpanContextFromTracer(this);
             } catch {}
             next();
         });
@@ -1854,7 +1908,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
             const before = (this as any).__repro_before ?? null;
             const after = res ?? null;
             const collection = (this as any).__repro_collection || resolveCollectionOrWarn(this, 'query');
-            const spanContext = captureSpanContext(this) || (this as any).__repro_spanContext || captureSpanContext();
+            const spanContext = (this as any).__repro_spanContext || captureSpanContextFromTracer(this);
             const pk = after?._id ?? before?._id;
 
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, (getCtx() as Ctx).sid!, {
@@ -1880,7 +1934,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                 (this as any).__repro_before = await (this.model as Model<any>).findOne(filter).lean().exec();
                 (this as any).__repro_collection = resolveCollectionOrWarn(this, 'query');
                 (this as any).__repro_filter = filter;
-                (this as any).__repro_spanContext = captureSpanContext(this);
+                (this as any).__repro_spanContext = captureSpanContextFromTracer(this);
             } catch {}
             next();
         });
@@ -1891,7 +1945,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
             if (!before) return;
             const collection = (this as any).__repro_collection || resolveCollectionOrWarn(this, 'query');
             const filter = (this as any).__repro_filter ?? { _id: before._id };
-            const spanContext = captureSpanContext(this) || (this as any).__repro_spanContext || captureSpanContext();
+            const spanContext = (this as any).__repro_spanContext || captureSpanContextFromTracer(this);
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, (getCtx() as Ctx).sid!, {
                 entries: [{
                     actionId: (getCtx() as Ctx).aid!,
@@ -1944,7 +1998,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                         t0: Date.now(),
                         collection: this?.model?.collection?.name || 'unknown',
                         op,
-                        spanContext: null,
+                        spanContext: captureSpanContextFromTracer(this),
                         filter: sanitizeDbValue(this.getFilter?.() ?? this._conditions ?? undefined),
                         update: sanitizeDbValue(this.getUpdate?.() ?? this._update ?? undefined),
                         projection: sanitizeDbValue(this.projection?.() ?? this._fields ?? undefined),
@@ -1955,7 +2009,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                         t0: Date.now(),
                         collection: 'unknown',
                         op,
-                        spanContext: null,
+                        spanContext: captureSpanContextFromTracer(this),
                     };
                 }
                 next();
@@ -1967,7 +2021,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
 
                 const meta = (this as any).__repro_qmeta || { t0: Date.now(), collection: 'unknown', op };
                 const resultMeta = summarizeQueryResult(op, res);
-                const spanContext = captureSpanContext(this) || meta.spanContext || captureSpanContext();
+                const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
 
                 emitDbQuery(cfg, sid, aid, {
                     collection: meta.collection,
@@ -1977,7 +2031,6 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                     durMs: Date.now() - meta.t0,
                     t: alignedNow(),
                     spanContext,
-                    spanSource: this,
                 });
             });
         }
@@ -1992,13 +2045,13 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                     t0: Date.now(),
                     collection: this?.collection?.name || this?.model?.collection?.name || 'unknown',
                     docs: sanitizeDbValue(docs),
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                 };
             } catch {
                 (this as any).__repro_insert_meta = {
                     t0: Date.now(),
                     collection: 'unknown',
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                 };
             }
             next();
@@ -2009,7 +2062,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
             if (!sid) return;
             const meta = (this as any).__repro_insert_meta || { t0: Date.now(), collection: 'unknown' };
             const resultMeta = Array.isArray(docs) ? { inserted: docs.length } : summarizeQueryResult('insertMany', docs);
-            const spanContext = captureSpanContext(this) || meta.spanContext || captureSpanContext();
+            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
 
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
@@ -2019,7 +2072,6 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
                 spanContext,
-                spanSource: this,
             });
         } as any);
 
@@ -2029,13 +2081,13 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                     t0: Date.now(),
                     collection: this?.collection?.name || this?.model?.collection?.name || 'unknown',
                     ops: sanitizeDbValue(ops),
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                 };
             } catch {
                 (this as any).__repro_bulk_meta = {
                     t0: Date.now(),
                     collection: 'unknown',
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                 };
             }
             next();
@@ -2047,7 +2099,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
             const meta = (this as any).__repro_bulk_meta || { t0: Date.now(), collection: 'unknown' };
             const bulkResult = summarizeBulkResult(res);
             const resultMeta = { ...bulkResult, result: sanitizeResultForMeta(res?.result ?? res) };
-            const spanContext = captureSpanContext(this) || meta.spanContext || captureSpanContext();
+            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
 
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
@@ -2057,7 +2109,6 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
                 spanContext,
-                spanSource: this,
             });
         } as any);
 
@@ -2071,7 +2122,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                         this?._model?.collection?.name ||
                         (this?.model && this.model.collection?.name) ||
                         'unknown',
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                     pipeline: sanitizeDbValue(this.pipeline?.() ?? this._pipeline ?? undefined),
                 };
             } catch {
@@ -2079,7 +2130,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                     t0: Date.now(),
                     collection: 'unknown',
                     pipeline: undefined,
-                    spanContext: null,
+                    spanContext: captureSpanContextFromTracer(this),
                 };
             }
             next();
@@ -2091,7 +2142,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
 
             const meta = (this as any).__repro_aggmeta || { t0: Date.now(), collection: 'unknown' };
             const resultMeta = summarizeQueryResult('aggregate', res);
-            const spanContext = captureSpanContext(this) || meta.spanContext || captureSpanContext();
+            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
 
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
@@ -2101,7 +2152,6 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
                 spanContext,
-                spanSource: this,
             });
         });
     };
@@ -2219,7 +2269,7 @@ function emitDbQuery(cfg: any, sid?: string, aid?: string, payload?: any) {
         durMs: payload.durMs ?? undefined,
         pk: null, before: null, after: null,
         error: payload.error ?? undefined,
-    }, payload?.spanContext, payload?.spanSource);
+    }, payload?.spanContext);
     post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, sid, {
         entries: [{
             actionId: aid ?? null,

package/tracer/runtime.js

@@ -262,12 +262,6 @@ const trace = {
                         return;
                     }
                     if (queueQueryFinalizer(rv, finalize)) return;
-                    setQuerySpanContext(rv, {
-                        traceId: traceIdAtExit,
-                        spanId: spanForExit.id,
-                        parentSpanId: spanForExit.parentId,
-                        depth: spanForExit.depth ?? depthAtExit
-                    });
                     emitNow({ unawaited: forceUnawaited, returnValue: rv }, spanForExit, spanStackForExit);
                     return;
                 }
@@ -278,12 +272,6 @@ const trace = {
             }
 
             if (isQuery) {
-                setQuerySpanContext(rv, {
-                    traceId: traceIdAtExit,
-                    spanId: spanInfoPeek.id,
-                    parentSpanId: spanInfoPeek.parentId,
-                    depth: spanInfoPeek.depth ?? depthAtExit
-                });
                 emitNow({ unawaited: forceUnawaited });
                 return;
             }
@@ -853,28 +841,6 @@ function getCurrentTraceId() {
     return s && s.traceId || null;
 }
 
-function setQuerySpanContext(target, ctx) {
-    if (!target || typeof target !== 'object' || !ctx) return;
-    const safeCtx = {
-        traceId: ctx.traceId || null,
-        spanId: ctx.spanId ?? null,
-        parentSpanId: ctx.parentSpanId ?? null,
-        depth: ctx.depth ?? null
-    };
-    try {
-        if (!target.__repro_span_context) {
-            Object.defineProperty(target, '__repro_span_context', {
-                value: safeCtx,
-                configurable: true,
-                writable: true,
-                enumerable: false
-            });
-        }
-    } catch {
-        try { target.__repro_span_context = safeCtx; } catch {}
-    }
-}
-
 function getCurrentSpanContext() {
     try {
         const store = als.getStore();