[incubator-kie-issues#1528] Adapt tracing code. Fix tests (#3727)

Co-authored-by: Gabriele-Cardosi <gabriele.cardosi@ibm.com>
apache · Oct 16, 2024 · d9aa6f9 · d9aa6f9
1 parent 23155eb
commit d9aa6f9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/...ommon/src/main/java/org/kie/kogito/tracing/decision/event/evaluate/EvaluateEventType.java b/...ommon/src/main/java/org/kie/kogito/tracing/decision/event/evaluate/EvaluateEventType.java
@@ -21,10 +21,12 @@
 import org.kie.kogito.tracing.event.trace.TraceExecutionStepType;
 
 public enum EvaluateEventType {
+    AFTER_CONDITIONAL_EVALUATION(false),
     BEFORE_EVALUATE_ALL(true),
     AFTER_EVALUATE_ALL(false),
     BEFORE_EVALUATE_BKM(true),
     AFTER_EVALUATE_BKM(false),
+    AFTER_EVALUATE_CONDITIONAL(false),
     BEFORE_EVALUATE_CONTEXT_ENTRY(true),
     AFTER_EVALUATE_CONTEXT_ENTRY(false),
     BEFORE_EVALUATE_DECISION(true),
@@ -52,6 +54,10 @@ public boolean isAfter() {
 
     public TraceExecutionStepType toTraceExecutionStepType() {
         switch (this) {
+            case AFTER_CONDITIONAL_EVALUATION:
+            case AFTER_EVALUATE_CONDITIONAL:
+                return TraceExecutionStepType.DMN_CONDITIONAL_INVOCATION;
+
             case BEFORE_EVALUATE_CONTEXT_ENTRY:
             case AFTER_EVALUATE_CONTEXT_ENTRY:
                 return TraceExecutionStepType.DMN_CONTEXT_ENTRY;

diff --git a/...n/src/test/java/org/kie/kogito/tracing/decision/event/evaluate/EvaluateEventTypeTest.java b/...n/src/test/java/org/kie/kogito/tracing/decision/event/evaluate/EvaluateEventTypeTest.java
@@ -24,8 +24,10 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
+import org.kie.dmn.api.core.event.AfterConditionalEvaluationEvent;
 import org.kie.dmn.api.core.event.AfterEvaluateAllEvent;
 import org.kie.dmn.api.core.event.AfterEvaluateBKMEvent;
+import org.kie.dmn.api.core.event.AfterEvaluateConditionalEvent;
 import org.kie.dmn.api.core.event.AfterEvaluateContextEntryEvent;
 import org.kie.dmn.api.core.event.AfterEvaluateDecisionEvent;
 import org.kie.dmn.api.core.event.AfterEvaluateDecisionServiceEvent;
@@ -67,6 +69,8 @@ class EvaluateEventTypeTest {
             put(EvaluateEventType.AFTER_EVALUATE_DECISION_TABLE, new Pair<>("afterEvaluateDecisionTable", AfterEvaluateDecisionTableEvent.class));
             put(EvaluateEventType.BEFORE_INVOKE_BKM, new Pair<>("beforeInvokeBKM", BeforeInvokeBKMEvent.class));
             put(EvaluateEventType.AFTER_INVOKE_BKM, new Pair<>("afterInvokeBKM", AfterInvokeBKMEvent.class));
+            put(EvaluateEventType.AFTER_CONDITIONAL_EVALUATION, new Pair<>("afterConditionalEvaluation", AfterConditionalEvaluationEvent.class));
+            put(EvaluateEventType.AFTER_EVALUATE_CONDITIONAL, new Pair<>("afterEvaluateConditional", AfterEvaluateConditionalEvent.class));
         }
     };
     private static final Class<DMNRuntimeEventListener> LISTENER_CLASS = DMNRuntimeEventListener.class;

diff --git a/.../tracing-api/src/main/java/org/kie/kogito/tracing/event/trace/TraceExecutionStepType.java b/.../tracing-api/src/main/java/org/kie/kogito/tracing/event/trace/TraceExecutionStepType.java
@@ -24,6 +24,7 @@
 public enum TraceExecutionStepType {
     DMN_BKM_EVALUATION,
     DMN_BKM_INVOCATION,
+    DMN_CONDITIONAL_INVOCATION,
     DMN_CONTEXT_ENTRY,
     DMN_DECISION,
     DMN_DECISION_SERVICE,