|
15 | 15 | ***************************************************************************/ |
16 | 16 | package com.optimizely.ab.bucketing; |
17 | 17 |
|
| 18 | +import java.util.AbstractMap; |
| 19 | +import java.util.ArrayList; |
| 20 | +import java.util.Arrays; |
| 21 | +import java.util.Collections; |
| 22 | +import java.util.List; |
| 23 | +import java.util.Map; |
| 24 | +import java.util.concurrent.ConcurrentHashMap; |
| 25 | + |
| 26 | +import javax.annotation.Nonnull; |
| 27 | +import javax.annotation.Nullable; |
| 28 | + |
| 29 | +import org.slf4j.Logger; |
| 30 | +import org.slf4j.LoggerFactory; |
| 31 | + |
18 | 32 | import com.optimizely.ab.OptimizelyDecisionContext; |
19 | 33 | import com.optimizely.ab.OptimizelyForcedDecision; |
20 | 34 | import com.optimizely.ab.OptimizelyRuntimeException; |
21 | 35 | import com.optimizely.ab.OptimizelyUserContext; |
22 | | -import com.optimizely.ab.config.*; |
| 36 | +import com.optimizely.ab.config.Experiment; |
| 37 | +import com.optimizely.ab.config.FeatureFlag; |
| 38 | +import com.optimizely.ab.config.Holdout; |
| 39 | +import com.optimizely.ab.config.ProjectConfig; |
| 40 | +import com.optimizely.ab.config.Rollout; |
| 41 | +import com.optimizely.ab.config.Variation; |
23 | 42 | import com.optimizely.ab.error.ErrorHandler; |
24 | 43 | import com.optimizely.ab.internal.ControlAttribute; |
25 | 44 | import com.optimizely.ab.internal.ExperimentUtils; |
| 45 | +import static com.optimizely.ab.internal.LoggingConstants.LoggingEntityType.EXPERIMENT; |
| 46 | +import static com.optimizely.ab.internal.LoggingConstants.LoggingEntityType.RULE; |
26 | 47 | import com.optimizely.ab.optimizelydecision.DecisionReasons; |
27 | 48 | import com.optimizely.ab.optimizelydecision.DecisionResponse; |
28 | 49 | import com.optimizely.ab.optimizelydecision.DefaultDecisionReasons; |
29 | 50 | import com.optimizely.ab.optimizelydecision.OptimizelyDecideOption; |
30 | | -import org.slf4j.Logger; |
31 | | -import org.slf4j.LoggerFactory; |
32 | | -import javax.annotation.Nonnull; |
33 | | -import javax.annotation.Nullable; |
34 | | -import java.util.*; |
35 | | -import java.util.concurrent.ConcurrentHashMap; |
36 | | - |
37 | | -import static com.optimizely.ab.internal.LoggingConstants.LoggingEntityType.EXPERIMENT; |
38 | | -import static com.optimizely.ab.internal.LoggingConstants.LoggingEntityType.RULE; |
39 | 51 |
|
40 | 52 | /** |
41 | 53 | * Optimizely's decision service that determines which variation of an experiment the user will be allocated to. |
@@ -240,10 +252,22 @@ public List<DecisionResponse<FeatureDecision>> getVariationsForFeatureList(@Non |
240 | 252 |
|
241 | 253 | List<DecisionResponse<FeatureDecision>> decisions = new ArrayList<>(); |
242 | 254 |
|
243 | | - for (FeatureFlag featureFlag: featureFlags) { |
| 255 | + flagLoop: for (FeatureFlag featureFlag: featureFlags) { |
244 | 256 | DecisionReasons reasons = DefaultDecisionReasons.newInstance(); |
245 | 257 | reasons.merge(upsReasons); |
246 | 258 |
|
| 259 | + List<Holdout> holdouts = projectConfig.getHoldoutForFlag(featureFlag.getId()); |
| 260 | + if (!holdouts.isEmpty()) { |
| 261 | + for (Holdout holdout : holdouts) { |
| 262 | + DecisionResponse<Variation> holdoutDecision = getVariationForHoldout(holdout, user, projectConfig); |
| 263 | + reasons.merge(holdoutDecision.getReasons()); |
| 264 | + if (holdoutDecision.getResult() != null) { |
| 265 | + decisions.add(new DecisionResponse<>(new FeatureDecision(holdout, holdoutDecision.getResult(), FeatureDecision.DecisionSource.HOLDOUT), reasons)); |
| 266 | + continue flagLoop; |
| 267 | + } |
| 268 | + } |
| 269 | + } |
| 270 | + |
247 | 271 | DecisionResponse<FeatureDecision> decisionVariationResponse = getVariationFromExperiment(projectConfig, featureFlag, user, options, userProfileTracker); |
248 | 272 | reasons.merge(decisionVariationResponse.getReasons()); |
249 | 273 |
|
@@ -419,6 +443,54 @@ DecisionResponse<Variation> getWhitelistedVariation(@Nonnull Experiment experime |
419 | 443 | return new DecisionResponse(null, reasons); |
420 | 444 | } |
421 | 445 |
|
| 446 | + /** |
| 447 | + * Determines the variation for a holdout rule. |
| 448 | + * |
| 449 | + * @param holdout The holdout rule to evaluate. |
| 450 | + * @param user The user context. |
| 451 | + * @param projectConfig The current project configuration. |
| 452 | + * @return A {@link DecisionResponse} with the variation (if any) and reasons. |
| 453 | + */ |
| 454 | + @Nonnull |
| 455 | + DecisionResponse<Variation> getVariationForHoldout(@Nonnull Holdout holdout, |
| 456 | + @Nonnull OptimizelyUserContext user, |
| 457 | + @Nonnull ProjectConfig projectConfig) { |
| 458 | + DecisionReasons reasons = DefaultDecisionReasons.newInstance(); |
| 459 | + |
| 460 | + if (!holdout.isActive()) { |
| 461 | + String message = reasons.addInfo("Holdout (%s) is not running.", holdout.getKey()); |
| 462 | + logger.info(message); |
| 463 | + return new DecisionResponse<>(null, reasons); |
| 464 | + } |
| 465 | + |
| 466 | + DecisionResponse<Boolean> decisionMeetAudience = ExperimentUtils.doesUserMeetAudienceConditions(projectConfig, holdout, user, EXPERIMENT, holdout.getKey()); |
| 467 | + reasons.merge(decisionMeetAudience.getReasons()); |
| 468 | + |
| 469 | + if (decisionMeetAudience.getResult()) { |
| 470 | + // User meets audience conditions for holdout |
| 471 | + String audienceMatchMessage = reasons.addInfo("User (%s) meets audience conditions for holdout (%s).", user.getUserId(), holdout.getKey()); |
| 472 | + logger.info(audienceMatchMessage); |
| 473 | + |
| 474 | + String bucketingId = getBucketingId(user.getUserId(), user.getAttributes()); |
| 475 | + DecisionResponse<Variation> decisionVariation = bucketer.bucket(holdout, bucketingId, projectConfig); |
| 476 | + reasons.merge(decisionVariation.getReasons()); |
| 477 | + Variation variation = decisionVariation.getResult(); |
| 478 | + |
| 479 | + if (variation != null) { |
| 480 | + String message = reasons.addInfo("User (%s) is in variation (%s) of holdout (%s).", user.getUserId(), variation.getKey(), holdout.getKey()); |
| 481 | + logger.info(message); |
| 482 | + } else { |
| 483 | + String message = reasons.addInfo("User (%s) is in no holdout variation.", user.getUserId()); |
| 484 | + logger.info(message); |
| 485 | + } |
| 486 | + return new DecisionResponse<>(variation, reasons); |
| 487 | + } |
| 488 | + |
| 489 | + String message = reasons.addInfo("User (%s) does not meet conditions for holdout (%s).", user.getUserId(), holdout.getKey()); |
| 490 | + logger.info(message); |
| 491 | + return new DecisionResponse<>(null, reasons); |
| 492 | + } |
| 493 | + |
422 | 494 |
|
423 | 495 | // TODO: Logically, it makes sense to move this method to UserProfileTracker. But some tests are also calling this |
424 | 496 | // method, requiring us to refactor those tests as well. We'll look to refactor this later. |
|
0 commit comments