From 29f70aaa55cd9e09d021743b9fd9436fffed37d4 Mon Sep 17 00:00:00 2001
From: lanzafame <adrianlanzafame92@gmail.com>
Date: Fri, 26 Feb 2021 08:45:30 +1000
Subject: [PATCH] fix: envvar syntax and labels struct type

---
 setup.go      | 18 ++++++++----------
 setup_test.go |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/setup.go b/setup.go
index 1f97e8c..2832b16 100644
--- a/setup.go
+++ b/setup.go
@@ -33,7 +33,7 @@ const (
 	envLoggingURL = "GOLOG_URL" // url that will be processed by sink in the zap
 
 	envLoggingOutput = "GOLOG_OUTPUT" // possible values: stdout|stderr|file combine multiple values with '+'
-	envLoggingLabels = "GOLOG_LOG_LABELS" // comma-separated key-value pairs, i.e. "app,example_app,dc,sjc-1"
+	envLoggingLabels = "GOLOG_LOG_LABELS" // comma-separated key-value pairs, i.e. "app=example_app,dc=sjc-1"
 )
 
 type LogFormat int
@@ -64,7 +64,7 @@ type Config struct {
 	URL string
 
 	// Labels is a set of key-values to apply to all loggers
-	Labels []string
+	Labels map[string]string
 }
 
 // ErrNoSuchLogger is returned when the util pkg is asked for a non existant logger
@@ -127,10 +127,8 @@ func SetupLogging(cfg Config) {
 
 	newPrimaryCore := newCore(primaryFormat, ws, LevelDebug) // the main core needs to log everything.
 
-	if len(cfg.Labels) > 0 {
-		for i := 0; i < len(cfg.Labels); i=i+2 {
-			newPrimaryCore = newPrimaryCore.With([]zap.Field{zap.String(cfg.Labels[i], cfg.Labels[i+1])})
-		}
+	for k, v := range cfg.Labels {
+		newPrimaryCore = newPrimaryCore.With([]zap.Field{zap.String(k, v)})
 	}
 
 	if primaryCore != nil {
@@ -251,6 +249,7 @@ func configFromEnv() Config {
 		Format: ColorizedOutput,
 		Stderr: true,
 		Level:  LevelError,
+		Labels: map[string]string{},
 	}
 
 	format := os.Getenv(envLoggingFmt)
@@ -307,10 +306,9 @@ func configFromEnv() Config {
 	labels := os.Getenv(envLoggingLabels)
 	if labels != "" {
 		labelKVs := strings.Split(labels, ",")
-		if len(labelKVs)%2 != 0 {
-			fmt.Fprint(os.Stderr, "odd number of args for GOLOG_LOG_LABELS; please specify complete key-value pairs")
-		} else {
-			cfg.Labels = labelKVs
+		for _, label := range labelKVs {
+			kv := strings.Split(label, "=")
+			cfg.Labels[kv[0]] = kv[1]
 		}
 	}
 
diff --git a/setup_test.go b/setup_test.go
index 313f956..3dc2137 100644
--- a/setup_test.go
+++ b/setup_test.go
@@ -136,7 +136,7 @@ func TestLogLabels(t *testing.T) {
 	}()
 
 	// set the go-log labels env var
-	os.Setenv(envLoggingLabels, "app,example_app,dc,sjc-1")
+	os.Setenv(envLoggingLabels, "app=example_app,dc=sjc-1")
 	SetupLogging(configFromEnv())
 
 	log := getLogger("test")