mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-03-09 17:09:29 +00:00
f87d06ed85
Several packages are only used while running the e2e suite. These packages are less important to update, as the they can not influence the final executable that is part of the Ceph-CSI container-image. By moving these dependencies out of the main Ceph-CSI go.mod, it is easier to identify if a reported CVE affects Ceph-CSI, or only the testing (like most of the Kubernetes CVEs). Signed-off-by: Niels de Vos <ndevos@ibm.com>
106 lines
3.1 KiB
Go
106 lines
3.1 KiB
Go
/*
|
|
Copyright 2021 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package klog
|
|
|
|
import (
|
|
"github.com/go-logr/logr"
|
|
|
|
"k8s.io/klog/v2/internal/serialize"
|
|
)
|
|
|
|
const (
|
|
// nameKey is used to log the `WithName` values as an additional attribute.
|
|
nameKey = "logger"
|
|
)
|
|
|
|
// NewKlogr returns a logger that is functionally identical to
|
|
// klogr.NewWithOptions(klogr.FormatKlog), i.e. it passes through to klog. The
|
|
// difference is that it uses a simpler implementation.
|
|
func NewKlogr() Logger {
|
|
return New(&klogger{})
|
|
}
|
|
|
|
// klogger is a subset of klogr/klogr.go. It had to be copied to break an
|
|
// import cycle (klogr wants to use klog, and klog wants to use klogr).
|
|
type klogger struct {
|
|
callDepth int
|
|
|
|
// hasPrefix is true if the first entry in values is the special
|
|
// nameKey key/value. Such an entry gets added and later updated in
|
|
// WithName.
|
|
hasPrefix bool
|
|
|
|
values []interface{}
|
|
groups string
|
|
}
|
|
|
|
func (l *klogger) Init(info logr.RuntimeInfo) {
|
|
l.callDepth += info.CallDepth
|
|
}
|
|
|
|
func (l *klogger) Info(level int, msg string, kvList ...interface{}) {
|
|
merged := serialize.MergeKVs(l.values, kvList)
|
|
// Skip this function.
|
|
VDepth(l.callDepth+1, Level(level)).InfoSDepth(l.callDepth+1, msg, merged...)
|
|
}
|
|
|
|
func (l *klogger) Enabled(level int) bool {
|
|
return VDepth(l.callDepth+1, Level(level)).Enabled()
|
|
}
|
|
|
|
func (l *klogger) Error(err error, msg string, kvList ...interface{}) {
|
|
merged := serialize.MergeKVs(l.values, kvList)
|
|
ErrorSDepth(l.callDepth+1, err, msg, merged...)
|
|
}
|
|
|
|
// WithName returns a new logr.Logger with the specified name appended. klogr
|
|
// uses '.' characters to separate name elements. Callers should not pass '.'
|
|
// in the provided name string, but this library does not actually enforce that.
|
|
func (l klogger) WithName(name string) logr.LogSink {
|
|
if l.hasPrefix {
|
|
// Copy slice and modify value. No length checks and type
|
|
// assertions are needed because hasPrefix is only true if the
|
|
// first two elements exist and are key/value strings.
|
|
v := make([]interface{}, 0, len(l.values))
|
|
v = append(v, l.values...)
|
|
prefix, _ := v[1].(string)
|
|
v[1] = prefix + "." + name
|
|
l.values = v
|
|
} else {
|
|
// Preprend new key/value pair.
|
|
v := make([]interface{}, 0, 2+len(l.values))
|
|
v = append(v, nameKey, name)
|
|
v = append(v, l.values...)
|
|
l.values = v
|
|
l.hasPrefix = true
|
|
}
|
|
return &l
|
|
}
|
|
|
|
func (l klogger) WithValues(kvList ...interface{}) logr.LogSink {
|
|
l.values = serialize.WithValues(l.values, kvList)
|
|
return &l
|
|
}
|
|
|
|
func (l klogger) WithCallDepth(depth int) logr.LogSink {
|
|
l.callDepth += depth
|
|
return &l
|
|
}
|
|
|
|
var _ logr.LogSink = &klogger{}
|
|
var _ logr.CallDepthLogSink = &klogger{}
|