d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

log: fix klog depth

Browse Source 
Signed-off-by: Pires <pjpires@gmail.com>
This commit is contained in:
Pires
2021-01-14 18:13:41 +00:00
parent 5edfe23bd5
commit c2b4863f40
1 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
log/klogv2/klogv2.go
View File

@@ -22,6 +22,10 @@
package klogv2 package klogv2
import ( import (
"fmt"
"sort"
"strings"
"github.com/virtual-kubelet/virtual-kubelet/log" "github.com/virtual-kubelet/virtual-kubelet/log"
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )
@@ -31,52 +35,64 @@ var _ log.Logger = (*adapter)(nil)
// adapter implements the `log.Logger` interface for klogv2 // adapter implements the `log.Logger` interface for klogv2
type adapter struct { type adapter struct {
fields map[string]interface{} fields string
} }
// FromKlogv2 creates a new `log.Logger` from the provided entry // FromKlogv2 creates a new `log.Logger` from the provided entry
func FromKlogv2(fields map[string]interface{}) log.Logger { func FromKlogv2(fields map[string]interface{}) log.Logger {
return &adapter{fields} return &adapter{fields: processFields(fields)}
} }
func (l *adapter) Debug(args ...interface{}) { func (l *adapter) Debug(args ...interface{}) {
klog.V(4).Info(args, l.fields) if klog.V(4).Enabled() {
l.Info(args...)
}
} }
func (l *adapter) Debugf(format string, args ...interface{}) { func (l *adapter) Debugf(format string, args ...interface{}) {
klog.V(4).Infof(format, args, l.fields) if klog.V(4).Enabled() {
l.Infof(format, args...)
}
} }
func (l *adapter) Info(args ...interface{}) { func (l *adapter) Info(args ...interface{}) {
klog.Info(args, l.fields) args = append(args, l.fields)
klog.InfoDepth(1, args...)
} }
func (l *adapter) Infof(format string, args ...interface{}) { func (l *adapter) Infof(format string, args ...interface{}) {
klog.Infof(format, args, l.fields) formattedArgs := fmt.Sprintf(format, args...)
klog.InfoDepth(1, formattedArgs, l.fields)
} }
func (l *adapter) Warn(args ...interface{}) { func (l *adapter) Warn(args ...interface{}) {
klog.Warning(args, l.fields) args = append(args, l.fields)
klog.WarningDepth(1, args...)
} }
func (l *adapter) Warnf(format string, args ...interface{}) { func (l *adapter) Warnf(format string, args ...interface{}) {
klog.Warningf(format, args, l.fields) formattedArgs := fmt.Sprintf(format, args...)
klog.WarningDepth(1, formattedArgs, l.fields)
} }
func (l *adapter) Error(args ...interface{}) { func (l *adapter) Error(args ...interface{}) {
klog.Error(args, l.fields) args = append(args, l.fields)
klog.ErrorDepth(1, args...)
} }
func (l *adapter) Errorf(format string, args ...interface{}) { func (l *adapter) Errorf(format string, args ...interface{}) {
klog.Errorf(format, args, l.fields) formattedArgs := fmt.Sprintf(format, args...)
klog.ErrorDepth(1, formattedArgs, l.fields)
} }
func (l *adapter) Fatal(args ...interface{}) { func (l *adapter) Fatal(args ...interface{}) {
klog.Fatal(args, l.fields) args = append(args, l.fields)
klog.FatalDepth(1, args...)
} }
func (l *adapter) Fatalf(format string, args ...interface{}) { func (l *adapter) Fatalf(format string, args ...interface{}) {
klog.Fatalf(format, args, l.fields) formattedArgs := fmt.Sprintf(format, args...)
klog.FatalDepth(1, formattedArgs, l.fields)
} }
// WithField adds a field to the log entry. // WithField adds a field to the log entry.
@@ -96,3 +112,17 @@ func (l *adapter) WithFields(fields log.Fields) log.Logger {
func (l *adapter) WithError(err error) log.Logger { func (l *adapter) WithError(err error) log.Logger {
return l.WithField("err", err) return l.WithField("err", err)
} }
// processFields prepares a string to be appended to every log call.
// This is called once to avoid costly log operations.
func processFields(fields map[string]interface{}) string {
processedFields := make([]string, 0, len(fields))
for k, v := range fields {
processedFields = append(processedFields, fmt.Sprintf("%s=%+v", k, v))
}
// Order fields lexically for easier reading.
sort.Strings(processedFields)
// Resulting string forcibly starts with an empty space.
return fmt.Sprintf(" [%s]", strings.Join(processedFields, " "))
}