Skip to content

Commit dab77b7

Browse files
committed
Remove "level" from klogr Info
Signed-off-by: Vince Prignano <vincepri@vmware.com>
1 parent 3ca30a5 commit dab77b7

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

klogr/klogr.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,11 @@ func pretty(value interface{}) string {
140140

141141
func (l klogger) Info(msg string, kvList ...interface{}) {
142142
if l.Enabled() {
143-
lvlStr := flatten("level", l.level)
144143
msgStr := flatten("msg", msg)
145144
trimmed := trimDuplicates(l.values, kvList)
146145
fixedStr := flatten(trimmed[0]...)
147146
userStr := flatten(trimmed[1]...)
148-
klog.InfoDepth(framesToCaller(), l.prefix, " ", lvlStr, " ", msgStr, " ", fixedStr, " ", userStr)
147+
klog.InfoDepth(framesToCaller(), l.prefix, " ", msgStr, " ", fixedStr, " ", userStr)
149148
}
150149
}
151150

klogr/klogr_test.go

+7-13
Original file line numberDiff line numberDiff line change
@@ -28,54 +28,48 @@ func TestInfo(t *testing.T) {
2828
klogr: New().V(0),
2929
text: "test",
3030
keysAndValues: []interface{}{"akey", "avalue"},
31-
expectedOutput: ` "level"=0 "msg"="test" "akey"="avalue"
31+
expectedOutput: ` "msg"="test" "akey"="avalue"
3232
`,
3333
},
3434
"should not print duplicate keys with the same value": {
3535
klogr: New().V(0),
3636
text: "test",
3737
keysAndValues: []interface{}{"akey", "avalue", "akey", "avalue"},
38-
expectedOutput: ` "level"=0 "msg"="test" "akey"="avalue"
38+
expectedOutput: ` "msg"="test" "akey"="avalue"
3939
`,
4040
},
4141
"should only print the last duplicate key when the values are passed to Info": {
4242
klogr: New().V(0),
4343
text: "test",
4444
keysAndValues: []interface{}{"akey", "avalue", "akey", "avalue2"},
45-
expectedOutput: ` "level"=0 "msg"="test" "akey"="avalue2"
45+
expectedOutput: ` "msg"="test" "akey"="avalue2"
4646
`,
4747
},
4848
"should only print the duplicate key that is passed to Info if one was passed to the logger": {
4949
klogr: New().WithValues("akey", "avalue"),
5050
text: "test",
5151
keysAndValues: []interface{}{"akey", "avalue"},
52-
expectedOutput: ` "level"=0 "msg"="test" "akey"="avalue"
52+
expectedOutput: ` "msg"="test" "akey"="avalue"
5353
`,
5454
},
5555
"should only print the key passed to Info when one is already set on the logger": {
5656
klogr: New().WithValues("akey", "avalue"),
5757
text: "test",
5858
keysAndValues: []interface{}{"akey", "avalue2"},
59-
expectedOutput: ` "level"=0 "msg"="test" "akey"="avalue2"
60-
`,
61-
},
62-
"should print different log level if set": {
63-
klogr: New().V(4),
64-
text: "test",
65-
expectedOutput: ` "level"=4 "msg"="test"
59+
expectedOutput: ` "msg"="test" "akey"="avalue2"
6660
`,
6761
},
6862
"should correctly handle odd-numbers of KVs": {
6963
text: "test",
7064
keysAndValues: []interface{}{"akey", "avalue", "akey2"},
71-
expectedOutput: ` "level"=0 "msg"="test" "akey"="avalue" "akey2"=null
65+
expectedOutput: ` "msg"="test" "akey"="avalue" "akey2"=null
7266
`,
7367
},
7468
"should correctly handle odd-numbers of KVs in both log values and Info args": {
7569
klogr: New().WithValues("basekey1", "basevar1", "basekey2"),
7670
text: "test",
7771
keysAndValues: []interface{}{"akey", "avalue", "akey2"},
78-
expectedOutput: ` "level"=0 "msg"="test" "basekey1"="basevar1" "basekey2"=null "akey"="avalue" "akey2"=null
72+
expectedOutput: ` "msg"="test" "basekey1"="basevar1" "basekey2"=null "akey"="avalue" "akey2"=null
7973
`,
8074
},
8175
}

0 commit comments

Comments
 (0)