From 0ea10cbbc25f184c94ed3a71458d889cf0ef955a Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Mon, 16 Aug 2021 23:45:10 -0700
Subject: [PATCH] Add one call depth to compensate for log pkg

---
 pkg/logging/logging.go | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go
index aa3c97c..0f63360 100644
--- a/pkg/logging/logging.go
+++ b/pkg/logging/logging.go
@@ -29,24 +29,19 @@ import (
 
 // Logger provides a logging interface.
 type Logger struct {
-	log       logr.Logger
+	logr.Logger
 	root      string
 	errorFile string
 }
 
 // New returns a Logger, with the same API as logr.Logger.
 func New(root string, errorFile string) *Logger {
-	return &Logger{log: glogr.New(), root: root, errorFile: errorFile}
-}
-
-// Info implements logr.Logger.Info.
-func (l *Logger) Info(msg string, keysAndValues ...interface{}) {
-	l.log.Info(msg, keysAndValues...)
+	return &Logger{Logger: glogr.New(), root: root, errorFile: errorFile}
 }
 
 // Error implements logr.Logger.Error.
 func (l *Logger) Error(err error, msg string, kvList ...interface{}) {
-	l.log.Error(err, msg, kvList...)
+	l.Logger.WithCallDepth(1).Error(err, msg, kvList...)
 	if l.errorFile == "" {
 		return
 	}
@@ -71,7 +66,7 @@ func (l *Logger) Error(err error, msg string, kvList ...interface{}) {
 	}
 	jb, err := json.Marshal(payload)
 	if err != nil {
-		l.log.Error(err, "can't encode error payload")
+		l.Logger.Error(err, "can't encode error payload")
 		content := fmt.Sprintf("%v", err)
 		l.writeContent([]byte(content))
 	} else {
@@ -79,21 +74,6 @@ func (l *Logger) Error(err error, msg string, kvList ...interface{}) {
 	}
 }
 
-// V implements logr.Logger.V.
-func (l *Logger) V(level int) logr.Logger {
-	return l.log.V(level)
-}
-
-// WithValues implements logr.Logger.WithValues.
-func (l *Logger) WithValues(keysAndValues ...interface{}) logr.Logger {
-	return l.log.WithValues(keysAndValues...)
-}
-
-// WithName implements logr.Logger.WithName.
-func (l *Logger) WithName(name string) logr.Logger {
-	return l.log.WithName(name)
-}
-
 // ExportError exports the error to the error file if --export-error is enabled.
 func (l *Logger) ExportError(content string) {
 	if l.errorFile == "" {
@@ -112,7 +92,7 @@ func (l *Logger) DeleteErrorFile() {
 		if os.IsNotExist(err) {
 			return
 		}
-		l.log.Error(err, "can't delete the error-file", "filename", errorFile)
+		l.Logger.Error(err, "can't delete the error-file", "filename", errorFile)
 	}
 }
 
@@ -121,32 +101,32 @@ func (l *Logger) writeContent(content []byte) {
 	if _, err := os.Stat(l.root); os.IsNotExist(err) {
 		fileMode := os.FileMode(0755)
 		if err := os.Mkdir(l.root, fileMode); err != nil {
-			l.log.Error(err, "can't create the root directory", "root", l.root)
+			l.Logger.Error(err, "can't create the root directory", "root", l.root)
 			return
 		}
 	}
 	tmpFile, err := ioutil.TempFile(l.root, "tmp-err-")
 	if err != nil {
-		l.log.Error(err, "can't create temporary error-file", "directory", l.root, "prefix", "tmp-err-")
+		l.Logger.Error(err, "can't create temporary error-file", "directory", l.root, "prefix", "tmp-err-")
 		return
 	}
 	defer func() {
 		if err := tmpFile.Close(); err != nil {
-			l.log.Error(err, "can't close temporary error-file", "filename", tmpFile.Name())
+			l.Logger.Error(err, "can't close temporary error-file", "filename", tmpFile.Name())
 		}
 	}()
 
 	if _, err = tmpFile.Write(content); err != nil {
-		l.log.Error(err, "can't write to temporary error-file", "filename", tmpFile.Name())
+		l.Logger.Error(err, "can't write to temporary error-file", "filename", tmpFile.Name())
 		return
 	}
 
 	errorFile := filepath.Join(l.root, l.errorFile)
 	if err := os.Rename(tmpFile.Name(), errorFile); err != nil {
-		l.log.Error(err, "can't rename to error-file", "temp-file", tmpFile.Name(), "error-file", errorFile)
+		l.Logger.Error(err, "can't rename to error-file", "temp-file", tmpFile.Name(), "error-file", errorFile)
 		return
 	}
 	if err := os.Chmod(errorFile, 0644); err != nil {
-		l.log.Error(err, "can't change permissions on the error-file", "error-file", errorFile)
+		l.Logger.Error(err, "can't change permissions on the error-file", "error-file", errorFile)
 	}
 }