pr

Author: sezen-datadog

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

@@ -306,14 +306,14 @@ class AppSecRequestContextSpecification extends DDSpecification {
 
   def "test increase and get WafErrors"() {
     when:
-    ctx.increaseWafErrorCode(-3)
-    ctx.increaseWafErrorCode(-3)
-    ctx.increaseWafErrorCode(-2)
+    ctx.increaseWafErrorCode(AppSecRequestContext.DD_WAF_RUN_INTERNAL_ERROR)
+    ctx.increaseWafErrorCode(AppSecRequestContext.DD_WAF_RUN_INTERNAL_ERROR)
+    ctx.increaseWafErrorCode(AppSecRequestContext.DD_WAF_RUN_INVALID_OBJECT_ERROR)
 
     then:
-    ctx.getWafError(-3) == 2
-    ctx.getWafError(-2) == 1
-    ctx.getWafError(-1) == 0
+    ctx.getWafError(AppSecRequestContext.DD_WAF_RUN_INTERNAL_ERROR) == 2
+    ctx.getWafError(AppSecRequestContext.DD_WAF_RUN_INVALID_OBJECT_ERROR) == 1
+    ctx.getWafError(AppSecRequestContext.DD_WAF_RUN_INVALID_ARGUMENT_ERROR) == 0
     ctx.getWafError(0) == 0
   }
 }

internal-api/src/test/groovy/datadog/trace/api/telemetry/WafMetricCollectorTest.groovy

@@ -182,9 +182,11 @@ class WafMetricCollectorTest extends DDSpecification {
     wafInvalidObjectCode.value == 1
     wafInvalidObjectCode.namespace == 'appsec'
     wafInvalidObjectCode.metricName == 'waf.error'
-    wafInvalidObjectCode.tags.toSet() == ['rule_type:sql_injection', 'waf_version:waf_ver1',
-                                          'waf_error:'+DD_WAF_RUN_INVALID_OBJECT_ERROR].toSet()
-
+    wafInvalidObjectCode.tags.toSet() == [
+      'rule_type:sql_injection',
+      'waf_version:waf_ver1',
+      'waf_error:'+DD_WAF_RUN_INVALID_OBJECT_ERROR
+    ].toSet()
   }
 
   def "overflowing WafMetricCollector does not crash"() {
@@ -424,7 +426,7 @@ class WafMetricCollectorTest extends DDSpecification {
       'rule_type:command_injection',
       'rule_variant:' + ruleType.variant,
       'event_rules_version:rules.1',
-      'waf_error:-3'
+      'waf_error:' + DD_WAF_RUN_INTERNAL_ERROR
     ].toSet()
 
     where: