Update agent to use CMAB configuration approach

Author: Mat001

cmd/optimizely/main.go

@@ -122,9 +122,6 @@ func loadConfig(v *viper.Viper) *config.AgentConfig {
 		if retryConfig, ok := cmab["retryConfig"].(map[string]interface{}); ok {
 			conf.CMAB.RetryConfig = retryConfig
 		}
-		if predictionEndpoint, ok := cmab["predictionEndpoint"].(string); ok {
-			conf.CMAB.PredictionEndpoint = predictionEndpoint
-		}
 	}
 
 	// Check for individual map sections
@@ -136,10 +133,6 @@ func loadConfig(v *viper.Viper) *config.AgentConfig {
 		conf.CMAB.RetryConfig = cmabRetryConfig
 	}
 
-	// Check for individual predictionEndpoint field
-	if predictionEndpoint := v.GetString("cmab.predictionEndpoint"); predictionEndpoint != "" {
-		conf.CMAB.PredictionEndpoint = predictionEndpoint
-	}
 
 	return conf
 }

config/config.go

@@ -141,8 +141,7 @@ func NewDefaultConfig() *AgentConfig {
 			},
 		},
 		CMAB: CMABConfig{
-			RequestTimeout:     10 * time.Second,
-			PredictionEndpoint: "https://prediction.cmab.optimizely.com/predict/%s",
+			RequestTimeout: 10 * time.Second,
 			Cache: map[string]interface{}{
 				"type": "memory",
 				"size": 1000,
@@ -409,9 +408,6 @@ type CMABConfig struct {
 	// RequestTimeout is the timeout for CMAB API requests
 	RequestTimeout time.Duration `json:"requestTimeout"`
 
-	// PredictionEndpoint is the URL template for CMAB prediction API
-	PredictionEndpoint string `json:"predictionEndpoint"`
-
 	// Cache configuration
 	Cache map[string]interface{} `json:"cache"`
 

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.2
 	github.com/google/uuid v1.3.1
 	github.com/lestrrat-go/jwx/v2 v2.0.20
-	github.com/optimizely/go-sdk/v2 v2.1.1-0.20250725211427-2baee7ec755d
+	github.com/optimizely/go-sdk/v2 v2.1.1-0.20250728200455-37780395c725
 	github.com/orcaman/concurrent-map v1.0.0
 	github.com/prometheus/client_golang v1.18.0
 	github.com/rakyll/statik v0.1.7

go.sum

@@ -231,6 +231,8 @@ github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
 github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
 github.com/optimizely/go-sdk/v2 v2.1.1-0.20250725211427-2baee7ec755d h1:50UbypBJW9larBSnkaePbLe5Kkm6cg1/hAZDpvkRvVg=
 github.com/optimizely/go-sdk/v2 v2.1.1-0.20250725211427-2baee7ec755d/go.mod h1:MusRCFsU7+XzJCoCTgheLoENJSf1iiFYm4KbJqz6BYA=
+github.com/optimizely/go-sdk/v2 v2.1.1-0.20250728200455-37780395c725 h1:CsafFEQ3xBhKiMyKho47oCyHYuWy9c8w20D5Oc2b4dw=
+github.com/optimizely/go-sdk/v2 v2.1.1-0.20250728200455-37780395c725/go.mod h1:MusRCFsU7+XzJCoCTgheLoENJSf1iiFYm4KbJqz6BYA=
 github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY=
 github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=

pkg/optimizely/cache.go

@@ -21,7 +21,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"net/http"
 	"regexp"
 	"strings"
 	"sync"
@@ -37,7 +36,7 @@ import (
 	"github.com/optimizely/agent/plugins/userprofileservice"
 	odpCachePkg "github.com/optimizely/go-sdk/v2/pkg/cache"
 	"github.com/optimizely/go-sdk/v2/pkg/client"
-	cmab "github.com/optimizely/go-sdk/v2/pkg/cmab"
+	"github.com/optimizely/go-sdk/v2/pkg/cmab"
 	sdkconfig "github.com/optimizely/go-sdk/v2/pkg/config"
 	"github.com/optimizely/go-sdk/v2/pkg/decision"
 	"github.com/optimizely/go-sdk/v2/pkg/event"
@@ -316,8 +315,8 @@ func defaultLoader(
 		clientOptions = append(clientOptions, client.WithOdpManager(odpManager))
 
 		// Parse CMAB cache configuration
-		cacheSize := 1000            // default
-		cacheTTL := 30 * time.Minute // default
+		cacheSize := cmab.DefaultCacheSize
+		cacheTTL := cmab.DefaultCacheTTL
 
 		if cacheConfig, ok := clientConf.CMAB.Cache["size"].(int); ok {
 			cacheSize = cacheConfig
@@ -331,55 +330,42 @@ func defaultLoader(
 			}
 		}
 
-		// Parse retry configuration
+		// Create retry config
 		retryConfig := &cmab.RetryConfig{
-			MaxRetries:        3,
-			InitialBackoff:    100 * time.Millisecond,
-			MaxBackoff:        10 * time.Second,
-			BackoffMultiplier: 2.0,
+			MaxRetries:        cmab.DefaultMaxRetries,
+			InitialBackoff:    cmab.DefaultInitialBackoff,
+			MaxBackoff:        cmab.DefaultMaxBackoff,
+			BackoffMultiplier: cmab.DefaultBackoffMultiplier,
 		}
 
+		// Parse retry configuration
 		if maxRetries, ok := clientConf.CMAB.RetryConfig["maxRetries"].(int); ok {
 			retryConfig.MaxRetries = maxRetries
 		}
-
 		if initialBackoffStr, ok := clientConf.CMAB.RetryConfig["initialBackoff"].(string); ok {
-			if parsedBackoff, err := time.ParseDuration(initialBackoffStr); err == nil {
-				retryConfig.InitialBackoff = parsedBackoff
+			if backoff, err := time.ParseDuration(initialBackoffStr); err == nil {
+				retryConfig.InitialBackoff = backoff
 			}
 		}
-
 		if maxBackoffStr, ok := clientConf.CMAB.RetryConfig["maxBackoff"].(string); ok {
-			if parsedBackoff, err := time.ParseDuration(maxBackoffStr); err == nil {
-				retryConfig.MaxBackoff = parsedBackoff
+			if backoff, err := time.ParseDuration(maxBackoffStr); err == nil {
+				retryConfig.MaxBackoff = backoff
 			}
 		}
-
 		if multiplier, ok := clientConf.CMAB.RetryConfig["backoffMultiplier"].(float64); ok {
 			retryConfig.BackoffMultiplier = multiplier
 		}
 
-		// Set CMAB prediction endpoint if configured
-		if clientConf.CMAB.PredictionEndpoint != "" {
-			cmab.CMABPredictionEndpoint = clientConf.CMAB.PredictionEndpoint
-		}
-
-		// Create CMAB client and service
-		cmabClient := cmab.NewDefaultCmabClient(cmab.ClientOptions{
-			HTTPClient: &http.Client{
-				Timeout: clientConf.CMAB.RequestTimeout,
-			},
+		// Create CMAB config (NO endpoint configuration - not configurable)
+		cmabConfig := cmab.Config{
+			CacheSize:   cacheSize,
+			CacheTTL:    cacheTTL,
+			HTTPTimeout: clientConf.CMAB.RequestTimeout,
 			RetryConfig: retryConfig,
-			Logger:      logging.GetLogger(sdkKey, "CmabClient"),
-		})
-
-		cmabService := cmab.NewDefaultCmabService(cmab.ServiceOptions{
-			Logger:     logging.GetLogger(sdkKey, "CmabService"),
-			CmabCache:  odpCachePkg.NewLRUCache(cacheSize, cacheTTL),
-			CmabClient: cmabClient,
-		})
+		}
 
-		clientOptions = append(clientOptions, client.WithCmabService(cmabService))
+		// Add to client options
+		clientOptions = append(clientOptions, client.WithCmabConfig(cmabConfig))
 
 		optimizelyClient, err := optimizelyFactory.Client(
 			clientOptions...,