Fix coverage and add tags to exception

manuel-alvarez-alvarez · manuel-alvarez-alvarez · commit 3c243efa4287 · 2025-11-20T01:32:23.000+01:00
diff --git a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java
@@ -238,7 +238,7 @@ public Evaluation evaluate(final List<Message> messages, final Options options)
         WafMetricCollector.get().aiGuardRequest(action, shouldBlock);
         if (shouldBlock) {
           span.setTag(BLOCKED_TAG, true);
-          throw new AIGuardAbortError(action, reason);
+          throw new AIGuardAbortError(action, reason, tags);
         }
         return new Evaluation(action, reason);
       }
diff --git a/dd-java-agent/agent-aiguard/src/test/groovy/com/datadog/aiguard/AIGuardInternalTests.groovy b/dd-java-agent/agent-aiguard/src/test/groovy/com/datadog/aiguard/AIGuardInternalTests.groovy
@@ -452,6 +452,14 @@ class AIGuardInternalTests extends DDSpecification {
     0 * span.setTag(AIGuardInternal.TOOL_TAG, _)
   }
 
+  void 'map requires even number of params'() {
+    when:
+    AIGuardInternal.mapOf('1', '2', '3')
+
+    then:
+    thrown(IllegalArgumentException)
+  }
+
   private static assertTelemetry(final String metric, final String...tags) {
     final metrics = WafMetricCollector.get().with {
       prepareMetrics()
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/AIGuard.java b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/AIGuard.java
@@ -63,11 +63,13 @@ public static Evaluation evaluate(final List<Message> messages, final Options op
   public static class AIGuardAbortError extends RuntimeException {
     private final Action action;
     private final String reason;
+    private final List<String> tags;
 
-    public AIGuardAbortError(final Action action, final String reason) {
+    public AIGuardAbortError(final Action action, final String reason, final List<String> tags) {
       super(reason);
       this.action = action;
       this.reason = reason;
+      this.tags = tags;
     }
 
     public Action getAction() {
@@ -77,6 +79,10 @@ public Action getAction() {
     public String getReason() {
       return reason;
     }
+
+    public List<String> getTags() {
+      return tags;
+    }
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public Evaluation evaluate(final List<Message> messages, final Options options)`
`238`	`238`	`WafMetricCollector.get().aiGuardRequest(action, shouldBlock);`
`239`	`239`	`if (shouldBlock) {`
`240`	`240`	`span.setTag(BLOCKED_TAG, true);`
`241`		`- throw new AIGuardAbortError(action, reason);`
	`241`	`+ throw new AIGuardAbortError(action, reason, tags);`
`242`	`242`	`}`
`243`	`243`	`return new Evaluation(action, reason);`
`244`	`244`	`}`