diff --git a/pkg/log/log.go b/pkg/log/log.go index 70ee05eef643861b86a72649a70b4281ce82e573..728f88b21355fb715b6b658fc7f9c6a4b68dab57 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -1,15 +1,10 @@ package log import ( - "encoding/json" "time" pb "git.perx.ru/perxis/perxis-go/proto/log" - "github.com/golang/protobuf/ptypes/any" - "google.golang.org/protobuf/proto" - "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/timestamppb" - wrappers "google.golang.org/protobuf/types/known/wrapperspb" ) type Level int @@ -44,15 +39,15 @@ type Entry struct { Tags []string `json:"tags,omitempty" bson:"tags,omitempty"` } -func convertInterfaceToAny(v interface{}) (*any.Any, error) { - anyValue := &any.Any{} - bytes, _ := json.Marshal(v) - bytesValue := &wrappers.BytesValue{ - Value: bytes, - } - err := anypb.MarshalFrom(anyValue, bytesValue, proto.MarshalOptions{}) - return anyValue, err -} +//func convertInterfaceToAny(v interface{}) (*any.Any, error) { +// anyValue := &any.Any{} +// bytes, _ := json.Marshal(v) +// bytesValue := &wrappers.BytesValue{ +// Value: bytes, +// } +// err := anypb.MarshalFrom(anyValue, bytesValue, proto.MarshalOptions{}) +// return anyValue, err +//} func EntryToPB(entry *Entry) *pb.LogEntry { logEntry := &pb.LogEntry{ @@ -65,10 +60,9 @@ func EntryToPB(entry *Entry) *pb.LogEntry { Event: entry.Event, Object: entry.Object, Caller: entry.Caller, + Attr: nil, //implement Tags: entry.Tags, } - logEntry.Attr, _ = convertInterfaceToAny(entry.Attr) - return logEntry }