PR comments+ fix

Author: sezen-datadog

dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java

@@ -47,6 +47,7 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.ProductActivation;
 import datadog.trace.api.UserIdCollectionMode;
+import datadog.trace.api.telemetry.LogCollector;
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -60,8 +61,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-
-import datadog.trace.api.telemetry.LogCollector;
 import okio.Okio;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -348,10 +347,7 @@ public void init() {
       throw new IllegalStateException("Expected default waf config to be available");
     }
     try {
-      handleWafUpdateResultReport(
-          DEFAULT_WAF_CONFIG_RULE,
-          wafConfig,
-          defaultConfigActivated ? DEFAULT_CONFIG_LOCATION : tracerConfig.getAppSecRulesFile());
+      handleWafUpdateResultReport(DEFAULT_WAF_CONFIG_RULE, wafConfig);
     } catch (AppSecModule.AppSecModuleActivationException e) {
       throw new RuntimeException(e);
     }
@@ -512,6 +508,10 @@ private void applyRemoteConfigListener() {
     setAppSecActivation(features.asm);
     setUserIdCollectionMode(features.autoUserInstrum);
 
+    if (!AppSecSystem.isActive()) {	    
+      return;
+    }
+    
     distributeSubConfigurations("waf", reconfiguration);
   }
 

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/config/AppSecConfigServiceImplSpecification.groovy

@@ -122,7 +122,7 @@ class AppSecConfigServiceImplSpecification extends DDSpecification {
     when:
     appSecConfigService.init()
     then:
-    2 * config.getAppSecRulesFile() >> (p as String)
+    1 * config.getAppSecRulesFile() >> (p as String)
 
     when:
     appSecConfigService.maybeSubscribeConfigPolling()

remote-config/remote-config-api/src/main/java/datadog/remoteconfig/ConfigurationPoller.java

@@ -19,7 +19,7 @@ <T> void addListener(
       ConfigurationChangesTypedListener<T> listener);
 
   void addListener(
-      Product product, ConfigurationChangesListener mapConfigurationChangesTypedListener);
+      Product product, ConfigurationChangesListener configurationChangesListener);
 
   void removeListeners(Product product);
 

remote-config/remote-config-core/src/main/java/datadog/remoteconfig/DefaultConfigurationPoller.java

@@ -135,7 +135,7 @@ public DefaultConfigurationPoller(
 
   @Override
   public synchronized void addListener(
-      Product product, ConfigurationChangesListener mapConfigurationChangesTypedListener) {
+      Product product, ConfigurationChangesListener configurationChangesListener) {
     this.addListener(product, new SimpleProductListener(mapConfigurationChangesTypedListener));
   }