Abstract log message publish in reporter

Author: CarlesDD

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

@@ -242,48 +242,49 @@ function reportWafInit (wafVersion, rulesVersion, diagnosticsRules = {}, success
   incrementWafInitMetric(wafVersion, rulesVersion, success)
 }
 
+function logWafDiagnosticMessage (product, rcConfigId, configKey, message, level) {
+  telemetryLogCh.publish({
+    message,
+    level,
+    tags: {
+      log_type: `rc::${product.toLowerCase()}::diagnostic`,
+      appsec_config_key: configKey,
+      rc_config_id: rcConfigId
+    }
+  })
+}
+
 function reportSuccessfulWafUpdate (product, rcConfigId, diagnostics) {
   for (const configKey of WAF_DIAGNOSTICS_CONFIG_KEYS_TO_REPORT) {
-    if (!diagnostics[configKey]) continue
-
-    if (diagnostics[configKey].error) {
-      telemetryLogCh.publish({
-        message: diagnostics[configKey].error,
-        level: 'ERROR',
-        tags: {
-          log_type: `rc::${product.toLowerCase()}::diagnostic`,
-          appsec_config_key: configKey,
-          rc_config_id: rcConfigId
-        }
-      })
+    const configDiagnostics = diagnostics[configKey]
+    if (!configDiagnostics) continue
+
+    if (configDiagnostics.error) {
+      logWafDiagnosticMessage(product, rcConfigId, configKey, configDiagnostics.error, 'ERROR')
       continue
     }
 
-    if (diagnostics[configKey].errors) {
-      for (const [errorMessage, errorIds] of Object.entries(diagnostics[configKey].errors)) {
-        telemetryLogCh.publish({
-          message: `"${errorMessage}": ${JSON.stringify(errorIds)}`,
-          level: 'ERROR',
-          tags: {
-            log_type: `rc::${product.toLowerCase()}::diagnostic`,
-            appsec_config_key: configKey,
-            rc_config_id: rcConfigId
-          }
-        })
+    if (configDiagnostics.errors) {
+      for (const [errorMessage, errorIds] of Object.entries(configDiagnostics.errors)) {
+        logWafDiagnosticMessage(
+          product,
+          rcConfigId,
+          configKey,
+          `"${errorMessage}": ${JSON.stringify(errorIds)}`,
+          'ERROR'
+        )
       }
     }
 
-    if (diagnostics[configKey].warnings) {
-      for (const [warningMessage, warningIds] of Object.entries(diagnostics[configKey].warnings)) {
-        telemetryLogCh.publish({
-          message: `"${warningMessage}": ${JSON.stringify(warningIds)}`,
-          level: 'WARN',
-          tags: {
-            log_type: `rc::${product.toLowerCase()}::diagnostic`,
-            appsec_config_key: configKey,
-            rc_config_id: rcConfigId
-          }
-        })
+    if (configDiagnostics.warnings) {
+      for (const [warningMessage, warningIds] of Object.entries(configDiagnostics.warnings)) {
+        logWafDiagnosticMessage(
+          product,
+          rcConfigId,
+          configKey,
+          `"${warningMessage}": ${JSON.stringify(warningIds)}`,
+          'WARN'
+        )
       }
     }
   }