-
Notifications
You must be signed in to change notification settings - Fork 47
feat: Add multi-provider support #1500
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
58c308c
1103949
4e380c6
dae672e
5810779
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,53 @@ | ||||||
package dev.openfeature.sdk.multiprovider; | ||||||
|
||||||
import static dev.openfeature.sdk.ErrorCode.FLAG_NOT_FOUND; | ||||||
|
||||||
import dev.openfeature.sdk.EvaluationContext; | ||||||
import dev.openfeature.sdk.FeatureProvider; | ||||||
import dev.openfeature.sdk.ProviderEvaluation; | ||||||
import dev.openfeature.sdk.exceptions.FlagNotFoundError; | ||||||
import java.util.Map; | ||||||
import java.util.function.Function; | ||||||
import lombok.NoArgsConstructor; | ||||||
import lombok.extern.slf4j.Slf4j; | ||||||
|
||||||
/** | ||||||
* First match strategy. Return the first result returned by a provider. Skip providers that | ||||||
* indicate they had no value due to FLAG_NOT_FOUND. In all other cases, use the value returned by | ||||||
* the provider. If any provider returns an error result other than FLAG_NOT_FOUND, the whole | ||||||
* evaluation should error and “bubble up” the individual provider’s error in the result. As soon as | ||||||
* a value is returned by a provider, the rest of the operation should short-circuit and not call | ||||||
* the rest of the providers. | ||||||
*/ | ||||||
@Slf4j | ||||||
@NoArgsConstructor | ||||||
public class FirstMatchStrategy implements Strategy { | ||||||
|
||||||
/** | ||||||
* Represents a strategy that evaluates providers based on a first-match approach. Provides a | ||||||
* method to evaluate providers using a specified function and return the evaluation result. | ||||||
* | ||||||
* @param providerFunction provider function | ||||||
* @param <T> ProviderEvaluation type | ||||||
* @return the provider evaluation | ||||||
*/ | ||||||
@Override | ||||||
public <T> ProviderEvaluation<T> evaluate( | ||||||
Map<String, FeatureProvider> providers, | ||||||
String key, | ||||||
T defaultValue, | ||||||
EvaluationContext ctx, | ||||||
Function<FeatureProvider, ProviderEvaluation<T>> providerFunction) { | ||||||
for (FeatureProvider provider : providers.values()) { | ||||||
try { | ||||||
ProviderEvaluation<T> res = providerFunction.apply(provider); | ||||||
if (!FLAG_NOT_FOUND.equals(res.getErrorCode())) { | ||||||
return res; | ||||||
} | ||||||
} catch (FlagNotFoundError e) { | ||||||
log.debug("flag not found {}", e.getMessage()); | ||||||
} | ||||||
} | ||||||
throw new FlagNotFoundError("flag not found"); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If we throw an exception here i suggest to add the key
Suggested change
but it would be better to construct a ProviderEvaluation object with an ErrorCode. we do not use the exception for flow control, our SDK will also handle this properly. |
||||||
} | ||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
package dev.openfeature.sdk.multiprovider; | ||
|
||
import dev.openfeature.sdk.EvaluationContext; | ||
import dev.openfeature.sdk.FeatureProvider; | ||
import dev.openfeature.sdk.ProviderEvaluation; | ||
import dev.openfeature.sdk.exceptions.GeneralError; | ||
import java.util.Map; | ||
import java.util.function.Function; | ||
import lombok.NoArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
|
||
/** | ||
* First Successful Strategy. Similar to “First Match”, except that errors from evaluated providers | ||
* do not halt execution. Instead, it will return the first successful result from a provider. If no | ||
* provider successfully responds, it will throw an error result. | ||
*/ | ||
@Slf4j | ||
@NoArgsConstructor | ||
public class FirstSuccessfulStrategy implements Strategy { | ||
|
||
@Override | ||
public <T> ProviderEvaluation<T> evaluate( | ||
Map<String, FeatureProvider> providers, | ||
String key, | ||
T defaultValue, | ||
EvaluationContext ctx, | ||
Function<FeatureProvider, ProviderEvaluation<T>> providerFunction) { | ||
for (FeatureProvider provider : providers.values()) { | ||
try { | ||
ProviderEvaluation<T> res = providerFunction.apply(provider); | ||
if (res.getErrorCode() == null) { | ||
return res; | ||
} | ||
} catch (Exception e) { | ||
log.debug("evaluation exception {}", e.getMessage()); | ||
} | ||
} | ||
|
||
throw new GeneralError("evaluation error"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should be consistent in our Exceptions/return-values - we should construct a ProviderEvaluation with an error code, and the error code should be consistent for all Strategies There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes this makes sense, I'll make these changes and raise a PR soon There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
For reference is there anywhere in the codebase where the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,151 @@ | ||||||
package dev.openfeature.sdk.multiprovider; | ||||||
|
||||||
import dev.openfeature.sdk.EvaluationContext; | ||||||
import dev.openfeature.sdk.EventProvider; | ||||||
import dev.openfeature.sdk.FeatureProvider; | ||||||
import dev.openfeature.sdk.Metadata; | ||||||
import dev.openfeature.sdk.ProviderEvaluation; | ||||||
import dev.openfeature.sdk.Value; | ||||||
import dev.openfeature.sdk.exceptions.GeneralError; | ||||||
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; | ||||||
import java.util.ArrayList; | ||||||
import java.util.Collection; | ||||||
import java.util.Collections; | ||||||
import java.util.HashMap; | ||||||
import java.util.LinkedHashMap; | ||||||
import java.util.List; | ||||||
import java.util.Map; | ||||||
import java.util.concurrent.Callable; | ||||||
import java.util.concurrent.ExecutorService; | ||||||
import java.util.concurrent.Executors; | ||||||
import java.util.concurrent.Future; | ||||||
import lombok.Getter; | ||||||
import lombok.extern.slf4j.Slf4j; | ||||||
|
||||||
/** <b>Experimental:</b> Provider implementation for Multi-provider. */ | ||||||
@Slf4j | ||||||
public class MultiProvider extends EventProvider { | ||||||
|
||||||
@Getter | ||||||
private static final String NAME = "multiprovider"; | ||||||
|
||||||
public static final int INIT_THREADS_COUNT = 8; | ||||||
private final Map<String, FeatureProvider> providers; | ||||||
private final Strategy strategy; | ||||||
private MultiProviderMetadata metadata; | ||||||
|
||||||
/** | ||||||
* Constructs a MultiProvider with the given list of FeatureProviders, by default uses FirstMatchStrategy. | ||||||
* | ||||||
* @param providers the list of FeatureProviders to initialize the MultiProvider with | ||||||
*/ | ||||||
public MultiProvider(List<FeatureProvider> providers) { | ||||||
this(providers, null); | ||||||
} | ||||||
|
||||||
/** | ||||||
* Constructs a MultiProvider with the given list of FeatureProviders and a strategy. | ||||||
* | ||||||
* @param providers the list of FeatureProviders to initialize the MultiProvider with | ||||||
* @param strategy the strategy | ||||||
*/ | ||||||
public MultiProvider(List<FeatureProvider> providers, Strategy strategy) { | ||||||
this.providers = buildProviders(providers); | ||||||
if (strategy != null) { | ||||||
this.strategy = strategy; | ||||||
} else { | ||||||
this.strategy = new FirstMatchStrategy(); | ||||||
} | ||||||
} | ||||||
|
||||||
protected static Map<String, FeatureProvider> buildProviders(List<FeatureProvider> providers) { | ||||||
Map<String, FeatureProvider> providersMap = new LinkedHashMap<>(providers.size()); | ||||||
for (FeatureProvider provider : providers) { | ||||||
FeatureProvider prevProvider = | ||||||
providersMap.put(provider.getMetadata().getName(), provider); | ||||||
if (prevProvider != null) { | ||||||
log.warn("duplicated provider name: {}", provider.getMetadata().getName()); | ||||||
} | ||||||
} | ||||||
return Collections.unmodifiableMap(providersMap); | ||||||
} | ||||||
|
||||||
/** | ||||||
* Initialize the provider. | ||||||
* | ||||||
* @param evaluationContext evaluation context | ||||||
* @throws Exception on error | ||||||
*/ | ||||||
@Override | ||||||
public void initialize(EvaluationContext evaluationContext) throws Exception { | ||||||
var metadataBuilder = MultiProviderMetadata.builder(); | ||||||
metadataBuilder.name(NAME); | ||||||
HashMap<String, Metadata> providersMetadata = new HashMap<>(); | ||||||
ExecutorService initPool = Executors.newFixedThreadPool(Math.min(INIT_THREADS_COUNT, providers.size())); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
Collection<Callable<Boolean>> tasks = new ArrayList<>(providers.size()); | ||||||
for (FeatureProvider provider : providers.values()) { | ||||||
tasks.add(() -> { | ||||||
provider.initialize(evaluationContext); | ||||||
return true; | ||||||
}); | ||||||
Metadata providerMetadata = provider.getMetadata(); | ||||||
providersMetadata.put(providerMetadata.getName(), providerMetadata); | ||||||
} | ||||||
metadataBuilder.originalMetadata(providersMetadata); | ||||||
List<Future<Boolean>> results = initPool.invokeAll(tasks); | ||||||
for (Future<Boolean> result : results) { | ||||||
if (!result.get()) { | ||||||
initPool.shutdown(); | ||||||
throw new GeneralError("init failed"); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We also need to shut down the executer service in this case |
||||||
} | ||||||
} | ||||||
initPool.shutdown(); | ||||||
metadata = metadataBuilder.build(); | ||||||
} | ||||||
|
||||||
@SuppressFBWarnings(value = "EI_EXPOSE_REP") | ||||||
@Override | ||||||
public Metadata getMetadata() { | ||||||
return metadata; | ||||||
} | ||||||
|
||||||
@Override | ||||||
public ProviderEvaluation<Boolean> getBooleanEvaluation(String key, Boolean defaultValue, EvaluationContext ctx) { | ||||||
return strategy.evaluate( | ||||||
providers, key, defaultValue, ctx, p -> p.getBooleanEvaluation(key, defaultValue, ctx)); | ||||||
} | ||||||
|
||||||
@Override | ||||||
public ProviderEvaluation<String> getStringEvaluation(String key, String defaultValue, EvaluationContext ctx) { | ||||||
return strategy.evaluate(providers, key, defaultValue, ctx, p -> p.getStringEvaluation(key, defaultValue, ctx)); | ||||||
} | ||||||
|
||||||
@Override | ||||||
public ProviderEvaluation<Integer> getIntegerEvaluation(String key, Integer defaultValue, EvaluationContext ctx) { | ||||||
return strategy.evaluate( | ||||||
providers, key, defaultValue, ctx, p -> p.getIntegerEvaluation(key, defaultValue, ctx)); | ||||||
} | ||||||
|
||||||
@Override | ||||||
public ProviderEvaluation<Double> getDoubleEvaluation(String key, Double defaultValue, EvaluationContext ctx) { | ||||||
return strategy.evaluate(providers, key, defaultValue, ctx, p -> p.getDoubleEvaluation(key, defaultValue, ctx)); | ||||||
} | ||||||
|
||||||
@Override | ||||||
public ProviderEvaluation<Value> getObjectEvaluation(String key, Value defaultValue, EvaluationContext ctx) { | ||||||
return strategy.evaluate(providers, key, defaultValue, ctx, p -> p.getObjectEvaluation(key, defaultValue, ctx)); | ||||||
} | ||||||
|
||||||
@Override | ||||||
public void shutdown() { | ||||||
log.debug("shutdown begin"); | ||||||
for (FeatureProvider provider : providers.values()) { | ||||||
try { | ||||||
provider.shutdown(); | ||||||
} catch (Exception e) { | ||||||
log.error("error shutdown provider {}", provider.getMetadata().getName(), e); | ||||||
} | ||||||
} | ||||||
log.debug("shutdown end"); | ||||||
} | ||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package dev.openfeature.sdk.multiprovider; | ||
|
||
import dev.openfeature.sdk.Metadata; | ||
import java.util.Map; | ||
import lombok.Builder; | ||
import lombok.Data; | ||
|
||
/** | ||
* Metadata class for Multiprovider. | ||
*/ | ||
@Data | ||
@Builder | ||
public class MultiProviderMetadata implements Metadata { | ||
String name; | ||
Map<String, Metadata> originalMetadata; | ||
|
||
@Override | ||
public String getName() { | ||
return name; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package dev.openfeature.sdk.multiprovider; | ||
|
||
import dev.openfeature.sdk.EvaluationContext; | ||
import dev.openfeature.sdk.FeatureProvider; | ||
import dev.openfeature.sdk.ProviderEvaluation; | ||
import java.util.Map; | ||
import java.util.function.Function; | ||
|
||
/** strategy. */ | ||
public interface Strategy { | ||
<T> ProviderEvaluation<T> evaluate( | ||
Map<String, FeatureProvider> providers, | ||
String key, | ||
T defaultValue, | ||
EvaluationContext ctx, | ||
Function<FeatureProvider, ProviderEvaluation<T>> providerFunction); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The exception might have a different message, hence i think adding the key is worth it, as a separate infomration. Additionally most logging frameworks allow you to add the exception as an additional parameter, which will print the stacktrace if available. It is just a good practice