log: remove support for traces (#7542)

This commit is contained in:
Sam Kleinman
2022-01-10 13:56:42 -05:00
committed by GitHub
parent f19f84bc8c
commit 0f3f2aa4bc
18 changed files with 23 additions and 36 deletions
+3 -10
View File
@@ -14,8 +14,6 @@ var _ Logger = (*defaultLogger)(nil)
type defaultLogger struct {
zerolog.Logger
trace bool
}
// NewDefaultLogger returns a default logger that can be used within Tendermint
@@ -26,7 +24,7 @@ type defaultLogger struct {
// Since zerolog supports typed structured logging and it is difficult to reflect
// that in a generic interface, all logging methods accept a series of key/value
// pair tuples, where the key must be a string.
func NewDefaultLogger(format, level string, trace bool) (Logger, error) {
func NewDefaultLogger(format, level string) (Logger, error) {
var logWriter io.Writer
switch strings.ToLower(format) {
case LogFormatPlain, LogFormatText:
@@ -59,14 +57,13 @@ func NewDefaultLogger(format, level string, trace bool) (Logger, error) {
return defaultLogger{
Logger: zerolog.New(logWriter).Level(logLevel).With().Timestamp().Logger(),
trace: trace,
}, nil
}
// MustNewDefaultLogger delegates a call NewDefaultLogger where it panics on
// error.
func MustNewDefaultLogger(format, level string, trace bool) Logger {
logger, err := NewDefaultLogger(format, level, trace)
func MustNewDefaultLogger(format, level string) Logger {
logger, err := NewDefaultLogger(format, level)
if err != nil {
panic(err)
}
@@ -80,9 +77,6 @@ func (l defaultLogger) Info(msg string, keyVals ...interface{}) {
func (l defaultLogger) Error(msg string, keyVals ...interface{}) {
e := l.Logger.Error()
if l.trace {
e = e.Stack()
}
e.Fields(getLogFields(keyVals...)).Msg(msg)
}
@@ -94,7 +88,6 @@ func (l defaultLogger) Debug(msg string, keyVals ...interface{}) {
func (l defaultLogger) With(keyVals ...interface{}) Logger {
return defaultLogger{
Logger: l.Logger.With().Fields(getLogFields(keyVals...)).Logger(),
trace: l.trace,
}
}
+2 -2
View File
@@ -34,11 +34,11 @@ func TestNewDefaultLogger(t *testing.T) {
tc := tc
t.Run(name, func(t *testing.T) {
_, err := log.NewDefaultLogger(tc.format, tc.level, false)
_, err := log.NewDefaultLogger(tc.format, tc.level)
if tc.expectErr {
require.Error(t, err)
require.Panics(t, func() {
_ = log.MustNewDefaultLogger(tc.format, tc.level, false)
_ = log.MustNewDefaultLogger(tc.format, tc.level)
})
} else {
require.NoError(t, err)
-1
View File
@@ -7,6 +7,5 @@ import (
func NewNopLogger() Logger {
return defaultLogger{
Logger: zerolog.Nop(),
trace: false,
}
}
+1 -6
View File
@@ -32,7 +32,7 @@ func TestingLogger() Logger {
}
if testing.Verbose() {
testingLogger = MustNewDefaultLogger(LogFormatText, LogLevelDebug, true)
testingLogger = MustNewDefaultLogger(LogFormatText, LogLevelDebug)
} else {
testingLogger = NewNopLogger()
}
@@ -73,13 +73,8 @@ func NewTestingLoggerWithLevel(t testing.TB, level string) Logger {
if err != nil {
t.Fatalf("failed to parse log level (%s): %v", level, err)
}
trace := false
if testing.Verbose() {
trace = true
}
return defaultLogger{
Logger: zerolog.New(newSyncWriter(testingWriter{t})).Level(logLevel),
trace: trace,
}
}