Merge pull request #17 from bombsimon/v3-release

V3 release
bombsimon · May 3, 2022 · 6409c42 · 6409c42
2 parents cf9b847 + bdde735
commit 6409c42
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ A [logr](https://github.com/go-logr/logr) implementation using
 
 ```go
 import (
-    "github.com/bombsimon/logrusr/v2"
+    "github.com/bombsimon/logrusr/v3"
     "github.com/go-logr/logr"
     "github.com/sirupsen/logrus"
 )

diff --git a/example/main.go b/example/main.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/bombsimon/logrusr/v2"
+	"github.com/bombsimon/logrusr/v3"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/bombsimon/logrusr/v2
+module github.com/bombsimon/logrusr/v3
 
 go 1.17
 

diff --git a/go.sum b/go.sum
@@ -1,8 +1,6 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -11,17 +9,13 @@ github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc=
 golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/logrusr.go b/logrusr.go
@@ -129,7 +129,7 @@ func (l *logrusr) Error(err error, msg string, keysAndValues ...interface{}) {
 // are sent all values will be discarded.
 func (l *logrusr) WithValues(keysAndValues ...interface{}) logr.LogSink {
 	newLogger := l.copyLogger()
-	newLogger.logger = l.logger.WithFields(
+	newLogger.logger = newLogger.logger.WithFields(
 		listToLogrusFields(l.defaultFormatter, keysAndValues...),
 	)
 
@@ -142,7 +142,7 @@ func (l *logrusr) WithName(name string) logr.LogSink {
 	newLogger := l.copyLogger()
 	newLogger.name = append(newLogger.name, name)
 
-	newLogger.logger = l.logger.WithField(
+	newLogger.logger = newLogger.logger.WithField(
 		"logger", strings.Join(newLogger.name, "."),
 	)
 

diff --git a/logrusr_test.go b/logrusr_test.go
@@ -59,6 +59,24 @@ func TestLogging(t *testing.T) {
 				"logger": "main.subpackage",
 			},
 		},
+		{
+			description: "set name and values and name again",
+			logFunc: func(log logr.Logger) {
+				log.
+					WithName("main").
+					WithValues("k1", "v1", "k2", "v2").
+					WithName("subpackage").
+					Info("hello, world", "k3", "v3")
+			},
+			assertions: map[string]string{
+				"level":  "info",
+				"msg":    "hello, world",
+				"logger": "main.subpackage",
+				"k1":     "v1",
+				"k2":     "v2",
+				"k3":     "v3",
+			},
+		},
 		{
 			description: "V(0) logging with info level set is shown",
 			logFunc: func(log logr.Logger) {