@reproapp/node-sdk 0.0.31 → 0.0.33

package/src/index.ts

@@ -1163,6 +1163,7 @@ type NativeMongoSuppression = {
     collection?: string | null;
     ops?: Set<string>;
     startedAt: number;
+    ownerStore?: Ctx;
 };
 
 type RequestCaptureScopeState = {
@@ -1236,6 +1237,7 @@ function pushNativeMongoSuppression(collection: any, ops?: string[] | readonly s
         collection: collection == null ? null : String(collection),
         ops: normalizedOps.length ? new Set(normalizedOps) : undefined,
         startedAt: Date.now(),
+        ownerStore: store,
     };
     if (!Array.isArray(store.nativeMongoSuppressions)) {
         store.nativeMongoSuppressions = [];
@@ -1246,28 +1248,64 @@ function pushNativeMongoSuppression(collection: any, ops?: string[] | readonly s
 
 function popNativeMongoSuppression(token: NativeMongoSuppression | null | undefined): void {
     if (!token) return;
-    const store = als.getStore();
+    const store = token.ownerStore ?? als.getStore();
     const suppressions = store?.nativeMongoSuppressions;
-    if (!Array.isArray(suppressions) || suppressions.length === 0) return;
-    const index = suppressions.indexOf(token);
-    if (index >= 0) {
-        suppressions.splice(index, 1);
+    if (Array.isArray(suppressions) && suppressions.length > 0) {
+        const index = suppressions.indexOf(token);
+        if (index >= 0) {
+            suppressions.splice(index, 1);
+        }
+    }
+    token.ownerStore = undefined;
+}
+
+function releaseNativeMongoSuppression(target: any): void {
+    const token = target?.__repro_native_mongo_suppression;
+    popNativeMongoSuppression(token);
+    try { delete target.__repro_native_mongo_suppression; } catch {
+        try { target.__repro_native_mongo_suppression = undefined; } catch {}
     }
 }
 
+function isMongooseInternalNativeMongoCall(): boolean {
+    let stack = '';
+    try {
+        stack = new Error().stack ?? '';
+    } catch {
+        stack = '';
+    }
+    return stack.includes('/node_modules/mongoose/') ||
+        stack.includes('\\node_modules\\mongoose\\') ||
+        stack.includes('mongoose/lib/');
+}
+
 function isNativeMongoSuppressed(collection: any, op: string): boolean {
     const suppressions = (getCtx() as Ctx).nativeMongoSuppressions;
     if (!Array.isArray(suppressions) || suppressions.length === 0) return false;
     const normalizedCollection = collection == null ? null : String(collection);
     const normalizedOp = normalizeNativeMongoSuppressionOp(op);
     const now = Date.now();
-    for (const token of suppressions) {
-        if (!token || now - token.startedAt > 60000) continue;
+    const matchingTokens: NativeMongoSuppression[] = [];
+    for (let i = suppressions.length - 1; i >= 0; i -= 1) {
+        const token = suppressions[i];
+        if (!token || now - token.startedAt > 60000) {
+            suppressions.splice(i, 1);
+            continue;
+        }
         if (token.collection && normalizedCollection && token.collection !== normalizedCollection) continue;
         if (token.ops && token.ops.size > 0 && !token.ops.has(normalizedOp)) continue;
-        return true;
+        matchingTokens.push(token);
     }
-    return false;
+    if (matchingTokens.length === 0) return false;
+
+    if (!isMongooseInternalNativeMongoCall()) {
+        return false;
+    }
+
+    for (const token of matchingTokens) {
+        popNativeMongoSuppression(token);
+    }
+    return true;
 }
 
 function currentClockSkewMs(): number {
@@ -5572,41 +5610,44 @@ export function reproMongoosePlugin(cfg: ReproMiddlewareConfig) {
         });
 
         schema.post('save', { document: true }, function () {
-            const { sid, aid } = getCtx();
-            if (!sid || !aid) return;
-            if ((this as any).$isSubdocument) return;
-
-            const meta = (this as any).__repro_meta || {};
-            const before = null;
-            const after = this;
-            const collection = meta.collection || resolveCollectionOrWarn(this, 'doc');
-            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
-            if (!shouldCaptureDbSpan(spanContext)) return;
-            const modifiedPaths = Array.isArray(meta.modifiedPaths) ? meta.modifiedPaths : [];
-
-            const query = meta.wasNew
-                ? { op: 'insertOne', doc: after }
-                : {
-                    filter: { _id: this._id },
-                    update: buildModifiedPathUpdate(this, modifiedPaths),
-                    options: { upsert: false },
-                };
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid || !aid) return;
+                if ((this as any).$isSubdocument) return;
 
-            emitDbQuery(cfg, sid, aid ?? undefined, {
-                collection,
-                pk: { _id: (this as any)._id },
-                before,
-                after,
-                op: meta.wasNew ? 'insert' : 'update',
-                query,
-                t: alignTimestamp(meta.t0 ?? Date.now()),
-                spanContext,
-            });
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+                const meta = (this as any).__repro_meta || {};
+                const before = null;
+                const after = this;
+                const collection = meta.collection || resolveCollectionOrWarn(this, 'doc');
+                const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
+                if (!shouldCaptureDbSpan(spanContext)) return;
+                const modifiedPaths = Array.isArray(meta.modifiedPaths) ? meta.modifiedPaths : [];
+
+                const query = meta.wasNew
+                    ? { op: 'insertOne', doc: after }
+                    : {
+                        filter: { _id: this._id },
+                        update: buildModifiedPathUpdate(this, modifiedPaths),
+                        options: { upsert: false },
+                    };
+
+                emitDbQuery(cfg, sid, aid ?? undefined, {
+                    collection,
+                    pk: { _id: (this as any)._id },
+                    before,
+                    after,
+                    op: meta.wasNew ? 'insert' : 'update',
+                    query,
+                    t: alignTimestamp(meta.t0 ?? Date.now()),
+                    spanContext,
+                });
+            } finally {
+                releaseNativeMongoSuppression(this);
+            }
         });
 
         schema.post('save', { document: true }, function (error: any, _doc: any, next: Function) {
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         });
 
@@ -5631,35 +5672,38 @@ export function reproMongoosePlugin(cfg: ReproMiddlewareConfig) {
         });
 
         schema.post<Query<any, any>>('findOneAndUpdate', function (res: any) {
-            const { sid, aid } = getCtx();
-            if (!sid || !aid) return;
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid || !aid) return;
 
-            const before = null;
-            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 filter = (this as any).__repro_filter;
-            const pk = after?._id ?? (filter && typeof filter === 'object' ? (filter as any)._id : undefined);
+                const before = null;
+                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 filter = (this as any).__repro_filter;
+                const pk = after?._id ?? (filter && typeof filter === 'object' ? (filter as any)._id : undefined);
 
-            emitDbQuery(cfg, sid, aid ?? undefined, {
-                collection,
-                pk: { _id: pk },
-                before,
-                after,
-                op: 'update',
-                queryRaw: {
-                    filter,
-                    update: (this as any).__repro_update,
-                },
-                t: alignTimestamp((this as any).__repro_t0 ?? Date.now()),
-                spanContext,
-            });
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+                emitDbQuery(cfg, sid, aid ?? undefined, {
+                    collection,
+                    pk: { _id: pk },
+                    before,
+                    after,
+                    op: 'update',
+                    queryRaw: {
+                        filter,
+                        update: (this as any).__repro_update,
+                    },
+                    t: alignTimestamp((this as any).__repro_t0 ?? Date.now()),
+                    spanContext,
+                });
+            } finally {
+                releaseNativeMongoSuppression(this);
+            }
         });
 
         schema.post<Query<any, any>>('findOneAndUpdate', function (this: any, error: any, _res: any, next: Function) {
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         } as any);
 
@@ -5681,27 +5725,30 @@ export function reproMongoosePlugin(cfg: ReproMiddlewareConfig) {
         });
 
         schema.post<Query<any, any>>('deleteOne', { document: false, query: true }, function () {
-            const { sid, aid } = getCtx(); if (!sid || !aid) return;
-            const before = null;
-            const collection = (this as any).__repro_collection || resolveCollectionOrWarn(this, 'query');
-            const filter = (this as any).__repro_filter ?? undefined;
-            const spanContext = (this as any).__repro_spanContext || captureSpanContextFromTracer(this);
-            if (!shouldCaptureDbSpan(spanContext)) return;
-            emitDbQuery(cfg, sid, aid ?? undefined, {
-                collection,
-                pk: filter && typeof filter === 'object' && '_id' in filter ? { _id: (filter as any)._id } : undefined,
-                before,
-                after: null,
-                op: 'delete',
-                queryRaw: { filter },
-                t: alignTimestamp((this as any).__repro_t0 ?? Date.now()),
-                spanContext,
-            });
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+            try {
+                const { sid, aid } = getCtx(); if (!sid || !aid) return;
+                const before = null;
+                const collection = (this as any).__repro_collection || resolveCollectionOrWarn(this, 'query');
+                const filter = (this as any).__repro_filter ?? undefined;
+                const spanContext = (this as any).__repro_spanContext || captureSpanContextFromTracer(this);
+                if (!shouldCaptureDbSpan(spanContext)) return;
+                emitDbQuery(cfg, sid, aid ?? undefined, {
+                    collection,
+                    pk: filter && typeof filter === 'object' && '_id' in filter ? { _id: (filter as any)._id } : undefined,
+                    before,
+                    after: null,
+                    op: 'delete',
+                    queryRaw: { filter },
+                    t: alignTimestamp((this as any).__repro_t0 ?? Date.now()),
+                    spanContext,
+                });
+            } finally {
+                releaseNativeMongoSuppression(this);
+            }
         });
 
         schema.post<Query<any, any>>('deleteOne', { document: false, query: true }, function (this: any, error: any, _res: any, next: Function) {
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         } as any);
 
@@ -5766,31 +5813,34 @@ export function reproMongoosePlugin(cfg: ReproMiddlewareConfig) {
             });
 
             schema.post(op as any, function (this: any, res: any) {
-                const { sid, aid } = getCtx();
-                if (!sid) return;
+                try {
+                    const { sid, aid } = getCtx();
+                    if (!sid) return;
 
-                const meta = (this as any).__repro_qmeta || { t0: Date.now(), collection: 'unknown', op };
-                const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
+                    const meta = (this as any).__repro_qmeta || { t0: Date.now(), collection: 'unknown', op };
+                    const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
 
-                emitDbQuery(cfg, sid, aid, {
-                    collection: meta.collection,
-                    op,
-                    queryRaw: {
-                        filter: meta.rawFilter,
-                        update: meta.rawUpdate,
-                        projection: meta.rawProjection,
-                        options: meta.rawOptions,
-                    },
-                    resultMetaRaw: res,
-                    durMs: Date.now() - meta.t0,
-                    t: alignedNow(),
-                    spanContext,
-                });
-                popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+                    emitDbQuery(cfg, sid, aid, {
+                        collection: meta.collection,
+                        op,
+                        queryRaw: {
+                            filter: meta.rawFilter,
+                            update: meta.rawUpdate,
+                            projection: meta.rawProjection,
+                            options: meta.rawOptions,
+                        },
+                        resultMetaRaw: res,
+                        durMs: Date.now() - meta.t0,
+                        t: alignedNow(),
+                        spanContext,
+                    });
+                } finally {
+                    releaseNativeMongoSuppression(this);
+                }
             });
 
             schema.post(op as any, function (this: any, error: any, _res: any, next: Function) {
-                popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+                releaseNativeMongoSuppression(this);
                 next(error);
             } as any);
         }
@@ -5824,25 +5874,28 @@ export function reproMongoosePlugin(cfg: ReproMiddlewareConfig) {
         } as any);
 
         schema.post<any>('insertMany' as any, { document: false, query: false } as any, function (this: any, docs: any[]) {
-            const { sid, aid } = getCtx();
-            if (!sid) return;
-            const meta = (this as any).__repro_insert_meta || { t0: Date.now(), collection: 'unknown' };
-            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
-
-            emitDbQuery(cfg, sid, aid ?? undefined, {
-                collection: meta.collection,
-                op: 'insertMany',
-                queryRaw: { docs: meta.rawDocs ?? undefined },
-                resultMetaRaw: docs,
-                durMs: Date.now() - meta.t0,
-                t: alignedNow(),
-                spanContext,
-            });
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid) return;
+                const meta = (this as any).__repro_insert_meta || { t0: Date.now(), collection: 'unknown' };
+                const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
+
+                emitDbQuery(cfg, sid, aid ?? undefined, {
+                    collection: meta.collection,
+                    op: 'insertMany',
+                    queryRaw: { docs: meta.rawDocs ?? undefined },
+                    resultMetaRaw: docs,
+                    durMs: Date.now() - meta.t0,
+                    t: alignedNow(),
+                    spanContext,
+                });
+            } finally {
+                releaseNativeMongoSuppression(this);
+            }
         } as any);
 
         schema.post<any>('insertMany' as any, { document: false, query: false } as any, function (this: any, error: any, _res: any, next: Function) {
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         } as any);
 
@@ -5871,25 +5924,28 @@ export function reproMongoosePlugin(cfg: ReproMiddlewareConfig) {
         } as any);
 
         schema.post<any>('bulkWrite' as any, { document: false, query: false } as any, function (this: any, res: any) {
-            const { sid, aid } = getCtx();
-            if (!sid) return;
-            const meta = (this as any).__repro_bulk_meta || { t0: Date.now(), collection: 'unknown' };
-            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
-
-            emitDbQuery(cfg, sid, aid, {
-                collection: meta.collection,
-                op: 'bulkWrite',
-                queryRaw: { ops: meta.rawOps ?? undefined },
-                resultMetaRaw: res,
-                durMs: Date.now() - meta.t0,
-                t: alignedNow(),
-                spanContext,
-            });
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid) return;
+                const meta = (this as any).__repro_bulk_meta || { t0: Date.now(), collection: 'unknown' };
+                const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
+
+                emitDbQuery(cfg, sid, aid, {
+                    collection: meta.collection,
+                    op: 'bulkWrite',
+                    queryRaw: { ops: meta.rawOps ?? undefined },
+                    resultMetaRaw: res,
+                    durMs: Date.now() - meta.t0,
+                    t: alignedNow(),
+                    spanContext,
+                });
+            } finally {
+                releaseNativeMongoSuppression(this);
+            }
         } as any);
 
         schema.post<any>('bulkWrite' as any, { document: false, query: false } as any, function (this: any, error: any, _res: any, next: Function) {
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         } as any);
 
@@ -5924,26 +5980,29 @@ export function reproMongoosePlugin(cfg: ReproMiddlewareConfig) {
         });
 
         schema.post('aggregate', function (this: any, res: any[]) {
-            const { sid, aid } = getCtx();
-            if (!sid) return;
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid) return;
 
-            const meta = (this as any).__repro_aggmeta || { t0: Date.now(), collection: 'unknown' };
-            const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
+                const meta = (this as any).__repro_aggmeta || { t0: Date.now(), collection: 'unknown' };
+                const spanContext = meta.spanContext || captureSpanContextFromTracer(this);
 
-            emitDbQuery(cfg, sid, aid, {
-                collection: meta.collection,
-                op: 'aggregate',
-                queryRaw: { pipeline: meta.rawPipeline },
-                resultMetaRaw: res,
-                durMs: Date.now() - meta.t0,
-                t: alignedNow(),
-                spanContext,
-            });
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+                emitDbQuery(cfg, sid, aid, {
+                    collection: meta.collection,
+                    op: 'aggregate',
+                    queryRaw: { pipeline: meta.rawPipeline },
+                    resultMetaRaw: res,
+                    durMs: Date.now() - meta.t0,
+                    t: alignedNow(),
+                    spanContext,
+                });
+            } finally {
+                releaseNativeMongoSuppression(this);
+            }
         });
 
         schema.post('aggregate', function (this: any, error: any, _res: any, next: Function) {
-            popNativeMongoSuppression((this as any).__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         } as any);
     };
@@ -9966,6 +10025,16 @@ export const __reproTestHooks = {
         lastClientActivityAt = 0;
         sdkBackgroundQuietUntil = 0;
     },
+    runWithRequestContextForTest<T>(ctx: Partial<Ctx>, fn: () => T): T {
+        return als.run({
+            ...ctx,
+            excludedSpanIds: ctx.excludedSpanIds ?? new Set<string>(),
+        }, fn);
+    },
+    getNativeMongoSuppressionCountForTest(): number {
+        const suppressions = getCtx().nativeMongoSuppressions;
+        return Array.isArray(suppressions) ? suppressions.length : 0;
+    },
     getRuntimePrivacyPolicyForTest(cfg: ReproMiddlewareConfig): NormalizedRuntimePrivacyPolicy | null {
         return getRuntimePrivacyState(cfg).policy;
     },

package/test/mongodb-integration.test.js

@@ -8,6 +8,7 @@ process.env.TRACE_LINGER_AFTER_FINISH_MS = '0';
 const assert = require('assert');
 const { EventEmitter } = require('events');
 const mongodb = require('mongodb');
+const mongoose = require('mongoose');
 
 const originalNativeMongoInsertOne = mongodb.Collection.prototype.insertOne;
 
@@ -18,7 +19,7 @@ mongodb.Collection.prototype.insertOne = async function reproFakeNativeMongoInse
 };
 
 const { flushIngestQueue } = require('../dist/ingest/client');
-const { reproMiddleware, __reproTestHooks } = require('../dist');
+const { reproMiddleware, reproMongoosePlugin, __reproTestHooks } = require('../dist');
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
@@ -126,12 +127,80 @@ async function runCapturedRequest(cfg, sessionId, actionId, fn) {
     res.end();
 }
 
+function execPre(hooks, name, context) {
+    return new Promise((resolve, reject) => {
+        hooks.execPre(name, context, [], (error) => (error ? reject(error) : resolve()));
+    });
+}
+
 function dbChanges(events) {
     return events
         .filter((event) => event.event_type === 'db_change')
         .flatMap((event) => Array.isArray(event.payload?.db) ? event.payload.db : []);
 }
 
+async function testMongooseSuppressionDoesNotHideExplicitNativeInsertOne() {
+    await withCapturedFetch(async (capturedBodies) => {
+        __reproTestHooks.resetSdkBackgroundQueuesForTest();
+        const sessionId = 'S_mongo_mixed_driver_insert';
+        const actionId = 'A_mongo_mixed_driver_insert';
+        const cfg = makeConfig(sessionId, actionId);
+
+        const schema = new mongoose.Schema({ subjectNumber: String, status: String });
+        reproMongoosePlugin(cfg)(schema);
+        const Model = mongoose.model(`ReproMixedNativeMongo${Date.now()}`, schema, 'subjects');
+        const pendingMongooseDoc = new Model({ subjectNumber: 'pre-save', status: 'pending' });
+
+        class FakeCollection {
+            constructor() {
+                this.collectionName = 'subjects';
+                this.dbName = 'clinical';
+            }
+
+            async insertOne(doc, options) {
+                assert.strictEqual(options.session.id, 'native-explicit-session-1');
+                doc._id = doc._id ?? 'subject-explicit-1';
+                return { acknowledged: true, insertedId: doc._id };
+            }
+        }
+
+        __reproTestHooks.patchMongoCollectionPrototypeForTest(FakeCollection.prototype, cfg);
+        const subjectsCollection = new FakeCollection();
+
+        await runCapturedRequest(cfg, sessionId, actionId, async () => {
+            await execPre(schema.s.hooks, 'save', pendingMongooseDoc);
+            assert.strictEqual(__reproTestHooks.getNativeMongoSuppressionCountForTest(), 1);
+
+            const result = await subjectsCollection.insertOne(
+                { subjectNumber: '10013038', status: 'screened' },
+                {
+                    session: {
+                        id: 'native-explicit-session-1',
+                        hasEnded: false,
+                        inTransaction: () => true,
+                    },
+                },
+            );
+            assert.deepStrictEqual(result, { acknowledged: true, insertedId: 'subject-explicit-1' });
+        });
+
+        await waitFor(() => dbChanges(flattenEvents(capturedBodies)).length === 1);
+        await drainSdk();
+
+        const [change] = dbChanges(flattenEvents(capturedBodies));
+        assert.strictEqual(change.type, 'mongo');
+        assert.strictEqual(change.collection, 'subjects');
+        assert.strictEqual(change.op, 'insertOne');
+        assert.strictEqual(change.pk._id, 'subject-explicit-1');
+        assert.strictEqual(change.query.driver, 'mongodb');
+        assert.strictEqual(change.query.db, 'clinical');
+        assert.strictEqual(change.query.doc.subjectNumber, '10013038');
+        assert.strictEqual(change.query.options.session.__kind, 'mongodb_client_session');
+        assert.strictEqual(change.query.options.session.id, 'native-explicit-session-1');
+        assert.strictEqual(change.after.subjectNumber, '10013038');
+    });
+}
+
 async function testReproMiddlewarePatchesPreloadedNativeMongoClientInsertOne() {
     await withCapturedFetch(async (capturedBodies) => {
         __reproTestHooks.resetSdkBackgroundQueuesForTest();
@@ -452,6 +521,7 @@ async function testNativeOperationFailureIsCapturedAndRethrown() {
 }
 
 (async () => {
+    await testMongooseSuppressionDoesNotHideExplicitNativeInsertOne();
     await testReproMiddlewarePatchesPreloadedNativeMongoClientInsertOne();
     await testMongoClientDbCollectionChainIsPatchedWithoutCollectionExport();
     await testNativeInsertOneIsCaptured();