Merge branch 'v3'

2023-05-07 19:15:49 +03:00 · 2023-05-07 19:15:49 +03:00 · fad3693ddc
commit fad3693ddc
parent 654f42f4b1 a271ac6a7c
13 changed files with 1004 additions and 198 deletions
--- a/.github/workflows/autoapprove.yml
+++ b/.github/workflows/autoapprove.yml
@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: approve
-        uses: hmarr/auto-approve-action@v2
+        uses: hmarr/auto-approve-action@v3
        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
        id: approve
        with:
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -10,13 +10,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
      with:
        go-version: 1.17
    - name: checkout
      uses: actions/checkout@v3
    - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
      with:
        path: ~/go/pkg/mod
        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -45,12 +45,12 @@ jobs:
    - name: checkout
      uses: actions/checkout@v3
    - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
      with:
        go-version: 1.17
    # Initializes the CodeQL tools for scanning.
    - name: init
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@ -61,7 +61,7 @@ jobs:
    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2

    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@ -75,4 +75,4 @@ jobs:
    #   make release

    - name: analyze
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@ -15,7 +15,7 @@ jobs:
    steps:
      - name: metadata
        id: metadata
-        uses: dependabot/fetch-metadata@v1.3.0
+        uses: dependabot/fetch-metadata@v1.3.6
        with:
          github-token: "${{ secrets.TOKEN }}"
      - name: merge
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -10,13 +10,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
      with:
        go-version: 1.17
    - name: checkout
      uses: actions/checkout@v3
    - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
      with:
        path: ~/go/pkg/mod
        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
--- a/go.mod
+++ b/go.mod
@ -4,11 +4,7 @@ go 1.16

 require (
 	github.com/google/uuid v1.3.0
-	go.unistack.org/micro/v3 v3.8.21
-	golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 // indirect
-	google.golang.org/grpc v1.44.0
-	google.golang.org/protobuf v1.27.1
+	go.unistack.org/micro/v3 v3.10.11
+	google.golang.org/grpc v1.52.3
+	google.golang.org/protobuf v1.28.1
 )
--- a/go.sum
+++ b/go.sum
--- a/micro/service_micro.pb.go
+++ b/micro/service_micro.pb.go
@ -22,9 +22,9 @@ func NewLoggerServiceEndpoints() []api.Endpoint {
 }

 type LoggerServiceClient interface {
-	Log(ctx context.Context, req *proto.Message, opts ...client.CallOption) (*proto.Empty, error)
+	Log(ctx context.Context, req *proto.LogReq, opts ...client.CallOption) (*proto.LogRsp, error)
 }

 type LoggerServiceServer interface {
-	Log(ctx context.Context, req *proto.Message, rsp *proto.Empty) error
+	Log(ctx context.Context, req *proto.LogReq, rsp *proto.LogRsp) error
 }
--- a/micro/service_micro_rpc.pb.go
+++ b/micro/service_micro_rpc.pb.go
@ -21,8 +21,8 @@ func NewLoggerServiceClient(name string, c client.Client) LoggerServiceClient {
 	return &loggerServiceClient{c: c, name: name}
 }

-func (c *loggerServiceClient) Log(ctx context.Context, req *proto.Message, opts ...client.CallOption) (*proto.Empty, error) {
-	rsp := &proto.Empty{}
+func (c *loggerServiceClient) Log(ctx context.Context, req *proto.LogReq, opts ...client.CallOption) (*proto.LogRsp, error) {
+	rsp := &proto.LogRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "LoggerService.Log", req), rsp, opts...)
 	if err != nil {
 		return nil, err
@ -34,13 +34,13 @@ type loggerServiceServer struct {
 	LoggerServiceServer
 }

-func (h *loggerServiceServer) Log(ctx context.Context, req *proto.Message, rsp *proto.Empty) error {
+func (h *loggerServiceServer) Log(ctx context.Context, req *proto.LogReq, rsp *proto.LogRsp) error {
 	return h.LoggerServiceServer.Log(ctx, req, rsp)
 }

 func RegisterLoggerServiceServer(s server.Server, sh LoggerServiceServer, opts ...server.HandlerOption) error {
 	type loggerService interface {
-		Log(ctx context.Context, req *proto.Message, rsp *proto.Empty) error
+		Log(ctx context.Context, req *proto.LogReq, rsp *proto.LogRsp) error
 	}
 	type LoggerService struct {
 		loggerService
--- a/proto/service.pb.go
+++ b/proto/service.pb.go
@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.17.3
+// 	protoc        v3.19.4
 // source: service.proto

 package servicepb
@ -20,14 +20,14 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )

-type Empty struct {
+type LogRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 }

-func (x *Empty) Reset() {
-	*x = Empty{}
+func (x *LogRsp) Reset() {
+	*x = LogRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_service_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -35,13 +35,13 @@ func (x *Empty) Reset() {
 	}
 }

-func (x *Empty) String() string {
+func (x *LogRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }

-func (*Empty) ProtoMessage() {}
+func (*LogRsp) ProtoMessage() {}

-func (x *Empty) ProtoReflect() protoreflect.Message {
+func (x *LogRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_service_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -53,12 +53,12 @@ func (x *Empty) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }

-// Deprecated: Use Empty.ProtoReflect.Descriptor instead.
-func (*Empty) Descriptor() ([]byte, []int) {
+// Deprecated: Use LogRsp.ProtoReflect.Descriptor instead.
+func (*LogRsp) Descriptor() ([]byte, []int) {
 	return file_service_proto_rawDescGZIP(), []int{0}
 }

-type Message struct {
+type LogReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@ -69,8 +69,8 @@ type Message struct {
 	Fields []*Field `protobuf:"bytes,4,rep,name=fields,proto3" json:"fields,omitempty"`
 }

-func (x *Message) Reset() {
-	*x = Message{}
+func (x *LogReq) Reset() {
+	*x = LogReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_service_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -78,13 +78,13 @@ func (x *Message) Reset() {
 	}
 }

-func (x *Message) String() string {
+func (x *LogReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }

-func (*Message) ProtoMessage() {}
+func (*LogReq) ProtoMessage() {}

-func (x *Message) ProtoReflect() protoreflect.Message {
+func (x *LogReq) ProtoReflect() protoreflect.Message {
 	mi := &file_service_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -96,33 +96,33 @@ func (x *Message) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }

-// Deprecated: Use Message.ProtoReflect.Descriptor instead.
-func (*Message) Descriptor() ([]byte, []int) {
+// Deprecated: Use LogReq.ProtoReflect.Descriptor instead.
+func (*LogReq) Descriptor() ([]byte, []int) {
 	return file_service_proto_rawDescGZIP(), []int{1}
 }

-func (x *Message) GetLevel() int32 {
+func (x *LogReq) GetLevel() int32 {
 	if x != nil {
 		return x.Level
 	}
 	return 0
 }

-func (x *Message) GetFormat() string {
+func (x *LogReq) GetFormat() string {
 	if x != nil {
 		return x.Format
 	}
 	return ""
 }

-func (x *Message) GetMsg() string {
+func (x *LogReq) GetMsg() string {
 	if x != nil {
 		return x.Msg
 	}
 	return ""
 }

-func (x *Message) GetFields() []*Field {
+func (x *LogReq) GetFields() []*Field {
 	if x != nil {
 		return x.Fields
 	}
@ -135,12 +135,7 @@ type Field struct {
 	unknownFields protoimpl.UnknownFields

 	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-	// Types that are assignable to Val:
-	//	*Field_DoubleVal
-	//	*Field_FloatVal
-	//	*Field_Int32Val
-	//	*Field_Int64Val
-	Val isField_Val `protobuf_oneof:"val"`
+	Val string `protobuf:"bytes,2,opt,name=val,proto3" json:"val,omitempty"`
 }

 func (x *Field) Reset() {
@ -182,101 +177,37 @@ func (x *Field) GetKey() string {
 	return ""
 }

-func (m *Field) GetVal() isField_Val {
-	if m != nil {
-		return m.Val
+func (x *Field) GetVal() string {
+	if x != nil {
+		return x.Val
 	}
-	return nil
+	return ""
 }

-func (x *Field) GetDoubleVal() float64 {
-	if x, ok := x.GetVal().(*Field_DoubleVal); ok {
-		return x.DoubleVal
-	}
-	return 0
-}
-
-func (x *Field) GetFloatVal() float32 {
-	if x, ok := x.GetVal().(*Field_FloatVal); ok {
-		return x.FloatVal
-	}
-	return 0
-}
-
-func (x *Field) GetInt32Val() int32 {
-	if x, ok := x.GetVal().(*Field_Int32Val); ok {
-		return x.Int32Val
-	}
-	return 0
-}
-
-func (x *Field) GetInt64Val() int64 {
-	if x, ok := x.GetVal().(*Field_Int64Val); ok {
-		return x.Int64Val
-	}
-	return 0
-}
-
-type isField_Val interface {
-	isField_Val()
-}
-
-type Field_DoubleVal struct {
-	// https://developers.google.com/protocol-buffers/docs/proto3#scalar
-	DoubleVal float64 `protobuf:"fixed64,2,opt,name=double_val,json=doubleVal,proto3,oneof"`
-}
-
-type Field_FloatVal struct {
-	FloatVal float32 `protobuf:"fixed32,3,opt,name=float_val,json=floatVal,proto3,oneof"`
-}
-
-type Field_Int32Val struct {
-	Int32Val int32 `protobuf:"varint,4,opt,name=int32_val,json=int32Val,proto3,oneof"`
-}
-
-type Field_Int64Val struct {
-	Int64Val int64 `protobuf:"varint,5,opt,name=int64_val,json=int64Val,proto3,oneof"` //1
-}
-
-func (*Field_DoubleVal) isField_Val() {}
-
-func (*Field_FloatVal) isField_Val() {}
-
-func (*Field_Int32Val) isField_Val() {}
-
-func (*Field_Int64Val) isField_Val() {}
-
 var File_service_proto protoreflect.FileDescriptor

 var file_service_proto_rawDesc = []byte{
 	0x0a, 0x0d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x09, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x22, 0x73, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x14,
+	0x09, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x22, 0x08, 0x0a, 0x06, 0x4c, 0x6f,
+	0x67, 0x52, 0x73, 0x70, 0x22, 0x72, 0x0a, 0x06, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x12, 0x14,
 	0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c,
 	0x65, 0x76, 0x65, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x10, 0x0a, 0x03,
 	0x6d, 0x73, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x28,
 	0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10,
 	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64,
-	0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x22, 0x9e, 0x01, 0x0a, 0x05, 0x46, 0x69, 0x65,
-	0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x0a, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x76,
-	0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x09, 0x64, 0x6f, 0x75, 0x62,
-	0x6c, 0x65, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x09, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x5f, 0x76,
-	0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x48, 0x00, 0x52, 0x08, 0x66, 0x6c, 0x6f, 0x61,
-	0x74, 0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x5f, 0x76, 0x61,
-	0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x33, 0x32,
-	0x56, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x76, 0x61, 0x6c,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x56,
-	0x61, 0x6c, 0x42, 0x05, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x32, 0x3e, 0x0a, 0x0d, 0x4c, 0x6f, 0x67,
-	0x67, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x2d, 0x0a, 0x03, 0x4c, 0x6f,
-	0x67, 0x12, 0x12, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x2e, 0x4d, 0x65,
-	0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x10, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70,
-	0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x6f, 0x2e,
-	0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63,
-	0x72, 0x6f, 0x2d, 0x6c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x22, 0x2b, 0x0a, 0x05, 0x46, 0x69, 0x65, 0x6c,
+	0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x76, 0x61, 0x6c, 0x32, 0x3e, 0x0a, 0x0d, 0x4c, 0x6f, 0x67, 0x67, 0x65, 0x72, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x2d, 0x0a, 0x03, 0x4c, 0x6f, 0x67, 0x12, 0x11, 0x2e,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x2e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71,
+	0x1a, 0x11, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x2e, 0x4c, 0x6f, 0x67,
+	0x52, 0x73, 0x70, 0x22, 0x00, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73,
+	0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x6c,
+	0x6f, 0x67, 0x67, 0x65, 0x72, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x33,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }

 var (
@ -293,14 +224,14 @@ func file_service_proto_rawDescGZIP() []byte {

 var file_service_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_service_proto_goTypes = []interface{}{
-	(*Empty)(nil),   // 0: servicepb.Empty
-	(*Message)(nil), // 1: servicepb.Message
+	(*LogRsp)(nil), // 0: servicepb.LogRsp
+	(*LogReq)(nil), // 1: servicepb.LogReq
 	(*Field)(nil),  // 2: servicepb.Field
 }
 var file_service_proto_depIdxs = []int32{
-	2, // 0: servicepb.Message.fields:type_name -> servicepb.Field
-	1, // 1: servicepb.LoggerService.Log:input_type -> servicepb.Message
-	0, // 2: servicepb.LoggerService.Log:output_type -> servicepb.Empty
+	2, // 0: servicepb.LogReq.fields:type_name -> servicepb.Field
+	1, // 1: servicepb.LoggerService.Log:input_type -> servicepb.LogReq
+	0, // 2: servicepb.LoggerService.Log:output_type -> servicepb.LogRsp
 	2, // [2:3] is the sub-list for method output_type
 	1, // [1:2] is the sub-list for method input_type
 	1, // [1:1] is the sub-list for extension type_name
@ -315,7 +246,7 @@ func file_service_proto_init() {
 	}
 	if !protoimpl.UnsafeEnabled {
 		file_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Empty); i {
+			switch v := v.(*LogRsp); i {
 			case 0:
 				return &v.state
 			case 1:
@ -327,7 +258,7 @@ func file_service_proto_init() {
 			}
 		}
 		file_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Message); i {
+			switch v := v.(*LogReq); i {
 			case 0:
 				return &v.state
 			case 1:
@ -351,12 +282,6 @@ func file_service_proto_init() {
 			}
 		}
 	}
-	file_service_proto_msgTypes[2].OneofWrappers = []interface{}{
-		(*Field_DoubleVal)(nil),
-		(*Field_FloatVal)(nil),
-		(*Field_Int32Val)(nil),
-		(*Field_Int64Val)(nil),
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
--- a/proto/service.proto
+++ b/proto/service.proto
@ -4,12 +4,12 @@ package servicepb;
 option go_package="go.unistack.org/micro-logger-service/v3/proto;servicepb";

 service LoggerService {
-	rpc Log(Message) returns (Empty) {};
+	rpc Log(LogReq) returns (LogRsp) {};
 }

-message Empty {};
+message LogRsp {};

-message Message {
+message LogReq {
  int32 level = 1;
 	string format = 2;
 	string msg = 3;
@ -18,12 +18,5 @@ message Message {

 message Field {
  string key = 1;
-  oneof val {
-    // https://developers.google.com/protocol-buffers/docs/proto3#scalar
-    double double_val = 2;
-    float float_val = 3;
-    int32 int32_val = 4;
-    int64 int64_val = 5;
-    //1
-  };
+  string val = 2;
 };
--- a/proto/service_grpc.pb.go
+++ b/proto/service_grpc.pb.go
@ -1,4 +1,8 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-grpc v1.2.0
+// - protoc             v3.19.4
+// source: service.proto

 package servicepb

@ -18,7 +22,7 @@ const _ = grpc.SupportPackageIsVersion7
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type LoggerServiceClient interface {
-	Log(ctx context.Context, in *Message, opts ...grpc.CallOption) (*Empty, error)
+	Log(ctx context.Context, in *LogReq, opts ...grpc.CallOption) (*LogRsp, error)
 }

 type loggerServiceClient struct {
@ -29,8 +33,8 @@ func NewLoggerServiceClient(cc grpc.ClientConnInterface) LoggerServiceClient {
 	return &loggerServiceClient{cc}
 }

-func (c *loggerServiceClient) Log(ctx context.Context, in *Message, opts ...grpc.CallOption) (*Empty, error) {
-	out := new(Empty)
+func (c *loggerServiceClient) Log(ctx context.Context, in *LogReq, opts ...grpc.CallOption) (*LogRsp, error) {
+	out := new(LogRsp)
 	err := c.cc.Invoke(ctx, "/servicepb.LoggerService/Log", in, out, opts...)
 	if err != nil {
 		return nil, err
@ -42,7 +46,7 @@ func (c *loggerServiceClient) Log(ctx context.Context, in *Message, opts ...grpc
 // All implementations must embed UnimplementedLoggerServiceServer
 // for forward compatibility
 type LoggerServiceServer interface {
-	Log(context.Context, *Message) (*Empty, error)
+	Log(context.Context, *LogReq) (*LogRsp, error)
 	mustEmbedUnimplementedLoggerServiceServer()
 }

@ -50,7 +54,7 @@ type LoggerServiceServer interface {
 type UnimplementedLoggerServiceServer struct {
 }

-func (UnimplementedLoggerServiceServer) Log(context.Context, *Message) (*Empty, error) {
+func (UnimplementedLoggerServiceServer) Log(context.Context, *LogReq) (*LogRsp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Log not implemented")
 }
 func (UnimplementedLoggerServiceServer) mustEmbedUnimplementedLoggerServiceServer() {}
@ -67,7 +71,7 @@ func RegisterLoggerServiceServer(s grpc.ServiceRegistrar, srv LoggerServiceServe
 }

 func _LoggerService_Log_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(Message)
+	in := new(LogReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@ -79,7 +83,7 @@ func _LoggerService_Log_Handler(srv interface{}, ctx context.Context, dec func(i
 		FullMethod: "/servicepb.LoggerService/Log",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(LoggerServiceServer).Log(ctx, req.(*Message))
+		return srv.(LoggerServiceServer).Log(ctx, req.(*LogReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
--- a/service.go
+++ b/service.go
@ -13,12 +13,13 @@ import (
 	"go.unistack.org/micro/v3/store"
 )

+var _ logger.Logger = &serviceLogger{}
+
 type serviceLogger struct {
 	opts    logger.Options
 	service string
 	client  pbmicro.LoggerServiceClient
 	store   store.Store
-	fields  []interface{}
 }

 func (l *serviceLogger) Clone(opts ...logger.Option) logger.Logger {
@ -34,6 +35,7 @@ func (l *serviceLogger) Level(lvl logger.Level) {
 }

 func (l *serviceLogger) Init(opts ...logger.Option) error {
+	// TODO: optimize to store only []string as fields
 	for _, o := range opts {
 		o(&l.opts)
 	}
@ -62,9 +64,8 @@ func (l *serviceLogger) Init(opts ...logger.Option) error {
 }

 func (l *serviceLogger) Fields(fields ...interface{}) logger.Logger {
-	nl := &serviceLogger{fields: l.fields, service: l.service, opts: l.opts, client: l.client, store: l.store}
-	nl.fields = append(nl.fields, fields...)
-	return nl
+	// TODO: optimize to store only []string as fields
+	return l.Clone(logger.WithFields(fields...))
 }

 func (l *serviceLogger) V(level logger.Level) bool {
@ -123,17 +124,15 @@ func (l *serviceLogger) Fatalf(ctx context.Context, msg string, args ...interfac

 func (l *serviceLogger) Log(ctx context.Context, level logger.Level, args ...interface{}) {
 	msg := l.newMessage(level, "", args...)
-	_, err := l.client.Log(ctx, msg)
-	if err != nil {
-		l.storeMessage(ctx, msg)
+	if _, err := l.client.Log(ctx, msg); err != nil {
+		_ = l.storeMessage(ctx, msg)
 	}
 }

 func (l *serviceLogger) Logf(ctx context.Context, level logger.Level, format string, args ...interface{}) {
 	msg := l.newMessage(level, "", args...)
-	_, err := l.client.Log(ctx, msg)
-	if err != nil {
-		l.storeMessage(ctx, msg)
+	if _, err := l.client.Log(ctx, msg); err != nil {
+		_ = l.storeMessage(ctx, msg)
 	}
 }

@ -152,12 +151,18 @@ func NewLogger(opts ...logger.Option) logger.Logger {
 	return l
 }

-func (l *serviceLogger) newMessage(level logger.Level, format string, args ...interface{}) *pb.Message {
-	msg := &pb.Message{Level: int32(level), Format: format}
+func (l *serviceLogger) newMessage(level logger.Level, format string, args ...interface{}) *pb.LogReq {
+	msg := &pb.LogReq{Level: int32(level), Format: format, Fields: make([]*pb.Field, 0, len(l.opts.Fields)/2)}
+	for idx := 0; idx < len(l.opts.Fields); idx += 2 {
+		msg.Fields = append(msg.Fields, &pb.Field{
+			Key: fmt.Sprintf("%v", l.opts.Fields[idx]),
+			Val: fmt.Sprintf("%v", l.opts.Fields[idx+1]),
+		})
+	}
 	return msg
 }

-func (l *serviceLogger) storeMessage(ctx context.Context, msg *pb.Message) error {
+func (l *serviceLogger) storeMessage(ctx context.Context, msg *pb.LogReq) error {
 	if l.store == nil {
 		return nil
 	}