feat: allow get and put extra keys (#37)

Signed-off-by: rogerogers <[email protected]>

_typos.toml

@@ -14,4 +14,6 @@ trUe = "trUe"
 OPTIO = "OPTIO"
 referer = "referer"
 TagReferer  = "TagReferer"
-Referer = "Referer"
+Referer = "Referer"
+O_WRONLY = "O_WRONLY"
+WRONLY = "WRONLY"

zap/logger.go

@@ -53,6 +53,20 @@ func NewLogger(opts ...Option) *Logger {
 	}
 }
 
+// GetExtraKeys get extraKeys from logger config
+func (l *Logger) GetExtraKeys() []ExtraKey {
+	return l.config.extraKeys
+}
+
+// PutExtraKeys add extraKeys after init
+func (l *Logger) PutExtraKeys(keys ...ExtraKey) {
+	for _, k := range keys {
+		if !InArray(k, l.config.extraKeys) {
+			l.config.extraKeys = append(l.config.extraKeys, k)
+		}
+	}
+}
+
 func (l *Logger) Log(level hlog.Level, kvs ...interface{}) {
 	sugar := l.l.Sugar()
 	switch level {

zap/logger_test.go

@@ -349,6 +349,16 @@ func TestWithExtraKeys(t *testing.T) {
 	assert.Equal(t, value, "123")
 }
 
+func TestPutExtraKeys(t *testing.T) {
+	logger := NewLogger(WithExtraKeys([]ExtraKey{"abc"}))
+
+	assert.Contains(t, logger.GetExtraKeys(), ExtraKey("abc"))
+	assert.NotContains(t, logger.GetExtraKeys(), ExtraKey("def"))
+
+	logger.PutExtraKeys("def")
+	assert.Contains(t, logger.GetExtraKeys(), ExtraKey("def"))
+}
+
 func BenchmarkNormal(b *testing.B) {
 	buf := new(bytes.Buffer)
 	log := NewLogger()

zap/option.go

@@ -108,7 +108,7 @@ func WithZapOptions(opts ...zap.Option) Option {
 func WithExtraKeys(keys []ExtraKey) Option {
 	return option(func(cfg *config) {
 		for _, k := range keys {
-			if !inArray(k, cfg.extraKeys) {
+			if !InArray(k, cfg.extraKeys) {
 				cfg.extraKeys = append(cfg.extraKeys, k)
 			}
 		}

zap/utils.go

@@ -14,8 +14,8 @@
 
 package zap
 
-// inArray check if a string in a slice
-func inArray(key ExtraKey, arr []ExtraKey) bool {
+// InArray check if a string in a slice
+func InArray(key ExtraKey, arr []ExtraKey) bool {
 	for _, k := range arr {
 		if k == key {
 			return true

zap/utils_test.go

@@ -23,6 +23,6 @@ import (
 func TestInArray(t *testing.T) {
 	key1 := ExtraKey("key1")
 	key2 := ExtraKey("key2")
-	assert.True(t, inArray(key1, []ExtraKey{key1}))
-	assert.False(t, inArray(key2, []ExtraKey{key1}))
+	assert.True(t, InArray(key1, []ExtraKey{key1}))
+	assert.False(t, InArray(key2, []ExtraKey{key1}))
 }