dont lock entire evaluation

Signed-off-by: Todd Baert <[email protected]>

Author: toddbaert

src/main/java/dev/openfeature/sdk/OpenFeatureClient.java

@@ -67,32 +67,39 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(FlagValueType type, String key
         FlagEvaluationDetails<T> details = null;
         List<Hook> mergedHooks = null;
         HookContext<T> hookCtx = null;
-
-        try (AutoCloseableLock __ = OpenFeatureAPI.rwLock.readLockAutoCloseable();
-            AutoCloseableLock ___ = this.rwLock.readLockAutoCloseable()) {
-
-            FeatureProvider provider = ObjectUtils.defaultIfNull(openfeatureApi.getProvider(), () -> {
-                log.debug("No provider configured, using no-op provider.");
-                return new NoOpProvider();
-            });
-
-            hookCtx = HookContext.from(key, type, this.getMetadata(),
-                    openfeatureApi.getProvider().getMetadata(), ctx, defaultValue);
-
-            mergedHooks = ObjectUtils.merge(provider.getProviderHooks(), flagOptions.getHooks(), clientHooks,
-                    openfeatureApi.getApiHooks());
+        FeatureProvider provider = null;
+
+        try {
+            EvaluationContext apiContext;
+            EvaluationContext clientContext;
+
+            // lock while getting the provider and hooks
+            try (AutoCloseableLock __ = OpenFeatureAPI.rwLock.readLockAutoCloseable();
+                    AutoCloseableLock ___ = this.rwLock.readLockAutoCloseable()) {
+                provider = ObjectUtils.defaultIfNull(openfeatureApi.getProvider(), () -> {
+                    log.debug("No provider configured, using no-op provider.");
+                    return new NoOpProvider();
+                });
+
+                mergedHooks = ObjectUtils.merge(provider.getProviderHooks(), flagOptions.getHooks(), clientHooks,
+                        openfeatureApi.getApiHooks());
+
+                hookCtx = HookContext.from(key, type, this.getMetadata(),
+                        provider.getMetadata(), ctx, defaultValue);
+
+                // merge of: API.context, client.context, invocation.context
+                apiContext = openfeatureApi.getEvaluationContext() != null
+                        ? openfeatureApi.getEvaluationContext()
+                        : new MutableContext();
+                clientContext = openfeatureApi.getEvaluationContext() != null
+                        ? this.getEvaluationContext()
+                        : new MutableContext();
+            }
 
             EvaluationContext ctxFromHook = hookSupport.beforeHooks(type, hookCtx, mergedHooks, hints);
 
             EvaluationContext invocationCtx = ctx.merge(ctxFromHook);
 
-            // merge of: API.context, client.context, invocation.context
-            EvaluationContext apiContext = openfeatureApi.getEvaluationContext() != null
-                    ? openfeatureApi.getEvaluationContext()
-                    : new MutableContext();
-            EvaluationContext clientContext = openfeatureApi.getEvaluationContext() != null
-                    ? this.getEvaluationContext()
-                    : new MutableContext();
             EvaluationContext mergedCtx = apiContext.merge(clientContext.merge(invocationCtx));
 
             ProviderEvaluation<T> providerEval = (ProviderEvaluation<T>) createProviderEvaluation(type, key,