Skip to content

Refine variant reason computation to include SPLIT and STATIC #11037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
typotter wants to merge 2 commits into
base: master
Choose a base branch
from
+26 −14
Open

Refine variant reason computation to include SPLIT and STATIC #11037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bff9528
fix(03-01): compute correct reason in DDEvaluator instead of hardcodi…
leoromanovsky Mar 26, 2026
0917bde
style: apply spotless formatting
leoromanovsky Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions ...lagging/feature-flagging-api/src/main/java/datadog/trace/api/openfeature/DDEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public <T> ProviderEvaluation<T> evaluate(
for (final Split split : allocation.splits) {
if (isEmpty(split.shards)) {
return resolveVariant(
target, key, defaultValue, flag, split.variationKey, allocation, context);
target, key, defaultValue, flag, split.variationKey, allocation, split, context);
} else {
if (targetingKey == null) {
return error(defaultValue, ErrorCode.TARGETING_KEY_MISSING);
Expand All @@ -136,7 +136,14 @@ public <T> ProviderEvaluation<T> evaluate(
}
if (allShardsMatch) {
return resolveVariant(
target, key, defaultValue, flag, split.variationKey, allocation, context);
target,
key,
defaultValue,
flag,
split.variationKey,
allocation,
split,
context);
}
}
}
Expand Down Expand Up @@ -332,6 +339,7 @@ private static <T> ProviderEvaluation<T> resolveVariant(
final Flag flag,
final String variationKey,
final Allocation allocation,
final Split split,
final EvaluationContext context) {
final Variant variant = flag.variations.get(variationKey);
if (variant == null) {
Expand All @@ -351,7 +359,10 @@ private static <T> ProviderEvaluation<T> resolveVariant(
final ProviderEvaluation<T> result =
ProviderEvaluation.<T>builder()
.value(mapValue(target, variant.value))
.reason(Reason.TARGETING_MATCH.name())
.reason(
!isEmpty(allocation.rules)
? Reason.TARGETING_MATCH.name()
: !isEmpty(split.shards) ? Reason.SPLIT.name() : Reason.STATIC.name())
Comment on lines +362 to +365
Copy link
Copy Markdown

@sameerank sameerank Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

.variant(variant.key)
.flagMetadata(metadataBuilder.build())
.build();
Expand Down
23 changes: 12 additions & 11 deletions ...ing/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import static dev.openfeature.sdk.Reason.DEFAULT;
import static dev.openfeature.sdk.Reason.DISABLED;
import static dev.openfeature.sdk.Reason.ERROR;
import static dev.openfeature.sdk.Reason.SPLIT;
import static dev.openfeature.sdk.Reason.STATIC;
import static dev.openfeature.sdk.Reason.TARGETING_MATCH;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
Expand Down Expand Up @@ -215,7 +217,7 @@ private static List<TestCase<?>> evaluateTestCases() {
new TestCase<>("default")
.flag("simple-string")
// no .targetingKey() -- null by default
.result(new Result<>("test-value").reason(TARGETING_MATCH.name()).variant("on")),
.result(new Result<>("test-value").reason(STATIC.name()).variant("on")),
// Null targeting key on sharded flag must return TARGETING_KEY_MISSING
new TestCase<>("default")
.flag("shard-flag")
Expand All @@ -231,7 +233,7 @@ private static List<TestCase<?>> evaluateTestCases() {
new TestCase<>("default")
.flag("simple-string")
.targetingKey("")
.result(new Result<>("test-value").reason(TARGETING_MATCH.name()).variant("on")),
.result(new Result<>("test-value").reason(STATIC.name()).variant("on")),
new TestCase<>("default")
.flag("non-existent-flag")
.targetingKey("user-123")
Expand All @@ -243,15 +245,15 @@ private static List<TestCase<?>> evaluateTestCases() {
new TestCase<>("default")
.flag("simple-string")
.targetingKey("user-123")
.result(new Result<>("test-value").reason(TARGETING_MATCH.name()).variant("on")),
.result(new Result<>("test-value").reason(STATIC.name()).variant("on")),
new TestCase<>(false)
.flag("boolean-flag")
.targetingKey("user-123")
.result(new Result<>(true).reason(TARGETING_MATCH.name()).variant("enabled")),
.result(new Result<>(true).reason(STATIC.name()).variant("enabled")),
new TestCase<>(0)
.flag("integer-flag")
.targetingKey("user-123")
.result(new Result<>(42).reason(TARGETING_MATCH.name()).variant("forty-two")),
.result(new Result<>(42).reason(STATIC.name()).variant("forty-two")),
new TestCase<>("default")
.flag("rule-based-flag")
.targetingKey("user-premium")
Expand All @@ -261,7 +263,7 @@ private static List<TestCase<?>> evaluateTestCases() {
.flag("rule-based-flag")
.targetingKey("user-basic")
.context("email", "john@gmail.com")
.result(new Result<>("basic").reason(TARGETING_MATCH.name()).variant("basic")),
.result(new Result<>("basic").reason(STATIC.name()).variant("basic")),
new TestCase<>("default")
.flag("numeric-rule-flag")
.targetingKey("user-vip")
Expand All @@ -287,11 +289,11 @@ private static List<TestCase<?>> evaluateTestCases() {
.result(
new Result<>("default")
// Result depends on shard calculation - either match or default
.reason(TARGETING_MATCH.name(), DEFAULT.name())),
.reason(SPLIT.name(), DEFAULT.name())),
new TestCase<>(0)
.flag("string-number-flag")
.targetingKey("user-123")
.result(new Result<>(123).reason(TARGETING_MATCH.name()).variant("string-num")),
.result(new Result<>(123).reason(STATIC.name()).variant("string-num")),
new TestCase<>("default")
.flag("broken-flag")
.targetingKey("user-123")
Expand Down Expand Up @@ -342,7 +344,7 @@ private static List<TestCase<?>> evaluateTestCases() {
.targetingKey("user-123")
.result(
new Result<>("tracked-value")
.reason(TARGETING_MATCH.name())
.reason(STATIC.name())
.variant("tracked")
.flagMetadata("allocationKey", "exposure-alloc")
.flagMetadata("doLog", true)),
Expand Down Expand Up @@ -415,8 +417,7 @@ private static List<TestCase<?>> evaluateTestCases() {
new TestCase<>("default")
.flag("shard-matching-flag")
.targetingKey("specific-key-that-matches-shard")
.result(
new Result<>("shard-matched").reason(TARGETING_MATCH.name()).variant("matched")),
.result(new Result<>("shard-matched").reason(SPLIT.name()).variant("matched")),
new TestCase<>("default")
.flag("future-allocation-flag")
.targetingKey("user-123")
Expand Down
Loading