feat: prevent-setting-logger-and-default-options-on-configured-custom-clients

Author: wood

client.go

@@ -78,49 +78,44 @@ func NewClient(apiKey string, options ...Option) *Client {
 		}
 	}
 
+	// If a resty custom client has been provided, client is already set - otherwise we use a custom http client or default to a resty
 	if c.client == nil {
 		if c.httpClient != nil {
 			c.client = resty.NewWithClient(c.httpClient)
+			c.config.userProvidedClient = true
 		} else {
 			c.client = resty.New()
 		}
-	}
-
-	for _, opt := range options {
-		name := getOptionQualifiedName(opt)
-		if isClientOption(name) {
-			continue
-		}
-		opt(c)
+	} else {
+		c.config.userProvidedClient = true
 	}
 
 	c.client.SetHeaders(map[string]string{
 		"Accept":             "application/json",
 		EnvironmentKeyHeader: c.apiKey,
 	})
-	c.client.SetTimeout(c.config.timeout)
+
+	if c.client.GetClient().Timeout == 0 {
+		c.client.SetTimeout(c.config.timeout)
+	}
+
 	c.log = createLogger()
 
 	for _, opt := range options {
-		if opt != nil {
-			opt(c)
+		name := getOptionQualifiedName(opt)
+		if isClientOption(name) {
+			continue
 		}
+		opt(c)
 	}
 
-	// If a resty custom client has been provided, client is already set - otherwise we use a custom http client or default to a resty
-	if c.client == nil {
-		if c.httpClient != nil {
-			c.client = resty.NewWithClient(c.httpClient)
-		} else {
-			c.client = resty.New()
-		}
+	if !c.config.userProvidedClient {
+		c.client = c.client.
+			SetLogger(newSlogToRestyAdapter(c.log)).
+			OnBeforeRequest(newRestyLogRequestMiddleware(c.log)).
+			OnAfterResponse(newRestyLogResponseMiddleware(c.log))
 	}
 
-	c.client = c.client.
-		SetLogger(newSlogToRestyAdapter(c.log)).
-		OnBeforeRequest(newRestyLogRequestMiddleware(c.log)).
-		OnAfterResponse(newRestyLogResponseMiddleware(c.log))
-
 	c.log.Info("initialising Flagsmith client",
 		"base_url", c.config.baseURL,
 		"local_evaluation", c.config.localEvaluation,

config.go

@@ -27,6 +27,7 @@ type config struct {
 	realtimeBaseUrl    string
 	useRealtime        bool
 	polling            bool
+	userProvidedClient bool
 }
 
 // defaultConfig returns default configuration.
@@ -36,5 +37,6 @@ func defaultConfig() config {
 		timeout:            DefaultTimeout,
 		envRefreshInterval: time.Second * 60,
 		realtimeBaseUrl:    DefaultRealtimeBaseUrl,
+		userProvidedClient: false,
 	}
 }

options.go

@@ -89,8 +89,10 @@ func WithAnalytics(ctx context.Context) Option {
 
 func WithRetries(count int, waitTime time.Duration) Option {
 	return func(c *Client) {
-		c.client.SetRetryCount(count)
-		c.client.SetRetryWaitTime(waitTime)
+		if c.config.userProvidedClient && c.client.RetryCount == 0 {
+			c.client.SetRetryCount(count)
+			c.client.SetRetryWaitTime(waitTime)
+		}
 	}
 }