[FSSDK-11587] Implement CMAB config

README.md

@@ -145,23 +145,16 @@ Below is a comprehensive list of available configuration properties.
 | webhook.projects.<_projectId_>.secret             | N/A                                             | Webhook secret used to validate webhook requests originating from the respective projectId                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | webhook.projects.<_projectId_>.skipSignatureCheck | N/A                                             | Boolean to indicate whether the signature should be validated. TODO remove in favor of empty secret.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 
-### CMAB Configuration Examples
+### CMAB Configuration Example
 
-**Complete CMAB Configuration (OPTIMIZELY_CMAB)**:
 ```json
 {
-  "enabled": true,
-  "predictionEndpoint": "https://custom-endpoint.com",
+  "predictionEndpoint": "https://prediction.cmab.optimizely.com/predict/%s",
   "requestTimeout": "5s",
   "cache": {
-    "type": "redis",
+    "type": "memory",
     "size": 2000,
-    "ttl": "45m",
-    "redis": {
-      "host": "redis:6379",
-      "password": "",
-      "database": 0
-    }
+    "ttl": "45m"
   },
   "retryConfig": {
     "maxRetries": 3,
@@ -170,28 +163,7 @@ Below is a comprehensive list of available configuration properties.
     "backoffMultiplier": 2.0
   }
 }
-
-CMAB Cache Configuration (OPTIMIZELY_CMAB_CACHE):
-
-{
-  "type": "redis",
-  "size": 2000,
-  "ttl": "45m",
-  "redis": {
-    "host": "redis:6379",
-    "password": "",
-    "database": 0
-  }
-}
-
-CMAB Retry Configuration (OPTIMIZELY_CMAB_RETRYCONFIG):
-
-{
-  "maxRetries": 3,
-  "initialBackoff": "100ms",
-  "maxBackoff": "10s",
-  "backoffMultiplier": 2.0
-}
+```
 
 More information about configuring Agent can be found in the [Advanced Configuration Notes](https://docs.developers.optimizely.com/experimentation/v4.0.0-full-stack/docs/advanced-configuration).
 

cmd/optimizely/main.go

@@ -111,9 +111,6 @@ func loadConfig(v *viper.Viper) *config.AgentConfig {
 	// Handle CMAB configuration using the same approach as UserProfileService
 	// Check for complete CMAB configuration first
 	if cmab := v.GetStringMap("cmab"); len(cmab) > 0 {
-		if enabled, ok := cmab["enabled"].(bool); ok {
-			conf.CMAB.Enabled = enabled
-		}
 		if endpoint, ok := cmab["predictionEndpoint"].(string); ok {
 			conf.CMAB.PredictionEndpoint = endpoint
 		}

cmd/optimizely/main_test.go

@@ -182,14 +182,12 @@ func assertWebhook(t *testing.T, actual config.WebhookConfig) {
 
 func assertCMAB(t *testing.T, cmab config.CMABConfig) {
 	fmt.Println("In assertCMAB, received CMAB config:")
-	fmt.Printf("  Enabled: %v\n", cmab.Enabled)
 	fmt.Printf("  PredictionEndpoint: %s\n", cmab.PredictionEndpoint)
 	fmt.Printf("  RequestTimeout: %v\n", cmab.RequestTimeout)
 	fmt.Printf("  Cache: %#v\n", cmab.Cache)
 	fmt.Printf("  RetryConfig: %#v\n", cmab.RetryConfig)
 
 	// Base assertions
-	assert.True(t, cmab.Enabled)
 	assert.Equal(t, "https://custom-cmab-endpoint.example.com", cmab.PredictionEndpoint)
 	assert.Equal(t, 15*time.Second, cmab.RequestTimeout)
 
@@ -299,7 +297,6 @@ func TestCMABEnvDebug(t *testing.T) {
 
 	// Debug: Print the parsed config
 	fmt.Println("Parsed CMAB config from JSON env var:")
-	fmt.Printf("  Enabled: %v\n", conf.CMAB.Enabled)
 	fmt.Printf("  PredictionEndpoint: %s\n", conf.CMAB.PredictionEndpoint)
 	fmt.Printf("  RequestTimeout: %v\n", conf.CMAB.RequestTimeout)
 	fmt.Printf("  Cache: %+v\n", conf.CMAB.Cache)
@@ -326,7 +323,6 @@ func TestCMABPartialConfig(t *testing.T) {
 	conf := loadConfig(v)
 
 	// Base assertions
-	assert.True(t, conf.CMAB.Enabled)
 	assert.Equal(t, "https://base-endpoint.example.com", conf.CMAB.PredictionEndpoint)
 
 	// Cache assertions

config.yaml

@@ -267,10 +267,8 @@ synchronization:
 ## cmab: Contextual Multi-Armed Bandit configuration
 ##
 cmab:
-    ## enable or disable CMAB functionality
-    enabled: false
     ## URL for CMAB prediction service
-    predictionEndpoint: "https://prediction.cmab.optimizely.com"
+    predictionEndpoint: "https://prediction.cmab.optimizely.com/predict/%s"
     ## timeout for CMAB API requests
     requestTimeout: 10s
     ## CMAB cache configuration
@@ -281,11 +279,6 @@ cmab:
         size: 1000
         ## time-to-live for cached decisions
         ttl: 30m
-        ## Redis configuration (if using redis cache)
-        redis:
-            host: "localhost:6379"
-            password: ""
-            database: 0
     ## retry configuration for CMAB API requests
     retryConfig:
         ## maximum number of retry attempts

config/config.go

@@ -141,18 +141,12 @@ func NewDefaultConfig() *AgentConfig {
 			},
 		},
 		CMAB: CMABConfig{
-			Enabled:            false,
-			PredictionEndpoint: "https://prediction.cmab.optimizely.com",
+			PredictionEndpoint: "https://prediction.cmab.optimizely.com/predict/%s",
 			RequestTimeout:     10 * time.Second,
 			Cache: map[string]interface{}{
 				"type": "memory",
 				"size": 1000,
 				"ttl":  "30m",
-				"redis": map[string]interface{}{
-					"host":     "localhost:6379",
-					"password": "",
-					"database": 0,
-				},
 			},
 			RetryConfig: map[string]interface{}{
 				"maxRetries":        3,
@@ -411,9 +405,6 @@ type RuntimeConfig struct {
 
 // CMABConfig holds configuration for the Contextual Multi-Armed Bandit functionality
 type CMABConfig struct {
-	// Enabled indicates whether the CMAB functionality is enabled
-	Enabled bool `json:"enabled"`
-
 	// PredictionEndpoint is the URL for CMAB predictions
 	PredictionEndpoint string `json:"predictionEndpoint"`
 

config/config_test.go

@@ -101,8 +101,7 @@ func TestDefaultConfig(t *testing.T) {
 	assert.Equal(t, 0, conf.Runtime.MutexProfileFraction)
 
 	// CMAB configuration
-	assert.False(t, conf.CMAB.Enabled)
-	assert.Equal(t, "https://prediction.cmab.optimizely.com", conf.CMAB.PredictionEndpoint)
+	assert.Equal(t, "https://prediction.cmab.optimizely.com/predict/%s", conf.CMAB.PredictionEndpoint)
 	assert.Equal(t, 10*time.Second, conf.CMAB.RequestTimeout)
 
 	// Test cache settings as maps
@@ -111,11 +110,6 @@ func TestDefaultConfig(t *testing.T) {
 	assert.Equal(t, 1000, cacheMap["size"])
 	assert.Equal(t, "30m", cacheMap["ttl"])
 
-	redisMap := cacheMap["redis"].(map[string]interface{})
-	assert.Equal(t, "localhost:6379", redisMap["host"])
-	assert.Equal(t, "", redisMap["password"])
-	assert.Equal(t, 0, redisMap["database"])
-
 	// Test retry settings as maps
 	retryMap := conf.CMAB.RetryConfig
 	assert.Equal(t, 3, retryMap["maxRetries"])
@@ -261,8 +255,7 @@ func TestDefaultCMABConfig(t *testing.T) {
 	conf := NewDefaultConfig()
 
 	// Test default values
-	assert.False(t, conf.CMAB.Enabled)
-	assert.Equal(t, "https://prediction.cmab.optimizely.com", conf.CMAB.PredictionEndpoint)
+	assert.Equal(t, "https://prediction.cmab.optimizely.com/predict/%s", conf.CMAB.PredictionEndpoint)
 	assert.Equal(t, 10*time.Second, conf.CMAB.RequestTimeout)
 
 	// Test default cache settings as maps
@@ -271,11 +264,6 @@ func TestDefaultCMABConfig(t *testing.T) {
 	assert.Equal(t, 1000, cacheMap["size"])
 	assert.Equal(t, "30m", cacheMap["ttl"])
 
-	redisMap := cacheMap["redis"].(map[string]interface{})
-	assert.Equal(t, "localhost:6379", redisMap["host"])
-	assert.Equal(t, "", redisMap["password"])
-	assert.Equal(t, 0, redisMap["database"])
-
 	// Test default retry settings as maps
 	retryMap := conf.CMAB.RetryConfig
 	assert.Equal(t, 3, retryMap["maxRetries"])