refactor

log/zap/core.go

@@ -57,11 +57,6 @@ func (core *Core) getEntry(entry zapcore.Entry, fields []zapcore.Field) *log.Ent
 		fields = append(fields, core.fields...)
 	}
 
-	enc := zapcore.NewMapObjectEncoder()
-	for _, field := range fields {
-		field.AddTo(enc)
-	}
-
 	ent := &log.Entry{
 		ID:        id.GenerateNewID(),
 		Timestamp: entry.Time,
@@ -69,18 +64,22 @@ func (core *Core) getEntry(entry zapcore.Entry, fields []zapcore.Field) *log.Ent
 		Message:   entry.Message,
 	}
 
-	ent.Category, _ = enc.Fields["category"].(string)
-	ent.Component, _ = enc.Fields["component"].(string)
-	ent.Event, _ = enc.Fields["event"].(string)
-	ent.ObjectID, _ = enc.Fields["object"].(*oid.ObjectId)
-	ent.CallerID, _ = enc.Fields["caller"].(*oid.ObjectId)
-	ent.Attr = enc.Fields["attr"]
-
-	if tags, ok := enc.Fields["tags"].([]any); ok {
-		for _, item := range tags {
-			if tag, ok := item.(string); ok {
-				ent.Tags = append(ent.Tags, tag)
-			}
+	for _, field := range fields {
+		switch field.Key {
+		case "category":
+			ent.Category = field.String
+		case "component":
+			ent.Component = field.String
+		case "event":
+			ent.Event = field.String
+		case "object":
+			ent.ObjectID = field.Interface.(*oid.ObjectId)
+		case "caller":
+			ent.CallerID = field.Interface.(*oid.ObjectId)
+		case "attr":
+			ent.Attr = field.Interface
+		case "tags":
+			ent.Tags, _ = field.Interface.([]string)
 		}
 	}
 

log/zap/field.go

@@ -62,12 +62,12 @@ func Attr(attr any) zap.Field {
 	if attr == nil {
 		return zap.Skip()
 	}
-	return zap.Any("attr", attr)
+	return zap.Reflect("attr", attr)
 }
 
 func Tags(tags ...string) zap.Field {
 	if len(tags) == 0 {
 		return zap.Skip()
 	}
-	return zap.Strings("tags", tags)
+	return zap.Reflect("tags", tags)
 }

log/zap/field_test.go

@@ -173,7 +173,7 @@ func TestTags(t *testing.T) {
 		field zap.Field
 		want  zap.Field
 	}{
-		{name: "ok", field: Tags("a", "b", "c"), want: zap.Strings("tags", []string{"a", "b", "c"})},
+		{name: "ok", field: Tags("a", "b", "c"), want: zap.Reflect("tags", []string{"a", "b", "c"})},
 		{name: "invalid", field: Tags(nil...), want: zap.Skip()},
 	}