repro-nest 0.0.212 → 0.0.214

package/dist/index.js

@@ -491,6 +491,26 @@ function isReproTracingEnabled() { return __TRACER_READY; }
 exports.isReproTracingEnabled = isReproTracingEnabled;
 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) {
             return {
@@ -522,6 +542,26 @@ function captureSpanContextFromTracer(source) {
     catch { }
     return null;
 }
+function isExcludedSpanId(spanId) {
+    if (spanId === null || spanId === undefined)
+        return false;
+    try {
+        const excluded = getCtx().excludedSpanIds;
+        if (!excluded || excluded.size === 0)
+            return false;
+        return excluded.has(String(spanId));
+    }
+    catch {
+        return false;
+    }
+}
+function shouldCaptureDbSpan(span) {
+    if (!span || span.spanId === null || span.spanId === undefined)
+        return false;
+    if (isExcludedSpanId(span.spanId))
+        return false;
+    return true;
+}
 function attachSpanContext(target, span) {
     if (!target)
         return target;
@@ -1274,7 +1314,7 @@ function reproMiddleware(cfg) {
             }
             return fn();
         };
-        runInTrace(() => als.run({ sid, aid, clockSkewMs }, () => {
+        runInTrace(() => als.run({ sid, aid, clockSkewMs, excludedSpanIds: new Set() }, () => {
             const events = [];
             let endpointTrace = null;
             let preferredAppTrace = null;
@@ -1423,6 +1463,7 @@ function reproMiddleware(cfg) {
                                 depth: evt.depth,
                                 library: inferLibraryNameFromFile(evt.file),
                             };
+                            const dropEvent = shouldDropTraceEvent(candidate);
                             const spanKey = normalizeSpanId(evt.spanId);
                             if (evt.type === 'enter') {
                                 lastEventAt = Date.now();
@@ -1442,7 +1483,13 @@ function reproMiddleware(cfg) {
                                     anonymousSpanDepth = Math.max(0, anonymousSpanDepth - 1);
                                 }
                             }
-                            if (shouldDropTraceEvent(candidate)) {
+                            if (dropEvent) {
+                                if (evt.type === 'enter' && spanKey) {
+                                    try {
+                                        getCtx().excludedSpanIds?.add(spanKey);
+                                    }
+                                    catch { }
+                                }
                                 if (finished) {
                                     scheduleIdleFlush();
                                 }
@@ -1626,6 +1673,8 @@ function reproMongoosePlugin(cfg) {
             const after = this.toObject({ depopulate: true });
             const collection = meta.collection || resolveCollectionOrWarn(this, 'doc');
             const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
+            if (!shouldCaptureDbSpan(spanContext))
+                return;
             const query = meta.wasNew
                 ? { op: 'insertOne', doc: after }
                 : { filter: { _id: this._id }, update: buildMinimalUpdate(before, after), options: { upsert: false } };
@@ -1668,6 +1717,8 @@ function reproMongoosePlugin(cfg) {
             const after = res ?? null;
             const collection = this.__repro_collection || resolveCollectionOrWarn(this, 'query');
             const spanContext = this.__repro_spanContext || captureSpanContextFromTracer(this);
+            if (!shouldCaptureDbSpan(spanContext))
+                return;
             const pk = after?._id ?? before?._id;
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, getCtx().sid, {
                 entries: [{
@@ -1708,6 +1759,8 @@ function reproMongoosePlugin(cfg) {
             const collection = this.__repro_collection || resolveCollectionOrWarn(this, 'query');
             const filter = this.__repro_filter ?? { _id: before._id };
             const spanContext = this.__repro_spanContext || captureSpanContextFromTracer(this);
+            if (!shouldCaptureDbSpan(spanContext))
+                return;
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, getCtx().sid, {
                 entries: [{
                         actionId: getCtx().aid,
@@ -2019,6 +2072,9 @@ function dehydrateComplexValue(value) {
 function emitDbQuery(cfg, sid, aid, payload) {
     if (!sid)
         return;
+    const spanContext = payload?.spanContext ?? captureSpanContextFromTracer();
+    if (!shouldCaptureDbSpan(spanContext))
+        return;
     const dbEntry = attachSpanContext({
         collection: payload.collection,
         op: payload.op,
@@ -2027,7 +2083,7 @@ function emitDbQuery(cfg, sid, aid, payload) {
         durMs: payload.durMs ?? undefined,
         pk: null, before: null, after: null,
         error: payload.error ?? undefined,
-    }, payload?.spanContext);
+    }, 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.212",
+  "version": "0.0.214",
   "description": "Repro Nest SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -684,6 +684,27 @@ export function isReproTracingEnabled() { return __TRACER_READY; }
 
 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) {
             return {
@@ -715,6 +736,23 @@ function captureSpanContextFromTracer(source?: any): SpanContext | null {
     return null;
 }
 
+function isExcludedSpanId(spanId: string | number | null | undefined): boolean {
+    if (spanId === null || spanId === undefined) return false;
+    try {
+        const excluded = (getCtx() as Ctx).excludedSpanIds;
+        if (!excluded || excluded.size === 0) return false;
+        return excluded.has(String(spanId));
+    } catch {
+        return false;
+    }
+}
+
+function shouldCaptureDbSpan(span: SpanContext | null | undefined): span is SpanContext {
+    if (!span || span.spanId === null || span.spanId === undefined) return false;
+    if (isExcludedSpanId(span.spanId)) return false;
+    return true;
+}
+
 function attachSpanContext<T extends Record<string, any>>(target: T, span?: SpanContext | null): T {
     if (!target) return target;
     const ctx = span ?? captureSpanContextFromTracer();
@@ -724,7 +762,7 @@ function attachSpanContext<T extends Record<string, any>>(target: T, span?: Span
     return target;
 }
 
-type Ctx = { sid?: string; aid?: string; clockSkewMs?: number };
+type Ctx = { sid?: string; aid?: string; clockSkewMs?: number; excludedSpanIds?: Set<string> };
 const als = new AsyncLocalStorage<Ctx>();
 const getCtx = () => als.getStore() || {};
 
@@ -1504,7 +1542,7 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
             return fn();
         };
 
-        runInTrace(() => als.run({ sid, aid, clockSkewMs }, () => {
+        runInTrace(() => als.run({ sid, aid, clockSkewMs, excludedSpanIds: new Set<string>() }, () => {
             const events: TraceEventRecord[] = [];
             let endpointTrace: EndpointTraceInfo | null = null;
             let preferredAppTrace: EndpointTraceInfo | null = null;
@@ -1639,6 +1677,7 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                                 library: inferLibraryNameFromFile(evt.file),
                             };
 
+                            const dropEvent = shouldDropTraceEvent(candidate);
                             const spanKey = normalizeSpanId(evt.spanId);
                             if (evt.type === 'enter') {
                                 lastEventAt = Date.now();
@@ -1656,7 +1695,10 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                                 }
                             }
 
-                            if (shouldDropTraceEvent(candidate)) {
+                            if (dropEvent) {
+                                if (evt.type === 'enter' && spanKey) {
+                                    try { (getCtx() as Ctx).excludedSpanIds?.add(spanKey); } catch {}
+                                }
                                 if (finished) {
                                     scheduleIdleFlush();
                                 }
@@ -1844,6 +1886,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
             const after = this.toObject({ depopulate: true });
             const collection = meta.collection || resolveCollectionOrWarn(this, 'doc');
             const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
+            if (!shouldCaptureDbSpan(spanContext)) return;
 
             const query = meta.wasNew
                 ? { op: 'insertOne', doc: after }
@@ -1888,6 +1931,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
             const after = res ?? null;
             const collection = (this as any).__repro_collection || resolveCollectionOrWarn(this, 'query');
             const spanContext = (this as any).__repro_spanContext || captureSpanContextFromTracer(this);
+            if (!shouldCaptureDbSpan(spanContext)) return;
             const pk = after?._id ?? before?._id;
 
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, (getCtx() as Ctx).sid!, {
@@ -1925,6 +1969,7 @@ export function reproMongoosePlugin(cfg: { appId: string; tenantId: string; appS
             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 || captureSpanContextFromTracer(this);
+            if (!shouldCaptureDbSpan(spanContext)) return;
             post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, (getCtx() as Ctx).sid!, {
                 entries: [{
                     actionId: (getCtx() as Ctx).aid!,
@@ -2240,6 +2285,8 @@ function dehydrateComplexValue(value: any) {
 
 function emitDbQuery(cfg: any, sid?: string, aid?: string, payload?: any) {
     if (!sid) return;
+    const spanContext = payload?.spanContext ?? captureSpanContextFromTracer();
+    if (!shouldCaptureDbSpan(spanContext)) return;
     const dbEntry = attachSpanContext({
         collection: payload.collection,
         op: payload.op,
@@ -2248,7 +2295,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);
+    }, spanContext);
     post(cfg.apiBase, cfg.tenantId, cfg.appId, cfg.appSecret, sid, {
         entries: [{
             actionId: aid ?? null,

package/tracer/runtime.js

@@ -545,7 +545,13 @@ if (!global.__repro_call) {
                         const perCallStore = cloneStore(baseStoreSnapshot);
                         let result;
                         als.run(perCallStore, () => {
-                            result = arg.apply(this, arguments);
+                            // Support both callbacks and constructors: some libraries (e.g., class-transformer)
+                            // pass class constructors as args and invoke them with `new`.
+                            if (new.target) {
+                                result = Reflect.construct(arg, arguments, arg);
+                            } else {
+                                result = arg.apply(this, arguments);
+                            }
                         });
                         return result;
                     };