Skip to content

Commit 2290333

Browse files
rabbbitrabbbit
committed
Optimize zap.Any to allocate less mamory on stack
This is an alternative to #1301 and #1302. It's not as fast as these two options, but it still gives us half the stack reduction without the `unsafe` usage. Interestingly it seems that on both arm64 and amd64 the new code, with the closure, is faster than the plain old switch. We do see a ~5-10ns delay on `Any` creation if it's used without `logger`, but that's minimal and not realistic. Bunch of credit for this goes to @cdvr1993, we started independently, I was about to give up but the conversations pushed me forward. In the end he ended up going into a more advanced land where I dare not to enter. Longer version: We have identified an issue where zap.Any can cause performance degradation due to stack size. This is apparently cased by the compiler assigning 4.8kb (a zap.Field per arm of the switch statement) for zap.Any on stack. This can result in an unnecessary runtime.newstack+runtime.copystack. A github issue against Go language is pending. This can be particularly bad if `zap.Any` was to be used in a new goroutine, since the default goroutine sizes can be as low as 2kb (it can vary depending on average stack size - see golang/go#18138). This is an alternative to #1301, @cdvr and me were talking about this, and he inspired this idea with the closure. By using a function and a closure we're able to reduce the size and remove the degradation. At least on my laptop, this change result in a new performance gain, as all benchmarks show reduced time. 10 runs. ``` ❯ benchstat ~/before2.txt ~/after2.txt goos: darwin goarch: arm64 pkg: go.uber.org/zap │ /Users/pawel/before2.txt │ /Users/pawel/after2.txt │ │ sec/op │ sec/op vs base │ Any/str-no-logger-12 3.344n ± 1% 3.029n ± 1% -9.40% (p=0.000 n=10) Any/any-no-logger-12 13.80n ± 4% 18.67n ± 1% +35.29% (p=0.000 n=10) Any/str-with-logger-12 372.4n ± 3% 363.6n ± 1% -2.35% (p=0.001 n=10) Any/any-with-logger-12 369.2n ± 1% 363.6n ± 1% -1.52% (p=0.002 n=10) Any/str-in-go-12 587.2n ± 2% 587.0n ± 1% ~ (p=0.617 n=10) Any/any-in-go-12 666.5n ± 3% 567.6n ± 1% -14.85% (p=0.000 n=10) Any/str-in-go-with-stack-12 448.6n ± 18% 403.4n ± 13% ~ (p=0.280 n=10) Any/any-in-go-with-stack-12 564.9n ± 7% 443.2n ± 4% -21.55% (p=0.000 n=10) geomean 167.8n 160.7n -4.23% │ /Users/pawel/before2.txt │ /Users/pawel/after2.txt │ │ B/op │ B/op vs base │ Any/str-no-logger-12 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=10) ¹ Any/any-no-logger-12 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=10) ¹ Any/str-with-logger-12 64.00 ± 0% 64.00 ± 0% ~ (p=1.000 n=10) ¹ Any/any-with-logger-12 64.00 ± 0% 64.00 ± 0% ~ (p=1.000 n=10) ¹ Any/str-in-go-12 88.00 ± 0% 88.00 ± 0% ~ (p=1.000 n=10) ¹ Any/any-in-go-12 88.00 ± 0% 88.00 ± 0% ~ (p=1.000 n=10) ¹ Any/str-in-go-with-stack-12 88.00 ± 0% 88.00 ± 0% ~ (p=1.000 n=10) ¹ Any/any-in-go-with-stack-12 88.00 ± 0% 88.00 ± 0% ~ (p=1.000 n=10) ¹ geomean ² +0.00% ² ¹ all samples are equal ² summaries must be >0 to compute geomean │ /Users/pawel/before2.txt │ /Users/pawel/after2.txt │ │ allocs/op │ allocs/op vs base │ Any/str-no-logger-12 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=10) ¹ Any/any-no-logger-12 0.000 ± 0% 0.000 ± 0% ~ (p=1.000 n=10) ¹ Any/str-with-logger-12 1.000 ± 0% 1.000 ± 0% ~ (p=1.000 n=10) ¹ Any/any-with-logger-12 1.000 ± 0% 1.000 ± 0% ~ (p=1.000 n=10) ¹ Any/str-in-go-12 2.000 ± 0% 2.000 ± 0% ~ (p=1.000 n=10) ¹ Any/any-in-go-12 2.000 ± 0% 2.000 ± 0% ~ (p=1.000 n=10) ¹ Any/str-in-go-with-stack-12 2.000 ± 0% 2.000 ± 0% ~ (p=1.000 n=10) ¹ Any/any-in-go-with-stack-12 2.000 ± 0% 2.000 ± 0% ~ (p=1.000 n=10) ¹ geomean ``` On absolute terms: Before, on arm64: ``` goos: darwin goarch: arm64 pkg: go.uber.org/zap BenchmarkAny/str-with-logger 3154850 387.9 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-2 3239221 371.0 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-4 3273285 363.8 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-8 3251991 372.4 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger 2944020 401.1 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-2 2984863 368.2 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-4 3265248 363.0 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-8 3301592 365.9 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-in-go 764239 1423 ns/op 140 B/op 2 allocs/op BenchmarkAny/str-in-go-2 1510189 753.0 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-4 3013986 369.1 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-8 2128927 540.0 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go 464083 2551 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-2 818104 1347 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-4 1587925 698.9 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-8 2452558 466.7 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack 767626 1440 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-2 1534382 771.1 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-4 2384058 433.4 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-8 3146942 450.0 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack 434194 2524 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-2 851312 1304 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-4 1570944 710.1 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-8 2546115 604.6 ns/op 88 B/op 2 allocs/op PASS ok go.uber.org/zap 50.238s ``` After: ``` goos: darwin goarch: arm64 pkg: go.uber.org/zap BenchmarkAny/str-with-logger 3191725 382.2 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-2 3159882 367.4 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-4 2998960 373.0 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-8 3264657 361.7 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger 3168627 386.2 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-2 3169394 364.4 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-4 3271981 368.9 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-8 3293463 362.5 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-in-go 793905 1388 ns/op 143 B/op 2 allocs/op BenchmarkAny/str-in-go-2 1724048 748.4 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-4 2536380 444.9 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-8 2177941 586.1 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go 890155 1237 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-2 1836302 719.1 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-4 3671503 322.2 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-8 2257405 540.8 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack 811408 1457 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-2 1384990 729.6 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-4 3228151 381.8 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-8 2678596 450.8 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack 821092 1386 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-2 1747638 662.3 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-4 3747934 341.9 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-8 2678191 463.6 ns/op 88 B/op 2 allocs/op PASS ok go.uber.org/zap 53.238s ``` And amd64, before: ``` % go test -bench BenchmarkAny -benchmem -run errs -cpu 1,2,4,8 goos: linux goarch: amd64 pkg: go.uber.org/zap cpu: AMD EPYC 7B13 BenchmarkAny/str-no-logger 100000000 11.58 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-no-logger-2 100000000 11.52 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-no-logger-4 100000000 11.56 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-no-logger-8 100000000 11.50 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger 39399811 30.35 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger-2 39448304 30.63 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger-4 39647024 30.32 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger-8 39479619 30.46 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-with-logger 1798702 669.3 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-2 1862551 647.1 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-4 1848636 642.2 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-8 1878465 656.7 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger 1776140 684.3 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-2 1868102 668.5 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-4 1869589 639.9 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-8 1782540 648.5 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-in-go 458112 2594 ns/op 91 B/op 2 allocs/op BenchmarkAny/str-in-go-2 820398 1344 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-4 1392148 969.6 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-8 1790403 644.8 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go 220327 4897 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-2 494391 2701 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-4 823672 1399 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-8 1591206 746.8 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack 384094 2820 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-2 809073 1530 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-4 1464598 933.0 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-8 1943251 578.0 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack 233019 4967 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-2 356689 2848 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-4 791342 1385 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-8 1662126 746.0 ns/op 88 B/op 2 allocs/op PASS ok go.uber.org/zap 51.671s ``` After: ``` goos: linux goarch: amd64 pkg: go.uber.org/zap cpu: AMD EPYC 7B13 BenchmarkAny/str-no-logger 100000000 11.65 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-no-logger-2 100000000 11.64 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-no-logger-4 100000000 11.63 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-no-logger-8 100000000 11.65 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger 27779637 44.20 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger-2 27881986 42.96 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger-4 27587953 43.39 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger-8 26861058 43.43 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-with-logger 1749990 690.4 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-2 1807341 660.3 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-4 1821039 654.3 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-8 1865083 650.8 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger 1677643 741.3 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-2 1905400 689.4 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-4 1843364 646.2 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-8 1899883 645.8 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-in-go 453326 2479 ns/op 92 B/op 2 allocs/op BenchmarkAny/str-in-go-2 724555 1580 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-4 1358790 953.3 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-8 1805985 585.6 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go 466447 2395 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-2 874053 1487 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-4 1457768 834.7 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-8 1795317 632.5 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack 407620 2749 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-2 725614 1597 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-4 1303908 863.7 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-8 1957864 609.1 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack 497640 2401 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-2 648355 1549 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-4 1486416 869.9 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-8 2116040 568.8 ns/op 88 B/op 2 allocs/op PASS ```
1 parent 382e251 commit 2290333

File tree

2 files changed

+301
-63
lines changed

2 files changed

+301
-63
lines changed

‎field.go‎

Lines changed: 194 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -418,132 +418,263 @@ func Inline(val zapcore.ObjectMarshaler) Field {
418418
// them. To minimize surprises, []byte values are treated as binary blobs, byte
419419
// values are treated as uint8, and runes are always treated as integers.
420420
func Any(key string, value interface{}) Field {
421+
// To work around go compiler assigning unreasonably large space on stack
422+
// (4kb, one `Field` per arm of the switch statement) which can trigger
423+
// performance degradation if `Any` is used in a brand new goroutine.
424+
var f func() Field
421425
switch val := value.(type) {
422426
case zapcore.ObjectMarshaler:
423-
return Object(key, val)
427+
f = func() Field {
428+
return Object(key, val)
429+
}
424430
case zapcore.ArrayMarshaler:
425-
return Array(key, val)
431+
f = func() Field {
432+
return Array(key, val)
433+
}
426434
case bool:
427-
return Bool(key, val)
435+
f = func() Field {
436+
return Bool(key, val)
437+
}
428438
case *bool:
429-
return Boolp(key, val)
439+
f = func() Field {
440+
return Boolp(key, val)
441+
}
430442
case []bool:
431-
return Bools(key, val)
443+
f = func() Field {
444+
return Bools(key, val)
445+
}
432446
case complex128:
433-
return Complex128(key, val)
447+
f = func() Field {
448+
return Complex128(key, val)
449+
}
434450
case *complex128:
435-
return Complex128p(key, val)
451+
f = func() Field {
452+
return Complex128p(key, val)
453+
}
436454
case []complex128:
437-
return Complex128s(key, val)
455+
f = func() Field {
456+
return Complex128s(key, val)
457+
}
438458
case complex64:
439-
return Complex64(key, val)
459+
f = func() Field {
460+
return Complex64(key, val)
461+
}
440462
case *complex64:
441-
return Complex64p(key, val)
463+
f = func() Field {
464+
return Complex64p(key, val)
465+
}
442466
case []complex64:
443-
return Complex64s(key, val)
467+
f = func() Field {
468+
return Complex64s(key, val)
469+
}
444470
case float64:
445-
return Float64(key, val)
471+
f = func() Field {
472+
return Float64(key, val)
473+
}
446474
case *float64:
447-
return Float64p(key, val)
475+
f = func() Field {
476+
return Float64p(key, val)
477+
}
448478
case []float64:
449-
return Float64s(key, val)
479+
f = func() Field {
480+
return Float64s(key, val)
481+
}
450482
case float32:
451-
return Float32(key, val)
483+
f = func() Field {
484+
return Float32(key, val)
485+
}
452486
case *float32:
453-
return Float32p(key, val)
487+
f = func() Field {
488+
return Float32p(key, val)
489+
}
454490
case []float32:
455-
return Float32s(key, val)
491+
f = func() Field {
492+
return Float32s(key, val)
493+
}
456494
case int:
457-
return Int(key, val)
495+
f = func() Field {
496+
return Int(key, val)
497+
}
458498
case *int:
459-
return Intp(key, val)
499+
f = func() Field {
500+
return Intp(key, val)
501+
}
460502
case []int:
461-
return Ints(key, val)
503+
f = func() Field {
504+
return Ints(key, val)
505+
}
462506
case int64:
463-
return Int64(key, val)
507+
f = func() Field {
508+
return Int64(key, val)
509+
}
464510
case *int64:
465-
return Int64p(key, val)
511+
f = func() Field {
512+
return Int64p(key, val)
513+
}
466514
case []int64:
467-
return Int64s(key, val)
515+
f = func() Field {
516+
return Int64s(key, val)
517+
}
468518
case int32:
469-
return Int32(key, val)
519+
f = func() Field {
520+
return Int32(key, val)
521+
}
470522
case *int32:
471-
return Int32p(key, val)
523+
f = func() Field {
524+
return Int32p(key, val)
525+
}
472526
case []int32:
473-
return Int32s(key, val)
527+
f = func() Field {
528+
return Int32s(key, val)
529+
}
474530
case int16:
475-
return Int16(key, val)
531+
f = func() Field {
532+
return Int16(key, val)
533+
}
476534
case *int16:
477-
return Int16p(key, val)
535+
f = func() Field {
536+
return Int16p(key, val)
537+
}
478538
case []int16:
479-
return Int16s(key, val)
539+
f = func() Field {
540+
return Int16s(key, val)
541+
}
480542
case int8:
481-
return Int8(key, val)
543+
f = func() Field {
544+
return Int8(key, val)
545+
}
482546
case *int8:
483-
return Int8p(key, val)
547+
f = func() Field {
548+
return Int8p(key, val)
549+
}
484550
case []int8:
485-
return Int8s(key, val)
551+
f = func() Field {
552+
return Int8s(key, val)
553+
}
486554
case string:
487-
return String(key, val)
555+
f = func() Field {
556+
return String(key, val)
557+
}
488558
case *string:
489-
return Stringp(key, val)
559+
f = func() Field {
560+
return Stringp(key, val)
561+
}
490562
case []string:
491-
return Strings(key, val)
563+
f = func() Field {
564+
return Strings(key, val)
565+
}
492566
case uint:
493-
return Uint(key, val)
567+
f = func() Field {
568+
return Uint(key, val)
569+
}
494570
case *uint:
495-
return Uintp(key, val)
571+
f = func() Field {
572+
return Uintp(key, val)
573+
}
496574
case []uint:
497-
return Uints(key, val)
575+
f = func() Field {
576+
return Uints(key, val)
577+
}
498578
case uint64:
499-
return Uint64(key, val)
579+
f = func() Field {
580+
return Uint64(key, val)
581+
}
500582
case *uint64:
501-
return Uint64p(key, val)
583+
f = func() Field {
584+
return Uint64p(key, val)
585+
}
502586
case []uint64:
503-
return Uint64s(key, val)
587+
f = func() Field {
588+
return Uint64s(key, val)
589+
}
504590
case uint32:
505-
return Uint32(key, val)
591+
f = func() Field {
592+
return Uint32(key, val)
593+
}
506594
case *uint32:
507-
return Uint32p(key, val)
595+
f = func() Field {
596+
return Uint32p(key, val)
597+
}
508598
case []uint32:
509-
return Uint32s(key, val)
599+
f = func() Field {
600+
return Uint32s(key, val)
601+
}
510602
case uint16:
511-
return Uint16(key, val)
603+
f = func() Field {
604+
return Uint16(key, val)
605+
}
512606
case *uint16:
513-
return Uint16p(key, val)
607+
f = func() Field {
608+
return Uint16p(key, val)
609+
}
514610
case []uint16:
515-
return Uint16s(key, val)
611+
f = func() Field {
612+
return Uint16s(key, val)
613+
}
516614
case uint8:
517-
return Uint8(key, val)
615+
f = func() Field {
616+
return Uint8(key, val)
617+
}
518618
case *uint8:
519-
return Uint8p(key, val)
619+
f = func() Field {
620+
return Uint8p(key, val)
621+
}
520622
case []byte:
521-
return Binary(key, val)
623+
f = func() Field {
624+
return Binary(key, val)
625+
}
522626
case uintptr:
523-
return Uintptr(key, val)
627+
f = func() Field {
628+
return Uintptr(key, val)
629+
}
524630
case *uintptr:
525-
return Uintptrp(key, val)
631+
f = func() Field {
632+
return Uintptrp(key, val)
633+
}
526634
case []uintptr:
527-
return Uintptrs(key, val)
635+
f = func() Field {
636+
return Uintptrs(key, val)
637+
}
528638
case time.Time:
529-
return Time(key, val)
639+
f = func() Field {
640+
return Time(key, val)
641+
}
530642
case *time.Time:
531-
return Timep(key, val)
643+
f = func() Field {
644+
return Timep(key, val)
645+
}
532646
case []time.Time:
533-
return Times(key, val)
647+
f = func() Field {
648+
return Times(key, val)
649+
}
534650
case time.Duration:
535-
return Duration(key, val)
651+
f = func() Field {
652+
return Duration(key, val)
653+
}
536654
case *time.Duration:
537-
return Durationp(key, val)
655+
f = func() Field {
656+
return Durationp(key, val)
657+
}
538658
case []time.Duration:
539-
return Durations(key, val)
659+
f = func() Field {
660+
return Durations(key, val)
661+
}
540662
case error:
541-
return NamedError(key, val)
663+
f = func() Field {
664+
return NamedError(key, val)
665+
}
542666
case []error:
543-
return Errors(key, val)
667+
f = func() Field {
668+
return Errors(key, val)
669+
}
544670
case fmt.Stringer:
545-
return Stringer(key, val)
671+
f = func() Field {
672+
return Stringer(key, val)
673+
}
546674
default:
547-
return Reflect(key, val)
675+
f = func() Field {
676+
return Reflect(key, val)
677+
}
548678
}
679+
return f()
549680
}

0 commit comments

Comments
 (0)