[AI-FSSDK] [FSSDK-12735] Add excludeTargetedDeliveries support to holdout logic (#420)

Author: esrakartalOpt

OptimizelySDK.Tests/DecisionServiceHoldoutTest.cs

@@ -126,7 +126,7 @@ public void TestNullHoldouts()
         }
 
         // =====================================================================
-        // Level 1: Local Holdout / IsGlobal Classification Tests (FSSDK-12369)
+        // Level 1: Local Holdout / IsGlobal Classification Tests
         // =====================================================================
 
         [Test]

OptimizelySDK.Tests/TestData/HoldoutTestData.json

@@ -1,5 +1,5 @@
 /*
-* Copyright 2017-2022, 2024 Optimizely
+* Copyright 2017-2022, 2024, 2026 Optimizely
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -686,7 +686,6 @@ ProjectConfig config
                         reasons);
                 }
 
-                // Check local holdouts targeting this specific delivery rule (FSSDK-12369)
                 var localHoldoutResult = EvaluateLocalHoldouts(rule.Id, user, config);
                 reasons += localHoldoutResult.DecisionReasons;
                 if (localHoldoutResult.ResultObject != null)
@@ -814,7 +813,6 @@ public virtual Result<FeatureDecision> GetVariationForFeatureExperiment(
                 }
                 else
                 {
-                    // Check local holdouts targeting this specific experiment rule (FSSDK-12369)
                     var localHoldoutResult = EvaluateLocalHoldouts(experiment.Id, user, config);
                     reasons += localHoldoutResult.DecisionReasons;
                     if (localHoldoutResult.ResultObject != null)
@@ -916,7 +914,8 @@ public virtual Result<FeatureDecision> GetDecisionForFlag(
 
             var userId = user.GetUserId();
 
-            // Check global holdouts first (highest priority — evaluated at flag level, before any rules)
+            FeatureDecision globalHoldoutDecision = null;
+            Holdout matchedHoldout = null;
             var globalHoldouts = projectConfig.GetGlobalHoldouts();
             foreach (var holdout in globalHoldouts)
             {
@@ -925,24 +924,50 @@ public virtual Result<FeatureDecision> GetDecisionForFlag(
 
                 if (holdoutDecision.ResultObject != null)
                 {
-                    Logger.Log(LogLevel.INFO,
-                        reasons.AddInfo(
-                            $"The user \"{userId}\" is bucketed into holdout \"{holdout.Key}\" for feature flag \"{featureFlag.Key}\"."));
-                    return Result<FeatureDecision>.NewResult(holdoutDecision.ResultObject, reasons);
+                    if (holdout.ExcludeTargetedDeliveries)
+                    {
+                        Logger.Log(LogLevel.INFO,
+                            reasons.AddInfo(
+                                $"User \"{userId}\" is in holdout \"{holdout.Key}\" which excludes targeted deliveries. Targeted delivery rules will be evaluated normally."));
+                        globalHoldoutDecision = holdoutDecision.ResultObject;
+                        matchedHoldout = holdout;
+                    }
+                    else
+                    {
+                        Logger.Log(LogLevel.INFO,
+                            reasons.AddInfo(
+                                $"The user \"{userId}\" is bucketed into holdout \"{holdout.Key}\" for feature flag \"{featureFlag.Key}\"."));
+                        return Result<FeatureDecision>.NewResult(holdoutDecision.ResultObject, reasons);
+                    }
+                    break;
                 }
             }
 
-            // Check if the feature flag has an experiment and the user is bucketed into that experiment.
-            var experimentDecision = GetVariationForFeatureExperiment(featureFlag, user,
-                filteredAttributes, projectConfig, options, userProfileTracker);
-            reasons += experimentDecision.DecisionReasons;
+            if (globalHoldoutDecision == null)
+            {
+                var experimentDecision = GetVariationForFeatureExperiment(featureFlag, user,
+                    filteredAttributes, projectConfig, options, userProfileTracker);
+                reasons += experimentDecision.DecisionReasons;
 
-            if (experimentDecision.ResultObject != null)
+                if (experimentDecision.ResultObject != null)
+                {
+                    return Result<FeatureDecision>.NewResult(experimentDecision.ResultObject, reasons);
+                }
+            }
+            else
             {
-                return Result<FeatureDecision>.NewResult(experimentDecision.ResultObject, reasons);
+                Logger.Log(LogLevel.INFO,
+                    reasons.AddInfo(
+                        $"Skipping experiment rules for user \"{userId}\" — holdout applies to A/B and MAB rules."));
+
+                if (matchedHoldout != null && matchedHoldout.ExcludeTargetedDeliveries)
+                {
+                    Logger.Log(LogLevel.INFO,
+                        reasons.AddInfo(
+                            $"Holdout \"{matchedHoldout.Key}\" has excludeTargetedDeliveries enabled, continuing to rollout evaluation."));
+                }
             }
 
-            // Check if the feature flag has rollout and the user is bucketed into one of its rules.
             var rolloutDecision = GetVariationForFeatureRollout(featureFlag, user, projectConfig);
             reasons += rolloutDecision.DecisionReasons;
 
@@ -951,17 +976,29 @@ public virtual Result<FeatureDecision> GetDecisionForFlag(
                 Logger.Log(LogLevel.INFO,
                     reasons.AddInfo(
                         $"The user \"{userId}\" is bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));
+                if (globalHoldoutDecision != null)
+                {
+                    rolloutDecision.ResultObject.HoldoutDecision = globalHoldoutDecision;
+                }
                 return Result<FeatureDecision>.NewResult(rolloutDecision.ResultObject, reasons);
             }
-            else
+
+            if (globalHoldoutDecision != null)
             {
+                var nullDecision = new FeatureDecision(null, null, FeatureDecision.DECISION_SOURCE_ROLLOUT);
+                nullDecision.HoldoutDecision = globalHoldoutDecision;
                 Logger.Log(LogLevel.INFO,
                     reasons.AddInfo(
-                        $"The user \"{userId}\" is not bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));
-                return Result<FeatureDecision>.NewResult(
-                    new FeatureDecision(null, null, FeatureDecision.DECISION_SOURCE_ROLLOUT),
-                    reasons);
+                        $"The user \"{userId}\" is not bucketed into any targeted delivery for feature flag \"{featureFlag.Key}\". Holdout impression will be sent but holdout variation is not applied as fallback."));
+                return Result<FeatureDecision>.NewResult(nullDecision, reasons);
             }
+
+            Logger.Log(LogLevel.INFO,
+                reasons.AddInfo(
+                    $"The user \"{userId}\" is not bucketed into a rollout for feature flag \"{featureFlag.Key}\"."));
+            return Result<FeatureDecision>.NewResult(
+                new FeatureDecision(null, null, FeatureDecision.DECISION_SOURCE_ROLLOUT),
+                reasons);
         }
 
         public virtual List<Result<FeatureDecision>> GetVariationsForFeatureList(

OptimizelySDK.Tests/UtilsTests/HoldoutConfigBasicTests.cs

@@ -1,5 +1,5 @@
 /* 
- * Copyright 2017-2019, Optimizely
+ * Copyright 2017-2019, 2026 Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

OptimizelySDK/Bucketing/DecisionService.cs

@@ -26,6 +26,7 @@ public class FeatureDecision
         public string Source { get; }
         public string CmabUuid { get; }
         public bool Error { get; }
+        public FeatureDecision HoldoutDecision { get; set; }
 
         public FeatureDecision(ExperimentCore experiment, Variation variation, string source, string cmabUuid = null, bool error = false)
         {

OptimizelySDK/Entity/Experiment.cs

@@ -15,6 +15,7 @@
  */
 
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace OptimizelySDK.Entity
 {
@@ -51,6 +52,9 @@ public override string LayerId
         /// </summary>
         public string[] IncludedRules { get; set; }
 
+        [JsonProperty("excludeTargetedDeliveries")]
+        public bool ExcludeTargetedDeliveries { get; set; }
+
         /// <summary>
         /// True when global (IncludedRules is null). Consistent with section membership
         /// because the config parser strips IncludedRules on 'holdouts'-section entries.

OptimizelySDK/Entity/FeatureDecision.cs

@@ -1126,6 +1126,19 @@ ProjectConfig projectConfig
             var ruleKey = flagDecision.Experiment?.Key;
 
             var decisionEventDispatched = false;
+            if (flagDecision?.HoldoutDecision != null && !allOptions.Contains(OptimizelyDecideOption.DISABLE_DECISION_EVENT))
+            {
+                decisionEventDispatched = SendImpressionEvent(
+                    flagDecision.HoldoutDecision.Experiment,
+                    flagDecision.HoldoutDecision.Variation,
+                    userId, user.GetAttributes(), projectConfig,
+                    flagKey, FeatureDecision.DECISION_SOURCE_HOLDOUT,
+                    flagDecision.HoldoutDecision.Variation?.FeatureEnabled ?? false
+#if USE_CMAB
+                    , null
+#endif
+                ) || decisionEventDispatched;
+            }
             if (!allOptions.Contains(OptimizelyDecideOption.DISABLE_DECISION_EVENT))
             {
                 decisionEventDispatched = SendImpressionEvent(
@@ -1140,7 +1153,7 @@ ProjectConfig projectConfig
 #if USE_CMAB
                     , flagDecision.CmabUuid
 #endif
-                );
+                ) || decisionEventDispatched;
             }
 
             var decisionInfo = new Dictionary<string, object>