[FSSDK-11587] Implement CMAB config

README.md

@@ -124,7 +124,10 @@ Below is a comprehensive list of available configuration properties.
 | log.level                                         | OPTIMIZELY_LOG_LEVEL                            | The log [level](https://github.com/rs/zerolog#leveled-logging) for the agent. Default: info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | log.pretty                                        | OPTIMIZELY_LOG_PRETTY                           | Flag used to set colorized console output as opposed to structured json logs. Default: false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | name                                              | OPTIMIZELY_NAME                                 | Agent name. Default: optimizely                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| sdkKeys                                           | OPTIMIZELY_SDKKEYS                              | Comma delimited list of SDK keys used to initialize on startup                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| sdkKeys                                           | OPTIMIZELY_SDKKEYS                              | Comma delimited list of SDK keys used to initialize on startup                                                                         | 
+| cmab               | OPTIMIZELY_CMAB           | Complete JSON configuration for CMAB. Format: see example below                                     |
+| cmab.cache         | OPTIMIZELY_CMAB_CACHE     | JSON configuration for just the CMAB cache section. Format: see example below                       |
+| cmab.retryConfig   | OPTIMIZELY_CMAB_RETRYCONFIG | JSON configuration for just the CMAB retry settings. Format: see example below                    |                                                                                                                                                                        
 | server.allowedHosts                               | OPTIMIZELY_SERVER_ALLOWEDHOSTS                  | List of allowed request host values. Requests whose host value does not match either the configured server.host, or one of these, will be rejected with a 404 response. To match all subdomains, you can use a leading dot (for example `.example.com` matches `my.example.com`, `hello.world.example.com`, etc.). You can use the value `.` to disable allowed host checking, allowing requests with any host. Request host is determined in the following priority order: 1. X-Forwarded-Host header value, 2. Forwarded header host= directive value, 3. Host property of request (see Host under https://pkg.go.dev/net/http#Request). Note: don't include port in these hosts values - port is stripped from the request host before comparing against these. |
 | server.batchRequests.maxConcurrency               | OPTIMIZELY_SERVER_BATCHREQUESTS_MAXCONCURRENCY  | Number of requests running in parallel. Default: 10                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | server.batchRequests.operationsLimit              | OPTIMIZELY_SERVER_BATCHREQUESTS_OPERATIONSLIMIT | Number of allowed operations. ( will flag an error if the number of operations exeeds this parameter) Default: 500                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
@@ -142,6 +145,54 @@ 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
+
+**Complete CMAB Configuration (OPTIMIZELY_CMAB)**:
+```json
+{
+  "enabled": true,
+  "predictionEndpoint": "https://custom-endpoint.com",
+  "requestTimeout": "5s",
+  "cache": {
+    "type": "redis",
+    "size": 2000,
+    "ttl": "45m",
+    "redis": {
+      "host": "redis:6379",
+      "password": "",
+      "database": 0
+    }
+  },
+  "retryConfig": {
+    "maxRetries": 3,
+    "initialBackoff": "100ms",
+    "maxBackoff": "10s",
+    "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).
 
 ### API

cmd/optimizely/main.go

@@ -25,6 +25,7 @@ import (
 	"runtime"
 	"strings"
 	"syscall"
+	"time"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -98,15 +99,46 @@ func loadConfig(v *viper.Viper) *config.AgentConfig {
 	}
 
 	// Check if JSON string was set using OPTIMIZELY_CLIENT_USERPROFILESERVICE environment variable
-	if userProfileService := v.GetStringMap("client.userprofileservice"); userProfileService != nil {
+	if userProfileService := v.GetStringMap("client.userprofileservice"); len(userProfileService) > 0 {
 		conf.Client.UserProfileService = userProfileService
 	}
 
 	// Check if JSON string was set using OPTIMIZELY_CLIENT_ODP_SEGMENTSCACHE environment variable
-	if odpSegmentsCache := v.GetStringMap("client.odp.segmentsCache"); odpSegmentsCache != nil {
+	if odpSegmentsCache := v.GetStringMap("client.odp.segmentsCache"); len(odpSegmentsCache) > 0 {
 		conf.Client.ODP.SegmentsCache = odpSegmentsCache
 	}
 
+	// 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
+		}
+		if timeout, ok := cmab["requestTimeout"].(string); ok {
+			if duration, err := time.ParseDuration(timeout); err == nil {
+				conf.CMAB.RequestTimeout = duration
+			}
+		}
+		if cache, ok := cmab["cache"].(map[string]interface{}); ok {
+			conf.CMAB.Cache = cache
+		}
+		if retryConfig, ok := cmab["retryConfig"].(map[string]interface{}); ok {
+			conf.CMAB.RetryConfig = retryConfig
+		}
+	}
+
+	// Check for individual map sections
+	if cmabCache := v.GetStringMap("cmab.cache"); len(cmabCache) > 0 {
+		conf.CMAB.Cache = cmabCache
+	}
+
+	if cmabRetryConfig := v.GetStringMap("cmab.retryConfig"); len(cmabRetryConfig) > 0 {
+		conf.CMAB.RetryConfig = cmabRetryConfig
+	}
+
 	return conf
 }