opt: improve logx performance (#3371)

master
Kevin Wan 1 year ago committed by GitHub
parent 8d23ab158b
commit 92e5819e91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -68,22 +68,30 @@ func Close() error {
// Debug writes v into access log. // Debug writes v into access log.
func Debug(v ...any) { func Debug(v ...any) {
if shallLog(DebugLevel) {
writeDebug(fmt.Sprint(v...)) writeDebug(fmt.Sprint(v...))
}
} }
// Debugf writes v with format into access log. // Debugf writes v with format into access log.
func Debugf(format string, v ...any) { func Debugf(format string, v ...any) {
if shallLog(DebugLevel) {
writeDebug(fmt.Sprintf(format, v...)) writeDebug(fmt.Sprintf(format, v...))
}
} }
// Debugv writes v into access log with json content. // Debugv writes v into access log with json content.
func Debugv(v any) { func Debugv(v any) {
if shallLog(DebugLevel) {
writeDebug(v) writeDebug(v)
}
} }
// Debugw writes msg along with fields into access log. // Debugw writes msg along with fields into access log.
func Debugw(msg string, fields ...LogField) { func Debugw(msg string, fields ...LogField) {
if shallLog(DebugLevel) {
writeDebug(msg, fields...) writeDebug(msg, fields...)
}
} }
// Disable disables the logging. // Disable disables the logging.
@ -99,35 +107,47 @@ func DisableStat() {
// Error writes v into error log. // Error writes v into error log.
func Error(v ...any) { func Error(v ...any) {
if shallLog(ErrorLevel) {
writeError(fmt.Sprint(v...)) writeError(fmt.Sprint(v...))
}
} }
// Errorf writes v with format into error log. // Errorf writes v with format into error log.
func Errorf(format string, v ...any) { func Errorf(format string, v ...any) {
if shallLog(ErrorLevel) {
writeError(fmt.Errorf(format, v...).Error()) writeError(fmt.Errorf(format, v...).Error())
}
} }
// ErrorStack writes v along with call stack into error log. // ErrorStack writes v along with call stack into error log.
func ErrorStack(v ...any) { func ErrorStack(v ...any) {
if shallLog(ErrorLevel) {
// there is newline in stack string // there is newline in stack string
writeStack(fmt.Sprint(v...)) writeStack(fmt.Sprint(v...))
}
} }
// ErrorStackf writes v along with call stack in format into error log. // ErrorStackf writes v along with call stack in format into error log.
func ErrorStackf(format string, v ...any) { func ErrorStackf(format string, v ...any) {
if shallLog(ErrorLevel) {
// there is newline in stack string // there is newline in stack string
writeStack(fmt.Sprintf(format, v...)) writeStack(fmt.Sprintf(format, v...))
}
} }
// Errorv writes v into error log with json content. // Errorv writes v into error log with json content.
// No call stack attached, because not elegant to pack the messages. // No call stack attached, because not elegant to pack the messages.
func Errorv(v any) { func Errorv(v any) {
if shallLog(ErrorLevel) {
writeError(v) writeError(v)
}
} }
// Errorw writes msg along with fields into error log. // Errorw writes msg along with fields into error log.
func Errorw(msg string, fields ...LogField) { func Errorw(msg string, fields ...LogField) {
if shallLog(ErrorLevel) {
writeError(msg, fields...) writeError(msg, fields...)
}
} }
// Field returns a LogField for the given key and value. // Field returns a LogField for the given key and value.
@ -170,22 +190,30 @@ func Field(key string, value any) LogField {
// Info writes v into access log. // Info writes v into access log.
func Info(v ...any) { func Info(v ...any) {
if shallLog(InfoLevel) {
writeInfo(fmt.Sprint(v...)) writeInfo(fmt.Sprint(v...))
}
} }
// Infof writes v with format into access log. // Infof writes v with format into access log.
func Infof(format string, v ...any) { func Infof(format string, v ...any) {
if shallLog(InfoLevel) {
writeInfo(fmt.Sprintf(format, v...)) writeInfo(fmt.Sprintf(format, v...))
}
} }
// Infov writes v into access log with json content. // Infov writes v into access log with json content.
func Infov(v any) { func Infov(v any) {
if shallLog(InfoLevel) {
writeInfo(v) writeInfo(v)
}
} }
// Infow writes msg along with fields into access log. // Infow writes msg along with fields into access log.
func Infow(msg string, fields ...LogField) { func Infow(msg string, fields ...LogField) {
if shallLog(InfoLevel) {
writeInfo(msg, fields...) writeInfo(msg, fields...)
}
} }
// Must checks if err is nil, otherwise logs the error and exits. // Must checks if err is nil, otherwise logs the error and exits.
@ -269,42 +297,58 @@ func SetUp(c LogConf) (err error) {
// Severe writes v into severe log. // Severe writes v into severe log.
func Severe(v ...any) { func Severe(v ...any) {
if shallLog(SevereLevel) {
writeSevere(fmt.Sprint(v...)) writeSevere(fmt.Sprint(v...))
}
} }
// Severef writes v with format into severe log. // Severef writes v with format into severe log.
func Severef(format string, v ...any) { func Severef(format string, v ...any) {
if shallLog(SevereLevel) {
writeSevere(fmt.Sprintf(format, v...)) writeSevere(fmt.Sprintf(format, v...))
}
} }
// Slow writes v into slow log. // Slow writes v into slow log.
func Slow(v ...any) { func Slow(v ...any) {
if shallLog(ErrorLevel) {
writeSlow(fmt.Sprint(v...)) writeSlow(fmt.Sprint(v...))
}
} }
// Slowf writes v with format into slow log. // Slowf writes v with format into slow log.
func Slowf(format string, v ...any) { func Slowf(format string, v ...any) {
if shallLog(ErrorLevel) {
writeSlow(fmt.Sprintf(format, v...)) writeSlow(fmt.Sprintf(format, v...))
}
} }
// Slowv writes v into slow log with json content. // Slowv writes v into slow log with json content.
func Slowv(v any) { func Slowv(v any) {
if shallLog(ErrorLevel) {
writeSlow(v) writeSlow(v)
}
} }
// Sloww writes msg along with fields into slow log. // Sloww writes msg along with fields into slow log.
func Sloww(msg string, fields ...LogField) { func Sloww(msg string, fields ...LogField) {
if shallLog(ErrorLevel) {
writeSlow(msg, fields...) writeSlow(msg, fields...)
}
} }
// Stat writes v into stat log. // Stat writes v into stat log.
func Stat(v ...any) { func Stat(v ...any) {
if shallLogStat() && shallLog(InfoLevel) {
writeStat(fmt.Sprint(v...)) writeStat(fmt.Sprint(v...))
}
} }
// Statf writes v with format into stat log. // Statf writes v with format into stat log.
func Statf(format string, v ...any) { func Statf(format string, v ...any) {
if shallLogStat() && shallLog(InfoLevel) {
writeStat(fmt.Sprintf(format, v...)) writeStat(fmt.Sprintf(format, v...))
}
} }
// WithCooldownMillis customizes logging on writing call stack interval. // WithCooldownMillis customizes logging on writing call stack interval.
@ -429,44 +473,58 @@ func shallLogStat() bool {
return atomic.LoadUint32(&disableStat) == 0 return atomic.LoadUint32(&disableStat) == 0
} }
// writeDebug writes v into debug log.
// Not checking shallLog here is for performance consideration.
// If we check shallLog here, the fmt.Sprint might be called even if the log level is not enabled.
// The caller should check shallLog before calling this function.
func writeDebug(val any, fields ...LogField) { func writeDebug(val any, fields ...LogField) {
if shallLog(DebugLevel) {
getWriter().Debug(val, addCaller(fields...)...) getWriter().Debug(val, addCaller(fields...)...)
}
} }
// writeError writes v into error log.
// Not checking shallLog here is for performance consideration.
// If we check shallLog here, the fmt.Sprint might be called even if the log level is not enabled.
// The caller should check shallLog before calling this function.
func writeError(val any, fields ...LogField) { func writeError(val any, fields ...LogField) {
if shallLog(ErrorLevel) {
getWriter().Error(val, addCaller(fields...)...) getWriter().Error(val, addCaller(fields...)...)
}
} }
// writeInfo writes v into info log.
// Not checking shallLog here is for performance consideration.
// If we check shallLog here, the fmt.Sprint might be called even if the log level is not enabled.
// The caller should check shallLog before calling this function.
func writeInfo(val any, fields ...LogField) { func writeInfo(val any, fields ...LogField) {
if shallLog(InfoLevel) {
getWriter().Info(val, addCaller(fields...)...) getWriter().Info(val, addCaller(fields...)...)
}
} }
// writeSevere writes v into severe log.
// Not checking shallLog here is for performance consideration.
// If we check shallLog here, the fmt.Sprint might be called even if the log level is not enabled.
// The caller should check shallLog before calling this function.
func writeSevere(msg string) { func writeSevere(msg string) {
if shallLog(SevereLevel) {
getWriter().Severe(fmt.Sprintf("%s\n%s", msg, string(debug.Stack()))) getWriter().Severe(fmt.Sprintf("%s\n%s", msg, string(debug.Stack())))
}
} }
// writeSlow writes v into slow log.
// Not checking shallLog here is for performance consideration.
// If we check shallLog here, the fmt.Sprint might be called even if the log level is not enabled.
// The caller should check shallLog before calling this function.
func writeSlow(val any, fields ...LogField) { func writeSlow(val any, fields ...LogField) {
if shallLog(ErrorLevel) {
getWriter().Slow(val, addCaller(fields...)...) getWriter().Slow(val, addCaller(fields...)...)
}
} }
// writeStack writes v into stack log.
// Not checking shallLog here is for performance consideration.
// If we check shallLog here, the fmt.Sprint might be called even if the log level is not enabled.
// The caller should check shallLog before calling this function.
func writeStack(msg string) { func writeStack(msg string) {
if shallLog(ErrorLevel) {
getWriter().Stack(fmt.Sprintf("%s\n%s", msg, string(debug.Stack()))) getWriter().Stack(fmt.Sprintf("%s\n%s", msg, string(debug.Stack())))
}
} }
// writeStat writes v into stat log.
// Not checking shallLog here is for performance consideration.
// If we check shallLog here, the fmt.Sprint might be called even if the log level is not enabled.
// The caller should check shallLog before calling this function.
func writeStat(msg string) { func writeStat(msg string) {
if shallLogStat() && shallLog(InfoLevel) {
getWriter().Stat(msg, addCaller()...) getWriter().Stat(msg, addCaller()...)
}
} }

@ -77,34 +77,44 @@ func getRealModule(workDir string, execRun execx.RunFunc) (*Module, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
modules, err := decodePackages(strings.NewReader(data)) modules, err := decodePackages(strings.NewReader(data))
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, m := range modules { for _, m := range modules {
mRealDir, err := pathx.ReadLink(m.Dir) realDir, err := pathx.ReadLink(m.Dir)
if err != nil { if err != nil {
return nil, fmt.Errorf("mod dir [%s] error: %w", m.Dir, err) return nil, fmt.Errorf("failed to read go.mod, dir: %s, error: %w", m.Dir, err)
} }
if strings.HasPrefix(workDir, mRealDir) { if strings.HasPrefix(workDir, realDir) {
return &m, nil return &m, nil
} }
} }
return nil, errors.New("no matched module") return nil, errors.New("no matched module")
} }
func decodePackages(rc io.Reader) ([]Module, error) { func decodePackages(reader io.Reader) ([]Module, error) {
r := bufio.NewReader(rc) br := bufio.NewReader(reader)
_, _ = r.ReadSlice('{') if _, err := br.ReadSlice('{'); err != nil {
_ = r.UnreadByte() return nil, err
}
if err := br.UnreadByte(); err != nil {
return nil, err
}
var modules []Module var modules []Module
decoder := json.NewDecoder(r) decoder := json.NewDecoder(br)
for decoder.More() { for decoder.More() {
var m Module var m Module
if err := decoder.Decode(&m); err != nil { if err := decoder.Decode(&m); err != nil {
return nil, fmt.Errorf("invalid module: %v", err) return nil, fmt.Errorf("invalid module: %v", err)
} }
modules = append(modules, m) modules = append(modules, m)
} }

Loading…
Cancel
Save