Merge pull request #5125 from Iceber/add-caller-info

dmcgowan · web-flow · commit d54225cceeea · 2021-03-23T08:28:20.000-07:00
diff --git a/log/logtest/context.go b/log/logtest/context.go
@@ -18,7 +18,10 @@ package logtest
 
 import (
 	"context"
+	"fmt"
 	"io/ioutil"
+	"path/filepath"
+	"runtime"
 	"testing"
 
 	"github.com/containerd/containerd/log"
@@ -35,13 +38,17 @@ func WithT(ctx context.Context, t testing.TB) context.Context {
 	// Increase debug level for tests
 	l.SetLevel(logrus.DebugLevel)
 	l.SetOutput(ioutil.Discard)
+	l.SetReportCaller(true)
 
 	// Add testing hook
 	l.AddHook(&testHook{
 		t: t,
 		fmt: &logrus.TextFormatter{
 			DisableColors:   true,
 			TimestampFormat: log.RFC3339NanoFixed,
+			CallerPrettyfier: func(frame *runtime.Frame) (string, string) {
+				return filepath.Base(frame.Function), fmt.Sprintf("%s:%d", frame.File, frame.Line)
+			},
 		},
 	})
 
