Vasiliy Tolstov 3cd27c71d9
usability fixes (#75)
* Bump google.golang.org/grpc from 1.41.0 to 1.43.0 (#53)

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.41.0 to 1.43.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.41.0...v1.43.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* logger updates (#57)

* logger: update for latest micro

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

* update all

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

* Bump go.unistack.org/micro/v3 from 3.8.15 to 3.8.16

Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.15 to 3.8.16.
- [Release notes](https://github.com/unistack-org/micro/releases)
- [Commits](https://github.com/unistack-org/micro/compare/v3.8.15...v3.8.16)

---
updated-dependencies:
- dependency-name: go.unistack.org/micro/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump go.unistack.org/micro/v3 from 3.8.16 to 3.8.18

Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.16 to 3.8.18.
- [Release notes](https://github.com/unistack-org/micro/releases)
- [Commits](https://github.com/unistack-org/micro/compare/v3.8.16...v3.8.18)

---
updated-dependencies:
- dependency-name: go.unistack.org/micro/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump go.unistack.org/micro/v3 from 3.8.18 to 3.8.19

Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.18 to 3.8.19.
- [Release notes](https://github.com/unistack-org/micro/releases)
- [Commits](https://github.com/unistack-org/micro/compare/v3.8.18...v3.8.19)

---
updated-dependencies:
- dependency-name: go.unistack.org/micro/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump go.unistack.org/micro/v3 from 3.8.19 to 3.8.20

Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.19 to 3.8.20.
- [Release notes](https://github.com/unistack-org/micro/releases)
- [Commits](https://github.com/unistack-org/micro/compare/v3.8.19...v3.8.20)

---
updated-dependencies:
- dependency-name: go.unistack.org/micro/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump go.unistack.org/micro/v3 from 3.8.20 to 3.8.21

Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.20 to 3.8.21.
- [Release notes](https://github.com/unistack-org/micro/releases)
- [Commits](https://github.com/unistack-org/micro/compare/v3.8.20...v3.8.21)

---
updated-dependencies:
- dependency-name: go.unistack.org/micro/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump golangci/golangci-lint-action from 2 to 3 (#66)

Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 2 to 3.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](https://github.com/golangci/golangci-lint-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump dependabot/fetch-metadata from 1.1.1 to 1.2.1 (#65)

Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.1.1 to 1.2.1.
- [Release notes](https://github.com/dependabot/fetch-metadata/releases)
- [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.1.1...v1.2.1)

---
updated-dependencies:
- dependency-name: dependabot/fetch-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump google.golang.org/grpc from 1.43.0 to 1.44.0 (#61)

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.43.0 to 1.44.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.43.0...v1.44.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Vasiliy Tolstov <v.tolstov@unistack.org>

* Bump dependabot/fetch-metadata from 1.2.1 to 1.3.0

Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/dependabot/fetch-metadata/releases)
- [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.2.1...v1.3.0)

---
updated-dependencies:
- dependency-name: dependabot/fetch-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* update workflows

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

* Update pr.yml

* update go version

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

* complete logger service

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-13 11:34:39 +03:00

175 lines
4.5 KiB
Go

package service // import "go.unistack.org/micro-logger-service/v3"
import (
"context"
"fmt"
"os"
"github.com/google/uuid"
pbmicro "go.unistack.org/micro-logger-service/v3/micro"
pb "go.unistack.org/micro-logger-service/v3/proto"
"go.unistack.org/micro/v3/client"
"go.unistack.org/micro/v3/logger"
"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
}
func (l *serviceLogger) Init(opts ...logger.Option) error {
// TODO: optimize to store only []string as fields
for _, o := range opts {
o(&l.opts)
}
var cli client.Client
if l.opts.Context != nil {
if v, ok := l.opts.Context.Value(clientKey{}).(client.Client); ok && v != nil {
cli = v
}
if v, ok := l.opts.Context.Value(serviceKey{}).(string); ok && v != "" {
l.service = v
}
}
if l.service == "" {
return fmt.Errorf("missing Service option")
}
if cli == nil {
return fmt.Errorf("missing Client option")
}
l.client = pbmicro.NewLoggerServiceClient(l.service, cli)
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) V(level logger.Level) bool {
return l.opts.Level >= level
}
func (l *serviceLogger) Info(ctx context.Context, args ...interface{}) {
l.Log(ctx, logger.InfoLevel, args...)
}
func (l *serviceLogger) Error(ctx context.Context, args ...interface{}) {
l.Log(ctx, logger.ErrorLevel, args...)
}
func (l *serviceLogger) Warn(ctx context.Context, args ...interface{}) {
l.Log(ctx, logger.WarnLevel, args...)
}
func (l *serviceLogger) Debug(ctx context.Context, args ...interface{}) {
l.Log(ctx, logger.DebugLevel, args...)
}
func (l *serviceLogger) Trace(ctx context.Context, args ...interface{}) {
l.Log(ctx, logger.TraceLevel, args...)
}
func (l *serviceLogger) Fatal(ctx context.Context, args ...interface{}) {
l.Log(ctx, logger.FatalLevel, args...)
os.Exit(1)
}
func (l *serviceLogger) Infof(ctx context.Context, msg string, args ...interface{}) {
l.Logf(ctx, logger.InfoLevel, msg, args...)
}
func (l *serviceLogger) Errorf(ctx context.Context, msg string, args ...interface{}) {
l.Logf(ctx, logger.ErrorLevel, msg, args...)
}
func (l *serviceLogger) Warnf(ctx context.Context, msg string, args ...interface{}) {
l.Logf(ctx, logger.WarnLevel, msg, args...)
}
func (l *serviceLogger) Debugf(ctx context.Context, msg string, args ...interface{}) {
l.Logf(ctx, logger.DebugLevel, msg, args...)
}
func (l *serviceLogger) Tracef(ctx context.Context, msg string, args ...interface{}) {
l.Logf(ctx, logger.TraceLevel, msg, args...)
}
func (l *serviceLogger) Fatalf(ctx context.Context, msg string, args ...interface{}) {
l.Logf(ctx, logger.FatalLevel, msg, args...)
os.Exit(1)
}
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)
}
}
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)
}
}
func (l *serviceLogger) String() string {
return "service"
}
func (l *serviceLogger) Options() logger.Options {
return l.opts
}
// NewLogger builds a new logger based on options
func NewLogger(opts ...logger.Option) logger.Logger {
options := logger.NewOptions(opts...)
l := &serviceLogger{opts: options}
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]),
})
}
return msg
}
func (l *serviceLogger) storeMessage(ctx context.Context, msg *pb.LogReq) error {
if l.store == nil {
return nil
}
uid, err := uuid.NewRandom()
if err != nil {
return err
}
return l.store.Write(ctx, uid.String(), msg)
}