feat(logger): Incorporate new SDK logging fields (#207)

* Add SDK key to logging output
* Bump to recent go-sdk v1.1.2
* Fix cache loader test to use actual constructor

Author: Mike Davis

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/go-kit/kit v0.9.0
 	github.com/google/uuid v1.1.1
 	github.com/lestrrat-go/jwx v0.9.0
-	github.com/optimizely/go-sdk v1.1.0
+	github.com/optimizely/go-sdk v1.1.2
 	github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6
 	github.com/rakyll/statik v0.1.7
 	github.com/rs/zerolog v1.15.0

go.sum

@@ -83,8 +83,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLD
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/optimizely/go-sdk v1.1.0 h1:vJbKuiSI/+dgDrd0QEUfYNIfW5Re71Bf1QOOp75b+2c=
-github.com/optimizely/go-sdk v1.1.0/go.mod h1:aA/UeFjLeQefRlvfTI8QkvBmJWPvLEHamKmp/CdJqGU=
+github.com/optimizely/go-sdk v1.1.2 h1:rojFANR6mp/eKfC/+HnXZNs+H0tpaS8qrQExBd/LptE=
+github.com/optimizely/go-sdk v1.1.2/go.mod h1:aA/UeFjLeQefRlvfTI8QkvBmJWPvLEHamKmp/CdJqGU=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=

pkg/optimizely/cache.go

@@ -121,6 +121,7 @@ func defaultLoader(
 
 		q := event.NewInMemoryQueue(conf.QueueSize)
 		ep := bpFactory(
+			event.WithSDKKey(sdkKey),
 			event.WithQueueSize(conf.QueueSize),
 			event.WithBatchSize(conf.BatchSize),
 			event.WithFlushInterval(conf.FlushInterval),

pkg/optimizely/cache_test.go

@@ -28,6 +28,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/optimizely/agent/config"
+	"github.com/optimizely/agent/pkg/metrics"
 	"github.com/optimizely/agent/pkg/optimizely/optimizelytest"
 
 	cmap "github.com/orcaman/concurrent-map"
@@ -107,12 +108,9 @@ func mockLoader(sdkKey string) (*OptlyClient, error) {
 }
 
 func TestDefaultLoader(t *testing.T) {
-	bp := &event.BatchEventProcessor{}
+	var bp *event.BatchEventProcessor
 	bpFactory := func(options ...event.BPOptionConfig) *event.BatchEventProcessor {
-		for _, option := range options {
-			option(bp)
-		}
-
+		bp = event.NewBatchEventProcessor(options...)
 		return bp
 	}
 
@@ -122,7 +120,7 @@ func TestDefaultLoader(t *testing.T) {
 		return MockConfigManager{}
 	}
 
-	mr := &MetricsRegistry{}
+	mr := &MetricsRegistry{metrics.NewRegistry()}
 	conf := config.ClientConfig{
 		FlushInterval: 321 * time.Second,
 		BatchSize:     1234,

pkg/optimizely/logger.go

@@ -34,6 +34,7 @@ var levelMap = map[logging.LogLevel]zerolog.Level{
 // init overrides the Optimizely SDK logger with the default zerolog logger.
 func init() {
 	SetLogger(&log.Logger)
+	logging.IncludeSDKKeyInLogFields(true)
 }
 
 // SetLogger explicitly overwrites the zerolog used by the SDK with the provided zerolog logger.

pkg/optimizely/optimizelytest/client.go

@@ -23,6 +23,7 @@ import (
 	"github.com/optimizely/go-sdk/pkg/decision"
 	"github.com/optimizely/go-sdk/pkg/entities"
 	"github.com/optimizely/go-sdk/pkg/event"
+	"github.com/optimizely/go-sdk/pkg/logging"
 )
 
 // TestClient encapsulates both the ProjectConfig interface and the OptimizelyClient
@@ -41,7 +42,7 @@ func NewClient() *TestClient {
 
 	factory := client.OptimizelyFactory{}
 	optlyClient, _ := factory.Client(
-		client.WithConfigManager(config.NewStaticProjectConfigManager(projectConfig)),
+		client.WithConfigManager(config.NewStaticProjectConfigManager(projectConfig, logging.GetLogger("test", "test"))),
 		client.WithEventProcessor(eventProcessor),
 		client.WithExperimentOverrides(forcedVariations),
 	)