remove extra caller skip from logger

machinezone · Aug 28, 2020 · 755ba30 · 755ba30
1 parent 3ad72e0
commit 755ba30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/cmd/configmapsecret-controller/main.go b/cmd/configmapsecret-controller/main.go
@@ -78,8 +78,7 @@ func main() {
 
 	logger = mzlog.NewZapLogger(logCfg)
 	mzlog.Process(logger)
-	// TODO(abursavich): remove CallerSkip when https://github.com/go-logr/zapr/issues/6 is fixed
-	log.SetLogger(zapr.NewLogger(logger.WithOptions(zap.AddCallerSkip(1))))
+	log.SetLogger(zapr.NewLogger(logger))
 
 	check(metrics.Registry.Register(logCfg.Metrics), "Unable to register logging metrics")
 	check(metrics.Registry.Register(buildinfo.Collector()), "Unable to register build metrics")

diff --git a/pkg/controllers/setup_test.go b/pkg/controllers/setup_test.go
@@ -16,7 +16,6 @@ import (
 	"github.com/machinezone/configmapsecrets/pkg/api/v1alpha1"
 	"github.com/machinezone/configmapsecrets/pkg/mzlog"
 	"github.com/onsi/gomega"
-	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -37,8 +36,8 @@ func init() {
 	logCfg := mzlog.DefaultConfig()
 	logCfg.Level = zapcore.DebugLevel
 	logCfg.Encoder = mzlog.ConsoleType
-	// TODO(abursavich): remove CallerSkip when https://github.com/go-logr/zapr/issues/6 is fixed
-	log.SetLogger(zapr.NewLogger(mzlog.NewZapLogger(logCfg).WithOptions(zap.AddCallerSkip(1))))
+	logCfg.EnableStacktrace = false
+	log.SetLogger(zapr.NewLogger(mzlog.NewZapLogger(logCfg)))
 }
 
 func TestMain(m *testing.M) {