@reproapp/node-sdk 0.0.25 → 0.0.26

package/dist/index.js

@@ -6325,6 +6325,7 @@ function patchKafkaJs(cfg) {
     }
 }
 exports.patchKafkaJs = patchKafkaJs;
+const AMQP_INTERNAL_PUBLISH_DEPTH = Symbol.for('repro.amqplib.internalPublishDepth');
 function decodeAmqpHeaderValue(value) {
     if (value === null || value === undefined)
         return null;
@@ -6726,6 +6727,9 @@ function patchAmqplibPublishMethod(channel, cfg, methodName) {
     const optionsIndex = methodName === 'publish' ? 3 : 2;
     const method = methodName === 'publish' ? 'AMQP_PUBLISH' : 'AMQP_SEND_TO_QUEUE';
     const wrapped = function reproPatchedAmqplibPublish(...args) {
+        if (methodName === 'publish' && Number(this?.[AMQP_INTERNAL_PUBLISH_DEPTH] ?? 0) > 0) {
+            return orig.apply(this, args);
+        }
         const ctx = getCtx();
         const fallback = cfg.resolveContext?.() ?? {};
         const sid = ctx.sid ?? fallback.sid ?? null;
@@ -6797,7 +6801,12 @@ function patchAmqplibPublishMethod(channel, cfg, methodName) {
             : (wrappedCallback
                 ? setAmqpPublishOptionsArg(args, optionsIndex, nextOptions, callbackIndex, wrappedCallback)
                 : args);
+        let bumpedInternalPublishDepth = false;
         try {
+            if (methodName === 'sendToQueue' && this && typeof this === 'object') {
+                this[AMQP_INTERNAL_PUBLISH_DEPTH] = Number(this?.[AMQP_INTERNAL_PUBLISH_DEPTH] ?? 0) + 1;
+                bumpedInternalPublishDepth = true;
+            }
             const result = orig.apply(this, nextArgs);
             if (!wrappedCallback) {
                 finish(200, undefined, result);
@@ -6808,6 +6817,17 @@ function patchAmqplibPublishMethod(channel, cfg, methodName) {
             finish(500, error);
             throw error;
         }
+        finally {
+            if (bumpedInternalPublishDepth) {
+                const nextDepth = Number(this?.[AMQP_INTERNAL_PUBLISH_DEPTH] ?? 0) - 1;
+                if (nextDepth > 0) {
+                    this[AMQP_INTERNAL_PUBLISH_DEPTH] = nextDepth;
+                }
+                else if (this && typeof this === 'object') {
+                    delete this[AMQP_INTERNAL_PUBLISH_DEPTH];
+                }
+            }
+        }
     };
     wrapped.__repro_amqplib_patched = true;
     channel[methodName] = wrapped;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reproapp/node-sdk",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "Repro Nest SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -7389,6 +7389,7 @@ type AmqpPropagationContext = {
     parentSpanId: string | null;
     requestRid: string | null;
 };
+const AMQP_INTERNAL_PUBLISH_DEPTH = Symbol.for('repro.amqplib.internalPublishDepth');
 
 export type AmqplibPatchConfig = ReproMiddlewareConfig & {
     resolveContext?: AmqpContextResolver;
@@ -7859,6 +7860,10 @@ function patchAmqplibPublishMethod(
     const method = methodName === 'publish' ? 'AMQP_PUBLISH' : 'AMQP_SEND_TO_QUEUE';
 
     const wrapped = function reproPatchedAmqplibPublish(this: any, ...args: any[]) {
+        if (methodName === 'publish' && Number(this?.[AMQP_INTERNAL_PUBLISH_DEPTH] ?? 0) > 0) {
+            return orig.apply(this, args);
+        }
+
         const ctx = getCtx();
         const fallback = cfg.resolveContext?.() ?? {};
         const sid = ctx.sid ?? fallback.sid ?? null;
@@ -7933,8 +7938,13 @@ function patchAmqplibPublishMethod(
             : (wrappedCallback
                 ? setAmqpPublishOptionsArg(args, optionsIndex, nextOptions, callbackIndex, wrappedCallback)
                 : args);
+        let bumpedInternalPublishDepth = false;
 
         try {
+            if (methodName === 'sendToQueue' && this && typeof this === 'object') {
+                this[AMQP_INTERNAL_PUBLISH_DEPTH] = Number(this?.[AMQP_INTERNAL_PUBLISH_DEPTH] ?? 0) + 1;
+                bumpedInternalPublishDepth = true;
+            }
             const result = orig.apply(this, nextArgs);
             if (!wrappedCallback) {
                 finish(200, undefined, result);
@@ -7943,6 +7953,15 @@ function patchAmqplibPublishMethod(
         } catch (error) {
             finish(500, error);
             throw error;
+        } finally {
+            if (bumpedInternalPublishDepth) {
+                const nextDepth = Number(this?.[AMQP_INTERNAL_PUBLISH_DEPTH] ?? 0) - 1;
+                if (nextDepth > 0) {
+                    this[AMQP_INTERNAL_PUBLISH_DEPTH] = nextDepth;
+                } else if (this && typeof this === 'object') {
+                    delete this[AMQP_INTERNAL_PUBLISH_DEPTH];
+                }
+            }
         }
     };
 

package/test/amqplib-integration.test.js

@@ -286,6 +286,55 @@ async function testCallbackApiConnectAndConfirmChannelArePatched() {
     });
 }
 
+async function testSendToQueueDoesNotDoubleCaptureInternalPublish() {
+    await withCapturedFetch(async (capturedBodies) => {
+        __reproTestHooks.resetSdkBackgroundQueuesForTest();
+        const internalPublishes = [];
+        const channel = {
+            publish(exchange, routingKey, content, options) {
+                internalPublishes.push({ exchange, routingKey, content, options });
+                return true;
+            },
+            sendToQueue(queue, content, options) {
+                return this.publish('', queue, content, options);
+            },
+        };
+        const cfg = makeConfig('S_amqp_send', 'A_amqp_send');
+        __reproTestHooks.patchAmqplibChannelForTest(channel, cfg);
+
+        const result = channel.sendToQueue(
+            'outbound-email',
+            Buffer.from(JSON.stringify({ subject: 'hello', html: '<p>full html</p>' })),
+            { contentType: 'application/json', headers: { existing: 'yes' } },
+        );
+
+        assert.strictEqual(result, true);
+        assert.strictEqual(internalPublishes.length, 1);
+        assert.strictEqual(internalPublishes[0].exchange, '');
+        assert.strictEqual(internalPublishes[0].routingKey, 'outbound-email');
+        assert.strictEqual(internalPublishes[0].options.headers.existing, 'yes');
+        assert.strictEqual(internalPublishes[0].options.headers['x-bug-session-id'], 'S_amqp_send');
+        assert.strictEqual(internalPublishes[0].options.headers['x-bug-action-id'], 'A_amqp_send');
+        assert(internalPublishes[0].options.headers['x-repro-request-rid']);
+
+        await waitFor(() => flattenEvents(capturedBodies)
+            .some((event) => event?.event_type === 'backend_request'));
+        await drainSdk();
+
+        const backendRequests = flattenEvents(capturedBodies)
+            .filter((event) => event?.event_type === 'backend_request');
+        assert.strictEqual(
+            backendRequests.length,
+            1,
+            JSON.stringify(backendRequests.map((event) => event.payload?.request?.method)),
+        );
+        assert.strictEqual(backendRequests[0].payload.request.method, 'AMQP_SEND_TO_QUEUE');
+        assert.strictEqual(backendRequests[0].payload.request.path, 'amqp://queue/outbound-email');
+        assert.strictEqual(backendRequests[0].payload.request.body.message.value.subject, 'hello');
+        assert.strictEqual(backendRequests[0].payload.request.body.message.value.html, '<p>full html</p>');
+    });
+}
+
 async function testNullConsumeMessagePassesThrough() {
     let received = 'not-called';
     const wrapped = __reproTestHooks.wrapAmqplibConsumeHandlerForTest((message) => {
@@ -329,6 +378,7 @@ async function main() {
     await testPublishInjectsHeadersWithoutMutatingOptions();
     await testConsumeCapturesRequestTraceAndManifest();
     await testCallbackApiConnectAndConfirmChannelArePatched();
+    await testSendToQueueDoesNotDoubleCaptureInternalPublish();
     await testNullConsumeMessagePassesThrough();
     await testSyncConsumeThrowIsNotRetried();
     console.log('amqplib integration OK');