Merge pull request #67298 from sylr/logging-calltrace

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Log real file's name and line **What this PR does / why we need it**: Have correct location of emission in the logs **Release note**: pkg/kubectl/util/logs & staging/src/k8s.io/apiserver/pkg/util/logs use `glog.info(...)` but this function is not made to be wrapped because the underlying mechanism use a fixed call trace length to determine where the log has been emited. This results is having `logs.go:49` in the logs which is in the body of the wrapper function and thus useless. Instead use `glog.infoDepth(1, ...)` which tells the underlying mechanism to go back 1 more level in the call trace to determine where the log has been emitted.

Merge pull request #67298 from sylr/logging-calltrace
70bc7f68 · Kubernetes Submit Queue · GitHub · f077d673 · 7e7b01fa · 70bc7f68
Unverified Commit 70bc7f68 authored Aug 21, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

logs.go pkg/kubectl/util/logs/logs.go +1 -1

logs.go staging/src/k8s.io/apiserver/pkg/util/logs/logs.go +1 -1

No files found.
--- a/pkg/kubectl/util/logs/logs.go
+++ b/pkg/kubectl/util/logs/logs.go
@@ -38,7 +38,7 @@ type GlogWriter struct{}
 // Write implements the io.Writer interface.
 func (writer GlogWriter) Write(data []byte) (n int, err error) {
-	glog.Info(string(data))
+	glog.InfoDepth(1, string(data))
 	return len(data), nil
 }

--- a/staging/src/k8s.io/apiserver/pkg/util/logs/logs.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/logs/logs.go
@@ -47,7 +47,7 @@ type GlogWriter struct{}
 // Write implements the io.Writer interface.
 func (writer GlogWriter) Write(data []byte) (n int, err error) {
-	glog.Info(string(data))
+	glog.InfoDepth(1, string(data))
 	return len(data), nil
 }