dd-trace 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -61,7 +61,7 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@datadog/native-appsec": "^0.8.0",
+    "@datadog/native-appsec": "^0.8.1",
     "@datadog/native-metrics": "^1.1.0",
     "@datadog/pprof": "^0.3.0",
     "@datadog/sketches-js": "^1.0.4",

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

@@ -6,8 +6,16 @@ const shimmer = require('../../datadog-shimmer')
 
 addHook({
   name: 'q',
-  versions: ['>=1']
+  versions: ['1']
 }, Q => {
   shimmer.wrap(Q.makePromise.prototype, 'then', wrapThen)
   return Q
 })
+
+addHook({
+  name: 'q',
+  versions: ['>=2']
+}, Q => {
+  shimmer.wrap(Q.Promise.prototype, 'then', wrapThen)
+  return Q
+})

package/packages/datadog-plugin-winston/src/index.js

@@ -2,18 +2,37 @@
 
 const { LOG } = require('../../../ext/formats')
 
+function chunkProxy (chunk, holder) {
+  return new Proxy(chunk, {
+    get (target, p, receiver) {
+      switch (p) {
+        case Symbol.toStringTag:
+          return Object.prototype.toString.call(target).slice(8, -1)
+        case 'dd':
+          return holder.dd
+        default:
+          return Reflect.get(target, p, receiver)
+      }
+    },
+    ownKeys (target) {
+      return ['dd', ...Reflect.ownKeys(target)]
+    },
+    getOwnPropertyDescriptor (target, p) {
+      return Reflect.getOwnPropertyDescriptor(p === 'dd' ? holder : target, p)
+    }
+  })
+}
+
 function createWrapWrite (tracer, config) {
   return function wrapWrite (write) {
     return function writeWithTrace (chunk, encoding, callback) {
       const span = tracer.scope().active()
 
-      tracer.inject(span, LOG, chunk)
+      const holder = {}
+      tracer.inject(span, LOG, holder)
+      arguments[0] = chunkProxy(chunk, holder)
 
-      const result = write.apply(this, arguments)
-
-      delete chunk.dd
-
-      return result
+      return write.apply(this, arguments)
     }
   }
 }
@@ -42,15 +61,14 @@ function createWrapLog (tracer, config) {
     return function logWithTrace (level, msg, meta, callback) {
       const span = tracer.scope().active()
 
-      meta = arguments[2] = meta || {}
+      meta = meta || {}
 
-      tracer.inject(span, LOG, meta)
+      const holder = {}
+      tracer.inject(span, LOG, holder)
 
-      const result = log.apply(this, arguments)
+      arguments[2] = chunkProxy(meta, holder)
 
-      delete meta.dd
-
-      return result
+      return log.apply(this, arguments)
     }
   }
 }

package/packages/dd-trace/lib/version.js

@@ -1 +1 @@
-module.exports = '2.0.0'
+module.exports = '2.0.1'