repro-nest 0.0.208 → 0.0.210

package/dist/index.d.ts

@@ -25,17 +25,19 @@
 /// <reference types="mongoose/types/inferrawdoctype" />
 import type { Request, Response, NextFunction } from 'express';
 import type { Schema } from 'mongoose';
+type SpanContext = {
+    traceId: string | null;
+    spanId: string | number | null;
+    parentSpanId: string | number | null;
+    depth: number | null;
+};
 type TracerApi = {
     init?: (opts: any) => void;
     tracer?: {
         on: (fn: (ev: any) => void) => () => void;
-        getCurrentTraceContext?: () => {
-            traceId: any;
-            spanId: any;
-            depth?: number;
-        };
     };
     getCurrentTraceId?: () => string | null;
+    getCurrentSpanContext?: () => SpanContext | null;
     patchHttp?: () => void;
     setFunctionLogsEnabled?: (enabled: boolean) => void;
 };

package/dist/index.js

@@ -439,13 +439,6 @@ function initReproTracing(opts) {
         const initOpts = { ...defaultTracerInitOpts(), ...rest };
         tracerPkg.init?.(initOpts);
         tracerPkg.patchHttp?.();
-        // Ensure tracer exposes current trace context on the on-event API when available.
-        try {
-            if (!tracerPkg.tracer?.getCurrentTraceContext && tracerPkg.getCurrentTraceContext) {
-                tracerPkg.tracer.getCurrentTraceContext = tracerPkg.getCurrentTraceContext;
-            }
-        }
-        catch { }
         applyTraceLogPreference(tracerPkg);
         __TRACER_READY = true;
         patchAllKnownMongooseInstances();
@@ -466,6 +459,52 @@ exports.initReproTracing = initReproTracing;
 /** Optional helper if users want to check it. */
 function isReproTracingEnabled() { return __TRACER_READY; }
 exports.isReproTracingEnabled = isReproTracingEnabled;
+function captureSpanContext(source) {
+    try {
+        const fromSource = source && source.__repro_span_context;
+        if (fromSource) {
+            const span = {
+                traceId: fromSource.traceId ?? null,
+                spanId: fromSource.spanId ?? null,
+                parentSpanId: fromSource.parentSpanId ?? null,
+                depth: fromSource.depth ?? null,
+            };
+            return span;
+        }
+        const ctx = __TRACER__?.getCurrentSpanContext?.();
+        if (ctx) {
+            const span = {
+                traceId: ctx.traceId ?? __TRACER__?.getCurrentTraceId?.() ?? null,
+                spanId: ctx.spanId ?? null,
+                parentSpanId: ctx.parentSpanId ?? null,
+                depth: ctx.depth ?? null,
+            };
+            if (span.traceId || span.spanId !== null || span.parentSpanId !== null) {
+                return span;
+            }
+        }
+        else if (__TRACER__?.getCurrentTraceId) {
+            const traceId = __TRACER__?.getCurrentTraceId?.() ?? null;
+            if (traceId) {
+                return { traceId, spanId: null, parentSpanId: null, depth: null };
+            }
+        }
+    }
+    catch { }
+    return null;
+}
+function attachSpanContext(target, spanSource, fallbackSource) {
+    if (!target)
+        return target;
+    const ctx = spanSource ?? captureSpanContext(fallbackSource);
+    if (ctx) {
+        try {
+            target.spanContext = ctx;
+        }
+        catch { }
+    }
+    return target;
+}
 const als = new async_hooks_1.AsyncLocalStorage();
 const getCtx = () => als.getStore() || {};
 function currentClockSkewMs() {
@@ -807,8 +846,7 @@ const SESSION_DRAIN_TIMEOUT_MS = (() => {
     if (Number.isFinite(env) && env >= 0)
         return env;
     // Bound wait for draining sessions to avoid lost flushes when a request hangs.
-    // Default to 1 minute; caller can override via env.
-    return 60000;
+    return 10000;
 })();
 function isThenable(value) {
     return value != null && typeof value === 'object' && typeof value.then === 'function';
@@ -1335,9 +1373,6 @@ function reproMiddleware(cfg) {
                             if (ev.args !== undefined) {
                                 evt.args = sanitizeTraceArgs(ev.args);
                             }
-                            if (ev.receiver !== undefined) {
-                                evt.receiver = sanitizeTraceValue(ev.receiver);
-                            }
                             if (ev.returnValue !== undefined) {
                                 evt.returnValue = sanitizeTraceValue(ev.returnValue);
                             }
@@ -1547,6 +1582,7 @@ function reproMongoosePlugin(cfg) {
                 wasNew: this.isNew,
                 before,
                 collection: resolveCollectionOrWarn(this, 'doc'),
+                spanContext: captureSpanContext(this),
             };
             next();
         });
@@ -1560,13 +1596,21 @@ function reproMongoosePlugin(cfg) {
             const before = meta.before ?? null;
             const after = this.toObject({ depopulate: true });
             const collection = meta.collection || resolveCollectionOrWarn(this, 'doc');
+            const spanContext = meta.spanContext || captureSpanContext(this);
             const query = meta.wasNew
                 ? { op: 'insertOne', doc: after }
                 : { filter: { _id: this._id }, update: buildMinimalUpdate(before, after), options: { upsert: false } };
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, getCtx().sid, {
                 entries: [{
                         actionId: getCtx().aid,
-                        db: [{ collection, pk: { _id: this._id }, before, after, op: meta.wasNew ? 'insert' : 'update', query }],
+                        db: [attachSpanContext({
+                                collection,
+                                pk: { _id: this._id },
+                                before,
+                                after,
+                                op: meta.wasNew ? 'insert' : 'update',
+                                query,
+                            }, spanContext)],
                         t: alignedNow(),
                     }]
             });
@@ -1582,6 +1626,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);
             }
             catch { }
             next();
@@ -1593,11 +1638,18 @@ function reproMongoosePlugin(cfg) {
             const before = this.__repro_before ?? null;
             const after = res ?? null;
             const collection = this.__repro_collection || resolveCollectionOrWarn(this, 'query');
+            const spanContext = this.__repro_spanContext || captureSpanContext(this);
             const pk = after?._id ?? before?._id;
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, getCtx().sid, {
                 entries: [{
                         actionId: getCtx().aid,
-                        db: [{ collection, pk: { _id: pk }, before, after, op: after && before ? 'update' : after ? 'insert' : 'update' }],
+                        db: [attachSpanContext({
+                                collection,
+                                pk: { _id: pk },
+                                before,
+                                after,
+                                op: after && before ? 'update' : after ? 'insert' : 'update',
+                            }, spanContext)],
                         t: alignedNow()
                     }]
             });
@@ -1612,6 +1664,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);
             }
             catch { }
             next();
@@ -1625,10 +1678,18 @@ function reproMongoosePlugin(cfg) {
                 return;
             const collection = this.__repro_collection || resolveCollectionOrWarn(this, 'query');
             const filter = this.__repro_filter ?? { _id: before._id };
+            const spanContext = this.__repro_spanContext || captureSpanContext(this);
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, getCtx().sid, {
                 entries: [{
                         actionId: getCtx().aid,
-                        db: [{ collection, pk: { _id: before._id }, before, after: null, op: 'delete', query: { filter } }],
+                        db: [attachSpanContext({
+                                collection,
+                                pk: { _id: before._id },
+                                before,
+                                after: null,
+                                op: 'delete',
+                                query: { filter },
+                            }, spanContext)],
                         t: alignedNow()
                     }]
             });
@@ -1666,6 +1727,7 @@ function reproMongoosePlugin(cfg) {
                         t0: Date.now(),
                         collection: this?.model?.collection?.name || 'unknown',
                         op,
+                        spanContext: captureSpanContext(this),
                         filter: sanitizeDbValue(this.getFilter?.() ?? this._conditions ?? undefined),
                         update: sanitizeDbValue(this.getUpdate?.() ?? this._update ?? undefined),
                         projection: sanitizeDbValue(this.projection?.() ?? this._fields ?? undefined),
@@ -1673,7 +1735,12 @@ function reproMongoosePlugin(cfg) {
                     };
                 }
                 catch {
-                    this.__repro_qmeta = { t0: Date.now(), collection: 'unknown', op };
+                    this.__repro_qmeta = {
+                        t0: Date.now(),
+                        collection: 'unknown',
+                        op,
+                        spanContext: captureSpanContext(this),
+                    };
                 }
                 next();
             });
@@ -1683,6 +1750,7 @@ function reproMongoosePlugin(cfg) {
                     return;
                 const meta = this.__repro_qmeta || { t0: Date.now(), collection: 'unknown', op };
                 const resultMeta = summarizeQueryResult(op, res);
+                const spanContext = meta.spanContext || captureSpanContext(this);
                 emitDbQuery(cfg, sid, aid, {
                     collection: meta.collection,
                     op,
@@ -1690,6 +1758,7 @@ function reproMongoosePlugin(cfg) {
                     resultMeta,
                     durMs: Date.now() - meta.t0,
                     t: alignedNow(),
+                    spanContext,
                 });
             });
         }
@@ -1702,10 +1771,15 @@ function reproMongoosePlugin(cfg) {
                     t0: Date.now(),
                     collection: this?.collection?.name || this?.model?.collection?.name || 'unknown',
                     docs: sanitizeDbValue(docs),
+                    spanContext: captureSpanContext(this),
                 };
             }
             catch {
-                this.__repro_insert_meta = { t0: Date.now(), collection: 'unknown' };
+                this.__repro_insert_meta = {
+                    t0: Date.now(),
+                    collection: 'unknown',
+                    spanContext: captureSpanContext(this),
+                };
             }
             next();
         });
@@ -1715,6 +1789,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 = meta.spanContext || captureSpanContext(this);
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
                 op: 'insertMany',
@@ -1722,6 +1797,7 @@ function reproMongoosePlugin(cfg) {
                 resultMeta,
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
+                spanContext,
             });
         });
         schema.pre('bulkWrite', { document: false, query: false }, function (next, ops) {
@@ -1730,10 +1806,15 @@ function reproMongoosePlugin(cfg) {
                     t0: Date.now(),
                     collection: this?.collection?.name || this?.model?.collection?.name || 'unknown',
                     ops: sanitizeDbValue(ops),
+                    spanContext: captureSpanContext(this),
                 };
             }
             catch {
-                this.__repro_bulk_meta = { t0: Date.now(), collection: 'unknown' };
+                this.__repro_bulk_meta = {
+                    t0: Date.now(),
+                    collection: 'unknown',
+                    spanContext: captureSpanContext(this),
+                };
             }
             next();
         });
@@ -1744,6 +1825,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 = meta.spanContext || captureSpanContext(this);
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
                 op: 'bulkWrite',
@@ -1751,6 +1833,7 @@ function reproMongoosePlugin(cfg) {
                 resultMeta,
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
+                spanContext,
             });
         });
         // Aggregate middleware (non-intrusive)
@@ -1762,11 +1845,17 @@ function reproMongoosePlugin(cfg) {
                         this?._model?.collection?.name ||
                         (this?.model && this.model.collection?.name) ||
                         'unknown',
+                    spanContext: captureSpanContext(this),
                     pipeline: sanitizeDbValue(this.pipeline?.() ?? this._pipeline ?? undefined),
                 };
             }
             catch {
-                this.__repro_aggmeta = { t0: Date.now(), collection: 'unknown', pipeline: undefined };
+                this.__repro_aggmeta = {
+                    t0: Date.now(),
+                    collection: 'unknown',
+                    pipeline: undefined,
+                    spanContext: captureSpanContext(this),
+                };
             }
             next();
         });
@@ -1776,6 +1865,7 @@ function reproMongoosePlugin(cfg) {
                 return;
             const meta = this.__repro_aggmeta || { t0: Date.now(), collection: 'unknown' };
             const resultMeta = summarizeQueryResult('aggregate', res);
+            const spanContext = meta.spanContext || captureSpanContext(this);
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
                 op: 'aggregate',
@@ -1783,6 +1873,7 @@ function reproMongoosePlugin(cfg) {
                 resultMeta,
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
+                spanContext,
             });
         });
     };
@@ -1899,26 +1990,19 @@ function dehydrateComplexValue(value) {
 function emitDbQuery(cfg, sid, aid, payload) {
     if (!sid)
         return;
-    let traceCtx = null;
-    try {
-        const getCtx = __TRACER__?.tracer?.getCurrentTraceContext;
-        traceCtx = typeof getCtx === 'function' ? getCtx() : null;
-    }
-    catch { }
+    const dbEntry = attachSpanContext({
+        collection: payload.collection,
+        op: payload.op,
+        query: payload.query ?? undefined,
+        resultMeta: payload.resultMeta ?? undefined,
+        durMs: payload.durMs ?? undefined,
+        pk: null, before: null, after: null,
+        error: payload.error ?? undefined,
+    }, payload?.spanContext);
     post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, sid, {
         entries: [{
                 actionId: aid ?? null,
-                db: [{
-                        collection: payload.collection,
-                        op: payload.op,
-                        query: payload.query ?? undefined,
-                        resultMeta: payload.resultMeta ?? undefined,
-                        durMs: payload.durMs ?? undefined,
-                        traceId: traceCtx?.traceId ?? null,
-                        spanId: traceCtx?.spanId ?? null,
-                        pk: null, before: null, after: null,
-                        error: payload.error ?? undefined,
-                    }],
+                db: [dbEntry],
                 t: payload.t,
             }]
     });

package/package.json

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

package/src/index.ts

@@ -172,13 +172,18 @@ function patchAllKnownMongooseInstances() {
 }
 
 // ====== tiny, safe tracer auto-init (no node_modules patches) ======
+type SpanContext = {
+    traceId: string | null;
+    spanId: string | number | null;
+    parentSpanId: string | number | null;
+    depth: number | null;
+};
+
 type TracerApi = {
     init?: (opts: any) => void;
-    tracer?: {
-        on: (fn: (ev: any) => void) => () => void;
-        getCurrentTraceContext?: () => { traceId: any; spanId: any; depth?: number };
-    };
+    tracer?: { on: (fn: (ev: any) => void) => () => void };
     getCurrentTraceId?: () => string | null;
+    getCurrentSpanContext?: () => SpanContext | null;
     patchHttp?: () => void; // optional in your tracer
     setFunctionLogsEnabled?: (enabled: boolean) => void;
 };
@@ -213,7 +218,6 @@ type TraceEventRecord = {
     spanId?: string | number | null;
     parentSpanId?: string | number | null;
     args?: any;
-    receiver?: any;
     returnValue?: any;
     threw?: boolean;
     error?: any;
@@ -626,12 +630,6 @@ export function initReproTracing(opts?: ReproTracingInitOptions) {
         const initOpts = { ...defaultTracerInitOpts(), ...(rest as TracerInitOpts) };
         tracerPkg.init?.(initOpts);
         tracerPkg.patchHttp?.();
-        // Ensure tracer exposes current trace context on the on-event API when available.
-        try {
-            if (!tracerPkg.tracer?.getCurrentTraceContext && (tracerPkg as any).getCurrentTraceContext) {
-                (tracerPkg.tracer as any).getCurrentTraceContext = (tracerPkg as any).getCurrentTraceContext;
-            }
-        } catch {}
         applyTraceLogPreference(tracerPkg);
         __TRACER_READY = true;
         patchAllKnownMongooseInstances();
@@ -650,6 +648,49 @@ 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 {
+    try {
+        const fromSource = source && source.__repro_span_context;
+        if (fromSource) {
+            const span: SpanContext = {
+                traceId: fromSource.traceId ?? null,
+                spanId: fromSource.spanId ?? null,
+                parentSpanId: fromSource.parentSpanId ?? null,
+                depth: fromSource.depth ?? null,
+            };
+            return span;
+        }
+
+        const ctx = __TRACER__?.getCurrentSpanContext?.();
+        if (ctx) {
+            const span: SpanContext = {
+                traceId: ctx.traceId ?? __TRACER__?.getCurrentTraceId?.() ?? null,
+                spanId: ctx.spanId ?? null,
+                parentSpanId: ctx.parentSpanId ?? null,
+                depth: ctx.depth ?? null,
+            };
+            if (span.traceId || span.spanId !== null || span.parentSpanId !== null) {
+                return span;
+            }
+        } else if (__TRACER__?.getCurrentTraceId) {
+            const traceId = __TRACER__?.getCurrentTraceId?.() ?? null;
+            if (traceId) {
+                return { traceId, spanId: null, parentSpanId: null, depth: null };
+            }
+        }
+    } catch {}
+    return null;
+}
+
+function attachSpanContext<T extends Record<string, any>>(target: T, spanSource?: SpanContext | null, fallbackSource?: any): T {
+    if (!target) return target;
+    const ctx = spanSource ?? captureSpanContext(fallbackSource);
+    if (ctx) {
+        try { (target as any).spanContext = ctx; } catch {}
+    }
+    return target;
+}
+
 type Ctx = { sid?: string; aid?: string; clockSkewMs?: number };
 const als = new AsyncLocalStorage<Ctx>();
 const getCtx = () => als.getStore() || {};
@@ -1033,8 +1074,7 @@ const SESSION_DRAIN_TIMEOUT_MS = (() => {
     const env = Number(process.env.SESSION_DRAIN_TIMEOUT_MS);
     if (Number.isFinite(env) && env >= 0) return env;
     // Bound wait for draining sessions to avoid lost flushes when a request hangs.
-    // Default to 1 minute; caller can override via env.
-    return 60000;
+    return 10000;
 })();
 
 function isThenable(value: any): value is PromiseLike<any> {
@@ -1543,9 +1583,6 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                             if (ev.args !== undefined) {
                                 evt.args = sanitizeTraceArgs(ev.args);
                             }
-                            if (ev.receiver !== undefined) {
-                                evt.receiver = sanitizeTraceValue(ev.receiver);
-                            }
                             if (ev.returnValue !== undefined) {
                                 evt.returnValue = sanitizeTraceValue(ev.returnValue);
                             }
@@ -1759,6 +1796,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                 wasNew: this.isNew,
                 before,
                 collection: resolveCollectionOrWarn(this, 'doc'),
+                spanContext: captureSpanContext(this),
             };
             next();
         });
@@ -1772,6 +1810,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 = meta.spanContext || captureSpanContext(this);
 
             const query = meta.wasNew
                 ? { op: 'insertOne', doc: after }
@@ -1780,7 +1819,14 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, (getCtx() as Ctx).sid!, {
                 entries: [{
                     actionId: (getCtx() as Ctx).aid!,
-                    db: [{ collection, pk: { _id: (this as any)._id }, before, after, op: meta.wasNew ? 'insert' : 'update', query }],
+                    db: [attachSpanContext({
+                        collection,
+                        pk: { _id: (this as any)._id },
+                        before,
+                        after,
+                        op: meta.wasNew ? 'insert' : 'update',
+                        query,
+                    }, spanContext)],
                     t: alignedNow(),
                 }]
             });
@@ -1796,6 +1842,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);
             } catch {}
             next();
         });
@@ -1807,12 +1854,19 @@ 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 = (this as any).__repro_spanContext || captureSpanContext(this);
             const pk = after?._id ?? before?._id;
 
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, (getCtx() as Ctx).sid!, {
                 entries: [{
                     actionId: (getCtx() as Ctx).aid!,
-                    db: [{ collection, pk: { _id: pk }, before, after, op: after && before ? 'update' : after ? 'insert' : 'update' }],
+                    db: [attachSpanContext({
+                        collection,
+                        pk: { _id: pk },
+                        before,
+                        after,
+                        op: after && before ? 'update' : after ? 'insert' : 'update',
+                    }, spanContext)],
                     t: alignedNow()
                 }]
             });
@@ -1826,6 +1880,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);
             } catch {}
             next();
         });
@@ -1836,10 +1891,18 @@ 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 = (this as any).__repro_spanContext || captureSpanContext(this);
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, (getCtx() as Ctx).sid!, {
                 entries: [{
                     actionId: (getCtx() as Ctx).aid!,
-                    db: [{ collection, pk: { _id: before._id }, before, after: null, op: 'delete', query: { filter } }],
+                    db: [attachSpanContext({
+                        collection,
+                        pk: { _id: before._id },
+                        before,
+                        after: null,
+                        op: 'delete',
+                        query: { filter },
+                    }, spanContext)],
                     t: alignedNow()
                 }]
             });
@@ -1881,13 +1944,19 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                         t0: Date.now(),
                         collection: this?.model?.collection?.name || 'unknown',
                         op,
+                        spanContext: captureSpanContext(this),
                         filter: sanitizeDbValue(this.getFilter?.() ?? this._conditions ?? undefined),
                         update: sanitizeDbValue(this.getUpdate?.() ?? this._update ?? undefined),
                         projection: sanitizeDbValue(this.projection?.() ?? this._fields ?? undefined),
                         options: sanitizeDbValue(this.getOptions?.() ?? this.options ?? undefined),
                     };
                 } catch {
-                    (this as any).__repro_qmeta = { t0: Date.now(), collection: 'unknown', op };
+                    (this as any).__repro_qmeta = {
+                        t0: Date.now(),
+                        collection: 'unknown',
+                        op,
+                        spanContext: captureSpanContext(this),
+                    };
                 }
                 next();
             });
@@ -1898,6 +1967,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 = meta.spanContext || captureSpanContext(this);
 
                 emitDbQuery(cfg, sid, aid, {
                     collection: meta.collection,
@@ -1906,6 +1976,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                     resultMeta,
                     durMs: Date.now() - meta.t0,
                     t: alignedNow(),
+                    spanContext,
                 });
             });
         }
@@ -1920,9 +1991,14 @@ 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: captureSpanContext(this),
                 };
             } catch {
-                (this as any).__repro_insert_meta = { t0: Date.now(), collection: 'unknown' };
+                (this as any).__repro_insert_meta = {
+                    t0: Date.now(),
+                    collection: 'unknown',
+                    spanContext: captureSpanContext(this),
+                };
             }
             next();
         } as any);
@@ -1932,6 +2008,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 = meta.spanContext || captureSpanContext(this);
 
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
@@ -1940,6 +2017,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                 resultMeta,
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
+                spanContext,
             });
         } as any);
 
@@ -1949,9 +2027,14 @@ 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: captureSpanContext(this),
                 };
             } catch {
-                (this as any).__repro_bulk_meta = { t0: Date.now(), collection: 'unknown' };
+                (this as any).__repro_bulk_meta = {
+                    t0: Date.now(),
+                    collection: 'unknown',
+                    spanContext: captureSpanContext(this),
+                };
             }
             next();
         } as any);
@@ -1962,6 +2045,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 = meta.spanContext || captureSpanContext(this);
 
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
@@ -1970,6 +2054,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                 resultMeta,
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
+                spanContext,
             });
         } as any);
 
@@ -1983,10 +2068,16 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                         this?._model?.collection?.name ||
                         (this?.model && this.model.collection?.name) ||
                         'unknown',
+                    spanContext: captureSpanContext(this),
                     pipeline: sanitizeDbValue(this.pipeline?.() ?? this._pipeline ?? undefined),
                 };
             } catch {
-                (this as any).__repro_aggmeta = { t0: Date.now(), collection: 'unknown', pipeline: undefined };
+                (this as any).__repro_aggmeta = {
+                    t0: Date.now(),
+                    collection: 'unknown',
+                    pipeline: undefined,
+                    spanContext: captureSpanContext(this),
+                };
             }
             next();
         });
@@ -1997,6 +2088,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 = meta.spanContext || captureSpanContext(this);
 
             emitDbQuery(cfg, sid, aid, {
                 collection: meta.collection,
@@ -2005,6 +2097,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
                 resultMeta,
                 durMs: Date.now() - meta.t0,
                 t: alignedNow(),
+                spanContext,
             });
         });
     };
@@ -2114,26 +2207,19 @@ function dehydrateComplexValue(value: any) {
 
 function emitDbQuery(cfg: any, sid?: string, aid?: string, payload?: any) {
     if (!sid) return;
-    let traceCtx: { traceId: any; spanId: any } | null = null;
-    try {
-        const getCtx = __TRACER__?.tracer?.getCurrentTraceContext;
-        traceCtx = typeof getCtx === 'function' ? getCtx() : null;
-    } catch {}
-
+    const dbEntry = attachSpanContext({
+        collection: payload.collection,
+        op: payload.op,
+        query: payload.query ?? undefined,
+        resultMeta: payload.resultMeta ?? undefined,
+        durMs: payload.durMs ?? undefined,
+        pk: null, before: null, after: null,
+        error: payload.error ?? undefined,
+    }, payload?.spanContext);
     post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, sid, {
         entries: [{
             actionId: aid ?? null,
-            db: [{
-                collection: payload.collection,
-                op: payload.op,
-                query: payload.query ?? undefined,
-                resultMeta: payload.resultMeta ?? undefined,
-                durMs: payload.durMs ?? undefined,
-                traceId: traceCtx?.traceId ?? null,
-                spanId: traceCtx?.spanId ?? null,
-                pk: null, before: null, after: null,
-                error: payload.error ?? undefined,
-            }],
+            db: [dbEntry],
             t: payload.t,
         }]
     });

package/tracer/index.js

@@ -9,6 +9,7 @@ const {
     printV8,
     patchConsole,
     getCurrentTraceId,
+    getCurrentSpanContext,
     setFunctionLogsEnabled
 } = require('./runtime');
 const { installCJS } = require('./cjs-hook');
@@ -60,6 +61,7 @@ function api(){
         tracer: trace,
         withTrace: trace.withTrace,
         getCurrentTraceId,
+        getCurrentSpanContext,
         setFunctionLogsEnabled,
     };
 }

package/tracer/runtime.js

@@ -100,17 +100,6 @@ function popSpan(ctx) {
 const trace = {
     on(fn){ listeners.add(fn); return () => listeners.delete(fn); },
     withTrace(id, fn, depth = 0){ return als.run({ traceId: id, depth }, fn); },
-    getCurrentTraceContext(){
-        const store = als.getStore();
-        if (!store) return { traceId: null, spanId: null, depth: 0 };
-        const spanStack = Array.isArray(store.__repro_span_stack) ? store.__repro_span_stack : [];
-        const top = spanStack.length ? spanStack[spanStack.length - 1] : null;
-        return {
-            traceId: store.traceId || null,
-            spanId: top ? top.id ?? null : null,
-            depth: typeof store.depth === 'number' ? store.depth : (top?.depth ?? 0),
-        };
-    },
     enter(fn, meta, detail){
         const parentSpanIdOverride = meta && Object.prototype.hasOwnProperty.call(meta, 'parentSpanId')
             ? meta.parentSpanId
@@ -143,7 +132,6 @@ const trace = {
             traceId: ctx.traceId,
             depth: ctx.depth,
             args: detail?.args,
-            receiver: detail?.receiver,
             spanId: span.id,
             parentSpanId: span.parentId
         });
@@ -171,8 +159,7 @@ const trace = {
             returnValue: detail?.returnValue,
             error: detail?.error,
             threw: detail?.threw === true,
-            unawaited: detail?.unawaited === true || frameUnawaited,
-            receiver: detail?.receiver
+            unawaited: detail?.unawaited === true || frameUnawaited
         };
 
         const promiseTaggedUnawaited = !!(baseDetail.returnValue && baseDetail.returnValue[SYM_UNAWAITED]);
@@ -192,9 +179,6 @@ const trace = {
                 unawaited: overrides.hasOwnProperty('unawaited')
                     ? overrides.unawaited
                     : forceUnawaited,
-                receiver: overrides.hasOwnProperty('receiver')
-                    ? overrides.receiver
-                    : baseDetail.receiver,
                 args: overrides.hasOwnProperty('args')
                     ? overrides.args
                     : baseDetail.args
@@ -215,7 +199,6 @@ const trace = {
                 threw: finalDetail.threw === true,
                 error: finalDetail.error,
                 args: finalDetail.args,
-                receiver: finalDetail.receiver,
                 unawaited: finalDetail.unawaited === true
             });
         };
@@ -279,6 +262,12 @@ 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;
                 }
@@ -289,6 +278,12 @@ const trace = {
             }
 
             if (isQuery) {
+                setQuerySpanContext(rv, {
+                    traceId: traceIdAtExit,
+                    spanId: spanInfoPeek.id,
+                    parentSpanId: spanInfoPeek.parentId,
+                    depth: spanInfoPeek.depth ?? depthAtExit
+                });
                 emitNow({ unawaited: forceUnawaited });
                 return;
             }
@@ -492,24 +487,6 @@ function forkAlsStoreForUnawaited(baseStore) {
     return cloned;
 }
 
-// Only capture receiver/collection snapshots for common array iteration helpers to keep noise low.
-const RECEIVER_METHOD_NAMES = new Set([
-    // Array iterators
-    'map', 'forEach', 'filter', 'find', 'findIndex', 'findLast', 'findLastIndex',
-    'some', 'every', 'reduce', 'reduceRight', 'flatMap', 'flat',
-    // Set / Map mutators
-    'add', 'delete', 'clear', 'set'
-]);
-
-function shouldCaptureReceiver(label, receiver) {
-    if (!label || receiver === null || receiver === undefined) return false;
-    const method = String(label).split('.').pop() || '';
-    if (!RECEIVER_METHOD_NAMES.has(method)) return false;
-    if (Array.isArray(receiver)) return true;
-    if (typeof receiver === 'object' && typeof receiver[Symbol.iterator] === 'function') return true;
-    return false;
-}
-
 // ========= Generic call-site shim (used by Babel transform) =========
 // Decides whether to emit a top-level event based on callee origin tags.
 // No hardcoded library names or file paths.
@@ -631,15 +608,13 @@ if (!global.__repro_call) {
                         ? (label && label.length ? label : fn.name)
                         : '(anonymous)';
                     const sourceFile = fn[SYM_SRC_FILE];
-                    const receiverForTrace = shouldCaptureReceiver(label, thisArg) ? thisArg : undefined;
                     const meta = {
-                        // Prefer callsite file/line so traces point to where the function was invoked.
-                        file: callFile || sourceFile || null,
-                        line: callLine ?? null,
+                        file: sourceFile || callFile || null,
+                        line: sourceFile ? null : (callLine || null),
                         parentSpanId: forcedParentSpanId
                     };
 
-                    trace.enter(name, meta, { args, receiver: receiverForTrace });
+                    trace.enter(name, meta, { args });
                     // After entering, snapshot a clean store that captures the parent + this call’s span,
                     // so callbacks invoked during the callee run are isolated per invocation.
                     const snapshotForArgs = cloneStore(als.getStore());
@@ -654,8 +629,7 @@ if (!global.__repro_call) {
                         const exitDetailBase = {
                             returnValue: out,
                             args,
-                            unawaited: shouldForceExit,
-                            receiver: receiverForTrace
+                            unawaited: shouldForceExit
                         };
 
                         if (shouldForceExit) markPromiseUnawaited(out);
@@ -697,8 +671,7 @@ if (!global.__repro_call) {
                                     args,
                                     threw,
                                     error,
-                                    unawaited: shouldForceExit,
-                                    receiver: receiverForTrace
+                                    unawaited: shouldForceExit
                                 };
                                 runExit(detail);
                                 return value;
@@ -718,7 +691,7 @@ if (!global.__repro_call) {
                         runExit(exitDetailBase);
                         return out;
                     } catch (e) {
-                        trace.exit({ fn: name, file: meta.file, line: meta.line }, { threw: true, error: e, args, receiver: receiverForTrace });
+                        trace.exit({ fn: name, file: meta.file, line: meta.line }, { threw: true, error: e, args });
                         throw e;
                     } finally {
                         if (pendingMarker) {
@@ -880,6 +853,54 @@ 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();
+        if (!store) return null;
+
+        const stack = Array.isArray(store.__repro_span_stack) ? store.__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 store.depth === 'number'
+                ? store.depth
+                : (stack.length ? stack.length : null));
+
+        const traceId = store.traceId || null;
+
+        if (spanId === null && parentSpanId === null && traceId === null) return null;
+        return { traceId, spanId, parentSpanId, depth: depth == null ? null : depth };
+    } catch {
+        return null;
+    }
+}
+
 // ---- Promise propagation fallback: ensure continuations run with the captured store ----
 let PROMISE_PATCHED = false;
 function patchPromise() {
@@ -924,6 +945,7 @@ module.exports = {
     printV8,
     patchConsole,
     getCurrentTraceId,
+    getCurrentSpanContext,
     setFunctionLogsEnabled,
     // export symbols so the require hook can tag function origins
     SYM_SRC_FILE,