Merge pull request 'issue_296' (#300) from devstigneev/micro:issue_296 into master

Reviewed-on: #300

.gitea/workflows/autoupdate.yml

@@ -5,8 +5,8 @@ on:
     - 'master'
     - 'v3'
   schedule:
-    - cron: '* * * * *'
-    #- cron: '@hourly'
+    #- cron: '* * * * *'
+    - cron: '@hourly'
 
 jobs:
   autoupdate:

.gitea/workflows/pr.yml

@@ -20,4 +20,4 @@ jobs:
     - name: test
       env:
         INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
+      run: go test -v -mod readonly -race -coverprofile=coverage.txt -covermode=atomic ./...

config/default.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/uuid"
 	"dario.cat/mergo"
+	"github.com/google/uuid"
 	"go.unistack.org/micro/v4/options"
 	mid "go.unistack.org/micro/v4/util/id"
 	rutil "go.unistack.org/micro/v4/util/reflect"
@@ -40,6 +40,10 @@ func (c *defaultConfig) Init(opts ...options.Option) error {
 }
 
 func (c *defaultConfig) Load(ctx context.Context, opts ...options.Option) error {
+	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
+		return nil
+	}
+
 	if err := DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
@@ -292,7 +296,11 @@ func fillValues(valueOf reflect.Value, tname string) error {
 	return nil
 }
 
-func (c *defaultConfig) Save(ctx context.Context, opts ...options.Option) error {
+func (c *defaultConfig) Save(ctx context.Context, _ ...options.Option) error {
+	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
+		return nil
+	}
+
 	if err := DefaultBeforeSave(ctx, c); err != nil {
 		return err
 	}

config/options.go

@@ -43,6 +43,10 @@ type Options struct {
 	AfterInit []func(context.Context, Config) error
 	// AllowFail flag to allow fail in config source
 	AllowFail bool
+	// SkipLoad runs only if condition returns true
+	SkipLoad func(context.Context, Config) bool
+	// SkipSave runs only if condition returns true
+	SkipSave func(context.Context, Config) bool
 }
 
 // NewOptions new options struct with filed values

database/dsn.go

@@ -0,0 +1,157 @@
+package database
+
+import (
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"net/url"
+	"strings"
+)
+
+var (
+	ErrInvalidDSNAddr      = errors.New("invalid dsn addr")
+	ErrInvalidDSNUnescaped = errors.New("dsn must be escaped")
+	ErrInvalidDSNNoSlash   = errors.New("dsn must contains slash")
+)
+
+type Config struct {
+	TLSConfig *tls.Config
+	Username  string
+	Password  string
+	Scheme    string
+	Host      string
+	Port      string
+	Database  string
+	Params    []string
+}
+
+func (cfg *Config) FormatDSN() string {
+	var s strings.Builder
+
+	if len(cfg.Scheme) > 0 {
+		s.WriteString(cfg.Scheme + "://")
+	}
+	// [username[:password]@]
+	if len(cfg.Username) > 0 {
+		s.WriteString(cfg.Username)
+		if len(cfg.Password) > 0 {
+			s.WriteByte(':')
+			s.WriteString(url.PathEscape(cfg.Password))
+		}
+		s.WriteByte('@')
+	}
+
+	// [host:port]
+	if len(cfg.Host) > 0 {
+		s.WriteString(cfg.Host)
+		if len(cfg.Port) > 0 {
+			s.WriteByte(':')
+			s.WriteString(cfg.Port)
+		}
+	}
+
+	// /dbname
+	s.WriteByte('/')
+	s.WriteString(url.PathEscape(cfg.Database))
+
+	for i := 0; i < len(cfg.Params); i += 2 {
+		if i == 0 {
+			s.WriteString("?")
+		} else {
+			s.WriteString("&")
+		}
+		s.WriteString(cfg.Params[i])
+		s.WriteString("=")
+		s.WriteString(cfg.Params[i+1])
+	}
+
+	return s.String()
+}
+
+func ParseDSN(dsn string) (*Config, error) {
+	cfg := &Config{}
+
+	// [user[:password]@][net[(addr)]]/dbname[?param1=value1&paramN=valueN]
+	// Find last '/' that goes before dbname
+	foundSlash := false
+	for i := len(dsn) - 1; i >= 0; i-- {
+		if dsn[i] == '/' {
+			foundSlash = true
+			var j, k int
+
+			// left part is empty if i <= 0
+			if i > 0 {
+				// Find the first ':' in dsn
+				for j = i; j >= 0; j-- {
+					if dsn[j] == ':' {
+						cfg.Scheme = dsn[0:j]
+					}
+				}
+
+				// [username[:password]@][host]
+				// Find the last '@' in dsn[:i]
+				for j = i; j >= 0; j-- {
+					if dsn[j] == '@' {
+						// username[:password]
+						// Find the second ':' in dsn[:j]
+						for k = 0; k < j; k++ {
+							if dsn[k] == ':' {
+								if cfg.Scheme == dsn[:k] {
+									continue
+								}
+								var err error
+								cfg.Password, err = url.PathUnescape(dsn[k+1 : j])
+								if err != nil {
+									return nil, err
+								}
+								break
+							}
+						}
+						cfg.Username = dsn[len(cfg.Scheme)+3 : k]
+						break
+					}
+				}
+
+				for k = j + 1; k < i; k++ {
+					if dsn[k] == ':' {
+						cfg.Host = dsn[j+1 : k]
+						cfg.Port = dsn[k+1 : i]
+						break
+					}
+				}
+
+			}
+
+			// dbname[?param1=value1&...&paramN=valueN]
+			// Find the first '?' in dsn[i+1:]
+			for j = i + 1; j < len(dsn); j++ {
+				if dsn[j] == '?' {
+					parts := strings.Split(dsn[j+1:], "&")
+					cfg.Params = make([]string, 0, len(parts)*2)
+					for _, p := range parts {
+						k, v, found := strings.Cut(p, "=")
+						if !found {
+							continue
+						}
+						cfg.Params = append(cfg.Params, k, v)
+					}
+
+					break
+				}
+			}
+			var err error
+			dbname := dsn[i+1 : j]
+			if cfg.Database, err = url.PathUnescape(dbname); err != nil {
+				return nil, fmt.Errorf("invalid dbname %q: %w", dbname, err)
+			}
+
+			break
+		}
+	}
+
+	if !foundSlash && len(dsn) > 0 {
+		return nil, ErrInvalidDSNNoSlash
+	}
+
+	return cfg, nil
+}

database/dsn_test.go

@@ -0,0 +1,31 @@
+package database
+
+import (
+	"net/url"
+	"testing"
+)
+
+func TestParseDSN(t *testing.T) {
+	cfg, err := ParseDSN("postgres://username:p@ssword#@host:12345/dbname?key1=val2&key2=val2")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cfg.Password != "p@ssword#" {
+		t.Fatalf("parsing error")
+	}
+}
+
+func TestFormatDSN(t *testing.T) {
+	src := "postgres://username:p@ssword#@host:12345/dbname?key1=val2&key2=val2"
+	cfg, err := ParseDSN(src)
+	if err != nil {
+		t.Fatal(err)
+	}
+	dst, err := url.PathUnescape(cfg.FormatDSN())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if src != dst {
+		t.Fatalf("\n%s\n%s", src, dst)
+	}
+}

fsm/fsm_test.go

@@ -17,7 +17,7 @@ func TestFSMStart(t *testing.T) {
 
 	wrapper := func(next StateFunc) StateFunc {
 		return func(sctx context.Context, s State, opts ...StateOption) (State, error) {
-			sctx = logger.NewContext(sctx, logger.Fields("state", s.Name()))
+			sctx = logger.NewContext(sctx, logger.Attrs("state", s.Name()))
 			return next(sctx, s, opts...)
 		}
 	}

logger/logger.go

@@ -1,26 +1,25 @@
 // Package logger provides a log interface
-package logger // import "go.unistack.org/micro/v4/logger"
+package logger
 
 import (
 	"context"
-	"os"
 
 	"go.unistack.org/micro/v4/options"
 )
 
-var (
-	// DefaultLogger variable
-	DefaultLogger = NewLogger(WithLevel(ParseLevel(os.Getenv("MICRO_LOG_LEVEL"))))
-	// DefaultLevel used by logger
-	DefaultLevel = InfoLevel
-	// DefaultCallerSkipCount used by logger
-	DefaultCallerSkipCount = 2
-)
-
 type ContextAttrFunc func(ctx context.Context) []interface{}
 
 var DefaultContextAttrFuncs []ContextAttrFunc
 
+var (
+	// DefaultLogger variable
+	DefaultLogger = NewLogger()
+	// DefaultLevel used by logger
+	DefaultLevel = InfoLevel
+	// DefaultCallerSkipCount used by logger
+	DefaultCallerSkipCount = 2
+)
+
 // Logger is a generic logging interface
 type Logger interface {
 	// Init initialises options

logger/noop.go

@@ -0,0 +1,71 @@
+package logger
+
+import (
+	"context"
+
+	"go.unistack.org/micro/v4/options"
+)
+
+type noopLogger struct {
+	opts Options
+}
+
+func NewLogger(opts ...options.Option) Logger {
+	options := NewOptions(opts...)
+	return &noopLogger{opts: options}
+}
+
+func (l *noopLogger) V(lvl Level) bool {
+	return false
+}
+
+func (l *noopLogger) Level(lvl Level) {
+}
+
+func (l *noopLogger) Init(opts ...options.Option) error {
+	for _, o := range opts {
+		o(&l.opts)
+	}
+	return nil
+}
+
+func (l *noopLogger) Clone(opts ...options.Option) Logger {
+	nl := &noopLogger{opts: l.opts}
+	for _, o := range opts {
+		o(&nl.opts)
+	}
+	return nl
+}
+
+func (l *noopLogger) Attrs(attrs ...interface{}) Logger {
+	return l
+}
+
+func (l *noopLogger) Options() Options {
+	return l.opts
+}
+
+func (l *noopLogger) String() string {
+	return "noop"
+}
+
+func (l *noopLogger) Log(ctx context.Context, lvl Level, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Info(ctx context.Context, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Error(ctx context.Context, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Warn(ctx context.Context, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) {
+}

logger/options.go

@@ -3,6 +3,7 @@ package logger
 import (
 	"context"
 	"io"
+	"log/slog"
 	"os"
 	"reflect"
 
@@ -26,6 +27,14 @@ type Options struct {
 	CallerSkipCount int
 	// ContextAttrFuncs contains funcs that executed before log func on context
 	ContextAttrFuncs []ContextAttrFunc
+	// TimeKey is the key used for the time of the log call
+	TimeKey string
+	// LevelKey is the key used for the level of the log call
+	LevelKey string
+	// MessageKey is the key used for the message of the log call
+	MessageKey string
+	// SourceKey is the key used for the source file and line of the log call
+	SourceKey string
 }
 
 // NewOptions creates new options struct
@@ -38,6 +47,9 @@ func NewOptions(opts ...options.Option) Options {
 		Context:          context.Background(),
 		ContextAttrFuncs: DefaultContextAttrFuncs,
 	}
+
+	WithMicroKeys()(&options)
+
 	for _, o := range opts {
 		o(&options)
 	}
@@ -45,16 +57,16 @@ func NewOptions(opts ...options.Option) Options {
 }
 
 // WithContextAttrFuncs appends default funcs for the context arrts filler
-func WithContextAttrFuncs(attrs ...interface{}) options.Option {
+func WithContextAttrFuncs(fncs ...ContextAttrFunc) options.Option {
 	return func(src interface{}) error {
 		v, err := options.Get(src, ".ContextAttrFuncs")
 		if err != nil {
 			return err
 		} else if rutil.IsZero(v) {
-			v = reflect.MakeSlice(reflect.TypeOf(v), 0, len(attrs)).Interface()
+			v = reflect.MakeSlice(reflect.TypeOf(v), 0, len(fncs)).Interface()
 		}
 		cv := reflect.ValueOf(v)
-		for _, l := range attrs {
+		for _, l := range fncs {
 			cv = reflect.Append(cv, reflect.ValueOf(l))
 		}
 		return options.Set(src, cv.Interface(), ".ContextAttrFuncs")
@@ -88,3 +100,79 @@ func WithCallerSkipCount(c int) options.Option {
 		return options.Set(src, c, ".CallerSkipCount")
 	}
 }
+
+func WithZapKeys() options.Option {
+	return func(src interface{}) error {
+		var err error
+		if err = options.Set(src, "@timestamp", ".TimeKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, "level", ".LevelKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, "msg", ".MessageKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, "caller", ".SourceKey"); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func WithZerologKeys() options.Option {
+	return func(src interface{}) error {
+		var err error
+		if err = options.Set(src, "time", ".TimeKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, "level", ".LevelKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, "message", ".MessageKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, "caller", ".SourceKey"); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func WithSlogKeys() options.Option {
+	return func(src interface{}) error {
+		var err error
+		if err = options.Set(src, slog.TimeKey, ".TimeKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, slog.LevelKey, ".LevelKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, slog.MessageKey, ".MessageKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, slog.SourceKey, ".SourceKey"); err != nil {
+			return err
+		}
+		return nil
+	}
+}
+
+func WithMicroKeys() options.Option {
+	return func(src interface{}) error {
+		var err error
+		if err = options.Set(src, "timestamp", ".TimeKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, "level", ".LevelKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, "msg", ".MessageKey"); err != nil {
+			return err
+		}
+		if err = options.Set(src, "caller", ".SourceKey"); err != nil {
+			return err
+		}
+		return nil
+	}
+}

logger/slog/slog.go

@@ -1,4 +1,4 @@
-package logger
+package slog
 
 import (
 	"context"
@@ -8,7 +8,9 @@ import (
 	"strconv"
 	"time"
 
+	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 var (
@@ -20,29 +22,32 @@ var (
 	fatalValue = slog.StringValue("fatal")
 )
 
-var renameAttr = func(_ []string, a slog.Attr) slog.Attr {
+func (s *slogLogger) renameAttr(_ []string, a slog.Attr) slog.Attr {
 	switch a.Key {
 	case slog.SourceKey:
 		source := a.Value.Any().(*slog.Source)
 		a.Value = slog.StringValue(source.File + ":" + strconv.Itoa(source.Line))
-		a.Key = "caller"
+		a.Key = s.opts.SourceKey
 	case slog.TimeKey:
-		a.Key = "timestamp"
+		a.Key = s.opts.TimeKey
+	case slog.MessageKey:
+		a.Key = s.opts.MessageKey
 	case slog.LevelKey:
 		level := a.Value.Any().(slog.Level)
 		lvl := slogToLoggerLevel(level)
+		a.Key = s.opts.LevelKey
 		switch {
-		case lvl < DebugLevel:
+		case lvl < logger.DebugLevel:
 			a.Value = traceValue
-		case lvl < InfoLevel:
+		case lvl < logger.InfoLevel:
 			a.Value = debugValue
-		case lvl < WarnLevel:
+		case lvl < logger.WarnLevel:
 			a.Value = infoValue
-		case lvl < ErrorLevel:
+		case lvl < logger.ErrorLevel:
 			a.Value = warnValue
-		case lvl < FatalLevel:
+		case lvl < logger.FatalLevel:
 			a.Value = errorValue
-		case lvl >= FatalLevel:
+		case lvl >= logger.FatalLevel:
 			a.Value = fatalValue
 		default:
 			a.Value = infoValue
@@ -55,10 +60,10 @@ var renameAttr = func(_ []string, a slog.Attr) slog.Attr {
 type slogLogger struct {
 	slog    *slog.Logger
 	leveler *slog.LevelVar
-	opts    Options
+	opts    logger.Options
 }
 
-func (s *slogLogger) Clone(opts ...options.Option) Logger {
+func (s *slogLogger) Clone(opts ...options.Option) logger.Logger {
 	options := s.opts
 
 	for _, o := range opts {
@@ -69,14 +74,16 @@ func (s *slogLogger) Clone(opts ...options.Option) Logger {
 		opts: options,
 	}
 
-	if slog, ok := s.opts.Context.Value(loggerKey{}).(*slog.Logger); ok {
-		l.slog = slog
-		return nil
-	}
+	/*
+		if slog, ok := s.opts.Context.Value(loggerKey{}).(*slog.Logger); ok {
+			l.slog = slog
+			return nil
+		}
+	*/
 
 	l.leveler = new(slog.LevelVar)
 	handleOpt := &slog.HandlerOptions{
-		ReplaceAttr: renameAttr,
+		ReplaceAttr: s.renameAttr,
 		Level:       l.leveler,
 		AddSource:   true,
 	}
@@ -87,25 +94,25 @@ func (s *slogLogger) Clone(opts ...options.Option) Logger {
 	return l
 }
 
-func (s *slogLogger) V(level Level) bool {
+func (s *slogLogger) V(level logger.Level) bool {
 	return s.opts.Level.Enabled(level)
 }
 
-func (s *slogLogger) Level(level Level) {
+func (s *slogLogger) Level(level logger.Level) {
 	s.leveler.Set(loggerToSlogLevel(level))
 }
 
-func (s *slogLogger) Options() Options {
+func (s *slogLogger) Options() logger.Options {
 	return s.opts
 }
 
-func (s *slogLogger) Attrs(attrs ...interface{}) Logger {
+func (s *slogLogger) Attrs(attrs ...interface{}) logger.Logger {
 	nl := &slogLogger{opts: s.opts}
 	nl.leveler = new(slog.LevelVar)
 	nl.leveler.Set(s.leveler.Level())
 
 	handleOpt := &slog.HandlerOptions{
-		ReplaceAttr: renameAttr,
+		ReplaceAttr: nl.renameAttr,
 		Level:       s.leveler,
 		AddSource:   true,
 	}
@@ -117,20 +124,25 @@ func (s *slogLogger) Attrs(attrs ...interface{}) Logger {
 }
 
 func (s *slogLogger) Init(opts ...options.Option) error {
+	if len(s.opts.ContextAttrFuncs) == 0 {
+		s.opts.ContextAttrFuncs = logger.DefaultContextAttrFuncs
+	}
 	for _, o := range opts {
 		if err := o(&s.opts); err != nil {
 			return err
 		}
 	}
 
-	if slog, ok := s.opts.Context.Value(loggerKey{}).(*slog.Logger); ok {
-		s.slog = slog
-		return nil
-	}
+	/*
+		if slog, ok := s.opts.Context.Value(loggerKey{}).(*slog.Logger); ok {
+			s.slog = slog
+			return nil
+		}
+	*/
 
 	s.leveler = new(slog.LevelVar)
 	handleOpt := &slog.HandlerOptions{
-		ReplaceAttr: renameAttr,
+		ReplaceAttr: s.renameAttr,
 		Level:       s.leveler,
 		AddSource:   true,
 	}
@@ -141,7 +153,7 @@ func (s *slogLogger) Init(opts ...options.Option) error {
 	return nil
 }
 
-func (s *slogLogger) Log(ctx context.Context, lvl Level, msg string, attrs ...interface{}) {
+func (s *slogLogger) Log(ctx context.Context, lvl logger.Level, msg string, attrs ...interface{}) {
 	if !s.V(lvl) {
 		return
 	}
@@ -149,77 +161,86 @@ func (s *slogLogger) Log(ctx context.Context, lvl Level, msg string, attrs ...in
 	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
 	r := slog.NewRecord(time.Now(), loggerToSlogLevel(lvl), msg, pcs[0])
 	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx))
+		attrs = append(attrs, fn(ctx)...)
 	}
 	r.Add(attrs...)
 	_ = s.slog.Handler().Handle(ctx, r)
 }
 
 func (s *slogLogger) Info(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
+	if !s.V(logger.InfoLevel) {
 		return
 	}
 	var pcs [1]uintptr
 	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
 	r := slog.NewRecord(time.Now(), slog.LevelInfo, msg, pcs[0])
 	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx))
+		attrs = append(attrs, fn(ctx)...)
 	}
 	r.Add(attrs...)
 	_ = s.slog.Handler().Handle(ctx, r)
 }
 
 func (s *slogLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
+	if !s.V(logger.DebugLevel) {
 		return
 	}
 	var pcs [1]uintptr
 	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
 	r := slog.NewRecord(time.Now(), slog.LevelDebug, msg, pcs[0])
 	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx))
+		attrs = append(attrs, fn(ctx)...)
 	}
 	r.Add(attrs...)
 	_ = s.slog.Handler().Handle(ctx, r)
 }
 
 func (s *slogLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
+	if !s.V(logger.TraceLevel) {
 		return
 	}
 	var pcs [1]uintptr
 	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
 	r := slog.NewRecord(time.Now(), slog.LevelDebug-1, msg, pcs[0])
 	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx))
+		attrs = append(attrs, fn(ctx)...)
 	}
 	r.Add(attrs...)
 	_ = s.slog.Handler().Handle(ctx, r)
 }
 
 func (s *slogLogger) Error(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
+	if !s.V(logger.ErrorLevel) {
 		return
 	}
 	var pcs [1]uintptr
 	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
 	r := slog.NewRecord(time.Now(), slog.LevelError, msg, pcs[0])
 	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx))
+		attrs = append(attrs, fn(ctx)...)
 	}
 	r.Add(attrs...)
+	r.Attrs(func(a slog.Attr) bool {
+		if a.Key == "error" {
+			if span, ok := tracer.SpanFromContext(ctx); ok {
+				span.SetStatus(tracer.SpanStatusError, a.Value.String())
+				return false
+			}
+		}
+		return true
+	})
 	_ = s.slog.Handler().Handle(ctx, r)
 }
 
 func (s *slogLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
+	if !s.V(logger.FatalLevel) {
 		return
 	}
 	var pcs [1]uintptr
 	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
 	r := slog.NewRecord(time.Now(), slog.LevelError+1, msg, pcs[0])
 	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx))
+		attrs = append(attrs, fn(ctx)...)
 	}
 	r.Add(attrs...)
 	_ = s.slog.Handler().Handle(ctx, r)
@@ -227,14 +248,14 @@ func (s *slogLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}
 }
 
 func (s *slogLogger) Warn(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
+	if !s.V(logger.WarnLevel) {
 		return
 	}
 	var pcs [1]uintptr
 	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
 	r := slog.NewRecord(time.Now(), slog.LevelWarn, msg, pcs[0])
 	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx))
+		attrs = append(attrs, fn(ctx)...)
 	}
 	r.Add(attrs...)
 	_ = s.slog.Handler().Handle(ctx, r)
@@ -244,43 +265,43 @@ func (s *slogLogger) String() string {
 	return "slog"
 }
 
-func NewLogger(opts ...options.Option) Logger {
+func NewLogger(opts ...options.Option) logger.Logger {
 	l := &slogLogger{
-		opts: NewOptions(opts...),
+		opts: logger.NewOptions(opts...),
 	}
 	return l
 }
 
-func loggerToSlogLevel(level Level) slog.Level {
+func loggerToSlogLevel(level logger.Level) slog.Level {
 	switch level {
-	case DebugLevel:
+	case logger.DebugLevel:
 		return slog.LevelDebug
-	case WarnLevel:
+	case logger.WarnLevel:
 		return slog.LevelWarn
-	case ErrorLevel:
+	case logger.ErrorLevel:
 		return slog.LevelError
-	case TraceLevel:
+	case logger.TraceLevel:
 		return slog.LevelDebug - 1
-	case FatalLevel:
+	case logger.FatalLevel:
 		return slog.LevelError + 1
 	default:
 		return slog.LevelInfo
 	}
 }
 
-func slogToLoggerLevel(level slog.Level) Level {
+func slogToLoggerLevel(level slog.Level) logger.Level {
 	switch level {
 	case slog.LevelDebug:
-		return DebugLevel
+		return logger.DebugLevel
 	case slog.LevelWarn:
-		return WarnLevel
+		return logger.WarnLevel
 	case slog.LevelError:
-		return ErrorLevel
+		return logger.ErrorLevel
 	case slog.LevelDebug - 1:
-		return TraceLevel
+		return logger.TraceLevel
 	case slog.LevelError + 1:
-		return FatalLevel
+		return logger.FatalLevel
 	default:
-		return InfoLevel
+		return logger.InfoLevel
 	}
 }

logger/slog/slog_test.go

@@ -1,21 +1,23 @@
-package logger
+package slog
 
 import (
 	"bytes"
 	"context"
 	"log"
 	"testing"
+
+	"go.unistack.org/micro/v4/logger"
 )
 
 func TestContext(t *testing.T) {
 	ctx := context.TODO()
 	buf := bytes.NewBuffer(nil)
-	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}
 
-	nl, ok := FromContext(NewContext(ctx, l.Attrs("key", "val")))
+	nl, ok := logger.FromContext(logger.NewContext(ctx, l.Attrs("key", "val")))
 	if !ok {
 		t.Fatal("context without logger")
 	}
@@ -28,7 +30,7 @@ func TestContext(t *testing.T) {
 func TestAttrs(t *testing.T) {
 	ctx := context.TODO()
 	buf := bytes.NewBuffer(nil)
-	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}
@@ -45,15 +47,15 @@ func TestFromContextWithFields(t *testing.T) {
 	ctx := context.TODO()
 	buf := bytes.NewBuffer(nil)
 	var ok bool
-	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}
 	nl := l.Attrs("key", "val")
 
-	ctx = NewContext(ctx, nl)
+	ctx = logger.NewContext(ctx, nl)
 
-	l, ok = FromContext(ctx)
+	l, ok = logger.FromContext(ctx)
 	if !ok {
 		t.Fatalf("context does not have logger")
 	}
@@ -67,11 +69,11 @@ func TestFromContextWithFields(t *testing.T) {
 func TestClone(t *testing.T) {
 	ctx := context.TODO()
 	buf := bytes.NewBuffer(nil)
-	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}
-	nl := l.Clone(WithLevel(ErrorLevel))
+	nl := l.Clone(logger.WithLevel(logger.ErrorLevel))
 	if err := nl.Init(); err != nil {
 		t.Fatal(err)
 	}
@@ -87,11 +89,11 @@ func TestClone(t *testing.T) {
 
 func TestRedirectStdLogger(t *testing.T) {
 	buf := bytes.NewBuffer(nil)
-	l := NewLogger(WithLevel(ErrorLevel), WithOutput(buf))
+	l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(buf))
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}
-	fn := RedirectStdLogger(l, ErrorLevel)
+	fn := logger.RedirectStdLogger(l, logger.ErrorLevel)
 	defer fn()
 	log.Print("test")
 	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"error"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"test"`))) {
@@ -101,11 +103,11 @@ func TestRedirectStdLogger(t *testing.T) {
 
 func TestStdLogger(t *testing.T) {
 	buf := bytes.NewBuffer(nil)
-	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}
-	lg := NewStdLogger(l, ErrorLevel)
+	lg := logger.NewStdLogger(l, logger.ErrorLevel)
 	lg.Print("test")
 	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"error"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"test"`))) {
 		t.Fatalf("logger error, buf %s", buf.Bytes())
@@ -115,7 +117,7 @@ func TestStdLogger(t *testing.T) {
 func TestLogger(t *testing.T) {
 	ctx := context.TODO()
 	buf := bytes.NewBuffer(nil)
-	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}

micro.go

@@ -0,0 +1,94 @@
+package micro
+
+import (
+	"reflect"
+
+	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/flow"
+	"go.unistack.org/micro/v4/fsm"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/register"
+	"go.unistack.org/micro/v4/resolver"
+	"go.unistack.org/micro/v4/router"
+	"go.unistack.org/micro/v4/selector"
+	"go.unistack.org/micro/v4/server"
+	"go.unistack.org/micro/v4/store"
+	"go.unistack.org/micro/v4/sync"
+	"go.unistack.org/micro/v4/tracer"
+)
+
+func As(b any, target any) bool {
+	if b == nil {
+		return false
+	}
+	if target == nil {
+		return false
+	}
+	val := reflect.ValueOf(target)
+	typ := val.Type()
+	if typ.Kind() != reflect.Ptr || val.IsNil() {
+		return false
+	}
+	targetType := typ.Elem()
+	if targetType.Kind() != reflect.Interface {
+		switch {
+		case targetType.Implements(brokerType):
+			break
+		case targetType.Implements(loggerType):
+			break
+		case targetType.Implements(clientType):
+			break
+		case targetType.Implements(serverType):
+			break
+		case targetType.Implements(codecType):
+			break
+		case targetType.Implements(flowType):
+			break
+		case targetType.Implements(fsmType):
+			break
+		case targetType.Implements(meterType):
+			break
+		case targetType.Implements(registerType):
+			break
+		case targetType.Implements(resolverType):
+			break
+		case targetType.Implements(selectorType):
+			break
+		case targetType.Implements(storeType):
+			break
+		case targetType.Implements(syncType):
+			break
+		case targetType.Implements(serviceType):
+			break
+		case targetType.Implements(routerType):
+			break
+		default:
+			return false
+		}
+	}
+	if reflect.TypeOf(b).AssignableTo(targetType) {
+		val.Elem().Set(reflect.ValueOf(b))
+		return true
+	}
+	return false
+}
+
+var brokerType = reflect.TypeOf((*broker.Broker)(nil)).Elem()
+var loggerType = reflect.TypeOf((*logger.Logger)(nil)).Elem()
+var clientType = reflect.TypeOf((*client.Client)(nil)).Elem()
+var serverType = reflect.TypeOf((*server.Server)(nil)).Elem()
+var codecType = reflect.TypeOf((*codec.Codec)(nil)).Elem()
+var flowType = reflect.TypeOf((*flow.Flow)(nil)).Elem()
+var fsmType = reflect.TypeOf((*fsm.FSM)(nil)).Elem()
+var meterType = reflect.TypeOf((*meter.Meter)(nil)).Elem()
+var registerType = reflect.TypeOf((*register.Register)(nil)).Elem()
+var resolverType = reflect.TypeOf((*resolver.Resolver)(nil)).Elem()
+var routerType = reflect.TypeOf((*router.Router)(nil)).Elem()
+var selectorType = reflect.TypeOf((*selector.Selector)(nil)).Elem()
+var storeType = reflect.TypeOf((*store.Store)(nil)).Elem()
+var syncType = reflect.TypeOf((*sync.Sync)(nil)).Elem()
+var tracerType = reflect.TypeOf((*tracer.Tracer)(nil)).Elem()
+var serviceType = reflect.TypeOf((*Service)(nil)).Elem()

micro_test.go

@@ -0,0 +1,103 @@
+package micro
+
+import (
+	"context"
+	"fmt"
+	"reflect"
+	"testing"
+
+	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v4/fsm"
+	"go.unistack.org/micro/v4/options"
+)
+
+func TestAs(t *testing.T) {
+	var b *bro
+	broTarget := &bro{name: "kafka"}
+	fsmTarget := &fsmT{name: "fsm"}
+
+	testCases := []struct {
+		b      any
+		target any
+		match  bool
+		want   any
+	}{
+		{
+			broTarget,
+			&b,
+			true,
+			broTarget,
+		},
+		{
+			nil,
+			&b,
+			false,
+			nil,
+		},
+		{
+			fsmTarget,
+			&b,
+			false,
+			nil,
+		},
+	}
+	for i, tc := range testCases {
+		name := fmt.Sprintf("%d:As(Errorf(..., %v), %v)", i, tc.b, tc.target)
+		// Clear the target pointer, in case it was set in a previous test.
+		rtarget := reflect.ValueOf(tc.target)
+		rtarget.Elem().Set(reflect.Zero(reflect.TypeOf(tc.target).Elem()))
+		t.Run(name, func(t *testing.T) {
+			match := As(tc.b, tc.target)
+			if match != tc.match {
+				t.Fatalf("match: got %v; want %v", match, tc.match)
+			}
+			if !match {
+				return
+			}
+			if got := rtarget.Elem().Interface(); got != tc.want {
+				t.Fatalf("got %#v, want %#v", got, tc.want)
+			}
+		})
+	}
+}
+
+type bro struct {
+	name string
+}
+
+func (p *bro) Name() string                      { return p.name }
+func (p *bro) Init(opts ...options.Option) error { return nil }
+
+// Options returns broker options
+func (p *bro) Options() broker.Options { return broker.Options{} }
+
+// Address return configured address
+func (p *bro) Address() string { return "" }
+
+// Connect connects to broker
+func (p *bro) Connect(ctx context.Context) error { return nil }
+
+// Disconnect disconnect from broker
+func (p *bro) Disconnect(ctx context.Context) error { return nil }
+
+// Publish message, msg can be single broker.Message or []broker.Message
+func (p *bro) Publish(ctx context.Context, msg interface{}, opts ...options.Option) error { return nil }
+
+// Subscribe subscribes to topic message via handler
+func (p *bro) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...options.Option) (broker.Subscriber, error) {
+	return nil, nil
+}
+
+// String type of broker
+func (p *bro) String() string { return p.name }
+
+type fsmT struct {
+	name string
+}
+
+func (f *fsmT) Start(ctx context.Context, a interface{}, o ...Option) (interface{}, error) {
+	return nil, nil
+}
+func (f *fsmT) Current() string                  { return f.name }
+func (f *fsmT) Reset()                           {}
+func (f *fsmT) State(s string, sf fsm.StateFunc) {}

options/options.go

@@ -151,9 +151,19 @@ func ContentType(ct string) Option {
 }
 
 // Metadata pass additional metadata
-func Metadata(md metadata.Metadata) Option {
+func Metadata(md any) Option {
+	result := metadata.Metadata{}
+	switch vt := md.(type) {
+	case metadata.Metadata:
+		result = metadata.Copy(vt)
+	case map[string]string:
+		result = metadata.Copy(vt)
+	case []string:
+		result.Set(vt...)
+	}
+
 	return func(src interface{}) error {
-		return Set(src, metadata.Copy(md), ".Metadata")
+		return Set(src, result, ".Metadata")
 	}
 }
 

options/options_test.go

@@ -1,10 +1,13 @@
 package options_test
 
 import (
+	"fmt"
 	"testing"
 
 	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/metadata"
 	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/util/reflect"
 )
 
 func TestAddress(t *testing.T) {
@@ -84,3 +87,69 @@ func TestLabels(t *testing.T) {
 		t.Fatal("failed to set labels")
 	}
 }
+
+func TestMetadataAny(t *testing.T) {
+	type s struct {
+		Metadata metadata.Metadata
+	}
+
+	testCases := []struct {
+		Name     string
+		Data     any
+		Expected metadata.Metadata
+	}{
+		{
+			"strings_even",
+			[]string{"key1", "val1", "key2", "val2"},
+			metadata.Metadata{
+				"Key1": "val1",
+				"Key2": "val2",
+			},
+		},
+		{
+			"strings_odd",
+			[]string{"key1", "val1", "key2"},
+			metadata.Metadata{
+				"Key1": "val1",
+			},
+		},
+		{
+			"map",
+			map[string]string{
+				"key1": "val1",
+				"key2": "val2",
+			},
+			metadata.Metadata{
+				"Key1": "val1",
+				"Key2": "val2",
+			},
+		},
+		{
+			"metadata.Metadata",
+			metadata.Metadata{
+				"key1": "val1",
+				"key2": "val2",
+			},
+			metadata.Metadata{
+				"Key1": "val1",
+				"Key2": "val2",
+			},
+		},
+	}
+
+	for _, tt := range testCases {
+		t.Run(tt.Name, func(t *testing.T) {
+			src := &s{}
+			var opts []options.Option
+			opts = append(opts, options.Metadata(tt.Data))
+			for _, o := range opts {
+				if err := o(src); err != nil {
+					t.Fatal(err)
+				}
+				if !reflect.Equal(tt.Expected, src.Metadata) {
+					t.Fatal(fmt.Sprintf("expected: %v, actual: %v", tt.Expected, src.Metadata))
+				}
+			}
+		})
+	}
+}

service.go

@@ -372,19 +372,71 @@ func (s *service) Run() error {
 	return s.Stop()
 }
 
-type nameIface interface {
-	Name() string
-}
-
 func getNameIndex(n string, ifaces interface{}) int {
-	values, ok := ifaces.([]interface{})
-	if !ok {
-		return 0
-	}
-	for idx, iface := range values {
-		if ifc, ok := iface.(nameIface); ok && ifc.Name() == n {
-			return idx
+	switch values := ifaces.(type) {
+	case []router.Router:
+		for idx, iface := range values {
+			if iface.Name() == n {
+				return idx
+			}
 		}
+	case []register.Register:
+		for idx, iface := range values {
+			if iface.Name() == n {
+				return idx
+			}
+		}
+	case []store.Store:
+		for idx, iface := range values {
+			if iface.Name() == n {
+				return idx
+			}
+		}
+	case []tracer.Tracer:
+		for idx, iface := range values {
+			if iface.Name() == n {
+				return idx
+			}
+		}
+	case []server.Server:
+		for idx, iface := range values {
+			if iface.Name() == n {
+				return idx
+			}
+		}
+	case []config.Config:
+		for idx, iface := range values {
+			if iface.Name() == n {
+				return idx
+			}
+		}
+	case []meter.Meter:
+		for idx, iface := range values {
+			if iface.Name() == n {
+				return idx
+			}
+		}
+	case []broker.Broker:
+		for idx, iface := range values {
+			if iface.Name() == n {
+				return idx
+			}
+		}
+	case []client.Client:
+		for idx, iface := range values {
+			if iface.Name() == n {
+				return idx
+			}
+		}
+		/*
+			case []logger.Logger:
+					for idx, iface := range values {
+						if iface.Name() == n {
+							return idx
+						}
+					}
+		*/
 	}
+
 	return 0
 }

service_test.go

@@ -17,20 +17,18 @@ import (
 	"go.unistack.org/micro/v4/tracer"
 )
 
-type testItem struct {
-	name string
-}
+func TestClient(t *testing.T) {
+	c1 := client.NewClient(options.Name("test1"))
+	c2 := client.NewClient(options.Name("test2"))
 
-func (ti *testItem) Name() string {
-	return ti.name
-}
+	svc := NewService(Client(c1, c2))
+	if err := svc.Init(); err != nil {
+		t.Fatal(err)
+	}
 
-func TestGetNameIndex(t *testing.T) {
-	item1 := &testItem{name: "first"}
-	item2 := &testItem{name: "second"}
-	items := []interface{}{item1, item2}
-	if idx := getNameIndex("second", items); idx != 1 {
-		t.Fatalf("getNameIndex func error, item not found")
+	x1 := svc.Client("test2")
+	if x1.Name() != "test2" {
+		t.Fatal("invalid client")
 	}
 }
 

tracer/noop.go

@@ -27,8 +27,8 @@ func (t *noopTracer) Start(ctx context.Context, name string, opts ...options.Opt
 		labels: options.Labels,
 		kind:   options.Kind,
 	}
-	span.spanID, _ = id.New()
-	span.traceID, _ = id.New()
+	span.spanID.s, _ = id.New()
+	span.traceID.s, _ = id.New()
 	if span.ctx == nil {
 		span.ctx = context.Background()
 	}
@@ -56,18 +56,26 @@ type noopEvent struct {
 	labels []interface{}
 }
 
+type noopStringer struct {
+	s string
+}
+
+func (s noopStringer) String() string {
+	return s.s
+}
+
 type noopSpan struct {
 	ctx       context.Context
 	tracer    Tracer
 	name      string
 	statusMsg string
+	traceID   noopStringer
+	spanID    noopStringer
 	events    []*noopEvent
 	labels    []interface{}
 	logs      []interface{}
 	kind      SpanKind
 	status    SpanStatus
-	traceID   string
-	spanID    string
 }
 
 func (s *noopSpan) Finish(opts ...options.Option) {
@@ -103,11 +111,11 @@ func (s *noopSpan) Kind() SpanKind {
 }
 
 func (s *noopSpan) TraceID() string {
-	return s.traceID
+	return s.traceID.String()
 }
 
 func (s *noopSpan) SpanID() string {
-	return s.spanID
+	return s.spanID.String()
 }
 
 func (s *noopSpan) Status() (SpanStatus, string) {

tracer/tracer_test.go

@@ -0,0 +1,28 @@
+package tracer_test
+
+import (
+	"bytes"
+	"context"
+	"strings"
+	"testing"
+
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/logger/slog"
+	"go.unistack.org/micro/v4/tracer"
+)
+
+func TestLoggerWithTracer(t *testing.T) {
+	ctx := context.TODO()
+	buf := bytes.NewBuffer(nil)
+	logger.DefaultLogger = slog.NewLogger(logger.WithOutput(buf))
+
+	if err := logger.Init(); err != nil {
+		t.Fatal(err)
+	}
+	var span tracer.Span
+	ctx, span = tracer.DefaultTracer.Start(ctx, "test")
+	logger.Info(ctx, "msg")
+	if !strings.Contains(buf.String(), span.TraceID()) {
+		t.Fatalf("log does not contains tracer id")
+	}
+}