update async scope tracking to not track itself (#773)

rochdev · web-flow · commit b43978be9a80 · 2019-12-03T11:24:39.000-05:00
diff --git a/packages/dd-trace/src/scope/async_hooks.js b/packages/dd-trace/src/scope/async_hooks.js
@@ -76,7 +76,9 @@ class Scope extends Base {
   _await (span) {
     if (!this._promises[this._depth]) return
 
+    this._enabled = false
     this._awaitAsync(span)
+    this._enabled = true
   }
 
   // https://github.com/nodejs/node/issues/22360
@@ -91,10 +93,8 @@ class Scope extends Base {
 
   _initPromise () {
     if (!this._promises[this._depth]) {
-      this._enabled = false
       this._promises[this._depth] = true
       this._await(this._current)
-      this._enabled = true
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,9 @@ class Scope extends Base {`
`76`	`76`	`_await (span) {`
`77`	`77`	`if (!this._promises[this._depth]) return`
`78`	`78`
	`79`	`+ this._enabled = false`
`79`	`80`	`this._awaitAsync(span)`
	`81`	`+ this._enabled = true`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`// https://github.com/nodejs/node/issues/22360`
`@@ -91,10 +93,8 @@ class Scope extends Base {`
`91`	`93`
`92`	`94`	`_initPromise () {`
`93`	`95`	`if (!this._promises[this._depth]) {`
`94`		`- this._enabled = false`
`95`	`96`	`this._promises[this._depth] = true`
`96`	`97`	`this._await(this._current)`
`97`		`- this._enabled = true`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`