Skip to content

Commit a700e10

Browse files
rabbbitrabbbit
committed
Optimize zap.Any to use less mamory on stack (unrolled version)
This is an alternative to: - #1301 and #1302 and #1304 - a series of PRs that are faster than this one. However, they rely on unsafe. - #1303 - my own PR that uses closures, to reduce the stack size by 60%. This PR reduces the stack size from: ``` field.go:420 0xd16c3 4881ecf8120000 SUBQ $0x12f8, SP // 4856 ``` to ``` field.go:420 0xcb603 4881ecb8000000 SUBQ $0xb8, SP // 184 ``` so by ~96%. More crucially, `zap.Any` is now as fast as correctly typed methods, like `zap.String`, etc. The downside is the (slight) incrase in the code maitenance - we unroll as much as we can and rely on the compiler correctly re-using small variable sizes. While this is not pretty, it feels safe - the changes were purely mechanical. Future changes and extensions should be easy to review. Additionally, the new code is (slightly) faster in all cases since we remove 1-2 function calls from all paths. The "in new goroutine" path is most affected, as shown in benchmarks below. This was largely inspired by conversations with @cdvr1993. We started looking at this in parallel, but I would have given up if it wasn't for our conversations. This particular version was inspired by an earlier version of #1304 - where I realized that @cdvr1993 is doing a similar dispatching mechanism that zap is already doing via `zapcore` - a possible optimization. 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). *Most crucially, `zap.Any` is now as fast as a direct dispatch like `zap.String`.* 10 runs. ``` goos: darwin goarch: arm64 pkg: go.uber.org/zap │ before-final.txt │ after-final.txt │ │ sec/op │ sec/op vs base │ Any/str-no-logger 3.106n ± 2% 3.160n ± 1% +1.75% (p=0.025 n=10) Any/str-no-logger-2 3.171n ± 4% 3.142n ± 1% ~ (p=0.593 n=10) Any/str-no-logger-4 3.108n ± 3% 3.139n ± 2% +0.97% (p=0.004 n=10) Any/str-no-logger-8 3.099n ± 2% 3.143n ± 2% ~ (p=0.086 n=10) Any/any-no-logger 13.89n ± 2% 12.98n ± 2% -6.59% (p=0.000 n=10) Any/any-no-logger-2 13.97n ± 2% 12.96n ± 2% -7.27% (p=0.000 n=10) Any/any-no-logger-4 13.83n ± 2% 12.89n ± 2% -6.83% (p=0.000 n=10) Any/any-no-logger-8 13.77n ± 2% 12.88n ± 2% -6.43% (p=0.000 n=10) Any/str-with-logger 384.1n ± 2% 383.9n ± 6% ~ (p=0.810 n=10) Any/str-with-logger-2 367.8n ± 2% 368.5n ± 3% ~ (p=0.971 n=10) Any/str-with-logger-4 372.4n ± 2% 368.6n ± 4% ~ (p=0.912 n=10) Any/str-with-logger-8 369.8n ± 3% 368.3n ± 3% ~ (p=0.698 n=10) Any/any-with-logger 383.8n ± 3% 383.3n ± 6% ~ (p=0.838 n=10) Any/any-with-logger-2 370.0n ± 3% 367.6n ± 1% ~ (p=0.239 n=10) Any/any-with-logger-4 370.0n ± 3% 368.2n ± 4% ~ (p=0.631 n=10) Any/any-with-logger-8 367.6n ± 2% 369.7n ± 3% ~ (p=0.756 n=10) Any/str-in-go 1.334µ ± 3% 1.347µ ± 3% ~ (p=0.271 n=10) Any/str-in-go-2 754.5n ± 3% 744.8n ± 5% ~ (p=0.481 n=10) Any/str-in-go-4 420.2n ± 11% 367.7n ± 31% ~ (p=0.086 n=10) Any/str-in-go-8 557.6n ± 4% 547.1n ± 12% ~ (p=0.579 n=10) Any/any-in-go 2.562µ ± 4% 1.447µ ± 3% -43.53% (p=0.000 n=10) Any/any-in-go-2 1361.0n ± 4% 761.4n ± 7% -44.06% (p=0.000 n=10) Any/any-in-go-4 732.1n ± 9% 397.1n ± 11% -45.76% (p=0.000 n=10) Any/any-in-go-8 541.3n ± 13% 564.6n ± 5% +4.30% (p=0.041 n=10) Any/str-in-go-with-stack 1.420µ ± 1% 1.428µ ± 3% ~ (p=0.670 n=10) Any/str-in-go-with-stack-2 749.5n ± 4% 771.8n ± 4% ~ (p=0.123 n=10) Any/str-in-go-with-stack-4 433.2n ± 15% 400.7n ± 14% ~ (p=0.393 n=10) Any/str-in-go-with-stack-8 494.0n ± 7% 490.1n ± 10% ~ (p=0.853 n=10) Any/any-in-go-with-stack 2.586µ ± 3% 1.471µ ± 4% -43.14% (p=0.000 n=10) Any/any-in-go-with-stack-2 1343.0n ± 3% 773.7n ± 4% -42.39% (p=0.000 n=10) Any/any-in-go-with-stack-4 697.7n ± 8% 403.4n ± 9% -42.17% (p=0.000 n=10) Any/any-in-go-with-stack-8 490.8n ± 9% 492.8n ± 8% ~ (p=0.796 n=10) geomean 206.3n 182.9n -11.35% ``` 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: ``` ❯ go test -bench BenchmarkAny -benchmem -run errs -cpu 1,2,4,8 goos: darwin goarch: arm64 pkg: go.uber.org/zap BenchmarkAny/str-with-logger 3202051 382.1 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-2 3301683 371.2 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-4 3186028 364.8 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-8 3061030 371.0 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger 3203704 378.2 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-2 3281462 372.8 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-4 3252879 371.5 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-8 3246148 373.9 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-in-go 804132 1404 ns/op 133 B/op 2 allocs/op BenchmarkAny/str-in-go-2 1686093 758.0 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-4 3075596 430.7 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-8 2101650 543.7 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go 845822 1424 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-2 1531311 736.6 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-4 2618665 464.6 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-8 2130280 536.2 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack 818583 1440 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-2 1533379 739.4 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-4 2507131 399.6 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-8 2348804 453.1 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack 807199 1526 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-2 1590476 783.0 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-4 3026263 383.3 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-8 2615467 493.8 ns/op 88 B/op 2 allocs/op PASS ok go.uber.org/zap 51.077s ``` 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: ``` % 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.77 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-no-logger-2 100000000 11.75 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-no-logger-4 100000000 11.76 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-no-logger-8 100000000 11.69 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger 49795383 24.33 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger-2 48821454 24.31 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger-4 49452686 24.79 ns/op 0 B/op 0 allocs/op BenchmarkAny/any-no-logger-8 49359926 24.26 ns/op 0 B/op 0 allocs/op BenchmarkAny/str-with-logger 1808188 700.1 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-2 1894179 643.9 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-4 1858263 649.7 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-with-logger-8 1879894 645.1 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger 1817276 663.7 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-2 1906438 637.7 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-4 1837354 641.5 ns/op 64 B/op 1 allocs/op BenchmarkAny/any-with-logger-8 1909658 648.3 ns/op 64 B/op 1 allocs/op BenchmarkAny/str-in-go 468484 2463 ns/op 96 B/op 2 allocs/op BenchmarkAny/str-in-go-2 726475 1465 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-4 1285284 958.9 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-8 1746547 573.1 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go 426568 2715 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-2 611106 1703 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-4 1000000 1017 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-8 2220459 625.7 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack 429721 2673 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-2 637306 1593 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-4 1301713 902.1 ns/op 88 B/op 2 allocs/op BenchmarkAny/str-in-go-with-stack-8 2012583 651.6 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack 391810 2833 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-2 675589 1639 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-4 1219318 970.3 ns/op 88 B/op 2 allocs/op BenchmarkAny/any-in-go-with-stack-8 1825632 574.6 ns/op 88 B/op 2 allocs/op PASS ok go.uber.org/zap 50.294s ```
1 parent ae3953e commit a700e10

File tree

1 file changed

+242
-63
lines changed

1 file changed

+242
-63
lines changed

‎field.go

Lines changed: 242 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -418,132 +418,311 @@ 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 (
425+
t zapcore.FieldType
426+
i int64
427+
s string
428+
iface any
429+
)
421430
switch val := value.(type) {
422431
case zapcore.ObjectMarshaler:
423-
return Object(key, val)
432+
t = zapcore.ObjectMarshalerType
433+
iface = val
424434
case zapcore.ArrayMarshaler:
425-
return Array(key, val)
435+
t = zapcore.ArrayMarshalerType
436+
iface = val
426437
case bool:
427-
return Bool(key, val)
438+
var ival int64
439+
if val {
440+
ival = 1
441+
}
442+
t = zapcore.BoolType
443+
i = ival
428444
case *bool:
429-
return Boolp(key, val)
445+
if val == nil {
446+
t = zapcore.ReflectType
447+
break
448+
}
449+
var ival int64
450+
if *val {
451+
ival = 1
452+
}
453+
t = zapcore.BoolType
454+
i = ival
430455
case []bool:
431-
return Bools(key, val)
456+
t = zapcore.ArrayMarshalerType
457+
iface = bools(val)
432458
case complex128:
433-
return Complex128(key, val)
459+
t = zapcore.Complex128Type
460+
iface = val
434461
case *complex128:
435-
return Complex128p(key, val)
462+
if val == nil {
463+
t = zapcore.ReflectType
464+
break
465+
}
466+
t = zapcore.Complex128Type
467+
iface = *val
436468
case []complex128:
437-
return Complex128s(key, val)
469+
t = zapcore.ArrayMarshalerType
470+
iface = complex128s(val)
438471
case complex64:
439-
return Complex64(key, val)
472+
t = zapcore.Complex64Type
473+
iface = val
440474
case *complex64:
441-
return Complex64p(key, val)
475+
if val == nil {
476+
t = zapcore.ReflectType
477+
break
478+
}
479+
t = zapcore.Complex64Type
480+
iface = *val
442481
case []complex64:
443-
return Complex64s(key, val)
482+
t = zapcore.ArrayMarshalerType
483+
iface = complex64s(val)
444484
case float64:
445-
return Float64(key, val)
485+
t = zapcore.Float64Type
486+
i = int64(math.Float64bits(val))
446487
case *float64:
447-
return Float64p(key, val)
488+
if val == nil {
489+
t = zapcore.ReflectType
490+
break
491+
}
492+
t = zapcore.Float64Type
493+
i = int64(math.Float64bits(*val))
448494
case []float64:
449-
return Float64s(key, val)
495+
t = zapcore.ArrayMarshalerType
496+
iface = float64s(val)
450497
case float32:
451-
return Float32(key, val)
498+
t = zapcore.Float32Type
499+
i = int64(math.Float32bits(val))
452500
case *float32:
453-
return Float32p(key, val)
501+
if val == nil {
502+
t = zapcore.ReflectType
503+
break
504+
}
505+
t = zapcore.Float32Type
506+
i = int64(math.Float32bits(*val))
454507
case []float32:
455-
return Float32s(key, val)
508+
t = zapcore.ArrayMarshalerType
509+
iface = float32s(val)
456510
case int:
457-
return Int(key, val)
511+
t = zapcore.Int64Type
512+
i = int64(val)
458513
case *int:
459-
return Intp(key, val)
514+
if val == nil {
515+
t = zapcore.ReflectType
516+
break
517+
}
518+
t = zapcore.Int64Type
519+
i = int64(*val)
460520
case []int:
461-
return Ints(key, val)
521+
t = zapcore.ArrayMarshalerType
522+
iface = ints(val)
462523
case int64:
463-
return Int64(key, val)
524+
t = zapcore.Int64Type
525+
i = val
464526
case *int64:
465-
return Int64p(key, val)
527+
if val == nil {
528+
t = zapcore.ReflectType
529+
break
530+
}
531+
t = zapcore.Int64Type
532+
i = *val
466533
case []int64:
467-
return Int64s(key, val)
534+
t = zapcore.ArrayMarshalerType
535+
iface = int64s(val)
468536
case int32:
469-
return Int32(key, val)
537+
t = zapcore.Int32Type
538+
i = int64(val)
470539
case *int32:
471-
return Int32p(key, val)
540+
if val == nil {
541+
t = zapcore.ReflectType
542+
break
543+
}
544+
t = zapcore.Int32Type
545+
i = int64(*val)
472546
case []int32:
473-
return Int32s(key, val)
547+
t = zapcore.ArrayMarshalerType
548+
iface = int32s(val)
474549
case int16:
475-
return Int16(key, val)
550+
t = zapcore.Int16Type
551+
i = int64(val)
476552
case *int16:
477-
return Int16p(key, val)
553+
if val == nil {
554+
t = zapcore.ReflectType
555+
break
556+
}
557+
t = zapcore.Int16Type
558+
i = int64(*val)
478559
case []int16:
479-
return Int16s(key, val)
560+
t = zapcore.ArrayMarshalerType
561+
iface = int16s(val)
480562
case int8:
481-
return Int8(key, val)
563+
t = zapcore.Int8Type
564+
i = int64(val)
482565
case *int8:
483-
return Int8p(key, val)
566+
if val == nil {
567+
t = zapcore.ReflectType
568+
break
569+
}
570+
t = zapcore.Int8Type
571+
i = int64(*val)
484572
case []int8:
485-
return Int8s(key, val)
573+
t = zapcore.ArrayMarshalerType
574+
iface = int8s(val)
486575
case string:
487-
return String(key, val)
576+
t = zapcore.StringType
577+
s = val
488578
case *string:
489-
return Stringp(key, val)
579+
if val == nil {
580+
t = zapcore.ReflectType
581+
break
582+
}
583+
t = zapcore.StringType
584+
s = *val
490585
case []string:
491-
return Strings(key, val)
586+
t = zapcore.ArrayMarshalerType
587+
iface = stringArray(val)
492588
case uint:
493-
return Uint(key, val)
589+
t = zapcore.Uint64Type
590+
i = int64(val)
494591
case *uint:
495-
return Uintp(key, val)
592+
if val == nil {
593+
t = zapcore.ReflectType
594+
break
595+
}
596+
t = zapcore.Uint64Type
597+
i = int64(*val)
496598
case []uint:
497-
return Uints(key, val)
599+
t = zapcore.ArrayMarshalerType
600+
iface = uints(val)
498601
case uint64:
499-
return Uint64(key, val)
602+
t = zapcore.Uint64Type
603+
i = int64(val)
500604
case *uint64:
501-
return Uint64p(key, val)
605+
if val == nil {
606+
t = zapcore.ReflectType
607+
break
608+
}
609+
t = zapcore.Uint64Type
610+
i = int64(*val)
502611
case []uint64:
503-
return Uint64s(key, val)
612+
t = zapcore.ArrayMarshalerType
613+
iface = uint64s(val)
504614
case uint32:
505-
return Uint32(key, val)
615+
t = zapcore.Uint32Type
616+
i = int64(val)
506617
case *uint32:
507-
return Uint32p(key, val)
618+
if val == nil {
619+
t = zapcore.ReflectType
620+
break
621+
}
622+
t = zapcore.Uint32Type
623+
i = int64(*val)
508624
case []uint32:
509-
return Uint32s(key, val)
625+
t = zapcore.ArrayMarshalerType
626+
iface = uint32s(val)
510627
case uint16:
511-
return Uint16(key, val)
628+
t = zapcore.Uint16Type
629+
i = int64(val)
512630
case *uint16:
513-
return Uint16p(key, val)
631+
if val == nil {
632+
t = zapcore.ReflectType
633+
break
634+
}
635+
t = zapcore.Uint16Type
636+
i = int64(*val)
514637
case []uint16:
515-
return Uint16s(key, val)
638+
t = zapcore.ArrayMarshalerType
639+
iface = uint16s(val)
516640
case uint8:
517-
return Uint8(key, val)
641+
t = zapcore.Uint8Type
642+
i = int64(val)
518643
case *uint8:
519-
return Uint8p(key, val)
644+
if val == nil {
645+
t = zapcore.ReflectType
646+
break
647+
}
648+
t = zapcore.Uint8Type
649+
i = int64(*val)
520650
case []byte:
521-
return Binary(key, val)
651+
t = zapcore.BinaryType
652+
iface = val
522653
case uintptr:
523-
return Uintptr(key, val)
654+
t = zapcore.UintptrType
655+
i = int64(val)
524656
case *uintptr:
525-
return Uintptrp(key, val)
657+
if val == nil {
658+
t = zapcore.ReflectType
659+
break
660+
}
661+
t = zapcore.UintptrType
662+
i = int64(*val)
526663
case []uintptr:
527-
return Uintptrs(key, val)
664+
t = zapcore.ArrayMarshalerType
665+
iface = uintptrs(val)
528666
case time.Time:
529-
return Time(key, val)
667+
if val.Before(_minTimeInt64) || val.After(_maxTimeInt64) {
668+
t = zapcore.TimeFullType
669+
iface = val
670+
break
671+
}
672+
t = zapcore.TimeType
673+
i = val.UnixNano()
674+
iface = val.Location()
530675
case *time.Time:
531-
return Timep(key, val)
676+
if val == nil {
677+
t = zapcore.ReflectType
678+
break
679+
}
680+
if val.Before(_minTimeInt64) || val.After(_maxTimeInt64) {
681+
t = zapcore.TimeFullType
682+
iface = *val
683+
break
684+
}
685+
t = zapcore.TimeType
686+
i = val.UnixNano()
687+
iface = val.Location()
532688
case []time.Time:
533-
return Times(key, val)
689+
t = zapcore.ArrayMarshalerType
690+
iface = times(val)
534691
case time.Duration:
535-
return Duration(key, val)
692+
t = zapcore.DurationType
693+
i = int64(val)
536694
case *time.Duration:
537-
return Durationp(key, val)
695+
if val == nil {
696+
t = zapcore.ReflectType
697+
break
698+
}
699+
t = zapcore.DurationType
700+
i = int64(*val)
538701
case []time.Duration:
539-
return Durations(key, val)
702+
t = zapcore.ArrayMarshalerType
703+
iface = durations(val)
540704
case error:
541-
return NamedError(key, val)
705+
if val == nil {
706+
t = zapcore.SkipType
707+
break
708+
}
709+
t = zapcore.ErrorType
710+
iface = val
542711
case []error:
543-
return Errors(key, val)
712+
t = zapcore.ArrayMarshalerType
713+
iface = errArray(val)
544714
case fmt.Stringer:
545-
return Stringer(key, val)
715+
t = zapcore.StringerType
716+
iface = val
546717
default:
547-
return Reflect(key, val)
718+
t = zapcore.ReflectType
719+
iface = val
720+
}
721+
return Field{
722+
Key: key,
723+
Type: t,
724+
Integer: i,
725+
String: s,
726+
Interface: iface,
548727
}
549728
}

0 commit comments

Comments
 (0)