@reproapp/node-sdk 0.0.31 → 0.0.32

package/dist/index.d.ts

@@ -262,6 +262,31 @@ export type ReproTracingInitOptions = TracerInitOpts & {
 export declare function initReproTracing(opts?: ReproTracingInitOptions): TracerApi | null;
 /** Optional helper if users want to check it. */
 export declare function isReproTracingEnabled(): boolean;
+type Ctx = {
+    sid?: string;
+    aid?: string;
+    rid?: string;
+    clockSkewMs?: number;
+    excludedSpanIds?: Set<string>;
+    maskReq?: MaskRequestContext;
+    privacyTasks?: Set<Promise<void>>;
+    captureScope?: RequestCaptureScopeState;
+    nativeMongoSuppressions?: NativeMongoSuppression[];
+};
+type NativeMongoSuppression = {
+    collection?: string | null;
+    ops?: Set<string>;
+    startedAt: number;
+    ownerStore?: Ctx;
+};
+type RequestCaptureScopeState = {
+    requestRid: string;
+    transport: 'http' | 'kafka' | 'amqp' | 'background';
+    backendRequestCount: number;
+    traceBatchCount: number;
+    dbChangeCount: number;
+    emailEventCount: number;
+};
 declare function sanitizeTraceValueForPrivacy(value: any): any;
 declare function sanitizeMaterializedTraceValue(value: any): any;
 export declare function __materializePendingTraceEventsForWorker(payload: TraceMaterializationWorkerPayload): Promise<PendingTraceEventRecord[]>;
@@ -382,6 +407,8 @@ export declare const __reproTestHooks: {
     }): void;
     drainSdkBackgroundQueueForTest(): Promise<void>;
     resetSdkBackgroundQueuesForTest(): void;
+    runWithRequestContextForTest<T>(ctx: Partial<Ctx>, fn: () => T): T;
+    getNativeMongoSuppressionCountForTest(): number;
     getRuntimePrivacyPolicyForTest(cfg: ReproMiddlewareConfig): NormalizedRuntimePrivacyPolicy | null;
     setRuntimePrivacyPolicyForTest(cfg: ReproMiddlewareConfig, policy: NormalizedRuntimePrivacyPolicy | null): void;
     recordKafkaTraceEventAsyncForTest: typeof recordKafkaTraceEventAsync;

package/dist/index.js

@@ -835,6 +835,7 @@ function pushNativeMongoSuppression(collection, ops) {
         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 = [];
@@ -845,13 +846,27 @@ function pushNativeMongoSuppression(collection, ops) {
 function popNativeMongoSuppression(token) {
     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) {
+    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 isNativeMongoSuppressed(collection, op) {
@@ -861,9 +876,12 @@ function isNativeMongoSuppressed(collection, op) {
     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)
+    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))
@@ -4634,40 +4652,44 @@ function reproMongoosePlugin(cfg) {
             next();
         });
         schema.post('save', { document: true }, function () {
-            const { sid, aid } = getCtx();
-            if (!sid || !aid)
-                return;
-            if (this.$isSubdocument)
-                return;
-            const meta = this.__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._id },
-                before,
-                after,
-                op: meta.wasNew ? 'insert' : 'update',
-                query,
-                t: alignTimestamp(meta.t0 ?? Date.now()),
-                spanContext,
-            });
-            popNativeMongoSuppression(this.__repro_native_mongo_suppression);
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid || !aid)
+                    return;
+                if (this.$isSubdocument)
+                    return;
+                const meta = this.__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._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, _doc, next) {
-            popNativeMongoSuppression(this.__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         });
         // -------- findOneAndUpdate capture (unchanged) --------
@@ -4689,34 +4711,38 @@ function reproMongoosePlugin(cfg) {
             next();
         });
         schema.post('findOneAndUpdate', function (res) {
-            const { sid, aid } = getCtx();
-            if (!sid || !aid)
-                return;
-            const before = null;
-            const after = res ?? null;
-            const collection = this.__repro_collection || resolveCollectionOrWarn(this, 'query');
-            const spanContext = this.__repro_spanContext || captureSpanContextFromTracer(this);
-            if (!shouldCaptureDbSpan(spanContext))
-                return;
-            const filter = this.__repro_filter;
-            const pk = after?._id ?? (filter && typeof filter === 'object' ? filter._id : undefined);
-            emitDbQuery(cfg, sid, aid ?? undefined, {
-                collection,
-                pk: { _id: pk },
-                before,
-                after,
-                op: 'update',
-                queryRaw: {
-                    filter,
-                    update: this.__repro_update,
-                },
-                t: alignTimestamp(this.__repro_t0 ?? Date.now()),
-                spanContext,
-            });
-            popNativeMongoSuppression(this.__repro_native_mongo_suppression);
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid || !aid)
+                    return;
+                const before = null;
+                const after = res ?? null;
+                const collection = this.__repro_collection || resolveCollectionOrWarn(this, 'query');
+                const spanContext = this.__repro_spanContext || captureSpanContextFromTracer(this);
+                if (!shouldCaptureDbSpan(spanContext))
+                    return;
+                const filter = this.__repro_filter;
+                const pk = after?._id ?? (filter && typeof filter === 'object' ? filter._id : undefined);
+                emitDbQuery(cfg, sid, aid ?? undefined, {
+                    collection,
+                    pk: { _id: pk },
+                    before,
+                    after,
+                    op: 'update',
+                    queryRaw: {
+                        filter,
+                        update: this.__repro_update,
+                    },
+                    t: alignTimestamp(this.__repro_t0 ?? Date.now()),
+                    spanContext,
+                });
+            }
+            finally {
+                releaseNativeMongoSuppression(this);
+            }
         });
         schema.post('findOneAndUpdate', function (error, _res, next) {
-            popNativeMongoSuppression(this.__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         });
         // -------- deleteOne capture (unchanged) --------
@@ -4736,29 +4762,33 @@ function reproMongoosePlugin(cfg) {
             next();
         });
         schema.post('deleteOne', { document: false, query: true }, function () {
-            const { sid, aid } = getCtx();
-            if (!sid || !aid)
-                return;
-            const before = null;
-            const collection = this.__repro_collection || resolveCollectionOrWarn(this, 'query');
-            const filter = this.__repro_filter ?? undefined;
-            const spanContext = this.__repro_spanContext || captureSpanContextFromTracer(this);
-            if (!shouldCaptureDbSpan(spanContext))
-                return;
-            emitDbQuery(cfg, sid, aid ?? undefined, {
-                collection,
-                pk: filter && typeof filter === 'object' && '_id' in filter ? { _id: filter._id } : undefined,
-                before,
-                after: null,
-                op: 'delete',
-                queryRaw: { filter },
-                t: alignTimestamp(this.__repro_t0 ?? Date.now()),
-                spanContext,
-            });
-            popNativeMongoSuppression(this.__repro_native_mongo_suppression);
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid || !aid)
+                    return;
+                const before = null;
+                const collection = this.__repro_collection || resolveCollectionOrWarn(this, 'query');
+                const filter = this.__repro_filter ?? undefined;
+                const spanContext = this.__repro_spanContext || captureSpanContextFromTracer(this);
+                if (!shouldCaptureDbSpan(spanContext))
+                    return;
+                emitDbQuery(cfg, sid, aid ?? undefined, {
+                    collection,
+                    pk: filter && typeof filter === 'object' && '_id' in filter ? { _id: filter._id } : undefined,
+                    before,
+                    after: null,
+                    op: 'delete',
+                    queryRaw: { filter },
+                    t: alignTimestamp(this.__repro_t0 ?? Date.now()),
+                    spanContext,
+                });
+            }
+            finally {
+                releaseNativeMongoSuppression(this);
+            }
         });
         schema.post('deleteOne', { document: false, query: true }, function (error, _res, next) {
-            popNativeMongoSuppression(this.__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         });
         // -------- NON-intrusive generic query telemetry via schema hooks -------
@@ -4814,29 +4844,33 @@ function reproMongoosePlugin(cfg) {
                 next();
             });
             schema.post(op, function (res) {
-                const { sid, aid } = getCtx();
-                if (!sid)
-                    return;
-                const meta = this.__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.__repro_native_mongo_suppression);
+                try {
+                    const { sid, aid } = getCtx();
+                    if (!sid)
+                        return;
+                    const meta = this.__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,
+                    });
+                }
+                finally {
+                    releaseNativeMongoSuppression(this);
+                }
             });
             schema.post(op, function (error, _res, next) {
-                popNativeMongoSuppression(this.__repro_native_mongo_suppression);
+                releaseNativeMongoSuppression(this);
                 next(error);
             });
         }
@@ -4865,24 +4899,28 @@ function reproMongoosePlugin(cfg) {
             next();
         });
         schema.post('insertMany', { document: false, query: false }, function (docs) {
-            const { sid, aid } = getCtx();
-            if (!sid)
-                return;
-            const meta = this.__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.__repro_native_mongo_suppression);
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid)
+                    return;
+                const meta = this.__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);
+            }
         });
         schema.post('insertMany', { document: false, query: false }, function (error, _res, next) {
-            popNativeMongoSuppression(this.__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         });
         schema.pre('bulkWrite', { document: false, query: false }, function (next, ops) {
@@ -4907,24 +4945,28 @@ function reproMongoosePlugin(cfg) {
             next();
         });
         schema.post('bulkWrite', { document: false, query: false }, function (res) {
-            const { sid, aid } = getCtx();
-            if (!sid)
-                return;
-            const meta = this.__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.__repro_native_mongo_suppression);
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid)
+                    return;
+                const meta = this.__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);
+            }
         });
         schema.post('bulkWrite', { document: false, query: false }, function (error, _res, next) {
-            popNativeMongoSuppression(this.__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         });
         // Aggregate middleware (non-intrusive)
@@ -4954,24 +4996,28 @@ function reproMongoosePlugin(cfg) {
             next();
         });
         schema.post('aggregate', function (res) {
-            const { sid, aid } = getCtx();
-            if (!sid)
-                return;
-            const meta = this.__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.__repro_native_mongo_suppression);
+            try {
+                const { sid, aid } = getCtx();
+                if (!sid)
+                    return;
+                const meta = this.__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,
+                });
+            }
+            finally {
+                releaseNativeMongoSuppression(this);
+            }
         });
         schema.post('aggregate', function (error, _res, next) {
-            popNativeMongoSuppression(this.__repro_native_mongo_suppression);
+            releaseNativeMongoSuppression(this);
             next(error);
         });
     };
@@ -8721,6 +8767,16 @@ exports.__reproTestHooks = {
         lastClientActivityAt = 0;
         sdkBackgroundQuietUntil = 0;
     },
+    runWithRequestContextForTest(ctx, fn) {
+        return als.run({
+            ...ctx,
+            excludedSpanIds: ctx.excludedSpanIds ?? new Set(),
+        }, fn);
+    },
+    getNativeMongoSuppressionCountForTest() {
+        const suppressions = getCtx().nativeMongoSuppressions;
+        return Array.isArray(suppressions) ? suppressions.length : 0;
+    },
     getRuntimePrivacyPolicyForTest(cfg) {
         return getRuntimePrivacyState(cfg).policy;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reproapp/node-sdk",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "Repro Nest SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,7 +12,7 @@
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput",
     "prepublishOnly": "npm run build",
-    "test": "npm run build && node test/unawaited.test.js && node test/integration-unawaited.js && node test/request-flush-timing.test.js && node test/request-capture-background.test.js && node test/init-auto-http-server.test.js && node test/client-performance-regression.test.js && node test/request-manifest-priority.test.js && node test/runtime-no-double-invoke.test.js && node test/express-trace-http-args.test.js && node test/trace-batch-size.test.js && node test/sdk-background-priority.test.js && node test/ingest-queue-retention.test.js && node test/ingest-high-priority-retention.test.js && node test/ingest-critical-retention.test.js && node test/ingest-critical-retry-retention.test.js && node test/ingest-timeout.test.js && node -r ./tracer/register test/promise-map.test.js && node test/disable-subtree.test.js && node test/circular-capture.test.js && node test/wrap-plugin-arrow-args.test.js && node test/wrap-plugin-super-call.test.js && node test/function-arg-identity.test.js && node test/privacy-runtime-policy.test.js && node test/runtime-privacy-materialization.test.js && node test/kafka-runtime-privacy-policy.test.js && node test/amqplib-integration.test.js && node test/mongodb-integration.test.js && node test/mongodb-esm-import-hook.test.js",
+    "test": "npm run build && node test/unawaited.test.js && node test/integration-unawaited.js && node test/request-flush-timing.test.js && node test/request-capture-background.test.js && node test/init-auto-http-server.test.js && node test/client-performance-regression.test.js && node test/request-manifest-priority.test.js && node test/runtime-no-double-invoke.test.js && node test/express-trace-http-args.test.js && node test/trace-batch-size.test.js && node test/sdk-background-priority.test.js && node test/ingest-queue-retention.test.js && node test/ingest-high-priority-retention.test.js && node test/ingest-critical-retention.test.js && node test/ingest-critical-retry-retention.test.js && node test/ingest-timeout.test.js && node -r ./tracer/register test/promise-map.test.js && node test/disable-subtree.test.js && node test/circular-capture.test.js && node test/wrap-plugin-arrow-args.test.js && node test/wrap-plugin-super-call.test.js && node test/function-arg-identity.test.js && node test/privacy-runtime-policy.test.js && node test/runtime-privacy-materialization.test.js && node test/kafka-runtime-privacy-policy.test.js && node test/amqplib-integration.test.js && node test/mongodb-integration.test.js && node test/mongodb-esm-import-hook.test.js && node test/mongodb-suppression-cleanup.test.js",
     "test:containers": "npm run build && node test/runtime-no-double-invoke.testcontainers.test.js && node test/wrap-plugin-super-call.testcontainers.test.js && node test/function-arg-identity.testcontainers.test.js"
   },
   "peerDependencies": {

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,12 +1248,22 @@ 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 {}
     }
 }
 
@@ -1261,8 +1273,12 @@ function isNativeMongoSuppressed(collection: any, op: string): boolean {
     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;
+    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;
@@ -5572,41 +5588,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 +5650,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 +5703,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 +5791,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 +5852,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 +5902,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 +5958,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 +10003,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-suppression-cleanup.test.js

@@ -0,0 +1,72 @@
+const assert = require('assert');
+const mongoose = require('mongoose');
+const { reproMongoosePlugin, __reproTestHooks } = require('../dist');
+
+function execPre(hooks, name, context) {
+    return new Promise((resolve, reject) => {
+        hooks.execPre(name, context, [], (error) => (error ? reject(error) : resolve()));
+    });
+}
+
+function execPost(hooks, name, context, args = []) {
+    return new Promise((resolve, reject) => {
+        hooks.execPost(name, context, args, {}, (error) => (error ? reject(error) : resolve()));
+    });
+}
+
+async function testPostSaveEarlyReturnReleasesSuppression() {
+    const schema = new mongoose.Schema({ name: String });
+    reproMongoosePlugin({
+        tenantId: 'TENANT_test',
+        appId: 'APP_test',
+        appSecret: 'secret',
+        privacy: { environment: 'dev', captureRaw: true },
+        ingestBase: 'http://127.0.0.1:65535',
+    })(schema);
+    const Model = mongoose.model(`ReproSuppressionCleanup${Date.now()}`, schema, 'subjects');
+    const doc = new Model({ name: 'subject' });
+
+    await __reproTestHooks.runWithRequestContextForTest({ sid: 'S_cleanup', aid: 'A_cleanup' }, async () => {
+        await execPre(schema.s.hooks, 'save', doc);
+        assert.equal(__reproTestHooks.getNativeMongoSuppressionCountForTest(), 1);
+
+        // No rid/span is present, so the post hook exits through shouldCaptureDbSpan(false).
+        await execPost(schema.s.hooks, 'save', doc, [doc]);
+        assert.equal(__reproTestHooks.getNativeMongoSuppressionCountForTest(), 0);
+    });
+}
+
+async function testPostSaveOutsideOriginalAlsReleasesOwnerStoreSuppression() {
+    const schema = new mongoose.Schema({ name: String });
+    reproMongoosePlugin({
+        tenantId: 'TENANT_test',
+        appId: 'APP_test',
+        appSecret: 'secret',
+        privacy: { environment: 'dev', captureRaw: true },
+        ingestBase: 'http://127.0.0.1:65535',
+    })(schema);
+    const Model = mongoose.model(`ReproSuppressionOwnerStore${Date.now()}`, schema, 'subjects');
+    const doc = new Model({ name: 'subject' });
+
+    let token;
+    await __reproTestHooks.runWithRequestContextForTest({ sid: 'S_owner', aid: 'A_owner', rid: 'R_owner' }, async () => {
+        await execPre(schema.s.hooks, 'save', doc);
+        assert.equal(__reproTestHooks.getNativeMongoSuppressionCountForTest(), 1);
+        token = doc.__repro_native_mongo_suppression;
+        assert.equal(token.ownerStore.nativeMongoSuppressions.length, 1);
+    });
+
+    await execPost(schema.s.hooks, 'save', doc, [doc]);
+    assert.equal(token.ownerStore, undefined);
+}
+
+async function main() {
+    await testPostSaveEarlyReturnReleasesSuppression();
+    await testPostSaveOutsideOriginalAlsReleasesOwnerStoreSuppression();
+    console.log('mongodb suppression cleanup OK');
+}
+
+main().catch((error) => {
+    console.error(error);
+    process.exit(1);
+});