From fb67a5027bbc24a49d9e2d923beecab21155cdab Mon Sep 17 00:00:00 2001
From: Markus Lehtonen <markus.lehtonen@intel.com>
Date: Thu, 11 Mar 2021 11:36:55 +0200
Subject: [PATCH] pkg/utils: show correct source file in gRPC logs

Unwind two call frames so that the source (file:line) of the log message
is correctly displayed.
---
 pkg/utils/grpc_log.go | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkg/utils/grpc_log.go b/pkg/utils/grpc_log.go
index da32030eb..f8c8bf0ae 100644
--- a/pkg/utils/grpc_log.go
+++ b/pkg/utils/grpc_log.go
@@ -17,6 +17,8 @@ limitations under the License.
 package utils
 
 import (
+	"fmt"
+
 	"google.golang.org/grpc/grpclog"
 	"k8s.io/klog/v2"
 )
@@ -30,51 +32,51 @@ func ConfigureGrpcKlog() {
 type grpcLogger struct{}
 
 func (g grpcLogger) Error(args ...interface{}) {
-	klog.Error(args...)
+	klog.ErrorDepth(2, args...)
 }
 
 func (g grpcLogger) Errorf(format string, args ...interface{}) {
-	klog.Errorf(format, args...)
+	klog.ErrorDepth(2, fmt.Sprintf(format, args...))
 }
 
 func (g grpcLogger) Errorln(args ...interface{}) {
-	klog.Errorln(args...)
+	klog.ErrorDepth(2, args...)
 }
 
 func (g grpcLogger) Fatal(args ...interface{}) {
-	klog.Fatal(args...)
+	klog.FatalDepth(2, args...)
 }
 
 func (g grpcLogger) Fatalf(format string, args ...interface{}) {
-	klog.Fatalf(format, args...)
+	klog.FatalDepth(2, fmt.Sprintf(format, args...))
 }
 
 func (g grpcLogger) Fatalln(args ...interface{}) {
-	klog.Fatalln(args...)
+	klog.FatalDepth(2, args...)
 }
 
 func (g grpcLogger) Info(args ...interface{}) {
-	klog.Info(args...)
+	klog.InfoDepth(2, args...)
 }
 
 func (g grpcLogger) Infof(format string, args ...interface{}) {
-	klog.Infof(format, args...)
+	klog.InfoDepth(2, fmt.Sprintf(format, args...))
 }
 
 func (g grpcLogger) Infoln(args ...interface{}) {
-	klog.Infoln(args...)
+	klog.InfoDepth(2, args...)
 }
 
 func (g grpcLogger) Warning(args ...interface{}) {
-	klog.Warning(args...)
+	klog.WarningDepth(2, args...)
 }
 
 func (g grpcLogger) Warningf(format string, args ...interface{}) {
-	klog.Warningf(format, args...)
+	klog.WarningDepth(2, fmt.Sprintf(format, args...))
 }
 
 func (g grpcLogger) Warningln(args ...interface{}) {
-	klog.Warningln(args...)
+	klog.WarningDepth(2, args...)
 }
 
 func (g grpcLogger) V(l int) bool {