update: enhance DecisionService and DecisionMessage to handle errors and include CMAB UUIDs in responses

Author: FarhanAnjum-opti

core-api/src/main/java/com/optimizely/ab/Optimizely.java

@@ -1450,7 +1450,17 @@ private Map<String, OptimizelyDecision> decideForKeys(@Nonnull OptimizelyUserCon
 
         for (int i = 0; i < flagsWithoutForcedDecision.size(); i++) {
             DecisionResponse<FeatureDecision> decision = decisionList.get(i);
+            boolean error = decision.isError();
             String flagKey = flagsWithoutForcedDecision.get(i).getKey();
+
+            if (error) {
+                OptimizelyDecision optimizelyDecision = OptimizelyDecision.newErrorDecision(flagKey, user, DecisionMessage.DECISION_ERROR.reason(flagKey));
+                decisionMap.put(flagKey, optimizelyDecision);
+                if (validKeys.contains(flagKey)) {
+                    validKeys.remove(flagKey);
+                }
+            }
+
             flagDecisions.put(flagKey, decision.getResult());
             decisionReasonsMap.get(flagKey).merge(decision.getReasons());
         }

core-api/src/main/java/com/optimizely/ab/bucketing/DecisionService.java

@@ -295,8 +295,10 @@ public  List<DecisionResponse<FeatureDecision>> getVariationsForFeatureList(@Non
             reasons.merge(decisionVariationResponse.getReasons());
 
             FeatureDecision decision = decisionVariationResponse.getResult();
+            boolean error = decisionVariationResponse.isError();
+
             if (decision != null) {
-                decisions.add(new DecisionResponse(decision, reasons));
+                decisions.add(new DecisionResponse(decision, reasons, error, decision.cmabUUID));
                 continue;
             }
 
@@ -354,11 +356,13 @@ DecisionResponse<FeatureDecision> getVariationFromExperiment(@Nonnull ProjectCon
                     getVariationFromExperimentRule(projectConfig, featureFlag.getKey(), experiment, user, options, userProfileTracker);
                 reasons.merge(decisionVariation.getReasons());
                 Variation variation = decisionVariation.getResult();
-
+                String cmabUUID = decisionVariation.getCmabUUID();
                 if (variation != null) {
                     return new DecisionResponse(
-                        new FeatureDecision(experiment, variation, FeatureDecision.DecisionSource.FEATURE_TEST),
-                        reasons);
+                        new FeatureDecision(experiment, variation, FeatureDecision.DecisionSource.FEATURE_TEST, cmabUUID),
+                        reasons,
+                        decisionVariation.isError(),
+                        cmabUUID);
                 }
             }
         } else {
@@ -792,7 +796,7 @@ private DecisionResponse<Variation> getVariationFromExperimentRule(@Nonnull Proj
 
         variation = decisionResponse.getResult();
 
-        return new DecisionResponse(variation, reasons);
+        return new DecisionResponse<>(variation, reasons, decisionResponse.isError(), decisionResponse.getCmabUUID());
     }
 
     /**

core-api/src/main/java/com/optimizely/ab/optimizelydecision/DecisionMessage.java

@@ -20,7 +20,8 @@
 public enum DecisionMessage {
     SDK_NOT_READY("Optimizely SDK not configured properly yet."),
     FLAG_KEY_INVALID("No flag was found for key \"%s\"."),
-    VARIABLE_VALUE_INVALID("Variable value for key \"%s\" is invalid or wrong type.");
+    VARIABLE_VALUE_INVALID("Variable value for key \"%s\" is invalid or wrong type."),
+    DECISION_ERROR("Decision service error occured for key \"%s\".");
 
     private String format;