ensure global state initialized with new client (#256)

creating new client skips the init for global sdk configs - but as kenny
commented, sdk configs shouldn't be shared across clients. This will now
be its own instance on the client

Author: kat-statsig

client.go

@@ -50,9 +50,11 @@ func newClientImpl(sdkKey string, options *Options) (*Client, *initContext) {
 		err := errors.New(InvalidSDKKeyError)
 		panic(err)
 	}
+	sdkConfigs := newSDKConfigs()
 	transport := newTransport(sdkKey, options)
-	logger := newLogger(transport, options, diagnostics, errorBoundary)
-	evaluator := newEvaluator(transport, errorBoundary, options, diagnostics, sdkKey)
+	logger := newLogger(transport, options, diagnostics, errorBoundary, sdkConfigs)
+	evaluator := newEvaluator(transport, errorBoundary, options, diagnostics, sdkKey, sdkConfigs)
+
 	client := &Client{
 		sdkKey:        sdkKey,
 		evaluator:     evaluator,

evaluator.go

@@ -103,8 +103,9 @@ func newEvaluator(
 	options *Options,
 	diagnostics *diagnostics,
 	sdkKey string,
+	sdkConfigs *SDKConfigs,
 ) *evaluator {
-	store := newStore(transport, errorBoundary, options, diagnostics, sdkKey)
+	store := newStore(transport, errorBoundary, options, diagnostics, sdkKey, sdkConfigs)
 	defer func() {
 		if err := recover(); err != nil {
 			errorBoundary.logException(toError(err))

global_state.go

@@ -10,7 +10,6 @@ import (
 // Instead, define an accessor below using the Mutex lock
 type GlobalState struct {
 	logger    *OutputLogger
-	sdkConfig *SDKConfigs
 	sessionID string
 	mu        sync.RWMutex
 }
@@ -42,15 +41,3 @@ func InitializeGlobalSessionID() {
 	defer global.mu.Unlock()
 	global.sessionID = uuid.NewString()
 }
-
-func SDKConfig() *SDKConfigs {
-	global.mu.RLock()
-	defer global.mu.RUnlock()
-	return global.sdkConfig
-}
-
-func InitializeGlobalSDKConfig() {
-	global.mu.Lock()
-	defer global.mu.Unlock()
-	global.sdkConfig = &SDKConfigs{}
-}

logger.go

@@ -55,9 +55,10 @@ type logger struct {
 	options        *Options
 	errorBoundary  *errorBoundary
 	samplingKeySet *TTLSet
+	SDKConfigs     *SDKConfigs
 }
 
-func newLogger(transport *transport, options *Options, diagnostics *diagnostics, errorBoundary *errorBoundary) *logger {
+func newLogger(transport *transport, options *Options, diagnostics *diagnostics, errorBoundary *errorBoundary, sdkConfigs *SDKConfigs) *logger {
 	loggingInterval := time.Minute
 	maxEvents := 1000
 	if options.LoggingInterval > 0 {
@@ -77,6 +78,7 @@ func newLogger(transport *transport, options *Options, diagnostics *diagnostics,
 		options:        options,
 		errorBoundary:  errorBoundary,
 		samplingKeySet: NewTTLSet(),
+		SDKConfigs:     sdkConfigs,
 	}
 
 	go log.backgroundFlush()
@@ -369,8 +371,8 @@ func (l *logger) determineSampling(entityType EntityType,
 
 	shadowShouldLog := true
 	env := l.options.GetSDKEnvironmentTier()
-	samplingMode, _ = SDKConfig().GetConfigStrValue("sampling_mode")
-	specialCaseSamplingRate, _ := SDKConfig().GetConfigIntValue("special_case_sampling_rate")
+	samplingMode, _ = l.SDKConfigs.GetConfigStrValue("sampling_mode")
+	specialCaseSamplingRate, _ := l.SDKConfigs.GetConfigIntValue("special_case_sampling_rate")
 	specialCaseRules := map[string]bool{
 		"disabled": true,
 		"default":  true,

logger_test.go

@@ -15,10 +15,10 @@ func TestLog(t *testing.T) {
 	opt := &Options{
 		API: testServer.URL,
 	}
-	InitializeGlobalSDKConfig()
 	transport := newTransport("secret", opt)
 	errorBoundary := newErrorBoundary("secret", opt, nil)
-	logger := newLogger(transport, opt, nil, errorBoundary)
+	sdkConfigs := newSDKConfigs()
+	logger := newLogger(transport, opt, nil, errorBoundary, sdkConfigs)
 
 	user := User{
 		UserID:            "123",

output_logger_test.go

@@ -31,7 +31,8 @@ func TestLogEventErrors(t *testing.T) {
 	diagnostics := newDiagnostics(opts)
 	transport := newTransport("secret", opts)
 	errorBoundary := newErrorBoundary("secret", opts, nil)
-	logger := newLogger(transport, opts, diagnostics, errorBoundary)
+	sdkConfigs := newSDKConfigs()
+	logger := newLogger(transport, opts, diagnostics, errorBoundary, sdkConfigs)
 
 	user := User{
 		UserID: "123",

sdk_configs.go

@@ -11,6 +11,13 @@ type SDKConfigs struct {
 	mu      sync.RWMutex
 }
 
+func newSDKConfigs() *SDKConfigs {
+	return &SDKConfigs{
+		flags:   make(map[string]bool),
+		configs: make(map[string]interface{}),
+	}
+}
+
 func (s *SDKConfigs) SetFlags(newFlags map[string]bool) {
 	s.mu.Lock()
 	s.flags = newFlags

statsig.go

@@ -30,7 +30,6 @@ func Initialize(sdkKey string) InitializeDetails {
 func InitializeWithOptions(sdkKey string, options *Options) InitializeDetails {
 	InitializeGlobalOutputLogger(options.OutputLoggerOptions)
 	InitializeGlobalSessionID()
-	InitializeGlobalSDKConfig()
 	if IsInitialized() {
 		Logger().Log("Statsig is already initialized.", nil)
 		return InitializeDetails{Success: true, Source: instance.evaluator.store.source}

store.go

@@ -143,6 +143,7 @@ type store struct {
 	sdkKey                  string
 	isPolling               bool
 	bootstrapValues         string
+	sdkConfigs              *SDKConfigs
 }
 
 var syncOutdatedMax = 2 * time.Minute
@@ -153,6 +154,7 @@ func newStore(
 	options *Options,
 	diagnostics *diagnostics,
 	sdkKey string,
+	sdkConfigs *SDKConfigs,
 ) *store {
 	configSyncInterval := 10 * time.Second
 	idListSyncInterval := time.Minute
@@ -172,6 +174,7 @@ func newStore(
 		diagnostics,
 		sdkKey,
 		options.BootstrapValues,
+		sdkConfigs,
 	)
 }
 
@@ -185,6 +188,7 @@ func newStoreInternal(
 	diagnostics *diagnostics,
 	sdkKey string,
 	bootstrapValues string,
+	sdkConfigs *SDKConfigs,
 ) *store {
 	store := &store{
 		featureGates:         make(map[string]configSpec),
@@ -203,6 +207,7 @@ func newStoreInternal(
 		sdkKey:               sdkKey,
 		isPolling:            false,
 		bootstrapValues:      bootstrapValues,
+		sdkConfigs:           sdkConfigs,
 	}
 	return store
 }
@@ -479,8 +484,8 @@ func (s *store) setConfigSpecs(specs downloadConfigSpecResponse) (bool, bool) {
 			}
 		}
 
-		SDKConfig().SetConfigs(specs.SDKConfigs)
-		SDKConfig().SetFlags(specs.SDKFlags)
+		s.sdkConfigs.SetConfigs(specs.SDKConfigs)
+		s.sdkConfigs.SetFlags(specs.SDKFlags)
 		s.mu.Lock()
 		s.featureGates = newGates
 		s.dynamicConfigs = newConfigs

store_test.go

@@ -113,7 +113,8 @@ func TestStoreSync(t *testing.T) {
 	n := newTransport("secret-123", opt)
 	d := newDiagnostics(opt)
 	e := newErrorBoundary("client-key", opt, d)
-	s := newStoreInternal(n, time.Second, time.Second, nil, e, nil, d, "secret-123", "")
+	c := newSDKConfigs()
+	s := newStoreInternal(n, time.Second, time.Second, nil, e, nil, d, "secret-123", "", c)
 	s.initialize(nil)
 
 	if s.getGatesCount() != 1 {