unistack-org/micro-logger-service
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Compare commits

base: unistack-org:v3
Branches Tags
unistack-org:master
unistack-org:v3
unistack-org:v4.0.0
unistack-org:v3.8.1
unistack-org:v3.8.0
unistack-org:v3.1.3
..
compare: unistack-org:v3.8.0
Branches Tags
unistack-org:master
unistack-org:v3
unistack-org:v4.0.0
unistack-org:v3.8.1
unistack-org:v3.8.0
unistack-org:v3.1.3

No commits in common. "v3" and "v3.8.0" have entirely different histories.
v3 ... v3.8.0

14 changed files with 214 additions and 1110 deletions
Show Stats Expand all files Collapse all files

20
.github/workflows/autoapprove.yml vendored
View File

@ -1,20 +0,0 @@
name: "autoapprove"
on:
pull_request_target:
types: [assigned, opened, synchronize, reopened]
permissions:
pull-requests: write
contents: write
jobs:
autoapprove:
runs-on: ubuntu-latest
steps:
- name: approve
uses: hmarr/auto-approve-action@v3
if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
id: approve
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

21
.github/workflows/automerge.yml vendored
View File

@ -1,21 +0,0 @@
name: "automerge"
on:
pull_request_target:
types: [assigned, opened, synchronize, reopened]
permissions:
pull-requests: write
contents: write
jobs:
automerge:
runs-on: ubuntu-latest
if: github.actor == 'vtolstov'
steps:
- name: merge
id: merge
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.TOKEN}}

13
.github/workflows/build.yml vendored
View File

@ -3,20 +3,19 @@ on:
push:
branches:
- master
- v3
jobs:
test:
name: test
runs-on: ubuntu-latest
steps:
- name: setup
uses: actions/setup-go@v3
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.16
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v2
- name: cache
uses: actions/cache@v3
uses: actions/cache@v2
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@ -32,9 +31,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v2
- name: lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v2
continue-on-error: true
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

12
.github/workflows/codeql-analysis.yml vendored
View File

@ -43,14 +43,14 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v2
- name: setup
uses: actions/setup-go@v3
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.16
# Initializes the CodeQL tools for scanning.
- name: init
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v1
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@v2
uses: github/codeql-action/autobuild@v1
# ℹ️ 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@v2
uses: github/codeql-action/analyze@v1

14
.github/workflows/dependabot-automerge.yml vendored
View File

@ -1,4 +1,4 @@
name: "dependabot-automerge"
name: "prautomerge"
on:
pull_request_target:
@ -9,17 +9,21 @@ permissions:
contents: write
jobs:
automerge:
dependabot:
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]'
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: metadata
id: metadata
uses: dependabot/fetch-metadata@v1.3.6
uses: dependabot/fetch-metadata@v1.1.1
with:
github-token: "${{ secrets.TOKEN }}"
- name: approve
run: gh pr review --approve "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.TOKEN}}
- name: merge
id: merge
if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
run: gh pr merge --auto --merge "$PR_URL"
env:

13
.github/workflows/pr.yml vendored
View File

@ -3,20 +3,19 @@ on:
pull_request:
branches:
- master
- v3
jobs:
test:
name: test
runs-on: ubuntu-latest
steps:
- name: setup
uses: actions/setup-go@v3
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.16
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v2
- name: cache
uses: actions/cache@v3
uses: actions/cache@v2
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@ -32,9 +31,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v2
- name: lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v2
continue-on-error: true
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

6
go.mod
View File

@ -4,7 +4,7 @@ go 1.16
require (
github.com/google/uuid v1.3.0
go.unistack.org/micro/v3 v3.10.11
google.golang.org/grpc v1.52.3
google.golang.org/protobuf v1.28.1
go.unistack.org/micro/v3 v3.8.7
google.golang.org/grpc v1.41.0
google.golang.org/protobuf v1.27.1
)

961
go.sum
View File

File diff suppressed because it is too large Load Diff

4
micro/service_micro.pb.go
View File

@ -22,9 +22,9 @@ func NewLoggerServiceEndpoints() []api.Endpoint {
}
type LoggerServiceClient interface {
Log(ctx context.Context, req *proto.LogReq, opts ...client.CallOption) (*proto.LogRsp, error)
Log(ctx context.Context, req *proto.Message, opts ...client.CallOption) (*proto.Empty, error)
}
type LoggerServiceServer interface {
Log(ctx context.Context, req *proto.LogReq, rsp *proto.LogRsp) error
Log(ctx context.Context, req *proto.Message, rsp *proto.Empty) error
}

8
micro/service_micro_rpc.pb.go
View File

@ -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.LogReq, opts ...client.CallOption) (*proto.LogRsp, error) {
rsp := &proto.LogRsp{}
func (c *loggerServiceClient) Log(ctx context.Context, req *proto.Message, opts ...client.CallOption) (*proto.Empty, error) {
rsp := &proto.Empty{}
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.LogReq, rsp *proto.LogRsp) error {
func (h *loggerServiceServer) Log(ctx context.Context, req *proto.Message, rsp *proto.Empty) 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.LogReq, rsp *proto.LogRsp) error
Log(ctx context.Context, req *proto.Message, rsp *proto.Empty) error
}
type LoggerService struct {
loggerService

171
proto/service.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.26.0
// protoc v3.19.4
// protoc v3.17.3
// source: service.proto
package servicepb
@ -20,14 +20,14 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
type LogRsp struct {
type Empty struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *LogRsp) Reset() {
*x = LogRsp{}
func (x *Empty) Reset() {
*x = Empty{}
if protoimpl.UnsafeEnabled {
mi := &file_service_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -35,13 +35,13 @@ func (x *LogRsp) Reset() {
}
}
func (x *LogRsp) String() string {
func (x *Empty) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*LogRsp) ProtoMessage() {}
func (*Empty) ProtoMessage() {}
func (x *LogRsp) ProtoReflect() protoreflect.Message {
func (x *Empty) 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 *LogRsp) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
// Deprecated: Use LogRsp.ProtoReflect.Descriptor instead.
func (*LogRsp) Descriptor() ([]byte, []int) {
// Deprecated: Use Empty.ProtoReflect.Descriptor instead.
func (*Empty) Descriptor() ([]byte, []int) {
return file_service_proto_rawDescGZIP(), []int{0}
}
type LogReq struct {
type Message struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
@ -69,8 +69,8 @@ type LogReq struct {
Fields []*Field `protobuf:"bytes,4,rep,name=fields,proto3" json:"fields,omitempty"`
}
func (x *LogReq) Reset() {
*x = LogReq{}
func (x *Message) Reset() {
*x = Message{}
if protoimpl.UnsafeEnabled {
mi := &file_service_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -78,13 +78,13 @@ func (x *LogReq) Reset() {
}
}
func (x *LogReq) String() string {
func (x *Message) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*LogReq) ProtoMessage() {}
func (*Message) ProtoMessage() {}
func (x *LogReq) ProtoReflect() protoreflect.Message {
func (x *Message) 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 *LogReq) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
// Deprecated: Use LogReq.ProtoReflect.Descriptor instead.
func (*LogReq) Descriptor() ([]byte, []int) {
// Deprecated: Use Message.ProtoReflect.Descriptor instead.
func (*Message) Descriptor() ([]byte, []int) {
return file_service_proto_rawDescGZIP(), []int{1}
}
func (x *LogReq) GetLevel() int32 {
func (x *Message) GetLevel() int32 {
if x != nil {
return x.Level
}
return 0
}
func (x *LogReq) GetFormat() string {
func (x *Message) GetFormat() string {
if x != nil {
return x.Format
}
return ""
}
func (x *LogReq) GetMsg() string {
func (x *Message) GetMsg() string {
if x != nil {
return x.Msg
}
return ""
}
func (x *LogReq) GetFields() []*Field {
func (x *Message) GetFields() []*Field {
if x != nil {
return x.Fields
}
@ -135,7 +135,12 @@ type Field struct {
unknownFields protoimpl.UnknownFields
Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
Val string `protobuf:"bytes,2,opt,name=val,proto3" json:"val,omitempty"`
// Types that are assignable to Val:
// *Field_DoubleVal
// *Field_FloatVal
// *Field_Int32Val
// *Field_Int64Val
Val isField_Val `protobuf_oneof:"val"`
}
func (x *Field) Reset() {
@ -177,37 +182,101 @@ func (x *Field) GetKey() string {
return ""
}
func (x *Field) GetVal() string {
if x != nil {
return x.Val
func (m *Field) GetVal() isField_Val {
if m != nil {
return m.Val
}
return ""
return nil
}
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, 0x08, 0x0a, 0x06, 0x4c, 0x6f,
0x67, 0x52, 0x73, 0x70, 0x22, 0x72, 0x0a, 0x06, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x12, 0x14,
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,
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, 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,
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,
}
var (
@ -224,14 +293,14 @@ func file_service_proto_rawDescGZIP() []byte {
var file_service_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_service_proto_goTypes = []interface{}{
(*LogRsp)(nil), // 0: servicepb.LogRsp
(*LogReq)(nil), // 1: servicepb.LogReq
(*Field)(nil), // 2: servicepb.Field
(*Empty)(nil), // 0: servicepb.Empty
(*Message)(nil), // 1: servicepb.Message
(*Field)(nil), // 2: servicepb.Field
}
var file_service_proto_depIdxs = []int32{
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, // 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, // [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
@ -246,7 +315,7 @@ func file_service_proto_init() {
}
if !protoimpl.UnsafeEnabled {
file_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LogRsp); i {
switch v := v.(*Empty); i {
case 0:
return &v.state
case 1:
@ -258,7 +327,7 @@ func file_service_proto_init() {
}
}
file_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*LogReq); i {
switch v := v.(*Message); i {
case 0:
return &v.state
case 1:
@ -282,6 +351,12 @@ 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{

15
proto/service.proto
View File

@ -4,12 +4,12 @@ package servicepb;
option go_package="go.unistack.org/micro-logger-service/v3/proto;servicepb";
service LoggerService {
rpc Log(LogReq) returns (LogRsp) {};
rpc Log(Message) returns (Empty) {};
}
message LogRsp {};
message Empty {};
message LogReq {
message Message {
int32 level = 1;
string format = 2;
string msg = 3;
@ -18,5 +18,12 @@ message LogReq {
message Field {
string key = 1;
string val = 2;
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
};
};

18
proto/service_grpc.pb.go
View File

@ -1,8 +1,4 @@
// 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
@ -22,7 +18,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 *LogReq, opts ...grpc.CallOption) (*LogRsp, error)
Log(ctx context.Context, in *Message, opts ...grpc.CallOption) (*Empty, error)
}
type loggerServiceClient struct {
@ -33,8 +29,8 @@ func NewLoggerServiceClient(cc grpc.ClientConnInterface) LoggerServiceClient {
return &loggerServiceClient{cc}
}
func (c *loggerServiceClient) Log(ctx context.Context, in *LogReq, opts ...grpc.CallOption) (*LogRsp, error) {
out := new(LogRsp)
func (c *loggerServiceClient) Log(ctx context.Context, in *Message, opts ...grpc.CallOption) (*Empty, error) {
out := new(Empty)
err := c.cc.Invoke(ctx, "/servicepb.LoggerService/Log", in, out, opts...)
if err != nil {
return nil, err
@ -46,7 +42,7 @@ func (c *loggerServiceClient) Log(ctx context.Context, in *LogReq, opts ...grpc.
// All implementations must embed UnimplementedLoggerServiceServer
// for forward compatibility
type LoggerServiceServer interface {
Log(context.Context, *LogReq) (*LogRsp, error)
Log(context.Context, *Message) (*Empty, error)
mustEmbedUnimplementedLoggerServiceServer()
}
@ -54,7 +50,7 @@ type LoggerServiceServer interface {
type UnimplementedLoggerServiceServer struct {
}
func (UnimplementedLoggerServiceServer) Log(context.Context, *LogReq) (*LogRsp, error) {
func (UnimplementedLoggerServiceServer) Log(context.Context, *Message) (*Empty, error) {
return nil, status.Errorf(codes.Unimplemented, "method Log not implemented")
}
func (UnimplementedLoggerServiceServer) mustEmbedUnimplementedLoggerServiceServer() {}
@ -71,7 +67,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(LogReq)
in := new(Message)
if err := dec(in); err != nil {
return nil, err
}
@ -83,7 +79,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.(*LogReq))
return srv.(LoggerServiceServer).Log(ctx, req.(*Message))
}
return interceptor(ctx, in, info, handler)
}

48
service.go
View File

@ -13,29 +13,15 @@ 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
}
func (l *serviceLogger) Clone(opts ...logger.Option) logger.Logger {
nl := &serviceLogger{service: l.service, store: l.store, client: l.client, opts: l.opts}
for _, o := range opts {
o(&nl.opts)
}
return nl
}
func (l *serviceLogger) Level(lvl logger.Level) {
l.opts.Level = lvl
fields map[string]interface{}
}
func (l *serviceLogger) Init(opts ...logger.Option) error {
// TODO: optimize to store only []string as fields
for _, o := range opts {
o(&l.opts)
}
@ -63,9 +49,13 @@ func (l *serviceLogger) Init(opts ...logger.Option) error {
return nil
}
func (l *serviceLogger) Fields(fields ...interface{}) logger.Logger {
// TODO: optimize to store only []string as fields
return l.Clone(logger.WithFields(fields...))
func (l *serviceLogger) Fields(fields map[string]interface{}) logger.Logger {
nl := &serviceLogger{opts: l.opts, client: l.client, store: l.store}
nl.fields = make(map[string]interface{}, len(fields))
for k, v := range fields {
nl.fields[k] = v
}
return nl
}
func (l *serviceLogger) V(level logger.Level) bool {
@ -124,15 +114,17 @@ 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...)
if _, err := l.client.Log(ctx, msg); err != nil {
_ = l.storeMessage(ctx, msg)
_, err := l.client.Log(ctx, msg)
if 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...)
if _, err := l.client.Log(ctx, msg); err != nil {
_ = l.storeMessage(ctx, msg)
_, err := l.client.Log(ctx, msg)
if err != nil {
l.storeMessage(ctx, msg)
}
}
@ -151,18 +143,12 @@ func NewLogger(opts ...logger.Option) logger.Logger {
return l
}
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]),
})
}
func (l *serviceLogger) newMessage(level logger.Level, format string, args ...interface{}) *pb.Message {
msg := &pb.Message{Level: int32(level), Format: format}
return msg
}
func (l *serviceLogger) storeMessage(ctx context.Context, msg *pb.LogReq) error {
func (l *serviceLogger) storeMessage(ctx context.Context, msg *pb.Message) error {
if l.store == nil {
return nil
}