move options to dedicated package

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

logger/context.go

@@ -20,13 +20,3 @@ func NewContext(ctx context.Context, l Logger) context.Context {
 	}
 	return context.WithValue(ctx, loggerKey{}, l)
 }
-
-// SetOption returns a function to setup a context with given value
-func SetOption(k, v interface{}) Option {
-	return func(o *Options) {
-		if o.Context == nil {
-			o.Context = context.Background()
-		}
-		o.Context = context.WithValue(o.Context, k, v)
-	}
-}

logger/context_test.go

@@ -40,14 +40,3 @@ func TestNewContext(t *testing.T) {
 		t.Fatal("NewContext not works")
 	}
 }
-
-func TestSetOption(t *testing.T) {
-	type key struct{}
-	o := SetOption(key{}, "test")
-	opts := &Options{}
-	o(opts)
-
-	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
-		t.Fatal("SetOption not works")
-	}
-}

logger/default.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"go.unistack.org/micro/v4/options"
 )
 
 type defaultLogger struct {
@@ -18,7 +20,7 @@ type defaultLogger struct {
 }
 
 // Init(opts...) should only overwrite provided options
-func (l *defaultLogger) Init(opts ...Option) error {
+func (l *defaultLogger) Init(opts ...options.Option) error {
 	l.Lock()
 	for _, o := range opts {
 		o(&l.opts)
@@ -33,7 +35,7 @@ func (l *defaultLogger) String() string {
 	return "micro"
 }
 
-func (l *defaultLogger) Clone(opts ...Option) Logger {
+func (l *defaultLogger) Clone(opts ...options.Option) Logger {
 	newopts := NewOptions(opts...)
 	oldopts := l.opts
 	for _, o := range opts {
@@ -221,7 +223,7 @@ func (l *defaultLogger) Options() Options {
 }
 
 // NewLogger builds a new logger based on options
-func NewLogger(opts ...Option) Logger {
+func NewLogger(opts ...options.Option) Logger {
 	l := &defaultLogger{
 		opts: NewOptions(opts...),
 	}

logger/logger.go

@@ -4,6 +4,8 @@ package logger // import "go.unistack.org/micro/v4/logger"
 import (
 	"context"
 	"os"
+
+	"go.unistack.org/micro/v4/options"
 )
 
 var (
@@ -18,9 +20,9 @@ var (
 // Logger is a generic logging interface
 type Logger interface {
 	// Init initialises options
-	Init(opts ...Option) error
+	Init(opts ...options.Option) error
 	// Clone create logger copy with new options
-	Clone(opts ...Option) Logger
+	Clone(opts ...options.Option) Logger
 	// V compare provided verbosity level with current log level
 	V(level Level) bool
 	// Level sets the log level for logger
@@ -130,7 +132,7 @@ func V(level Level) bool {
 }
 
 // Init initialize logger
-func Init(opts ...Option) error {
+func Init(opts ...options.Option) error {
 	return DefaultLogger.Init(opts...)
 }
 

logger/options.go

@@ -4,10 +4,9 @@ import (
 	"context"
 	"io"
 	"os"
-)
 
-// Option func
-type Option func(*Options)
+	"go.unistack.org/micro/v4/options"
+)
 
 // Options holds logger options
 type Options struct {
@@ -26,7 +25,7 @@ type Options struct {
 }
 
 // NewOptions creates new options struct
-func NewOptions(opts ...Option) Options {
+func NewOptions(opts ...options.Option) Options {
 	options := Options{
 		Level:           DefaultLevel,
 		Fields:          make([]interface{}, 0, 6),
@@ -41,43 +40,29 @@ func NewOptions(opts ...Option) Options {
 }
 
 // WithFields set default fields for the logger
-func WithFields(fields ...interface{}) Option {
-	return func(o *Options) {
-		o.Fields = fields
+func WithFields(fields ...interface{}) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fields, ".Fields")
 	}
 }
 
 // WithLevel set default level for the logger
-func WithLevel(level Level) Option {
-	return func(o *Options) {
-		o.Level = level
+func WithLevel(lvl Level) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, lvl, ".Level")
 	}
 }
 
 // WithOutput set default output writer for the logger
-func WithOutput(out io.Writer) Option {
-	return func(o *Options) {
-		o.Out = out
+func WithOutput(out io.Writer) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, out, ".Out")
 	}
 }
 
 // WithCallerSkipCount set frame count to skip
-func WithCallerSkipCount(c int) Option {
-	return func(o *Options) {
-		o.CallerSkipCount = c
-	}
-}
-
-// WithContext set context
-func WithContext(ctx context.Context) Option {
-	return func(o *Options) {
-		o.Context = ctx
-	}
-}
-
-// WithName sets the name
-func WithName(n string) Option {
-	return func(o *Options) {
-		o.Name = n
+func WithCallerSkipCount(c int) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, c, ".CallerSkipCount")
 	}
 }

logger/wrapper/wrapper.go

@@ -29,15 +29,6 @@ var (
 		return labels
 	}
 
-	// DefaultClientPublishObserver called by wrapper in client Publish
-	DefaultClientPublishObserver = func(ctx context.Context, msg client.Message, opts []client.PublishOption, err error) []string {
-		labels := []string{"endpoint", msg.Topic()}
-		if err != nil {
-			labels = append(labels, "error", err.Error())
-		}
-		return labels
-	}
-
 	// DefaultServerHandlerObserver called by wrapper in server Handler
 	DefaultServerHandlerObserver = func(ctx context.Context, req server.Request, rsp interface{}, err error) []string {
 		labels := []string{"service", req.Service(), "endpoint", req.Endpoint()}
@@ -47,15 +38,6 @@ var (
 		return labels
 	}
 
-	// DefaultServerSubscriberObserver called by wrapper in server Subscriber
-	DefaultServerSubscriberObserver = func(ctx context.Context, msg server.Message, err error) []string {
-		labels := []string{"endpoint", msg.Topic()}
-		if err != nil {
-			labels = append(labels, "error", err.Error())
-		}
-		return labels
-	}
-
 	// DefaultClientCallFuncObserver called by wrapper in client CallFunc
 	DefaultClientCallFuncObserver = func(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions, err error) []string {
 		labels := []string{"service", req.Service(), "endpoint", req.Endpoint()}
@@ -71,10 +53,9 @@ var (
 
 type lWrapper struct {
 	client.Client
-	serverHandler    server.HandlerFunc
-	serverSubscriber server.SubscriberFunc
-	clientCallFunc   client.CallFunc
-	opts             Options
+	serverHandler  server.HandlerFunc
+	clientCallFunc client.CallFunc
+	opts           Options
 }
 
 type (
@@ -82,14 +63,10 @@ type (
 	ClientCallObserver func(context.Context, client.Request, interface{}, []client.CallOption, error) []string
 	// ClientStreamObserver func signature
 	ClientStreamObserver func(context.Context, client.Request, []client.CallOption, client.Stream, error) []string
-	// ClientPublishObserver func signature
-	ClientPublishObserver func(context.Context, client.Message, []client.PublishOption, error) []string
 	// ClientCallFuncObserver func signature
 	ClientCallFuncObserver func(context.Context, string, client.Request, interface{}, client.CallOptions, error) []string
 	// ServerHandlerObserver func signature
 	ServerHandlerObserver func(context.Context, server.Request, interface{}, error) []string
-	// ServerSubscriberObserver func signature
-	ServerSubscriberObserver func(context.Context, server.Message, error) []string
 )
 
 // Options struct for wrapper
@@ -98,14 +75,10 @@ type Options struct {
 	Logger logger.Logger
 	// ServerHandlerObservers funcs
 	ServerHandlerObservers []ServerHandlerObserver
-	// ServerSubscriberObservers funcs
-	ServerSubscriberObservers []ServerSubscriberObserver
 	// ClientCallObservers funcs
 	ClientCallObservers []ClientCallObserver
 	// ClientStreamObservers funcs
 	ClientStreamObservers []ClientStreamObserver
-	// ClientPublishObservers funcs
-	ClientPublishObservers []ClientPublishObserver
 	// ClientCallFuncObservers funcs
 	ClientCallFuncObservers []ClientCallFuncObserver
 	// SkipEndpoints
@@ -122,15 +95,13 @@ type Option func(*Options)
 // NewOptions creates Options from Option slice
 func NewOptions(opts ...Option) Options {
 	options := Options{
-		Logger:                    logger.DefaultLogger,
-		Level:                     logger.TraceLevel,
-		ClientCallObservers:       []ClientCallObserver{DefaultClientCallObserver},
-		ClientStreamObservers:     []ClientStreamObserver{DefaultClientStreamObserver},
-		ClientPublishObservers:    []ClientPublishObserver{DefaultClientPublishObserver},
-		ClientCallFuncObservers:   []ClientCallFuncObserver{DefaultClientCallFuncObserver},
-		ServerHandlerObservers:    []ServerHandlerObserver{DefaultServerHandlerObserver},
-		ServerSubscriberObservers: []ServerSubscriberObserver{DefaultServerSubscriberObserver},
-		SkipEndpoints:             DefaultSkipEndpoints,
+		Logger:                  logger.DefaultLogger,
+		Level:                   logger.TraceLevel,
+		ClientCallObservers:     []ClientCallObserver{DefaultClientCallObserver},
+		ClientStreamObservers:   []ClientStreamObserver{DefaultClientStreamObserver},
+		ClientCallFuncObservers: []ClientCallFuncObserver{DefaultClientCallFuncObserver},
+		ServerHandlerObservers:  []ServerHandlerObserver{DefaultServerHandlerObserver},
+		SkipEndpoints:           DefaultSkipEndpoints,
 	}
 
 	for _, o := range opts {
@@ -175,13 +146,6 @@ func WithClientStreamObservers(ob ...ClientStreamObserver) Option {
 	}
 }
 
-// WithClientPublishObservers funcs
-func WithClientPublishObservers(ob ...ClientPublishObserver) Option {
-	return func(o *Options) {
-		o.ClientPublishObservers = ob
-	}
-}
-
 // WithClientCallFuncObservers funcs
 func WithClientCallFuncObservers(ob ...ClientCallFuncObserver) Option {
 	return func(o *Options) {
@@ -196,13 +160,6 @@ func WithServerHandlerObservers(ob ...ServerHandlerObserver) Option {
 	}
 }
 
-// WithServerSubscriberObservers funcs
-func WithServerSubscriberObservers(ob ...ServerSubscriberObserver) Option {
-	return func(o *Options) {
-		o.ServerSubscriberObservers = ob
-	}
-}
-
 // SkipEndpoins
 func SkipEndpoints(eps ...string) Option {
 	return func(o *Options) {
@@ -256,29 +213,6 @@ func (l *lWrapper) Stream(ctx context.Context, req client.Request, opts ...clien
 	return stream, err
 }
 
-func (l *lWrapper) Publish(ctx context.Context, msg client.Message, opts ...client.PublishOption) error {
-	err := l.Client.Publish(ctx, msg, opts...)
-
-	endpoint := msg.Topic()
-	for _, ep := range l.opts.SkipEndpoints {
-		if ep == endpoint {
-			return err
-		}
-	}
-
-	if !l.opts.Enabled {
-		return err
-	}
-
-	var labels []string
-	for _, o := range l.opts.ClientPublishObservers {
-		labels = append(labels, o(ctx, msg, opts, err)...)
-	}
-	l.opts.Logger.Fields(labels).Log(ctx, l.opts.Level)
-
-	return err
-}
-
 func (l *lWrapper) ServerHandler(ctx context.Context, req server.Request, rsp interface{}) error {
 	err := l.serverHandler(ctx, req, rsp)
 
@@ -302,29 +236,6 @@ func (l *lWrapper) ServerHandler(ctx context.Context, req server.Request, rsp in
 	return err
 }
 
-func (l *lWrapper) ServerSubscriber(ctx context.Context, msg server.Message) error {
-	err := l.serverSubscriber(ctx, msg)
-
-	endpoint := msg.Topic()
-	for _, ep := range l.opts.SkipEndpoints {
-		if ep == endpoint {
-			return err
-		}
-	}
-
-	if !l.opts.Enabled {
-		return err
-	}
-
-	var labels []string
-	for _, o := range l.opts.ServerSubscriberObservers {
-		labels = append(labels, o(ctx, msg, err)...)
-	}
-	l.opts.Logger.Fields(labels).Log(ctx, l.opts.Level)
-
-	return err
-}
-
 // NewClientWrapper accepts an open options and returns a Client Wrapper
 func NewClientWrapper(opts ...Option) client.Wrapper {
 	return func(c client.Client) client.Client {
@@ -384,16 +295,3 @@ func NewServerHandlerWrapper(opts ...Option) server.HandlerWrapper {
 		return l.ServerHandler
 	}
 }
-
-// NewServerSubscriberWrapper accepts an options and returns a Subscriber Wrapper
-func NewServerSubscriberWrapper(opts ...Option) server.SubscriberWrapper {
-	return func(h server.SubscriberFunc) server.SubscriberFunc {
-		options := NewOptions()
-		for _, o := range opts {
-			o(&options)
-		}
-
-		l := &lWrapper{opts: options, serverSubscriber: h}
-		return l.ServerSubscriber
-	}
-}