Make WithCallDepth additive

Resolves #27
bombsimon · Aug 22, 2023 · f3b316d · f3b316d
1 parent d198d3e
commit f3b316d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/logrusr.go b/logrusr.go
@@ -214,7 +214,7 @@ func (l *logrusr) copyLogger() *logrusr {
 // when reporting caller.
 func (l *logrusr) WithCallDepth(depth int) logr.LogSink {
 	newLogger := l.copyLogger()
-	newLogger.depth = depth
+	newLogger.depth += depth
 
 	return newLogger
 }

diff --git a/logrusr_test.go b/logrusr_test.go
@@ -268,6 +268,21 @@ func TestLogging(t *testing.T) {
 				"caller": `~testing.go:\d+`,
 			},
 		},
+		{
+			description: "with call depth is additive",
+			logFunc: func(log logr.Logger) {
+				log.
+					WithCallDepth(1).
+					WithCallDepth(1).
+					Info("hello, world")
+			},
+			reportCaller: true,
+			assertions: map[string]string{
+				"level":  "info",
+				"msg":    "hello, world",
+				"caller": `~testing.go:\d+`,
+			},
+		},
 	}
 
 	for _, tc := range cases {