fix(aws-sdk): do not patch client config deserialization multiple times

integration-tests/helpers/index.js

@@ -578,7 +578,8 @@ async function spawnPluginIntegrationTestProc (cwd, serverFile, agentPort, stdio
   env = { ...process.env, ...env, ...additionalEnvArgs }
   return spawnProc(path.join(cwd, serverFile), {
     cwd,
-    env
+    env,
+    execArgv: additionalEnvArgs.execArgv
   }, stdioHandler)
 }
 

packages/datadog-instrumentations/src/aws-sdk.js

@@ -3,6 +3,8 @@
 const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
+const patchedClientConfigProtocols = new WeakSet()
+
 function wrapRequest (send) {
   return function wrappedRequest (cb) {
     if (!this.service) return send.apply(this, arguments)
@@ -67,12 +69,14 @@ function wrapSmithySend (send) {
 
     if (typeof command.deserialize === 'function') {
       shimmer.wrap(command, 'deserialize', deserialize => wrapDeserialize(deserialize, channelSuffix))
-    } else if (this.config?.protocol?.deserializeResponse) {
+    } else if (this.config?.protocol?.deserializeResponse && !patchedClientConfigProtocols.has(this.config.protocol)) {
       shimmer.wrap(
         this.config.protocol,
         'deserializeResponse',
         deserializeResponse => wrapDeserialize(deserializeResponse, channelSuffix, 2)
       )
+
+      patchedClientConfigProtocols.add(this.config.protocol)
     }
 
     const ctx = {

packages/datadog-plugin-aws-sdk/test/integration-test/recursion.mjs

@@ -0,0 +1,17 @@
+import 'dd-trace/init.js'
+import {
+  SQSClient,
+  CreateQueueCommand,
+  ReceiveMessageCommand,
+} from '@aws-sdk/client-sqs'
+
+const client = new SQSClient({ endpoint: 'http://127.0.0.1:4566', region: 'us-east-1' })
+
+// Create queue first
+const createRes = await client.send(new CreateQueueCommand({ QueueName: 'test-queue' }))
+const queueUrl = createRes.QueueUrl
+
+// Send many receive message commands to trigger recursion
+for (let i = 0; i < 500; i++) {
+  client.send(new ReceiveMessageCommand({ QueueUrl: queueUrl, MessageAttributeNames: ['.*'] }))
+}

packages/datadog-plugin-aws-sdk/test/integration-test/sqs.spec.js

@@ -0,0 +1,49 @@
+'use strict'
+
+const {
+  FakeAgent,
+  sandboxCwd,
+  useSandbox,
+  checkSpansForServiceName,
+  spawnPluginIntegrationTestProc
+} = require('../../../../integration-tests/helpers')
+const { withVersions } = require('../../../dd-trace/test/setup/mocha')
+
+const assert = require('node:assert')
+
+describe('recursion regression test', () => {
+  let agent
+  let proc
+
+  withVersions('aws-sdk', ['@aws-sdk/smithy-client'], version => {
+    useSandbox([`'@aws-sdk/client-sqs'@${version}'`], false, [
+      './packages/datadog-plugin-aws-sdk/test/integration-test/*'])
+
+    beforeEach(async () => {
+      agent = await new FakeAgent().start()
+    })
+
+    afterEach(async () => {
+      proc && proc.kill()
+      await agent.stop()
+    })
+
+    it('does not cause a recursion error when many commands are sent', async () => {
+      const res = agent.assertMessageReceived(({ headers, payload }) => {
+        assert.equal(headers.host, `127.0.0.1:${agent.port}`)
+        assert.ok(Array.isArray(payload))
+        assert.strictEqual(checkSpansForServiceName(payload, 'aws.request'), true)
+      })
+
+      proc = await spawnPluginIntegrationTestProc(sandboxCwd(), 'recursion.mjs', agent.port, undefined,
+        {
+          AWS_SECRET_ACCESS_KEY: '0000000000/00000000000000000000000000000',
+          AWS_ACCESS_KEY_ID: '00000000000000000000',
+          execArgv: ['--stack-size=128']
+        }
+      )
+
+      await res
+    }).timeout(20000)
+  })
+})