mirror of
https://github.com/go-kratos/kratos.git
synced 2025-03-17 21:07:54 +02:00
fix(filter): filter out keyvals if keyFunc is provided (#2484)
This commit is contained in:
parent
511f1917ce
commit
0f38511ea8
@ -64,20 +64,18 @@ func (f *Filter) Log(level Level, keyvals ...interface{}) error {
|
||||
if level < f.level {
|
||||
return nil
|
||||
}
|
||||
// fkv is used to provide a slice to contains both logger.prefix and keyvals for filter
|
||||
var fkv []interface{}
|
||||
// prefixkv contains the slice of arguments defined as prefixes during the log initialization
|
||||
var prefixkv []interface{}
|
||||
l, ok := f.logger.(*logger)
|
||||
if ok && len(l.prefix) > 0 {
|
||||
fkv = make([]interface{}, 0, len(l.prefix)+len(keyvals))
|
||||
fkv = append(fkv, l.prefix...)
|
||||
fkv = append(fkv, keyvals...)
|
||||
prefixkv = make([]interface{}, 0, len(l.prefix))
|
||||
prefixkv = append(prefixkv, l.prefix...)
|
||||
}
|
||||
if !ok {
|
||||
fkv = keyvals
|
||||
}
|
||||
if f.filter != nil && f.filter(level, fkv...) {
|
||||
|
||||
if f.filter != nil && (f.filter(level, prefixkv...) || f.filter(level, keyvals...)) {
|
||||
return nil
|
||||
}
|
||||
|
||||
if len(f.key) > 0 || len(f.value) > 0 {
|
||||
for i := 0; i < len(keyvals); i += 2 {
|
||||
v := i + 1
|
||||
|
@ -102,13 +102,19 @@ func TestFilterFuncWitchLoggerPrefix(t *testing.T) {
|
||||
want: "",
|
||||
},
|
||||
{
|
||||
// Filtered value
|
||||
logger: NewFilter(With(NewStdLogger(buf), "caller", "caller"), FilterFunc(testFilterFuncWithLoggerPrefix)),
|
||||
want: "INFO caller=caller msg=msg\n",
|
||||
want: "INFO caller=caller msg=msg filtered=***\n",
|
||||
},
|
||||
{
|
||||
// NO prefix
|
||||
logger: NewFilter(With(NewStdLogger(buf)), FilterFunc(testFilterFuncWithLoggerPrefix)),
|
||||
want: "INFO msg=msg filtered=***\n",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
err := tt.logger.Log(LevelInfo, "msg", "msg")
|
||||
err := tt.logger.Log(LevelInfo, "msg", "msg", "filtered", "true")
|
||||
if err != nil {
|
||||
t.Fatal("err should be nil")
|
||||
}
|
||||
@ -128,6 +134,9 @@ func testFilterFuncWithLoggerPrefix(level Level, keyvals ...interface{}) bool {
|
||||
if keyvals[i] == "prefix" {
|
||||
return true
|
||||
}
|
||||
if keyvals[i] == "filtered" {
|
||||
keyvals[i+1] = fuzzyStr
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user