Refactor appsec.waf.updates and appsec.waf.init success tag (#8341)

Author: Mariovido

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

@@ -209,15 +209,22 @@ private void applyConfig(Object config_, AppSecModuleConfigurer.Reconfiguration
       config.dirtyStatus.markAllDirty();
     }
 
+    boolean success = false;
     try {
       // ddwaf_init/update
-      initializeNewWafCtx(reconf, config, curCtxAndAddresses);
+      success = initializeNewWafCtx(reconf, config, curCtxAndAddresses);
     } catch (Exception e) {
       throw new AppSecModuleActivationException("Could not initialize/update waf", e);
+    } finally {
+      if (curCtxAndAddresses == null) {
+        WafMetricCollector.get().wafInit(Powerwaf.LIB_VERSION, currentRulesVersion, success);
+      } else {
+        WafMetricCollector.get().wafUpdates(currentRulesVersion, success);
+      }
     }
   }
 
-  private void initializeNewWafCtx(
+  private boolean initializeNewWafCtx(
       AppSecModuleConfigurer.Reconfiguration reconf,
       CurrentAppSecConfig config,
       CtxAndAddresses prevContextAndAddresses)
@@ -267,13 +274,11 @@ private void initializeNewWafCtx(
       }
     } catch (InvalidRuleSetException irse) {
       initReport = irse.ruleSetInfo;
-      sendWafMetrics(prevContextAndAddresses, false);
       throw new AppSecModuleActivationException("Error creating WAF rules", irse);
     } catch (RuntimeException | AbstractPowerwafException e) {
       if (newPwafCtx != null) {
         newPwafCtx.close();
       }
-      sendWafMetrics(prevContextAndAddresses, false);
       throw new AppSecModuleActivationException("Error creating WAF rules", e);
     } finally {
       if (initReport != null) {
@@ -283,25 +288,15 @@ private void initializeNewWafCtx(
 
     if (!this.ctxAndAddresses.compareAndSet(prevContextAndAddresses, newContextAndAddresses)) {
       newPwafCtx.close();
-      sendWafMetrics(prevContextAndAddresses, false);
       throw new AppSecModuleActivationException("Concurrent update of WAF configuration");
     }
 
-    sendWafMetrics(prevContextAndAddresses, true);
-
     if (prevContextAndAddresses != null) {
       prevContextAndAddresses.ctx.close();
     }
 
     reconf.reloadSubscriptions();
-  }
-
-  private void sendWafMetrics(CtxAndAddresses prevContextAndAddresses, boolean success) {
-    if (prevContextAndAddresses == null) {
-      WafMetricCollector.get().wafInit(Powerwaf.LIB_VERSION, currentRulesVersion, success);
-    } else {
-      WafMetricCollector.get().wafUpdates(currentRulesVersion, success);
-    }
+    return true;
   }
 
   private Map<String, ActionInfo> calculateEffectiveActions(