Implement call depth in new struct model

funcr/funcr.go

@@ -36,6 +36,7 @@ func New(fn func(prefix, args string), opts Options) logr.Logger {
 	fnl := fnlogger{
 		prefix:    "",
 		values:    nil,
+		depth:     0,
 		write:     fn,
 		logCaller: opts.LogCaller,
 		verbosity: opts.Verbosity,
@@ -65,6 +66,7 @@ const (
 type fnlogger struct {
 	prefix    string
 	values    []interface{}
+	depth     int
 	write     func(prefix, args string)
 	logCaller MessageClass
 	verbosity int
@@ -268,7 +270,7 @@ func (l fnlogger) caller() callerID {
 	// +1 for this frame, +1 for logr itself.
 	// FIXME: Maybe logr should offer a clue as to how many frames are
 	// needed here?  Or is it part of the contract to LogSinks?
-	_, file, line, ok := runtime.Caller(framesToCaller() + 2)
+	_, file, line, ok := runtime.Caller(framesToCaller() + l.depth + 2)
 	if !ok {
 		return callerID{"<unknown>", 0}
 	}
@@ -326,4 +328,10 @@ func (l fnlogger) WithValues(kvList ...interface{}) logr.LogSink {
 	return l
 }
 
+func (l fnlogger) WithCallDepth(depth int) logr.LogSink {
+	l.depth += depth
+	return l
+}
+
 var _ logr.LogSink = fnlogger{}
+var _ logr.CallDepthLogSink = fnlogger{}