optimizely-sdk 3.9.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3502b43c8fae064fda3e1b237786a0285103d4ce9383a9d64cfc7b34f3f8c849
-  data.tar.gz: 9b843fc3a7999e640f329812aeeb8e26474b5b85f29d27c0647ba7c3685cb73f
+  metadata.gz: 96375e01eed1e2a237d2c7c22a8c417bdb81fdff82414dd186900f521b13ea7e
+  data.tar.gz: 17d6f554563447c577cc5db13da3e4c5c6ac46f749e6f9756f8030336e6e516a
 SHA512:
-  metadata.gz: a244307de60cf4a7e9b4e90bd0282e071e310701c09b4314a5f011f9f97a1f638205dc9e3de59611c247315314bfd58a0521690bbc3fa876575f3ef8fa917306
-  data.tar.gz: b68df42eef86c3a4e1fd22f2b1b4cd3060df4ade0c9125862443164735778a16415af958a4002fba7adcdf078d1552a5ffef446bac22e7a269a5984445d1fd50
+  metadata.gz: c58553a209a14f5cfea1749da188666b0a178cf1e6ca9447e4de5a56b70cb0e651825d09fa1265503a94b7121171cc7d6abede6b347c2e2791476f48eeebbce8
+  data.tar.gz: 41140f1ba5e87a11410f05899d183d9a1793e0741e02c438481902b4c240dde90df6ec97d04228aab8655d75f2c2d97f1de168a7962b7107dfcbeb55afa8edb1

data/lib/optimizely/config/datafile_project_config.rb

@@ -60,6 +60,7 @@ module Optimizely
     attr_reader :variation_key_map
     attr_reader :variation_id_map_by_experiment_id
     attr_reader :variation_key_map_by_experiment_id
+    attr_reader :flag_variation_map
 
     def initialize(datafile, logger, error_handler)
       # ProjectConfig init method to fetch and set project config data
@@ -123,6 +124,8 @@ module Optimizely
       @variation_key_map_by_experiment_id = {}
       @variation_id_to_variable_usage_map = {}
       @variation_id_to_experiment_map = {}
+      @flag_variation_map = {}
+
       @experiment_id_map.each_value do |exp|
         # Excludes experiments from rollouts
         variations = exp.fetch('variations')
@@ -138,6 +141,8 @@ module Optimizely
         exps = rollout.fetch('experiments')
         @rollout_experiment_id_map = @rollout_experiment_id_map.merge(generate_key_map(exps, 'id'))
       end
+
+      @flag_variation_map = generate_feature_variation_map(@feature_flags)
       @all_experiments = @experiment_id_map.merge(@rollout_experiment_id_map)
       @all_experiments.each do |id, exp|
         variations = exp.fetch('variations')
@@ -165,6 +170,24 @@ module Optimizely
       end
     end
 
+    def get_rules_for_flag(feature_flag)
+      # Retrieves rules for a given feature flag
+      #
+      # feature_flag - String key representing the feature_flag
+      #
+      # Returns rules in feature flag
+      rules = feature_flag['experimentIds'].map { |exp_id| @experiment_id_map[exp_id] }
+      rollout = feature_flag['rolloutId'].empty? ? nil : @rollout_id_map[feature_flag['rolloutId']]
+
+      if rollout
+        rollout_experiments = rollout.fetch('experiments')
+        rollout_experiments.each do |exp|
+          rules.push(exp)
+        end
+      end
+      rules
+    end
+
     def self.create(datafile, logger, error_handler, skip_json_validation)
       # Looks up and sets datafile and config based on response body.
       #
@@ -279,6 +302,13 @@ module Optimizely
       nil
     end
 
+    def get_variation_from_flag(flag_key, target_value, attribute)
+      variations = @flag_variation_map[flag_key]
+      return variations.select { |variation| variation[attribute] == target_value }.first if variations
+
+      nil
+    end
+
     def get_variation_from_id(experiment_key, variation_id)
       # Get variation given experiment key and variation ID
       #
@@ -494,6 +524,20 @@ module Optimizely
 
     private
 
+    def generate_feature_variation_map(feature_flags)
+      flag_variation_map = {}
+      feature_flags.each do |flag|
+        variations = []
+        get_rules_for_flag(flag).each do |rule|
+          rule['variations'].each do |rule_variation|
+            variations.push(rule_variation) if variations.select { |variation| variation['id'] == rule_variation['id'] }.empty?
+          end
+        end
+        flag_variation_map[flag['key']] = variations
+      end
+      flag_variation_map
+    end
+
     def generate_key_map(array, key)
       # Helper method to generate map from key to hash in array of hashes
       #

data/lib/optimizely/decision_service.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2017-2021, Optimizely and contributors
+#    Copyright 2017-2022, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -52,18 +52,19 @@ module Optimizely
       @forced_variation_map = {}
     end
 
-    def get_variation(project_config, experiment_id, user_id, attributes = nil, decide_options = [])
+    def get_variation(project_config, experiment_id, user_context, decide_options = [])
       # Determines variation into which user will be bucketed.
       #
       # project_config - project_config - Instance of ProjectConfig
       # experiment_id - Experiment for which visitor variation needs to be determined
-      # user_id - String ID for user
-      # attributes - Hash representing user attributes
+      # user_context - Optimizely user context instance
       #
       # Returns variation ID where visitor will be bucketed
       #   (nil if experiment is inactive or user does not meet audience conditions)
 
       decide_reasons = []
+      user_id = user_context.user_id
+      attributes = user_context.user_attributes
       # By default, the bucketing ID should be the user ID
       bucketing_id, bucketing_id_reasons = get_bucketing_id(user_id, attributes)
       decide_reasons.push(*bucketing_id_reasons)
@@ -134,40 +135,39 @@ module Optimizely
       [variation_id, decide_reasons]
     end
 
-    def get_variation_for_feature(project_config, feature_flag, user_id, attributes = nil, decide_options = [])
+    def get_variation_for_feature(project_config, feature_flag, user_context, decide_options = [])
       # Get the variation the user is bucketed into for the given FeatureFlag.
       #
       # project_config - project_config - Instance of ProjectConfig
       # feature_flag - The feature flag the user wants to access
-      # user_id - String ID for the user
-      # attributes - Hash representing user attributes
+      # user_context - Optimizely user context instance
       #
       # Returns Decision struct (nil if the user is not bucketed into any of the experiments on the feature)
 
       decide_reasons = []
 
       # check if the feature is being experiment on and whether the user is bucketed into the experiment
-      decision, reasons_received = get_variation_for_feature_experiment(project_config, feature_flag, user_id, attributes, decide_options)
+      decision, reasons_received = get_variation_for_feature_experiment(project_config, feature_flag, user_context, decide_options)
       decide_reasons.push(*reasons_received)
       return decision, decide_reasons unless decision.nil?
 
-      decision, reasons_received = get_variation_for_feature_rollout(project_config, feature_flag, user_id, attributes)
+      decision, reasons_received = get_variation_for_feature_rollout(project_config, feature_flag, user_context)
       decide_reasons.push(*reasons_received)
 
       [decision, decide_reasons]
     end
 
-    def get_variation_for_feature_experiment(project_config, feature_flag, user_id, attributes = nil, decide_options = [])
+    def get_variation_for_feature_experiment(project_config, feature_flag, user_context, decide_options = [])
       # Gets the variation the user is bucketed into for the feature flag's experiment.
       #
       # project_config - project_config - Instance of ProjectConfig
       # feature_flag - The feature flag the user wants to access
-      # user_id - String ID for the user
-      # attributes - Hash representing user attributes
+      # user_context - Optimizely user context instance
       #
       # Returns Decision struct (nil if the user is not bucketed into any of the experiments on the feature)
       # or nil if the user is not bucketed into any of the experiments on the feature
       decide_reasons = []
+      user_id = user_context.user_id
       feature_flag_key = feature_flag['key']
       if feature_flag['experimentIds'].empty?
         message = "The feature flag '#{feature_flag_key}' is not used in any experiments."
@@ -187,12 +187,13 @@ module Optimizely
         end
 
         experiment_id = experiment['id']
-        variation_id, reasons_received = get_variation(project_config, experiment_id, user_id, attributes, decide_options)
+        variation_id, reasons_received = get_variation_from_experiment_rule(project_config, feature_flag_key, experiment, user_context, decide_options)
         decide_reasons.push(*reasons_received)
 
         next unless variation_id
 
         variation = project_config.get_variation_from_id_by_experiment_id(experiment_id, variation_id)
+        variation = project_config.get_variation_from_flag(feature_flag['key'], variation_id, 'id') if variation.nil?
 
         return Decision.new(experiment, variation, DECISION_SOURCES['FEATURE_TEST']), decide_reasons
       end
@@ -204,22 +205,20 @@ module Optimizely
       [nil, decide_reasons]
     end
 
-    def get_variation_for_feature_rollout(project_config, feature_flag, user_id, attributes = nil)
+    def get_variation_for_feature_rollout(project_config, feature_flag, user_context)
       # Determine which variation the user is in for a given rollout.
       # Returns the variation of the first experiment the user qualifies for.
       #
       # project_config - project_config - Instance of ProjectConfig
       # feature_flag - The feature flag the user wants to access
-      # user_id - String ID for the user
-      # attributes - Hash representing user attributes
+      # user_context - Optimizely user context instance
       #
       # Returns the Decision struct or nil if not bucketed into any of the targeting rules
       decide_reasons = []
-      bucketing_id, bucketing_id_reasons = get_bucketing_id(user_id, attributes)
-      decide_reasons.push(*bucketing_id_reasons)
+
       rollout_id = feature_flag['rolloutId']
+      feature_flag_key = feature_flag['key']
       if rollout_id.nil? || rollout_id.empty?
-        feature_flag_key = feature_flag['key']
         message = "Feature flag '#{feature_flag_key}' is not used in a rollout."
         @logger.log(Logger::DEBUG, message)
         decide_reasons.push(message)
@@ -236,60 +235,102 @@ module Optimizely
 
       return nil, decide_reasons if rollout['experiments'].empty?
 
+      index = 0
       rollout_rules = rollout['experiments']
-      number_of_rules = rollout_rules.length - 1
-
-      # Go through each experiment in order and try to get the variation for the user
-      number_of_rules.times do |index|
-        rollout_rule = rollout_rules[index]
-        logging_key = index + 1
-
-        user_meets_audience_conditions, reasons_received = Audience.user_meets_audience_conditions?(project_config, rollout_rule, attributes, @logger, 'ROLLOUT_AUDIENCE_EVALUATION_LOGS', logging_key)
+      while index < rollout_rules.length
+        variation, skip_to_everyone_else, reasons_received = get_variation_from_delivery_rule(project_config, feature_flag_key, rollout_rules, index, user_context)
         decide_reasons.push(*reasons_received)
-        # Check that user meets audience conditions for targeting rule
-        unless user_meets_audience_conditions
-          message = "User '#{user_id}' does not meet the audience conditions for targeting rule '#{logging_key}'."
-          @logger.log(Logger::DEBUG, message)
-          decide_reasons.push(message)
-          # move onto the next targeting rule
-          next
+        if variation
+          rule = rollout_rules[index]
+          feature_decision = Decision.new(rule, variation, DECISION_SOURCES['ROLLOUT'])
+          return [feature_decision, decide_reasons]
         end
 
-        message = "User '#{user_id}' meets the audience conditions for targeting rule '#{logging_key}'."
-        @logger.log(Logger::DEBUG, message)
-        decide_reasons.push(message)
+        index = skip_to_everyone_else ? (rollout_rules.length - 1) : (index + 1)
+      end
 
-        # Evaluate if user satisfies the traffic allocation for this rollout rule
-        variation, bucket_reasons = @bucketer.bucket(project_config, rollout_rule, bucketing_id, user_id)
-        decide_reasons.push(*bucket_reasons)
-        return Decision.new(rollout_rule, variation, DECISION_SOURCES['ROLLOUT']), decide_reasons unless variation.nil?
+      [nil, decide_reasons]
+    end
 
-        break
-      end
+    def get_variation_from_experiment_rule(project_config, flag_key, rule, user, options = [])
+      # Determine which variation the user is in for a given rollout.
+      # Returns the variation from experiment rules.
+      #
+      # project_config - project_config - Instance of ProjectConfig
+      # flag_key - The feature flag the user wants to access
+      # rule - An experiment rule key
+      # user - Optimizely user context instance
+      #
+      # Returns variation_id and reasons
+      reasons = []
 
-      # get last rule which is the everyone else rule
-      everyone_else_experiment = rollout_rules[number_of_rules]
-      logging_key = 'Everyone Else'
+      context = Optimizely::OptimizelyUserContext::OptimizelyDecisionContext.new(flag_key, rule['key'])
+      variation, forced_reasons = validated_forced_decision(project_config, context, user)
+      reasons.push(*forced_reasons)
 
-      user_meets_audience_conditions, reasons_received = Audience.user_meets_audience_conditions?(project_config, everyone_else_experiment, attributes, @logger, 'ROLLOUT_AUDIENCE_EVALUATION_LOGS', logging_key)
-      decide_reasons.push(*reasons_received)
-      # Check that user meets audience conditions for last rule
+      return [variation['id'], reasons] if variation
+
+      variation_id, response_reasons = get_variation(project_config, rule['id'], user, options)
+      reasons.push(*response_reasons)
+
+      [variation_id, reasons]
+    end
+
+    def get_variation_from_delivery_rule(project_config, flag_key, rules, rule_index, user)
+      # Determine which variation the user is in for a given rollout.
+      # Returns the variation from delivery rules.
+      #
+      # project_config - project_config - Instance of ProjectConfig
+      # flag_key - The feature flag the user wants to access
+      # rule - An experiment rule key
+      # user - Optimizely user context instance
+      #
+      # Returns variation, boolean to skip for eveyone else rule and reasons
+      reasons = []
+      skip_to_everyone_else = false
+      rule = rules[rule_index]
+      context = Optimizely::OptimizelyUserContext::OptimizelyDecisionContext.new(flag_key, rule['key'])
+      variation, forced_reasons = validated_forced_decision(project_config, context, user)
+      reasons.push(*forced_reasons)
+
+      return [variation, skip_to_everyone_else, reasons] if variation
+
+      user_id = user.user_id
+      attributes = user.user_attributes
+      bucketing_id, bucketing_id_reasons = get_bucketing_id(user_id, attributes)
+      reasons.push(*bucketing_id_reasons)
+
+      everyone_else = (rule_index == rules.length - 1)
+
+      logging_key = everyone_else ? 'Everyone Else' : (rule_index + 1).to_s
+
+      user_meets_audience_conditions, reasons_received = Audience.user_meets_audience_conditions?(project_config, rule, attributes, @logger, 'ROLLOUT_AUDIENCE_EVALUATION_LOGS', logging_key)
+      reasons.push(*reasons_received)
       unless user_meets_audience_conditions
-        message = "User '#{user_id}' does not meet the audience conditions for targeting rule '#{logging_key}'."
+        message = "User '#{user_id}' does not meet the conditions for targeting rule '#{logging_key}'."
         @logger.log(Logger::DEBUG, message)
-        decide_reasons.push(message)
-        return nil, decide_reasons
+        reasons.push(message)
+        return [nil, skip_to_everyone_else, reasons]
       end
 
       message = "User '#{user_id}' meets the audience conditions for targeting rule '#{logging_key}'."
       @logger.log(Logger::DEBUG, message)
-      decide_reasons.push(message)
+      reasons.push(message)
+      bucket_variation, bucket_reasons = @bucketer.bucket(project_config, rule, bucketing_id, user_id)
 
-      variation, bucket_reasons = @bucketer.bucket(project_config, everyone_else_experiment, bucketing_id, user_id)
-      decide_reasons.push(*bucket_reasons)
-      return Decision.new(everyone_else_experiment, variation, DECISION_SOURCES['ROLLOUT']), decide_reasons unless variation.nil?
+      reasons.push(*bucket_reasons)
 
-      [nil, decide_reasons]
+      if bucket_variation
+        message = "User '#{user_id}' is in the traffic group of targeting rule '#{logging_key}'."
+        @logger.log(Logger::DEBUG, message)
+        reasons.push(message)
+      elsif !everyone_else
+        message = "User '#{user_id}' is not in the traffic group for targeting rule '#{logging_key}'."
+        @logger.log(Logger::DEBUG, message)
+        reasons.push(message)
+        skip_to_everyone_else = true
+      end
+      [bucket_variation, skip_to_everyone_else, reasons]
     end
 
     def set_forced_variation(project_config, experiment_key, user_id, variation_key)
@@ -376,6 +417,28 @@ module Optimizely
       [variation, decide_reasons]
     end
 
+    def validated_forced_decision(project_config, context, user_context)
+      decision = user_context.get_forced_decision(context)
+      flag_key = context[:flag_key]
+      rule_key = context[:rule_key]
+      variation_key = decision ? decision[:variation_key] : decision
+      reasons = []
+      target = rule_key ? "flag (#{flag_key}), rule (#{rule_key})" : "flag (#{flag_key})"
+      if variation_key
+        variation = project_config.get_variation_from_flag(flag_key, variation_key, 'key')
+        if variation
+          reason = "Variation (#{variation_key}) is mapped to #{target} and user (#{user_context.user_id}) in the forced decision map."
+          reasons.push(reason)
+          return variation, reasons
+        else
+          reason = "Invalid variation is mapped to #{target} and user (#{user_context.user_id}) in the forced decision map."
+          reasons.push(reason)
+        end
+      end
+
+      [nil, reasons]
+    end
+
     private
 
     def get_whitelisted_variation_id(project_config, experiment_id, user_id)

data/lib/optimizely/optimizely_user_context.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2020, Optimizely and contributors
+#    Copyright 2020-2022, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -23,16 +23,26 @@ module Optimizely
     # Representation of an Optimizely User Context using which APIs are to be called.
 
     attr_reader :user_id
+    attr_reader :forced_decisions
+    attr_reader :OptimizelyDecisionContext
+    attr_reader :OptimizelyForcedDecision
+    attr_reader :optimizely_client
 
+    OptimizelyDecisionContext = Struct.new(:flag_key, :rule_key)
+    OptimizelyForcedDecision = Struct.new(:variation_key)
     def initialize(optimizely_client, user_id, user_attributes)
       @attr_mutex = Mutex.new
+      @forced_decision_mutex = Mutex.new
       @optimizely_client = optimizely_client
       @user_id = user_id
       @user_attributes = user_attributes.nil? ? {} : user_attributes.clone
+      @forced_decisions = {}
     end
 
     def clone
-      OptimizelyUserContext.new(@optimizely_client, @user_id, user_attributes)
+      user_context = OptimizelyUserContext.new(@optimizely_client, @user_id, user_attributes)
+      @forced_decision_mutex.synchronize { user_context.instance_variable_set('@forced_decisions', @forced_decisions.dup) unless @forced_decisions.empty? }
+      user_context
     end
 
     def user_attributes
@@ -85,6 +95,68 @@ module Optimizely
       @optimizely_client&.decide_all(clone, options)
     end
 
+    # Sets the forced decision (variation key) for a given flag and an optional rule.
+    #
+    # @param context - An OptimizelyDecisionContext object containg flag key and rule key.
+    # @param decision - An OptimizelyForcedDecision object containing variation key
+    #
+    # @return - true if the forced decision has been set successfully.
+
+    def set_forced_decision(context, decision)
+      flag_key = context[:flag_key]
+      return false if flag_key.nil?
+
+      @forced_decision_mutex.synchronize { @forced_decisions[context] = decision }
+
+      true
+    end
+
+    def find_forced_decision(context)
+      return nil if @forced_decisions.empty?
+
+      decision = nil
+      @forced_decision_mutex.synchronize { decision = @forced_decisions[context] }
+      decision
+    end
+
+    # Returns the forced decision for a given flag and an optional rule.
+    #
+    # @param context - An OptimizelyDecisionContext object containg flag key and rule key.
+    #
+    # @return - A variation key or nil if forced decisions are not set for the parameters.
+
+    def get_forced_decision(context)
+      find_forced_decision(context)
+    end
+
+    # Removes the forced decision for a given flag and an optional rule.
+    #
+    # @param context - An OptimizelyDecisionContext object containg flag key and rule key.
+    #
+    # @return - true if the forced decision has been removed successfully.
+
+    def remove_forced_decision(context)
+      deleted = false
+      @forced_decision_mutex.synchronize do
+        if @forced_decisions.key?(context)
+          @forced_decisions.delete(context)
+          deleted = true
+        end
+      end
+      deleted
+    end
+
+    # Removes all forced decisions bound to this user context.
+    #
+    # @return - true if forced decisions have been removed successfully.
+
+    def remove_all_forced_decisions
+      return false if @optimizely_client&.get_optimizely_config.nil?
+
+      @forced_decision_mutex.synchronize { @forced_decisions.clear }
+      true
+    end
+
     # Track an event
     #
     # @param event_key - Event key representing the event which needs to be recorded.

data/lib/optimizely/version.rb

@@ -17,5 +17,5 @@
 #
 module Optimizely
   CLIENT_ENGINE = 'ruby-sdk'
-  VERSION = '3.9.0'
+  VERSION = '3.10.0'
 end

data/lib/optimizely.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2016-2021, Optimizely and contributors
+#    Copyright 2016-2022, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -198,17 +198,24 @@ module Optimizely
       decision_event_dispatched = false
       experiment = nil
       decision_source = Optimizely::DecisionService::DECISION_SOURCES['ROLLOUT']
-
-      decision, reasons_received = @decision_service.get_variation_for_feature(config, feature_flag, user_id, attributes, decide_options)
+      context = Optimizely::OptimizelyUserContext::OptimizelyDecisionContext.new(key, nil)
+      variation, reasons_received = @decision_service.validated_forced_decision(config, context, user_context)
       reasons.push(*reasons_received)
 
+      if variation
+        decision = Optimizely::DecisionService::Decision.new(nil, variation, Optimizely::DecisionService::DECISION_SOURCES['FEATURE_TEST'])
+      else
+        decision, reasons_received = @decision_service.get_variation_for_feature(config, feature_flag, user_context, decide_options)
+        reasons.push(*reasons_received)
+      end
+
       # Send impression event if Decision came from a feature test and decide options doesn't include disableDecisionEvent
       if decision.is_a?(Optimizely::DecisionService::Decision)
         experiment = decision.experiment
-        rule_key = experiment['key']
+        rule_key = experiment ? experiment['key'] : nil
         variation = decision['variation']
-        variation_key = variation['key']
-        feature_enabled = variation['featureEnabled']
+        variation_key = variation ? variation['key'] : nil
+        feature_enabled = variation ? variation['featureEnabled'] : false
         decision_source = decision.source
       end
 
@@ -291,6 +298,19 @@ module Optimizely
       decisions
     end
 
+    # Gets variation using variation key or id and flag key.
+    #
+    # @param flag_key - flag key from which the variation is required.
+    # @param target_value - variation value either id or key that will be matched.
+    # @param attribute - string representing variation attribute.
+    #
+    # @return [variation]
+    # @return [nil] if no variation found in flag_variation_map.
+
+    def get_flag_variation(flag_key, target_value, attribute)
+      project_config.get_variation_from_flag(flag_key, target_value, attribute)
+    end
+
     # Buckets visitor and sends impression event to Optimizely.
     #
     # @param experiment_key - Experiment which needs to be activated.
@@ -490,7 +510,8 @@ module Optimizely
         return false
       end
 
-      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_id, attributes)
+      user_context = create_user_context(user_id, attributes)
+      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_context)
 
       feature_enabled = false
       source_string = Optimizely::DecisionService::DECISION_SOURCES['ROLLOUT']
@@ -739,7 +760,8 @@ module Optimizely
         return nil
       end
 
-      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_id, attributes)
+      user_context = create_user_context(user_id, attributes)
+      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_context)
       variation = decision ? decision['variation'] : nil
       feature_enabled = variation ? variation['featureEnabled'] : false
       all_variables = {}
@@ -881,7 +903,8 @@ module Optimizely
 
       return nil unless user_inputs_valid?(attributes)
 
-      variation_id, = @decision_service.get_variation(config, experiment_id, user_id, attributes)
+      user_context = create_user_context(user_id, attributes)
+      variation_id, = @decision_service.get_variation(config, experiment_id, user_context)
       variation = config.get_variation_from_id(experiment_key, variation_id) unless variation_id.nil?
       variation_key = variation['key'] if variation
       decision_notification_type = if config.feature_experiment?(experiment_id)
@@ -947,7 +970,8 @@ module Optimizely
         return nil
       end
 
-      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_id, attributes)
+      user_context = create_user_context(user_id, attributes)
+      decision, = @decision_service.get_variation_for_feature(config, feature_flag, user_context)
       variation = decision ? decision['variation'] : nil
       feature_enabled = variation ? variation['featureEnabled'] : false
 
@@ -1083,8 +1107,12 @@ module Optimizely
       experiment_id = experiment['id']
       experiment_key = experiment['key']
 
-      variation_id = ''
-      variation_id = config.get_variation_id_from_key_by_experiment_id(experiment_id, variation_key) if experiment_id != ''
+      variation_id = config.get_variation_id_from_key_by_experiment_id(experiment_id, variation_key) unless experiment_id.empty?
+
+      unless variation_id
+        variation = !flag_key.empty? ? get_flag_variation(flag_key, variation_key, 'key') : nil
+        variation_id = variation ? variation['id'] : ''
+      end
 
       metadata = {
         flag_key: flag_key,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimizely-sdk
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Optimizely
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,7 +185,7 @@ homepage: https://www.optimizely.com/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,8 +200,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Ruby SDK for Optimizely's testing framework
 test_files: []