create isNoop method on scope

DataDog · Oct 28, 2024 · dfb235e · dfb235e
1 parent 83468b8
commit dfb235e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/dd-trace/src/scope.js b/packages/dd-trace/src/scope.js
@@ -58,6 +58,10 @@ class Scope {
   _isPromise (promise) {
     return promise && typeof promise.then === 'function'
   }
+
+  isNoop () {
+    return storage.getStore()?.noop
+  }
 }
 
 module.exports = Scope
diff --git a/packages/dd-trace/src/tracer.js b/packages/dd-trace/src/tracer.js
@@ -3,7 +3,6 @@
 const Tracer = require('./opentracing/tracer')
 const tags = require('../../../ext/tags')
 const Scope = require('./scope')
-const { storage } = require('../../datadog-core')
 const { isError } = require('./util')
 const { setStartupLogConfig } = require('./startup-log')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
@@ -106,9 +105,7 @@ class DatadogTracer extends Tracer {
     const tracer = this
 
     return function () {
-      const store = storage.getStore()
-
-      if (store && store.noop) return fn.apply(this, arguments)
+      if (tracer.scope().isNoop()) return fn.apply(this, arguments)
 
       let optionsObj = options
       if (typeof optionsObj === 'function' && typeof fn === 'function') {