Merge metadata in any update config (#7856)

Author: ValentinZakharov

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

@@ -88,7 +88,6 @@ public AppSecConfig getMergedUpdateConfig() throws IOException {
 
     Map<String, Object> mso = new HashMap<>();
     if (dirtyStatus.rules) {
-      mso.put("metadata", ddConfig.getRawConfig().getOrDefault("metadata", Collections.emptyMap()));
       mso.put("rules", ddConfig.getRawConfig().getOrDefault("rules", Collections.emptyList()));
       mso.put(
           "processors",
@@ -116,6 +115,10 @@ public AppSecConfig getMergedUpdateConfig() throws IOException {
 
     mso.put("version", ddConfig.getVersion() == null ? "2.1" : ddConfig.getVersion());
 
+    if (dirtyStatus.isAnyDirty()) {
+      mso.put("metadata", ddConfig.getRawConfig().getOrDefault("metadata", Collections.emptyMap()));
+    }
+
     if (log.isDebugEnabled()) {
       log.debug(
           "Providing WAF config with: "
@@ -220,11 +223,9 @@ private List<Map<String, Object>> getMergedActions() {
   }
 
   private List<Map<String, Object>> getMergedCustomRules() {
-    List<Map<String, Object>> customRules =
-        this.userConfigs.stream()
-            .map(uc -> uc.customRules)
-            .reduce(Collections.emptyList(), CurrentAppSecConfig::mergeMapsByIdKeepLatest);
-    return customRules;
+    return this.userConfigs.stream()
+        .map(uc -> uc.customRules)
+        .reduce(Collections.emptyList(), CurrentAppSecConfig::mergeMapsByIdKeepLatest);
   }
 
   private List<Map<String, Object>> getMergedExclusions() {