Address review comments

Author: watson

packages/dd-trace/src/appsec/index.js

@@ -48,7 +48,7 @@ const storedBodies = new WeakMap()
 let isEnabled = false
 let config
 
-function enable (_config) {
+function enable (_config, rc) {
   if (isEnabled) return
 
   try {
@@ -63,7 +63,10 @@ function enable (_config) {
 
     RuleManager.loadRules(_config.appsec)
 
-    appsecRemoteConfig.enableWafUpdate(_config.appsec)
+    if (rc) {
+      appsecRemoteConfig.enable(rc, _config, module.exports)
+      appsecRemoteConfig.enableWafUpdate(_config.appsec)
+    }
 
     Reporter.init(_config.appsec)
 

packages/dd-trace/src/proxy.js

@@ -125,16 +125,17 @@ class Tracer extends NoopProxy {
         spanleak.startScrubber()
       }
 
+      let rc
       if (config.remoteConfig.enabled && !config.isCiVisibility) {
-        const rc = require('./remote_config').enable(config)
+        rc = require('./remote_config').enable(config)
 
         rc.setProductHandler('APM_TRACING', (action, conf) => {
           if (action === 'unapply') {
             config.configure({}, true)
           } else {
             config.configure(conf.lib_config, true)
           }
-          this._enableOrDisableTracing(config)
+          this._enableOrDisableTracing(config, rc)
         })
 
         rc.setProductHandler('AGENT_CONFIG', (action, conf) => {
@@ -156,11 +157,6 @@ class Tracer extends NoopProxy {
           this._flare.module.send(conf.args)
         })
 
-        if (this._modules.appsec) {
-          const appsecRemoteConfig = require('./appsec/remote_config')
-          appsecRemoteConfig.enable(rc, config, this._modules.appsec)
-        }
-
         if (config.dynamicInstrumentation.enabled) {
           DynamicInstrumentation.start(config, rc)
         }
@@ -194,7 +190,7 @@ class Tracer extends NoopProxy {
         runtimeMetrics.start(config)
       }
 
-      this._enableOrDisableTracing(config)
+      this._enableOrDisableTracing(config, rc)
 
       this._modules.rewriter.enable(config)
 
@@ -253,10 +249,10 @@ class Tracer extends NoopProxy {
     }
   }
 
-  _enableOrDisableTracing (config) {
+  _enableOrDisableTracing (config, rc) {
     if (config.tracing !== false) {
       if (config.appsec.enabled) {
-        this._modules.appsec.enable(config)
+        this._modules.appsec.enable(config, rc)
       }
       if (config.llmobs.enabled) {
         this._modules.llmobs.enable(config)

packages/dd-trace/test/proxy.spec.js

@@ -450,7 +450,7 @@ describe('TracerProxy', () => {
         const remoteConfigProxy = new RemoteConfigProxy()
         remoteConfigProxy.init()
 
-        sinon.assert.calledOnceWithExactly(appsec.enable, config)
+        sinon.assert.calledOnceWithExactly(appsec.enable, config, rc)
         sinon.assert.calledOnceWithExactly(iast.enable, config, tracer)
 
         let conf = { tracing_enabled: false }
@@ -461,7 +461,7 @@ describe('TracerProxy', () => {
         conf = { tracing_enabled: true }
         handlers.get('APM_TRACING')('apply', { lib_config: conf })
         sinon.assert.calledTwice(appsec.enable)
-        sinon.assert.calledWithExactly(appsec.enable.secondCall, config)
+        sinon.assert.calledWithExactly(appsec.enable.secondCall, config, rc)
         sinon.assert.calledTwice(iast.enable)
         sinon.assert.calledWithExactly(iast.enable.secondCall, config, tracer)
       })