dd-trace 2.12.0 → 2.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

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

@@ -78,12 +78,12 @@ function wrapLayerHandle (layer) {
 
       try {
         return original.apply(this, arguments)
-      } catch (e) {
-        errorChannel.publish(e)
+      } catch (error) {
+        errorChannel.publish({ req, error })
         nextChannel.publish({ req })
         exitChannel.publish({ req })
 
-        throw e
+        throw error
       }
     })
   })
@@ -92,7 +92,7 @@ function wrapLayerHandle (layer) {
 function wrapNext (req, next) {
   return function (error) {
     if (error) {
-      errorChannel.publish(error)
+      errorChannel.publish({ req, error })
     }
 
     nextChannel.publish({ req })

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

@@ -6,7 +6,6 @@ const { addHook, channel, AsyncResource } = require('./helpers/instrument')
 const errorChannel = channel('apm:fastify:middleware:error')
 const handleChannel = channel('apm:fastify:request:handle')
 
-const requestResources = new WeakMap()
 const parsingResources = new WeakMap()
 
 function wrapFastify (fastify, hasParsingEvents) {
@@ -42,16 +41,13 @@ function wrapAddHook (addHook) {
 
     arguments[arguments.length - 1] = shimmer.wrap(fn, function (request, reply, done) {
       const req = getReq(request)
-      const requestResource = requestResources.get(req)
-
-      if (!requestResource) return fn.apply(this, arguments)
 
       try {
         if (typeof done === 'function') {
           done = arguments[arguments.length - 1]
 
           arguments[arguments.length - 1] = function (err) {
-            publishError(err, requestResource)
+            publishError(err, req)
 
             if (name === 'onRequest' || name === 'preParsing') {
               const parsingResource = new AsyncResource('bound-anonymous-fn')
@@ -71,13 +67,13 @@ function wrapAddHook (addHook) {
           const promise = fn.apply(this, arguments)
 
           if (promise && typeof promise.catch === 'function') {
-            return promise.catch(err => publishError(err, requestResource))
+            return promise.catch(err => publishError(err, req))
           }
 
           return promise
         }
       } catch (e) {
-        throw publishError(e, requestResource)
+        throw publishError(e, req)
       }
     })
 
@@ -90,14 +86,10 @@ function onRequest (request, reply, done) {
 
   const req = getReq(request)
   const res = getRes(reply)
-  const requestResource = new AsyncResource('bound-anonymous-fn')
 
-  requestResources.set(req, requestResource)
+  handleChannel.publish({ req, res })
 
-  return requestResource.runInAsyncScope(() => {
-    handleChannel.publish({ req, res })
-    return done()
-  })
+  return done()
 }
 
 function preHandler (request, reply, done) {
@@ -105,9 +97,8 @@ function preHandler (request, reply, done) {
   if (!reply || typeof reply.send !== 'function') return done()
 
   const req = getReq(request)
-  const requestResource = requestResources.get(req)
 
-  reply.send = wrapSend(reply.send, requestResource)
+  reply.send = wrapSend(reply.send, req)
 
   done()
 }
@@ -133,12 +124,10 @@ function preParsing (request, reply, payload, done) {
   parsingResource.runInAsyncScope(() => done())
 }
 
-function wrapSend (send, resource) {
-  return function sendWithTrace (payload) {
-    if (payload instanceof Error) {
-      resource.runInAsyncScope(() => {
-        errorChannel.publish(payload)
-      })
+function wrapSend (send, req) {
+  return function sendWithTrace (error) {
+    if (error instanceof Error) {
+      errorChannel.publish({ req, error })
     }
 
     return send.apply(this, arguments)
@@ -153,11 +142,9 @@ function getRes (reply) {
   return reply && (reply.raw || reply.res || reply)
 }
 
-function publishError (error, resource) {
+function publishError (error, req) {
   if (error) {
-    resource.runInAsyncScope(() => {
-      errorChannel.publish(error)
-    })
+    errorChannel.publish({ error, req })
   }
 
   return error

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

@@ -126,13 +126,13 @@ function wrapMiddleware (fn, layer) {
 }
 
 function fulfill (ctx, error) {
-  if (error) {
-    errorChannel.publish(error)
-  }
-
   const req = ctx.req
   const route = ctx.routePath
 
+  if (error) {
+    errorChannel.publish({ req, error })
+  }
+
   // TODO: make sure that the parent class cannot override this in `enter`
   if (route) {
     routeChannel.publish({ req, route })

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

@@ -49,12 +49,12 @@ function createWrapRouterMethod (name) {
 
         try {
           return original.apply(this, arguments)
-        } catch (e) {
-          errorChannel.publish(e)
+        } catch (error) {
+          errorChannel.publish({ req, error })
           nextChannel.publish({ req })
           exitChannel.publish({ req })
 
-          throw e
+          throw error
         }
       })
     })
@@ -91,7 +91,7 @@ function createWrapRouterMethod (name) {
   function wrapNext (req, next) {
     return function (error) {
       if (error) {
-        errorChannel.publish(error)
+        errorChannel.publish({ req, error })
       }
 
       nextChannel.publish({ req })

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

@@ -16,7 +16,10 @@ class RouterPlugin extends WebPlugin {
     this._contexts = new WeakMap()
 
     this.addSub(`apm:${this.constructor.name}:middleware:enter`, ({ req, name, route }) => {
-      const childOf = this._getActive(req)
+      const childOf = this._getActive(req) || this._getStoreSpan()
+
+      if (!childOf) return
+
       const span = this._getMiddlewareSpan(name, childOf)
       const context = this._createContext(req, route, childOf)
 
@@ -46,14 +49,16 @@ class RouterPlugin extends WebPlugin {
       context.middleware.pop().finish()
     })
 
-    this.addSub(`apm:${this.constructor.name}:middleware:error`, err => {
-      const store = storage.getStore()
+    this.addSub(`apm:${this.constructor.name}:middleware:error`, ({ req, error }) => {
+      web.addError(req, error)
 
-      web.addError(store.req, err)
+      if (!this.config.middleware) return
 
-      if (this.config.middleware) {
-        this.addError(err)
-      }
+      const span = this._getActive(req)
+
+      if (!span) return
+
+      span.setTag('error', error)
     })
 
     this.addSub(`apm:http:server:request:finish`, ({ req }) => {
@@ -72,7 +77,7 @@ class RouterPlugin extends WebPlugin {
   _getActive (req) {
     const context = this._contexts.get(req)
 
-    if (!context) return this._getStoreSpan()
+    if (!context) return
     if (context.middleware.length === 0) return context.span
 
     return context.middleware[context.middleware.length - 1]

package/packages/dd-trace/src/plugins/util/web.js

@@ -270,7 +270,10 @@ const web = {
   addError (req, error) {
     if (error instanceof Error) {
       const context = contexts.get(req)
-      context.error = error
+
+      if (context) {
+        context.error = error
+      }
     }
   },