dd-trace 5.101.0 → 5.103.0

package/packages/datadog-instrumentations/src/oracledb.js

@@ -137,21 +137,21 @@ addHook({ name: 'oracledb', versions: ['>=5'], file: 'lib/oracledb.js' }, oracle
     }
   })
   shimmer.wrap(oracledb.Pool.prototype, 'getConnection', getConnection => {
-    return function wrappedGetConnection () {
+    return function wrappedGetConnection (...args) {
       let callback
-      if (typeof arguments[arguments.length - 1] === 'function') {
-        callback = arguments[arguments.length - 1]
+      if (typeof args[args.length - 1] === 'function') {
+        callback = args[args.length - 1]
       }
       if (callback) {
-        arguments[arguments.length - 1] = shimmer.wrapFunction(callback, callback => (err, connection) => {
+        args[args.length - 1] = shimmer.wrapFunction(callback, callback => (err, connection) => {
           if (connection) {
             connectionAttributes.set(connection, poolAttributes.get(this))
           }
           callback(err, connection)
         })
-        getConnection.apply(this, arguments)
+        getConnection.apply(this, args)
       } else {
-        return getConnection.apply(this, arguments).then((connection) => {
+        return getConnection.apply(this, args).then((connection) => {
           connectionAttributes.set(connection, poolAttributes.get(this))
           return connection
         })

package/packages/datadog-instrumentations/src/passport-utils.js

@@ -40,15 +40,15 @@ function wrapVerify (verify) {
 }
 
 function wrapStrategy (Strategy) {
-  return function wrappedStrategy () {
+  return function wrappedStrategy (...args) {
     // verify function can be either the first or second argument
-    if (typeof arguments[0] === 'function') {
-      arguments[0] = wrapVerify(arguments[0])
+    if (typeof args[0] === 'function') {
+      args[0] = wrapVerify(args[0])
     } else {
-      arguments[1] = wrapVerify(arguments[1])
+      args[1] = wrapVerify(args[1])
     }
 
-    return Strategy.apply(this, arguments)
+    return Strategy.apply(this, args)
   }
 }
 

package/packages/datadog-instrumentations/src/pg.js

@@ -15,6 +15,10 @@ const errorCh = channel('apm:pg:query:error')
 const startPoolQueryCh = channel('datadog:pg:pool:query:start')
 const finishPoolQueryCh = channel('datadog:pg:pool:query:finish')
 
+// Drivers like pg-promise reuse the same prepared-statement query object across executions; cache
+// the un-injected `text` so the wrap doesn't capture a previous DBM injection as the new original.
+const originalTextCache = new WeakMap()
+
 addHook({ name: 'pg', versions: ['>=8.0.3'], file: 'lib/native/client.js' }, Client => {
   shimmer.wrap(Client.prototype, 'query', query => wrapQuery(query))
   return Client
@@ -31,32 +35,26 @@ addHook({ name: 'pg', versions: ['>=8.0.3'] }, pg => {
 })
 
 function wrapQuery (query) {
-  return function () {
+  return function (...args) {
     if (!startCh.hasSubscribers) {
-      return query.apply(this, arguments)
+      return query.apply(this, args)
     }
 
     const processId = this.processID
 
-    const pgQuery = arguments[0] !== null && typeof arguments[0] === 'object'
-      ? arguments[0]
-      : { text: arguments[0] }
+    const pgQuery = args[0] !== null && typeof args[0] === 'object'
+      ? args[0]
+      : { text: args[0] }
 
     const textPropObj = pgQuery.cursor ?? pgQuery
-    const textProp = Object.getOwnPropertyDescriptor(textPropObj, 'text')
     const stream = typeof textPropObj.read === 'function'
 
-    // Only alter `text` property if safe to do so. Initially, it's a property, not a getter.
-    let originalText
-    if (!textProp || textProp.configurable) {
+    let originalText = originalTextCache.get(textPropObj)
+    if (originalText === undefined) {
       originalText = textPropObj.text
-
-      Object.defineProperty(textPropObj, 'text', {
-        get () {
-          return this?.__ddInjectableQuery || originalText
-        },
-      })
+      originalTextCache.set(textPropObj, originalText)
     }
+
     const abortController = new AbortController()
     const ctx = {
       params: this.connectionParameters,
@@ -80,7 +78,7 @@ function wrapQuery (query) {
 
         // Based on: https://github.com/brianc/node-postgres/blob/54eb0fa216aaccd727765641e7d1cf5da2bc483d/packages/pg/lib/client.js#L510
         const reusingQuery = typeof pgQuery.submit === 'function'
-        const callback = arguments[arguments.length - 1]
+        const callback = args[args.length - 1]
 
         finish(error)
 
@@ -109,9 +107,25 @@ function wrapQuery (query) {
         return Promise.reject(error)
       }
 
-      arguments[0] = pgQuery
+      const injected = ctx.injected
+      if (injected !== undefined) {
+        // Skip the per-read getter trampoline when `text` is a configurable, writable data
+        // property (the pg / pg-cursor common shape). Accessor descriptors and read-only data
+        // still go through `defineProperty(get)` so `get text ()` query objects keep working.
+        const textProp = Object.getOwnPropertyDescriptor(textPropObj, 'text')
+        if (textProp?.configurable === true && textProp.writable === true) {
+          textPropObj.text = injected
+        } else if (textProp === undefined || textProp.configurable === true) {
+          Object.defineProperty(textPropObj, 'text', {
+            configurable: true,
+            get () { return injected },
+          })
+        }
+      }
+
+      args[0] = pgQuery
 
-      const retval = query.apply(this, arguments)
+      const retval = query.apply(this, args)
 
       const deperecated = Object.hasOwn(this, '_activeQuery')
       const queryQueue = deperecated ? this._queryQueue : this.queryQueue
@@ -153,18 +167,18 @@ const finish = (ctx) => {
   finishPoolQueryCh.publish(ctx)
 }
 function wrapPoolQuery (query) {
-  return function () {
+  return function (...args) {
     if (!startPoolQueryCh.hasSubscribers) {
-      return query.apply(this, arguments)
+      return query.apply(this, args)
     }
 
-    const pgQuery = arguments[0] !== null && typeof arguments[0] === 'object' ? arguments[0] : { text: arguments[0] }
+    const pgQuery = args[0] !== null && typeof args[0] === 'object' ? args[0] : { text: args[0] }
     const abortController = new AbortController()
 
     const ctx = { query: pgQuery, abortController }
 
     return startPoolQueryCh.runStores(ctx, () => {
-      const cb = arguments[arguments.length - 1]
+      const cb = args[args.length - 1]
 
       if (abortController.signal.aborted) {
         const error = abortController.signal.reason || new Error('Aborted')
@@ -179,13 +193,13 @@ function wrapPoolQuery (query) {
       }
 
       if (typeof cb === 'function') {
-        arguments[arguments.length - 1] = shimmer.wrapFunction(cb, cb => function () {
+        args[args.length - 1] = shimmer.wrapFunction(cb, cb => function (...args) {
           finish(ctx)
-          return cb.apply(this, arguments)
+          return cb.apply(this, args)
         })
       }
 
-      const retval = query.apply(this, arguments)
+      const retval = query.apply(this, args)
 
       if (retval?.then) {
         retval.then(() => {

package/packages/datadog-instrumentations/src/pino.js

@@ -7,8 +7,8 @@ const {
 } = require('./helpers/instrument')
 
 function wrapPino (symbol, wrapper, pino) {
-  return function pinoWithTrace () {
-    const instance = pino.apply(this, arguments)
+  return function pinoWithTrace (...args) {
+    const instance = pino.apply(this, args)
 
     Object.defineProperty(instance, symbol, {
       configurable: true,
@@ -46,8 +46,8 @@ function wrapPrettifyObject (prettifyObject) {
 
 function wrapPrettyFactory (prettyFactory) {
   const ch = channel('apm:pino:log')
-  return function prettyFactoryWithTrace () {
-    const pretty = prettyFactory.apply(this, arguments)
+  return function prettyFactoryWithTrace (...args) {
+    const pretty = prettyFactory.apply(this, args)
     return function prettyWithTrace (obj) {
       const payload = { message: obj }
       ch.publish(payload)
@@ -60,17 +60,13 @@ function wrapPrettyFactory (prettyFactory) {
 addHook({ name: 'pino', versions: ['2 - 3', '4'], patchDefault: true }, (pino) => {
   const asJsonSym = (pino.symbols && pino.symbols.asJsonSym) || 'asJson'
 
-  const wrapped = shimmer.wrapFunction(pino, pino => wrapPino(asJsonSym, wrapAsJson, pino))
-
-  return wrapped
+  return shimmer.wrapFunction(pino, pino => wrapPino(asJsonSym, wrapAsJson, pino))
 })
 
 addHook({ name: 'pino', versions: ['>=5 <6.8.0'], patchDefault: true }, (pino) => {
   const asJsonSym = ((pino.default || pino)?.symbols.asJsonSym) || 'asJson'
 
-  const wrapped = shimmer.wrapFunction(pino, pino => wrapPino(asJsonSym, wrapAsJson, pino.default || pino))
-
-  return wrapped
+  return shimmer.wrapFunction(pino, pino => wrapPino(asJsonSym, wrapAsJson, pino.default || pino))
 })
 
 addHook({ name: 'pino', versions: ['>=6.8.0'], patchDefault: false }, (pino) => {