Merge branch 'master' into pawel/fix_requester_despatcher

# Conflicts:
#	optimizely/client/client_test.go

Author: pawels-optimizely

optimizely/client/client.go

@@ -45,34 +45,7 @@ type OptimizelyClient struct {
 // IsFeatureEnabled returns true if the feature is enabled for the given user
 func (o *OptimizelyClient) IsFeatureEnabled(featureKey string, userContext entities.UserContext) (result bool, err error) {
 
-	defer func() {
-		if r := recover(); r != nil {
-			errorMessage := fmt.Sprintf(`Optimizely SDK is panicking with the error "%s"`, string(debug.Stack()))
-			err = errors.New(errorMessage)
-			logger.Error(errorMessage, err)
-		}
-	}()
-
-	projectConfig, err := o.GetProjectConfig()
-	if err != nil {
-		logger.Error("Error retrieving feature", err)
-		return false, err
-	}
-
-	feature, err := projectConfig.GetFeatureByKey(featureKey)
-	if err != nil {
-		logger.Error("Error retrieving feature", err)
-		return result, err
-	}
-	featureDecisionContext := decision.FeatureDecisionContext{
-		Feature:       &feature,
-		ProjectConfig: projectConfig,
-	}
-
-	userID := userContext.ID
-	logger.Debug(fmt.Sprintf(`Evaluating feature "%s" for user "%s".`, featureKey, userID))
-	featureDecision, err := o.decisionService.GetFeatureDecision(featureDecisionContext, userContext)
-
+	context, featureDecision, err := o.getFeatureDecision(featureKey, userContext)
 	if err != nil {
 		logger.Error("received an error while computing feature decision", err)
 		return result, err
@@ -85,17 +58,17 @@ func (o *OptimizelyClient) IsFeatureEnabled(featureKey string, userContext entit
 	}
 
 	if result {
-		logger.Info(fmt.Sprintf(`Feature "%s" is enabled for user "%s".`, featureKey, userID))
+		logger.Info(fmt.Sprintf(`Feature "%s" is enabled for user "%s".`, featureKey, userContext.ID))
 	} else {
-		logger.Info(fmt.Sprintf(`Feature "%s" is not enabled for user "%s".`, featureKey, userID))
+		logger.Info(fmt.Sprintf(`Feature "%s" is not enabled for user "%s".`, featureKey, userContext.ID))
 	}
 
 	if featureDecision.Source == decision.FeatureTest {
 		// send impression event for feature tests
-		impressionEvent := event.CreateImpressionUserEvent(projectConfig, featureDecision.Experiment, *featureDecision.Variation, userContext)
+		impressionEvent := event.CreateImpressionUserEvent(context.ProjectConfig, featureDecision.Experiment, *featureDecision.Variation, userContext)
 		o.eventProcessor.ProcessEvent(impressionEvent)
 	}
-	return result, nil
+	return result, err
 }
 
 // GetEnabledFeatures returns an array containing the keys of all features in the project that are enabled for the given user.
@@ -124,7 +97,7 @@ func (o *OptimizelyClient) GetEnabledFeatures(userContext entities.UserContext)
 		}
 	}
 
-	return enabledFeatures, nil
+	return enabledFeatures, err
 }
 
 // Track take and event key with event tags and if the event is part of the config, send to events backend.
@@ -155,12 +128,12 @@ func (o *OptimizelyClient) Track(eventKey string, userContext entities.UserConte
 		return err
 	}
 
-	return nil
+	return err
 }
 
 // GetFeatureVariableBoolean returns boolean feature variable value
 func (o *OptimizelyClient) GetFeatureVariableBoolean(featureKey, variableKey string, userContext entities.UserContext) (value bool, err error) {
-	val, valueType, err := o.getFeatureVariable(featureKey, variableKey, userContext)
+	val, valueType, err := o.GetFeatureVariable(featureKey, variableKey, userContext)
 	if err != nil {
 		return false, err
 	}
@@ -173,7 +146,7 @@ func (o *OptimizelyClient) GetFeatureVariableBoolean(featureKey, variableKey str
 
 // GetFeatureVariableDouble returns double feature variable value
 func (o *OptimizelyClient) GetFeatureVariableDouble(featureKey, variableKey string, userContext entities.UserContext) (value float64, err error) {
-	val, valueType, err := o.getFeatureVariable(featureKey, variableKey, userContext)
+	val, valueType, err := o.GetFeatureVariable(featureKey, variableKey, userContext)
 	if err != nil {
 		return 0, err
 	}
@@ -186,7 +159,7 @@ func (o *OptimizelyClient) GetFeatureVariableDouble(featureKey, variableKey stri
 
 // GetFeatureVariableInteger returns integer feature variable value
 func (o *OptimizelyClient) GetFeatureVariableInteger(featureKey, variableKey string, userContext entities.UserContext) (value int, err error) {
-	val, valueType, err := o.getFeatureVariable(featureKey, variableKey, userContext)
+	val, valueType, err := o.GetFeatureVariable(featureKey, variableKey, userContext)
 	if err != nil {
 		return 0, err
 	}
@@ -199,7 +172,7 @@ func (o *OptimizelyClient) GetFeatureVariableInteger(featureKey, variableKey str
 
 // GetFeatureVariableString returns string feature variable value
 func (o *OptimizelyClient) GetFeatureVariableString(featureKey, variableKey string, userContext entities.UserContext) (value string, err error) {
-	value, valueType, err := o.getFeatureVariable(featureKey, variableKey, userContext)
+	value, valueType, err := o.GetFeatureVariable(featureKey, variableKey, userContext)
 	if err != nil {
 		return "", err
 	}
@@ -209,50 +182,98 @@ func (o *OptimizelyClient) GetFeatureVariableString(featureKey, variableKey stri
 	return value, err
 }
 
-func (o *OptimizelyClient) getFeatureVariable(featureKey, variableKey string, userContext entities.UserContext) (value string, valueType entities.VariableType, err error) {
+// GetFeatureVariable returns feature as a string along with it's associated type
+func (o *OptimizelyClient) GetFeatureVariable(featureKey, variableKey string, userContext entities.UserContext) (value string, valueType entities.VariableType, err error) {
+
+	context, featureDecision, err := o.getFeatureDecision(featureKey, userContext)
+	if err != nil {
+		return "", "", err
+	}
+
+	variable, err := context.ProjectConfig.GetVariableByKey(featureKey, variableKey)
+	if err != nil {
+		return "", "", err
+	}
+
+	if featureDecision.Variation != nil {
+		if v, ok := featureDecision.Variation.Variables[variable.ID]; ok && featureDecision.Variation.FeatureEnabled {
+			return v.Value, variable.Type, err
+		}
+	}
+
+	return variable.DefaultValue, variable.Type, err
+}
+
+// GetAllFeatureVariables returns all the variables for a given feature along with the enabled state
+func (o *OptimizelyClient) GetAllFeatureVariables(featureKey string, userContext entities.UserContext) (enabled bool, variableMap map[string]string, err error) {
+	variableMap = make(map[string]string)
+	decisionContext, featureDecision, err := o.getFeatureDecision(featureKey, userContext)
+	if err != nil {
+		logger.Error("Optimizely SDK tracking error", err)
+		return enabled, variableMap, err
+	}
+
+	feature := decisionContext.Feature
+	if featureDecision.Variation != nil {
+		enabled = featureDecision.Variation.FeatureEnabled
+	}
+
+	for _, v := range feature.Variables {
+		variableMap[v.Key] = v.DefaultValue
+
+		if enabled {
+			if variable, ok := featureDecision.Variation.Variables[v.ID]; ok {
+				variableMap[v.Key] = variable.Value
+			}
+		}
+	}
+
+	return enabled, variableMap, err
+}
+
+func (o *OptimizelyClient) getFeatureDecision(featureKey string, userContext entities.UserContext) (decisionContext decision.FeatureDecisionContext, featureDecision decision.FeatureDecision, err error) {
 
 	defer func() {
 		if r := recover(); r != nil {
 			errorMessage := fmt.Sprintf(`optimizely SDK is panicking with the error "%s"`, string(debug.Stack()))
-			err = errors.New(errorMessage)
 			logger.Error(errorMessage, err)
+
+			// If we have a feature, then we can recover w/o throwing
+			if decisionContext.Feature == nil {
+				err = errors.New(errorMessage)
+			}
 		}
 	}()
 
+	userID := userContext.ID
+	logger.Debug(fmt.Sprintf(`Evaluating feature "%s" for user "%s".`, featureKey, userID))
+
 	projectConfig, err := o.GetProjectConfig()
 	if err != nil {
-		logger.Error("Error calling getFeatureVariable", err)
-		return "", "", err
+		logger.Error("Error calling getFeatureDecision", err)
+		return decisionContext, featureDecision, err
 	}
 
 	feature, err := projectConfig.GetFeatureByKey(featureKey)
 	if err != nil {
-		logger.Error("Error calling getFeatureVariable", err)
-		return "", "", err
-	}
-
-	variable, err := projectConfig.GetVariableByKey(featureKey, variableKey)
-	if err != nil {
-		logger.Error("Error calling getFeatureVariable", err)
-		return "", "", err
+		logger.Error("Error calling getFeatureDecision", err)
+		return decisionContext, featureDecision, err
 	}
 
-	featureValue := variable.DefaultValue
-
-	featureDecisionContext := decision.FeatureDecisionContext{
+	decisionContext = decision.FeatureDecisionContext{
 		Feature:       &feature,
 		ProjectConfig: projectConfig,
 	}
 
-	featureDecision, err := o.decisionService.GetFeatureDecision(featureDecisionContext, userContext)
-	if err == nil && featureDecision.Variation != nil {
-		if v, ok := featureDecision.Variation.Variables[variable.ID]; ok && featureDecision.Variation.FeatureEnabled {
-			featureValue = v.Value
-		}
+	featureDecision, err = o.decisionService.GetFeatureDecision(decisionContext, userContext)
+	if err != nil {
+		err = nil
+		logger.Warning("error making a decision")
+		return decisionContext, featureDecision, err
 	}
 
 	// @TODO(yasir): send decision notification
-	return featureValue, variable.Type, nil
+	return decisionContext, featureDecision, err
 }
 
 // GetProjectConfig returns the current ProjectConfig or nil if the instance is not valid