[core] Ensure Explicit Timeouts from Underlying Request Socket are Recorded as Errors When Using Node 20 (#3853)

* req.socket timeouts recorded as errors node 20

* check for process.send

Author: sabrenner

packages/datadog-instrumentations/src/http/client.js

@@ -69,17 +69,29 @@ function patch (http, methodName) {
         try {
           const req = request.call(this, options, callback)
           const emit = req.emit
-          const setTimeout = req.setTimeout
+
+          const requestSetTimeout = req.setTimeout
 
           ctx.req = req
 
           // tracked to accurately discern custom request socket timeout
           let customRequestTimeout = false
+
           req.setTimeout = function () {
             customRequestTimeout = true
-            return setTimeout.apply(this, arguments)
+            return requestSetTimeout.apply(this, arguments)
           }
 
+          req.on('socket', socket => {
+            if (socket) {
+              const socketSetTimeout = socket.setTimeout
+              socket.setTimeout = function () {
+                customRequestTimeout = true
+                return socketSetTimeout.apply(this, arguments)
+              }
+            }
+          })
+
           req.emit = function (eventName, arg) {
             switch (eventName) {
               case 'response': {

packages/datadog-plugin-http/src/client.js

@@ -121,7 +121,7 @@ class HttpClientPlugin extends ClientPlugin {
     } else {
       // conditions for no error:
       // 1. not using a custom agent instance with custom timeout specified
-      // 2. no invocation of `req.setTimeout`
+      // 2. no invocation of `req.setTimeout` or `socket.setTimeout`
       if (!args.options.agent?.options.timeout && !customRequestTimeout) return
 
       span.setTag('error', 1)

packages/datadog-plugin-http/test/client.spec.js

@@ -900,6 +900,39 @@ describe('Plugin', () => {
               })
             })
           }).timeout(10000)
+
+          it('should record error if req.socket.setTimeout is used with Node 20', done => {
+            const app = express()
+
+            app.get('/user', async (req, res) => {
+              await new Promise(resolve => {
+                setTimeout(resolve, 6 * 1000)
+              })
+              res.status(200).send()
+            })
+
+            getPort().then(port => {
+              agent
+                .use(traces => {
+                  expect(traces[0][0]).to.have.property('error', 1)
+                })
+                .then(done)
+                .catch(done)
+
+              appListener = server(app, port, async () => {
+                const req = http.request(`${protocol}://localhost:${port}/user`, res => {
+                  res.on('data', () => { })
+                })
+
+                req.on('error', () => {})
+                req.on('socket', socket => {
+                  socket.setTimeout(5000)// match default timeout
+                })
+
+                req.end()
+              })
+            })
+          }).timeout(10000)
         }
 
         it('should only record a request once', done => {

packages/datadog-plugin-http/test/integration-test/server.mjs

@@ -10,5 +10,7 @@ const server = http.createServer(async (req, res) => {
   }
 }).listen(0, () => {
   const port = server.address().port
-  process.send({ port })
+  if (process.send) {
+    process.send({ port })
+  }
 })

packages/datadog-plugin-http2/test/integration-test/server.mjs

@@ -7,5 +7,7 @@ const server = http2.createServer((req, res) => {
 
 server.listen(0, () => {
   const port = server.address().port
-  process.send({ port })
+  if (process.send) {
+    process.send({ port })
+  }
 })