diff --git a/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java b/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java index 2567cc6c200..c7e518a7309 100644 --- a/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java +++ b/internal-api/src/main/java/datadog/trace/api/telemetry/WafMetricCollector.java @@ -328,7 +328,8 @@ public RaspRuleEval(final long counter, final RuleType ruleType, final String wa ? new String[] { "rule_type:" + ruleType.type, "rule_variant:" + ruleType.variant, - "waf_version:" + wafVersion + "waf_version:" + wafVersion, + "event_rules_version" + rulesVersion } : new String[] {"rule_type:" + ruleType.type, "waf_version:" + wafVersion}); } @@ -343,7 +344,8 @@ public RaspRuleMatch(final long counter, final RuleType ruleType, final String w ? new String[] { "rule_type:" + ruleType.type, "rule_variant:" + ruleType.variant, - "waf_version:" + wafVersion + "waf_version:" + wafVersion, + "event_rules_version" + rulesVersion } : new String[] {"rule_type:" + ruleType.type, "waf_version:" + wafVersion}); } @@ -358,7 +360,8 @@ public RaspTimeout(final long counter, final RuleType ruleType, final String waf ? new String[] { "rule_type:" + ruleType.type, "rule_variant:" + ruleType.variant, - "waf_version:" + wafVersion + "waf_version:" + wafVersion, + "event_rules_version" + rulesVersion } : new String[] {"rule_type:" + ruleType.type, "waf_version:" + wafVersion}); } diff --git a/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy index 1e1159dcfa7..a4dec8d505e 100644 --- a/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy @@ -314,21 +314,36 @@ class WafMetricCollectorTest extends DDSpecification { raspRuleEval.value == 3 raspRuleEval.namespace == 'appsec' raspRuleEval.metricName == 'rasp.rule.eval' - raspRuleEval.tags.toSet() == ['rule_type:command_injection', 'rule_variant:'+ruleType.variant, 'waf_version:waf_ver1'].toSet() + raspRuleEval.tags.toSet() == [ + 'rule_type:command_injection', + 'rule_variant:'+ruleType.variant, + 'waf_version:waf_ver1', + 'event_rules_versionrules.1' + ].toSet() def raspRuleMatch = (WafMetricCollector.RaspRuleMatch)metrics[2] raspRuleMatch.type == 'count' raspRuleMatch.value == 1 raspRuleMatch.namespace == 'appsec' raspRuleMatch.metricName == 'rasp.rule.match' - raspRuleMatch.tags.toSet() == ['rule_type:command_injection', 'rule_variant:'+ruleType.variant, 'waf_version:waf_ver1'].toSet() + raspRuleMatch.tags.toSet() == [ + 'rule_type:command_injection', + 'rule_variant:'+ruleType.variant, + 'waf_version:waf_ver1', + 'event_rules_versionrules.1' + ].toSet() def raspTimeout = (WafMetricCollector.RaspTimeout)metrics[3] raspTimeout.type == 'count' raspTimeout.value == 1 raspTimeout.namespace == 'appsec' raspTimeout.metricName == 'rasp.timeout' - raspTimeout.tags.toSet() == ['rule_type:command_injection', 'rule_variant:'+ruleType.variant, 'waf_version:waf_ver1'].toSet() + raspTimeout.tags.toSet() == [ + 'rule_type:command_injection', + 'rule_variant:'+ruleType.variant, + 'waf_version:waf_ver1', + 'event_rules_versionrules.1' + ].toSet() where: ruleType << [RuleType.COMMAND_INJECTION, RuleType.SHELL_INJECTION]