Merge pull request #112 from harness/FFM-7327-use-custom-logger-for-http-client

(FFM-7327) Use custom logger for startup and http requests

Author: conormurray95

client/client.go

@@ -5,13 +5,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log"
 	"net/http"
 	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
 
 	"github.com/harness/ff-golang-server-sdk/evaluation"
+	"github.com/harness/ff-golang-server-sdk/logger"
 
 	"github.com/harness/ff-golang-server-sdk/pkg/repository"
 
@@ -36,7 +38,6 @@ import (
 // When an application is shutting down or no longer needs to use the CfClient instance, it
 // should call Close() to ensure that all of its connections and goroutines are shut down and
 // that any pending analytics events have been delivered.
-//
 type CfClient struct {
 	evaluator           *evaluation.Evaluator
 	repository          repository.Repository
@@ -65,7 +66,7 @@ type CfClient struct {
 func NewCfClient(sdkKey string, options ...ConfigOption) (*CfClient, error) {
 
 	//  functional options for config
-	config := newDefaultConfig()
+	config := newDefaultConfig(getLogger(options...))
 	for _, opt := range options {
 		opt(config)
 	}
@@ -497,3 +498,19 @@ func (a *atomicBool) set(value bool) {
 func (a *atomicBool) get() bool {
 	return atomic.LoadInt32(&(a.flag)) != int32(0)
 }
+
+// getLogger returns either the custom passed in logger or our default zap logger
+func getLogger(options ...ConfigOption) logger.Logger {
+	dummyConfig := &config{}
+	for _, opt := range options {
+		opt(dummyConfig)
+	}
+	if dummyConfig.Logger == nil {
+		defaultLogger, err := logger.NewZapLogger(false)
+		if err != nil {
+			log.Printf("Error creating zap logger instance, %v", err)
+		}
+		dummyConfig.Logger = defaultLogger
+	}
+	return dummyConfig.Logger
+}

client/config.go

@@ -1,7 +1,6 @@
 package client
 
 import (
-	"log"
 	"net/http"
 
 	"github.com/harness/ff-golang-server-sdk/evaluation"
@@ -28,24 +27,21 @@ type config struct {
 	enableAnalytics     bool
 }
 
-func newDefaultConfig() *config {
-	defaultLogger, err := logger.NewZapLogger(false)
-	if err != nil {
-		log.Printf("Error creating zap logger instance, %v", err)
-	}
-	defaultCache, _ := cache.NewLruCache(10000, defaultLogger) // size of cache
-	defaultStore := storage.NewFileStore("defaultProject", storage.GetHarnessDir(), defaultLogger)
+func newDefaultConfig(log logger.Logger) *config {
+	defaultCache, _ := cache.NewLruCache(10000, log) // size of cache
+	defaultStore := storage.NewFileStore("defaultProject", storage.GetHarnessDir(), log)
 
 	retryClient := retryablehttp.NewClient()
 	retryClient.RetryMax = 10
+	retryClient.Logger = logger.NewRetryableLogger(log)
 
 	return &config{
 		url:             "https://config.ff.harness.io/api/1.0",
 		eventsURL:       "https://events.ff.harness.io/api/1.0",
 		pullInterval:    60,
 		Cache:           defaultCache,
 		Store:           defaultStore,
-		Logger:          defaultLogger,
+		Logger:          log,
 		httpClient:      retryClient.StandardClient(),
 		enableStream:    true,
 		enableStore:     true,

logger/retryablelogger.go

@@ -0,0 +1,18 @@
+package logger
+
+// RetryableLogger implements the Logger interface required by the go-retryablehttp client and wraps our internal logger
+type RetryableLogger struct {
+	logger Logger
+}
+
+// NewRetryableLogger creates a RetryableLogger instance.
+func NewRetryableLogger(logger Logger) RetryableLogger {
+	s := RetryableLogger{}
+	s.logger = logger
+	return s
+}
+
+// Printf - logs any printf messages from the http client as debug logs
+func (s RetryableLogger) Printf(string string, args ...interface{}) {
+	s.logger.Debugf(string, args...)
+}