pr

Author: sezen-datadog

dd-java-agent/appsec/src/main/java/com/datadog/appsec/powerwaf/PowerWAFModule.java

@@ -218,7 +218,7 @@ private void applyConfig(Object config_, AppSecModuleConfigurer.Reconfiguration
     List<String> errors = new ArrayList<>();
     try {
       // ddwaf_init/update
-      success = initializeNewWafCtx(reconf, config, curCtxAndAddresses, errors);
+      success = initializeNewWafCtx(reconf, config, curCtxAndAddresses);
     } catch (Exception e) {
       throw new AppSecModuleActivationException("Could not initialize/update waf", e);
     } finally {
@@ -227,18 +227,13 @@ private void applyConfig(Object config_, AppSecModuleConfigurer.Reconfiguration
       } else {
         WafMetricCollector.get().wafUpdates(currentRulesVersion, success);
       }
-      if (!errors.isEmpty()) {
-        log.error("Errors during WAF initialization: {}", errors);
-        WafMetricCollector.get().addWafConfigError(errors.size());
-      }
     }
   }
 
   private boolean initializeNewWafCtx(
       AppSecModuleConfigurer.Reconfiguration reconf,
       CurrentAppSecConfig config,
-      CtxAndAddresses prevContextAndAddresses,
-      List<String> errors)
+      CtxAndAddresses prevContextAndAddresses)
       throws AppSecModuleActivationException, IOException {
     CtxAndAddresses newContextAndAddresses;
     RuleSetInfo initReport = null;
@@ -286,10 +281,9 @@ private boolean initializeNewWafCtx(
       if (initReport != null
           && initReport.getErrors() != null
           && !initReport.getErrors().isEmpty()) {
-        errors.addAll(
-            initReport.getErrors().values().stream()
-                .flatMap(List::stream)
-                .collect(Collectors.toList()));
+
+        WafMetricCollector.get()
+            .addWafConfigError(initReport.getErrors().values().stream().mapToInt(List::size).sum());
       }
     } catch (InvalidRuleSetException irse) {
       initReport = irse.ruleSetInfo;

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

@@ -44,9 +44,9 @@ class StubAppSecConfigService implements AppSecConfigService, AppSecConfigServic
   Optional<Object> addSubConfigListener(String key, AppSecModuleConfigurer.SubconfigListener listener) {
     listeners[key] = listener
 
-    if(lastConfig != null){
+    if (lastConfig != null) {
       Optional.ofNullable(lastConfig[key])
-    }else{
+    } else {
       Optional.empty()
     }
   }