Skip to content

Commit 27ca034

Browse files
grafovgrafov
committed
Fix tests after filters renaming
1 parent 2c6ba6a commit 27ca034

File tree

11 files changed

+100
-100
lines changed

11 files changed

+100
-100
lines changed

‎cmd/example-minimal/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ import (
77
)
88

99
func main() {
10-
kiwi.SinkTo(os.Stdout, kiwi.UseLogfmt()).Start()
10+
kiwi.SinkTo(os.Stdout, kiwi.AsLogfmt()).Start()
1111
kiwi.Log("key1", "text value", "key2", 123)
1212
}

‎cmd/example-several-outputs/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ func main() {
1414

1515
// You can set arbitrary number of outputs.
1616
// But they will remain unused until you explicitly start them with Start().
17-
info := kiwi.SinkTo(os.Stdout, kiwi.UseLogfmt())
18-
errors := kiwi.SinkTo(os.Stderr, kiwi.UseLogfmt())
19-
something := kiwi.SinkTo(tmpFile, kiwi.UseLogfmt())
17+
info := kiwi.SinkTo(os.Stdout, kiwi.AsLogfmt())
18+
errors := kiwi.SinkTo(os.Stderr, kiwi.AsLogfmt())
19+
something := kiwi.SinkTo(tmpFile, kiwi.AsLogfmt())
2020

2121
// Each record by default will copied to all outputs.
2222
// But until you Start() any output the records will just dropped as the sample record below.

‎cmd/example-sink-start-stop/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func main() {
1313

1414
// For starting write log records to some writer output should be
1515
// initialized.
16-
output := kiwi.SinkTo(os.Stdout, kiwi.UseLogfmt()).Start()
16+
output := kiwi.SinkTo(os.Stdout, kiwi.AsLogfmt()).Start()
1717

1818
log.Add("sample-record", 1, "key", "value")
1919
log.Log()

‎cmd/example-with-context/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func main() {
1212
ctx := kiwi.New()
1313

1414
// For starting write ctx records to some writer output should be initialized.
15-
out := kiwi.SinkTo(os.Stdout, kiwi.UseLogfmt()).Start()
15+
out := kiwi.SinkTo(os.Stdout, kiwi.AsLogfmt()).Start()
1616

1717
// setup context of the logger
1818
ctx.With("userID", 1000, "host", "local", "startedAt", time.Now())

‎convertor_test.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestConvertor_NonDefaultFloatFormatPass_Logfmt(t *testing.T) {
5454
log := New()
5555
original := FloatFormat
5656
FloatFormat = 'f'
57-
out := SinkTo(output, UseLogfmt()).Start()
57+
out := SinkTo(output, AsLogfmt()).Start()
5858

5959
log.Log("key", 3.14159265)
6060

@@ -75,7 +75,7 @@ func TestConvertor_NonDefaultTimeLayoutPass_Logfmt(t *testing.T) {
7575
TimeLayout = time.RFC822
7676
now := time.Now()
7777
nowString := now.Format(time.RFC822)
78-
out := SinkTo(output, UseLogfmt()).Start()
78+
out := SinkTo(output, AsLogfmt()).Start()
7979

8080
log.Log("key", now)
8181

@@ -90,7 +90,7 @@ func TestConvertor_NonDefaultTimeLayoutPass_Logfmt(t *testing.T) {
9090
func TestConvertor_LogByteType_Logfmt(t *testing.T) {
9191
output := bytes.NewBufferString("")
9292
log := New()
93-
out := SinkTo(output, UseLogfmt()).Start()
93+
out := SinkTo(output, AsLogfmt()).Start()
9494

9595
log.Log("the key", []byte("the sample byte sequence..."))
9696

@@ -104,7 +104,7 @@ func TestConvertor_LogByteType_Logfmt(t *testing.T) {
104104
func TestConvertor_LogBoolType_Logfmt(t *testing.T) {
105105
output := bytes.NewBufferString("")
106106
log := New()
107-
out := SinkTo(output, UseLogfmt()).Start()
107+
out := SinkTo(output, AsLogfmt()).Start()
108108

109109
log.Log("true", false)
110110

@@ -118,7 +118,7 @@ func TestConvertor_LogBoolType_Logfmt(t *testing.T) {
118118
func TestConvertor_LogInt8Type_Logfmt(t *testing.T) {
119119
output := bytes.NewBufferString("")
120120
log := New()
121-
out := SinkTo(output, UseLogfmt()).Start()
121+
out := SinkTo(output, AsLogfmt()).Start()
122122

123123
log.Log("1", int8(2))
124124

@@ -132,7 +132,7 @@ func TestConvertor_LogInt8Type_Logfmt(t *testing.T) {
132132
func TestConvertor_LogInt16Type_Logfmt(t *testing.T) {
133133
output := bytes.NewBufferString("")
134134
log := New()
135-
out := SinkTo(output, UseLogfmt()).Start()
135+
out := SinkTo(output, AsLogfmt()).Start()
136136

137137
log.Log("1", int16(2))
138138

@@ -146,7 +146,7 @@ func TestConvertor_LogInt16Type_Logfmt(t *testing.T) {
146146
func TestConvertor_LogInt32Type_Logfmt(t *testing.T) {
147147
output := bytes.NewBufferString("")
148148
log := New()
149-
out := SinkTo(output, UseLogfmt()).Start()
149+
out := SinkTo(output, AsLogfmt()).Start()
150150

151151
log.Log("1", int32(2))
152152

@@ -160,7 +160,7 @@ func TestConvertor_LogInt32Type_Logfmt(t *testing.T) {
160160
func TestConvertor_LogIntType_Logfmt(t *testing.T) {
161161
output := bytes.NewBufferString("")
162162
log := New()
163-
out := SinkTo(output, UseLogfmt()).Start()
163+
out := SinkTo(output, AsLogfmt()).Start()
164164

165165
log.Log("1", 2)
166166

@@ -174,7 +174,7 @@ func TestConvertor_LogIntType_Logfmt(t *testing.T) {
174174
func TestConvertor_LogInt64Type_Logfmt(t *testing.T) {
175175
output := bytes.NewBufferString("")
176176
log := New()
177-
out := SinkTo(output, UseLogfmt()).Start()
177+
out := SinkTo(output, AsLogfmt()).Start()
178178

179179
log.Log("1", int64(2))
180180

@@ -188,7 +188,7 @@ func TestConvertor_LogInt64Type_Logfmt(t *testing.T) {
188188
func TestConvertor_LogUint8Type_Logfmt(t *testing.T) {
189189
output := bytes.NewBufferString("")
190190
log := New()
191-
out := SinkTo(output, UseLogfmt()).Start()
191+
out := SinkTo(output, AsLogfmt()).Start()
192192

193193
log.Log("1", uint8(2))
194194

@@ -202,7 +202,7 @@ func TestConvertor_LogUint8Type_Logfmt(t *testing.T) {
202202
func TestConvertor_LogUint16Type_Logfmt(t *testing.T) {
203203
output := bytes.NewBufferString("")
204204
log := New()
205-
out := SinkTo(output, UseLogfmt()).Start()
205+
out := SinkTo(output, AsLogfmt()).Start()
206206

207207
log.Log("1", uint16(2))
208208

@@ -216,7 +216,7 @@ func TestConvertor_LogUint16Type_Logfmt(t *testing.T) {
216216
func TestConvertor_LogUint32Type_Logfmt(t *testing.T) {
217217
output := bytes.NewBufferString("")
218218
log := New()
219-
out := SinkTo(output, UseLogfmt()).Start()
219+
out := SinkTo(output, AsLogfmt()).Start()
220220

221221
log.Log("1", uint32(2))
222222

@@ -230,7 +230,7 @@ func TestConvertor_LogUint32Type_Logfmt(t *testing.T) {
230230
func TestConvertor_LogUintType_Logfmt(t *testing.T) {
231231
output := bytes.NewBufferString("")
232232
log := New()
233-
out := SinkTo(output, UseLogfmt()).Start()
233+
out := SinkTo(output, AsLogfmt()).Start()
234234

235235
log.Log("1", uint(2))
236236

@@ -244,7 +244,7 @@ func TestConvertor_LogUintType_Logfmt(t *testing.T) {
244244
func TestConvertor_LogUint64Type_Logfmt(t *testing.T) {
245245
output := bytes.NewBufferString("")
246246
log := New()
247-
out := SinkTo(output, UseLogfmt()).Start()
247+
out := SinkTo(output, AsLogfmt()).Start()
248248

249249
log.Log("1", uint64(2))
250250

@@ -258,7 +258,7 @@ func TestConvertor_LogUint64Type_Logfmt(t *testing.T) {
258258
func TestConvertor_LogFloat32Type_Logfmt(t *testing.T) {
259259
output := bytes.NewBufferString("")
260260
log := New()
261-
out := SinkTo(output, UseLogfmt()).Start()
261+
out := SinkTo(output, AsLogfmt()).Start()
262262

263263
log.Log("pi", float32(3.14159265))
264264

@@ -272,7 +272,7 @@ func TestConvertor_LogFloat32Type_Logfmt(t *testing.T) {
272272
func TestConvertor_LogFloat64Type_Logfmt(t *testing.T) {
273273
output := bytes.NewBufferString("")
274274
log := New()
275-
out := SinkTo(output, UseLogfmt()).Start()
275+
out := SinkTo(output, AsLogfmt()).Start()
276276

277277
log.Log("pi", 3.14159265359)
278278

@@ -286,7 +286,7 @@ func TestConvertor_LogFloat64Type_Logfmt(t *testing.T) {
286286
func TestConvertor_LogNil(t *testing.T) {
287287
output := bytes.NewBufferString("")
288288
log := New()
289-
out := SinkTo(output, UseLogfmt()).Start()
289+
out := SinkTo(output, AsLogfmt()).Start()
290290

291291
log.Log("key", nil)
292292

@@ -300,7 +300,7 @@ func TestConvertor_LogNil(t *testing.T) {
300300
func TestConvertor_LogValueWithoutKey(t *testing.T) {
301301
output := bytes.NewBufferString("")
302302
log := New()
303-
out := SinkTo(output, UseLogfmt()).Start()
303+
out := SinkTo(output, AsLogfmt()).Start()
304304

305305
log.Log("just a single value")
306306

‎global-logger_test.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import (
4545
// Test logging of string value.
4646
func TestGlobalLogger_LogStringValue_Logfmt(t *testing.T) {
4747
output := bytes.NewBufferString("")
48-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
48+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
4949

5050
kiwi.Log("k", "The sample string with a lot of spaces.")
5151

@@ -59,7 +59,7 @@ func TestGlobalLogger_LogStringValue_Logfmt(t *testing.T) {
5959
// Test logging of byte array.
6060
func TestGlobalLogger_LogBytesValue_Logfmt(t *testing.T) {
6161
output := bytes.NewBufferString("")
62-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
62+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
6363

6464
kiwi.Log("k", []byte("The sample string with a lot of spaces."))
6565

@@ -73,7 +73,7 @@ func TestGlobalLogger_LogBytesValue_Logfmt(t *testing.T) {
7373
// Test logging of integer value.
7474
func TestGlobalLogger_LogIntValue_Logfmt(t *testing.T) {
7575
output := bytes.NewBufferString("")
76-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
76+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
7777

7878
kiwi.Log("k", 123)
7979

@@ -87,7 +87,7 @@ func TestGlobalLogger_LogIntValue_Logfmt(t *testing.T) {
8787
// Test logging of negative integer value.
8888
func TestGlobalLogger_LogNegativeIntValue_Logfmt(t *testing.T) {
8989
output := bytes.NewBufferString("")
90-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
90+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
9191

9292
kiwi.Log("k", 123)
9393

@@ -101,7 +101,7 @@ func TestGlobalLogger_LogNegativeIntValue_Logfmt(t *testing.T) {
101101
// Test logging of float value in default (scientific) format.
102102
func TestGlobalLogger_LogFloatValue_Logfmt(t *testing.T) {
103103
output := bytes.NewBufferString("")
104-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
104+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
105105

106106
kiwi.Log("k", 3.14159265359)
107107

@@ -115,7 +115,7 @@ func TestGlobalLogger_LogFloatValue_Logfmt(t *testing.T) {
115115
// Test logging of float value in fixed format.
116116
func TestGlobalLogger_LogFixedFloatValue_Logfmt(t *testing.T) {
117117
output := bytes.NewBufferString("")
118-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
118+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
119119

120120
kiwi.FloatFormat = 'f'
121121
kiwi.Log("k", 3.14159265359)
@@ -132,7 +132,7 @@ func TestGlobalLogger_LogFixedFloatValue_Logfmt(t *testing.T) {
132132
// Test logging of boolean value.
133133
func TestGlobalLogger_LogBoolValue_Logfmt(t *testing.T) {
134134
output := bytes.NewBufferString("")
135-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
135+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
136136

137137
kiwi.Log("k", true, "k2", false)
138138

@@ -146,7 +146,7 @@ func TestGlobalLogger_LogBoolValue_Logfmt(t *testing.T) {
146146
// Test logging of complex number.
147147
func TestGlobalLogger_LogComplexValue_Logfmt(t *testing.T) {
148148
output := bytes.NewBufferString("")
149-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
149+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
150150

151151
kiwi.Log("k", .12345E+5i, "k2", 1.e+0i)
152152

@@ -160,7 +160,7 @@ func TestGlobalLogger_LogComplexValue_Logfmt(t *testing.T) {
160160
// Test logging of time literal.
161161
func TestGlobalLogger_LogTimeValue_Logfmt(t *testing.T) {
162162
output := bytes.NewBufferString("")
163-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
163+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
164164
value := time.Now()
165165
valueString := value.Format(kiwi.TimeLayout)
166166

@@ -176,7 +176,7 @@ func TestGlobalLogger_LogTimeValue_Logfmt(t *testing.T) {
176176
// Test logging of the numeric key.
177177
func TestGlobalLogger_LogNumericKey_Logfmt(t *testing.T) {
178178
output := bytes.NewBufferString("")
179-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
179+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
180180

181181
kiwi.Log("123", "The sample value.")
182182

@@ -190,7 +190,7 @@ func TestGlobalLogger_LogNumericKey_Logfmt(t *testing.T) {
190190
// Test logging of the key with spaces.
191191
func TestGlobalLogger_LogKeyWithSpaces_Logfmt(t *testing.T) {
192192
output := bytes.NewBufferString("")
193-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
193+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
194194

195195
kiwi.Log("key with spaces", "The sample value.")
196196

@@ -204,7 +204,7 @@ func TestGlobalLogger_LogKeyWithSpaces_Logfmt(t *testing.T) {
204204
// Test logging of the key with tabs.
205205
func TestGlobalLogger_LogKeyWithTabs_Logfmt(t *testing.T) {
206206
output := bytes.NewBufferString("")
207-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
207+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
208208

209209
kiwi.Log(fmt.Sprintf("key\twith\ttabs"), "The sample value.")
210210

@@ -218,7 +218,7 @@ func TestGlobalLogger_LogKeyWithTabs_Logfmt(t *testing.T) {
218218
// Test logging of the multi lines key.
219219
func TestGlobalLogger_LogKeyMultiLine_Logfmt(t *testing.T) {
220220
output := bytes.NewBufferString("")
221-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
221+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
222222

223223
kiwi.Log(fmt.Sprintf("multi\nlines\nkey"), "The sample value.")
224224

@@ -232,7 +232,7 @@ func TestGlobalLogger_LogKeyMultiLine_Logfmt(t *testing.T) {
232232
// Test logging of the multi lines value.
233233
func TestGlobalLogger_LogValueMultiLine_Logfmt(t *testing.T) {
234234
output := bytes.NewBufferString("")
235-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
235+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
236236

237237
kiwi.Log("key", fmt.Sprintf("multi\nlines\nvalue"))
238238

@@ -246,7 +246,7 @@ func TestGlobalLogger_LogValueMultiLine_Logfmt(t *testing.T) {
246246
// Test log with the context value.
247247
func TestGlobalLogger_WithContextPassed_Logfmt(t *testing.T) {
248248
output := bytes.NewBufferString("")
249-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
249+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
250250

251251
kiwi.With("key1", "value")
252252
kiwi.Log("key2", "value")
@@ -260,7 +260,7 @@ func TestGlobalLogger_WithContextPassed_Logfmt(t *testing.T) {
260260
// Test log with adding then removing the context.
261261
func TestGlobalLogger_WithoutContextPassed_Logfmt(t *testing.T) {
262262
output := bytes.NewBufferString("")
263-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
263+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
264264

265265
// add the context
266266
kiwi.With("key1", "value")
@@ -278,7 +278,7 @@ func TestGlobalLogger_WithoutContextPassed_Logfmt(t *testing.T) {
278278
// Test log with adding then reset the context.
279279
func TestGlobalLogger_ResetContext_Logfmt(t *testing.T) {
280280
output := bytes.NewBufferString("")
281-
out := kiwi.SinkTo(output, kiwi.UseLogfmt()).Start()
281+
out := kiwi.SinkTo(output, kiwi.AsLogfmt()).Start()
282282

283283
// add the context
284284
kiwi.With("key1", "value")

0 commit comments

Comments
 (0)