try again to make the tests pass

Author: bengl

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

@@ -62,7 +62,7 @@ class RouterPlugin extends WebPlugin {
     this.addSub(`apm:${this.constructor.id}:middleware:error`, ({ req, error }) => {
       web.addError(req, error)
 
-      if (!this.config.middlewareTracingEnabled) return
+      if (!this.config.middleware) return
 
       const span = this._getActive(req)
 
@@ -100,7 +100,7 @@ class RouterPlugin extends WebPlugin {
   }
 
   _getMiddlewareSpan (name, childOf) {
-    if (this.config.middlewareTracingEnabled === false) {
+    if (this.config.middleware === false) {
       return childOf
     }
 

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

@@ -45,7 +45,7 @@ const web = {
     const validateStatus = getStatusValidator(config)
     const hooks = getHooks(config)
     const filter = urlFilter.getFilter(config)
-    const middlewareTracingEnabled = getMiddlewareSetting(config, tracerConfig)
+    const middleware = getMiddlewareSetting(config, tracerConfig)
     const queryStringObfuscation = getQsObfuscator(config)
 
     return {
@@ -54,7 +54,7 @@ const web = {
       validateStatus,
       hooks,
       filter,
-      middlewareTracingEnabled,
+      middleware,
       queryStringObfuscation
     }
   },
@@ -160,7 +160,7 @@ const web = {
     const childOf = this.active(req)
     const config = context.config
 
-    if (config.middlewareTracingEnabled === false) {
+    if (config.middleware === false) {
       return this.bindAndWrapMiddlewareErrors(fn, req, tracer, childOf)
     }
 
@@ -574,8 +574,8 @@ function getHooks (config) {
 
 function getMiddlewareSetting (config, tracerConfig) {
   if (config) {
-    if (typeof config.middlewareTracingEnabled === 'boolean') {
-      return config.middlewareTracingEnabled
+    if (typeof config.middleware === 'boolean') {
+      return config.middleware
     } else if (config.hasOwnProperty('middlewareTracingEnabled')) {
       log.error('Expected `middlewareTracingEnabled` to be a boolean.')
     }