rebse erorr

Author: sezen-datadog

dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFModule.java

@@ -593,14 +593,6 @@ private Waf.ResultWithData runWafContext(
     }
   }
 
-  private static void incrementErrorCodeMetric(GatewayContext gwCtx, int code) {
-    if (gwCtx.isRasp) {
-      WafMetricCollector.get().raspErrorCode(gwCtx.raspRuleType, code);
-    } else {
-      WafMetricCollector.get().wafErrorCode(gwCtx.raspRuleType, code);
-    }
-  }
-
   private static void incrementErrorCodeMetric(GatewayContext gwCtx, int code) {
     if (gwCtx.isRasp) {
       WafMetricCollector.get().raspErrorCode(gwCtx.raspRuleType, code);

dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java

@@ -198,7 +198,8 @@ public int getRaspTimeouts() {
     return raspTimeouts;
   }
 
-  public WafContext getOrCreateWafContext(WafBuilder wafBuilder, boolean createMetrics, boolean isRasp) {
+  public WafContext getOrCreateWafContext(
+      WafBuilder wafBuilder, boolean createMetrics, boolean isRasp) {
 
     if (createMetrics) {
       if (wafMetrics == null) {

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/ddwaf/WAFModuleSpecification.groovy

@@ -1,9 +1,5 @@
 package com.datadog.appsec.ddwaf
 
-import com.datadog.ddwaf.WafContext
-import com.datadog.ddwaf.WafErrorCode as LibWafErrorCode
-import datadog.trace.api.telemetry.WafMetricCollector.WafErrorCode as InternalWafErrorCode
-
 import com.datadog.appsec.AppSecModule
 import com.datadog.appsec.AppSecSystem
 import com.datadog.appsec.config.AppSecConfig
@@ -22,17 +18,17 @@ import com.datadog.appsec.event.data.MapDataBundle
 import com.datadog.appsec.gateway.AppSecRequestContext
 import com.datadog.appsec.gateway.GatewayContext
 import com.datadog.appsec.report.AppSecEvent
+import com.datadog.appsec.test.StubAppSecConfigService
+import com.datadog.ddwaf.Waf
+import com.datadog.ddwaf.WafBuilder
+import com.datadog.ddwaf.WafContext
+import com.datadog.ddwaf.WafErrorCode as LibWafErrorCode
+import com.datadog.ddwaf.WafMetrics
 import com.datadog.ddwaf.exception.AbstractWafException
 import com.datadog.ddwaf.exception.InternalWafException
 import com.datadog.ddwaf.exception.InvalidArgumentWafException
 import com.datadog.ddwaf.exception.InvalidObjectWafException
 import com.datadog.ddwaf.exception.UnclassifiedWafException
-import datadog.trace.api.telemetry.RuleType
-import datadog.trace.util.stacktrace.StackTraceEvent
-import com.datadog.appsec.test.StubAppSecConfigService
-import com.datadog.ddwaf.Waf
-import com.datadog.ddwaf.WafBuilder
-import com.datadog.ddwaf.WafMetrics
 import datadog.appsec.api.blocking.BlockingContentType
 import datadog.communication.monitor.Monitoring
 import datadog.trace.api.Config
@@ -41,6 +37,7 @@ import datadog.trace.api.gateway.Flow
 import datadog.trace.api.internal.TraceSegment
 import datadog.trace.api.telemetry.RuleType
 import datadog.trace.api.telemetry.WafMetricCollector
+import datadog.trace.api.telemetry.WafMetricCollector.WafErrorCode as InternalWafErrorCode
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import datadog.trace.test.util.DDSpecification