Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Keep time location in zap.Time #425

Merged
merged 7 commits into from
May 12, 2017
Merged

Keep time location in zap.Time #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f8ecb7
Add failing test case for combination of Time and ISO8601TimeEncoder
hnakamur May 4, 2017
9b01b9b
Keep time location in Time
hnakamur May 4, 2017
7c4bfbc
Update existing test cases for Time
hnakamur May 4, 2017
a79e9fc
Add license header
hnakamur May 4, 2017
e3dfbef
Fix year in license header
hnakamur May 4, 2017
384c2f1
Keep time location in Inteface field in Field
hnakamur May 6, 2017
c5121e5
Slim down testing
May 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion field.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ func Stringer(key string, val fmt.Stringer) zapcore.Field {
// Time constructs a zapcore.Field with the given key and value. The encoder
// controls how the time is serialized.
func Time(key string, val time.Time) zapcore.Field {
return zapcore.Field{Key: key, Type: zapcore.TimeType, Integer: val.UnixNano()}
return zapcore.Field{Key: key, Type: zapcore.TimeType, Integer: val.UnixNano(), Interface: val.Location()}
}

// Error is shorthand for the common idiom NamedError("error", err).
Expand Down
4 changes: 2 additions & 2 deletions field_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ func TestFieldConstructors(t *testing.T) {
{"Int16", zapcore.Field{Key: "k", Type: zapcore.Int16Type, Integer: 1}, Int16("k", 1)},
{"Int8", zapcore.Field{Key: "k", Type: zapcore.Int8Type, Integer: 1}, Int8("k", 1)},
{"String", zapcore.Field{Key: "k", Type: zapcore.StringType, String: "foo"}, String("k", "foo")},
{"Time", zapcore.Field{Key: "k", Type: zapcore.TimeType, Integer: 0}, Time("k", time.Unix(0, 0))},
{"Time", zapcore.Field{Key: "k", Type: zapcore.TimeType, Integer: 1000}, Time("k", time.Unix(0, 1000))},
{"Time", zapcore.Field{Key: "k", Type: zapcore.TimeType, Integer: 0, Interface: time.UTC}, Time("k", time.Unix(0, 0).In(time.UTC))},
{"Time", zapcore.Field{Key: "k", Type: zapcore.TimeType, Integer: 1000, Interface: time.UTC}, Time("k", time.Unix(0, 1000).In(time.UTC))},
{"Uint", zapcore.Field{Key: "k", Type: zapcore.Uint64Type, Integer: 1}, Uint("k", 1)},
{"Uint64", zapcore.Field{Key: "k", Type: zapcore.Uint64Type, Integer: 1}, Uint64("k", 1)},
{"Uint32", zapcore.Field{Key: "k", Type: zapcore.Uint32Type, Integer: 1}, Uint32("k", 1)},
Expand Down
7 changes: 6 additions & 1 deletion zapcore/field.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,12 @@ func (f Field) AddTo(enc ObjectEncoder) {
case StringType:
enc.AddString(f.Key, f.String)
case TimeType:
enc.AddTime(f.Key, time.Unix(0, f.Integer))
if f.Interface != nil {
enc.AddTime(f.Key, time.Unix(0, f.Integer).In(f.Interface.(*time.Location)))
} else {
// Fall back to UTC if location is nil.
enc.AddTime(f.Key, time.Unix(0, f.Integer))
}
case Uint64Type:
enc.AddUint64(f.Key, uint64(f.Integer))
case Uint32Type:
Expand Down
2 changes: 1 addition & 1 deletion zapcore/field_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func TestFields(t *testing.T) {
{t: Int16Type, i: 42, want: int16(42)},
{t: Int8Type, i: 42, want: int8(42)},
{t: StringType, s: "foo", want: "foo"},
{t: TimeType, i: 1000, want: time.Unix(0, 1000)},
{t: TimeType, i: 1000, iface: time.UTC, want: time.Unix(0, 1000).In(time.UTC)},
{t: Uint64Type, i: 42, want: uint64(42)},
{t: Uint32Type, i: 42, want: uint32(42)},
{t: Uint16Type, i: 42, want: uint16(42)},
Expand Down