tmp

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

.gitea/pkgdashcli.yaml

@@ -1,3 +0,0 @@
-branches:
-  - master
-  - v3

.gitea/workflows/autoupdate.yml

@@ -1,24 +0,0 @@
-on:
-  push:
-    branches:
-    - 'main'
-    - 'master'
-    - 'v3'
-  schedule:
-    #- cron: '* * * * *'
-    - cron: '@hourly'
-
-jobs:
-  autoupdate:
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup-go
-      uses: https://gitea.com/actions/setup-go@v3
-      with:
-        go-version: 1.21
-    - name: checkout
-      uses: https://gitea.com/actions/checkout@v3
-    - name: get pkgdashcli
-      run: GOPROXY=direct GONOSUMDB="git.unistack.org/*" GONOPROXY="git.unistack.org/*" GOBIN=/bin go install git.unistack.org/unistack-org/pkgdash/cmd/pkgdashcli@latest
-    - name: pkgdashcli check
-      run: /bin/pkgdashcli check

.gitea/workflows/coverage.yml

@@ -1,30 +0,0 @@
-name: Go
-
-on:
-  push:
-    branches: [ master, v3 ]
-  pull_request:
-    branches: [ master, v3 ]
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout
-      uses: actions/checkout@v4
-
-    - name: setup
-      uses: actions/setup-go@v4
-      with:
-        go-version: stable
-
-    - name: coverage
-      run: go test -v -coverprofile coverage.out ./...
-
-    - name: badge
-      uses: ncruces/go-coverage-report@main
-      with:
-        coverage-file: coverage.out
-        reuse-go: true
-        amend: true

.gitea/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
     - name: setup-go
       uses: https://gitea.com/actions/setup-go@v3
       with:
-        go-version: 1.21
+        go-version: 1.18
     - name: checkout
       uses: https://gitea.com/actions/checkout@v3
     - name: deps

.gitea/workflows/pr.yml

@@ -14,10 +14,10 @@ jobs:
     - name: setup-go
       uses: https://gitea.com/actions/setup-go@v3
       with:
-        go-version: 1.21
+        go-version: 1.18
     - name: deps
       run: go get -v -t -d ./...
     - name: test
       env:
         INTEGRATION_TESTS: yes
-      run: go test -v -mod readonly -race -coverprofile=coverage.txt -covermode=atomic ./...
+      run: go test -mod readonly -v ./...

.gitignore

@@ -1,8 +1,6 @@
 # Develop tools
 /.vscode/
 /.idea/
-.idea
-.vscode
 
 # Binaries for programs and plugins
 *.exe
@@ -15,7 +13,6 @@
 _obj
 _test
 _build
-.DS_Store
 
 # Architecture specific extensions/prefixes
 *.[568vq]

.golangci.yml

@@ -1,5 +1,6 @@
 run:
   concurrency: 4
+  deadline: 5m
   issues-exit-code: 1
   tests: true
 
@@ -12,13 +13,15 @@ linters-settings:
 linters:
   enable:
     - govet
+    - deadcode
     - errcheck
     - govet
     - ineffassign
     - staticcheck
+    - structcheck
     - typecheck
     - unused
-    - spancheck
+    - varcheck
     - bodyclose
     - gci
     - goconst
@@ -38,5 +41,4 @@ linters:
     - prealloc
     - unconvert
     - unparam
-    - unused
   disable-all: false

broker/broker.go

@@ -4,14 +4,13 @@ package broker // import "go.unistack.org/micro/v4/broker"
 import (
 	"context"
 	"errors"
-	"time"
 
+	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
 )
 
 // DefaultBroker default memory broker
-var DefaultBroker Broker = NewBroker()
+var DefaultBroker Broker // =  NewBroker()
 
 var (
 	// ErrNotConnected returns when broker used but not connected yet
@@ -20,8 +19,6 @@ var (
 	ErrDisconnected = errors.New("broker disconnected")
 	// ErrInvalidMessage returns when message has nvalid format
 	ErrInvalidMessage = errors.New("broker message has invalid format")
-	// DefaultGracefulTimeout
-	DefaultGracefulTimeout = 5 * time.Second
 )
 
 // Broker is an interface used for asynchronous messaging.
@@ -29,7 +26,7 @@ type Broker interface {
 	// Name returns broker instance name
 	Name() string
 	// Init initilize broker
-	Init(opts ...options.Option) error
+	Init(opts ...Option) error
 	// Options returns broker options
 	Options() Options
 	// Address return configured address
@@ -38,10 +35,12 @@ type Broker interface {
 	Connect(ctx context.Context) error
 	// Disconnect disconnect from broker
 	Disconnect(ctx context.Context) error
-	// Publish message, msg can be single broker.Message or []broker.Message
+	// NewMessage creates new broker message
-	Publish(ctx context.Context, msg interface{}, opts ...options.Option) error
+	NewMessage(endpoint string, req interface{}, opts ...MessageOption) Message
+	// Publish message to broker topic
+	Publish(ctx context.Context, msg interface{}, opts ...PublishOption) error
 	// Subscribe subscribes to topic message via handler
-	Subscribe(ctx context.Context, topic string, handler interface{}, opts ...options.Option) (Subscriber, error)
+	Subscribe(ctx context.Context, topic string, handler interface{}, opts ...SubscribeOption) (Subscriber, error)
 	// String type of broker
 	String() string
 }
@@ -50,11 +49,9 @@ type Broker interface {
 type Message interface {
 	// Context for the message
 	Context() context.Context
-	// Topic
+	// Topic returns event topic
 	Topic() string
-	// Header returns message headers
+	// Body returns broker message
-	Header() metadata.Metadata
-	// Body returns broker message may be []byte slice or some go struct
 	Body() interface{}
 	// Ack acknowledge message
 	Ack() error
@@ -63,6 +60,21 @@ type Message interface {
 	Error() error
 }
 
+// RawMessage is used to transfer data
+type RawMessage struct {
+	// Header contains message metadata
+	Header metadata.Metadata
+	// Body contains message body
+	Body codec.RawMessage
+}
+
+// NewMessage create broker message with topic filled
+func NewRawMessage(topic string) *RawMessage {
+	m := &RawMessage{Header: metadata.New(2)}
+	m.Header.Set(metadata.HeaderTopic, topic)
+	return m
+}
+
 // Subscriber is a convenience return type for the Subscribe method
 type Subscriber interface {
 	// Options returns subscriber options
@@ -72,9 +84,3 @@ type Subscriber interface {
 	// Unsubscribe from topic
 	Unsubscribe(ctx context.Context) error
 }
-
-// MessageHandler func signature for single message processing
-type MessageHandler func(Message) error
-
-// MessagesHandler func signature for batch message processing
-type MessagesHandler func([]Message) error

broker/context.go

@@ -22,3 +22,33 @@ func NewContext(ctx context.Context, s Broker) context.Context {
 	}
 	return context.WithValue(ctx, brokerKey{}, s)
 }
+
+// SetSubscribeOption returns a function to setup a context with given value
+func SetSubscribeOption(k, v interface{}) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}
+
+// 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)
+	}
+}
+
+// SetPublishOption returns a function to setup a context with given value
+func SetPublishOption(k, v interface{}) PublishOption {
+	return func(o *PublishOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}

broker/context_test.go

@@ -37,3 +37,36 @@ func TestNewNilContext(t *testing.T) {
 		t.Fatal("NewContext not works")
 	}
 }
+
+func TestSetSubscribeOption(t *testing.T) {
+	type key struct{}
+	o := SetSubscribeOption(key{}, "test")
+	opts := &SubscribeOptions{}
+	o(opts)
+
+	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
+		t.Fatal("SetSubscribeOption not works")
+	}
+}
+
+func TestSetPublishOption(t *testing.T) {
+	type key struct{}
+	o := SetPublishOption(key{}, "test")
+	opts := &PublishOptions{}
+	o(opts)
+
+	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
+		t.Fatal("SetPublishOption 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")
+	}
+}

broker/memory.go

@@ -1,23 +1,20 @@
+//go:build ignore
+
 package broker
 
 import (
 	"context"
-	"fmt"
 	"sync"
 	"time"
 
-	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v4/semconv"
 	maddr "go.unistack.org/micro/v4/util/addr"
 	"go.unistack.org/micro/v4/util/id"
 	mnet "go.unistack.org/micro/v4/util/net"
 	"go.unistack.org/micro/v4/util/rand"
 )
 
-type MemoryBroker struct {
+type memoryBroker struct {
 	subscribers map[string][]*memorySubscriber
 	addr        string
 	opts        Options
@@ -25,15 +22,15 @@ type MemoryBroker struct {
 	connected bool
 }
 
-func (m *MemoryBroker) Options() Options {
+func (m *memoryBroker) Options() Options {
 	return m.opts
 }
 
-func (m *MemoryBroker) Address() string {
+func (m *memoryBroker) Address() string {
 	return m.addr
 }
 
-func (m *MemoryBroker) Connect(ctx context.Context) error {
+func (m *memoryBroker) Connect(ctx context.Context) error {
 	m.Lock()
 	defer m.Unlock()
 
@@ -57,33 +54,30 @@ func (m *MemoryBroker) Connect(ctx context.Context) error {
 	return nil
 }
 
-func (m *MemoryBroker) Disconnect(ctx context.Context) error {
+func (m *memoryBroker) Disconnect(ctx context.Context) error {
 	m.Lock()
 	defer m.Unlock()
 
-	select {
+	if !m.connected {
-	case <-ctx.Done():
+		return nil
-		return ctx.Err()
+	}
-	default:
+
-		if m.connected {
 	m.connected = false
-		}
-	}
-
 	return nil
 }
 
-func (m *MemoryBroker) Init(opts ...options.Option) error {
+func (m *memoryBroker) Init(opts ...Option) error {
-	var err error
 	for _, o := range opts {
-		if err = o(&m.opts); err != nil {
+		o(&m.opts)
-			return err
-		}
 	}
 	return nil
 }
 
-func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ...options.Option) error {
+func (m *memoryBroker) NewMessage(endpoint string, req interface{}, opts ...MessageOption) Message {
+	return &memoryMessage{}
+}
+
+func (m *memoryBroker) Publish(ctx context.Context, message interface{}, opts ...PublishOption) error {
 	m.RLock()
 	if !m.connected {
 		m.RUnlock()
@@ -98,34 +92,30 @@ func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ..
 		return ctx.Err()
 	default:
 		options := NewPublishOptions(opts...)
-		var msgs []Message
+		var msgs []*memoryMessage
 		switch v := message.(type) {
-		case []Message:
+		case *memoryMessage:
+			msgs = []*memoryMessage{v}
+		case []*memoryMessage:
 			msgs = v
-		case Message:
-			msgs = append(msgs, v)
 		default:
 			return ErrInvalidMessage
 		}
 		msgTopicMap := make(map[string][]*memoryMessage)
 		for _, msg := range msgs {
 			p := &memoryMessage{opts: options}
-			p.topic, _ = msg.Header().Get(metadata.HeaderTopic)
+			/*
-			if v, ok := msg.Body().(*codec.Frame); ok {
+				if mb, ok := msg.Body().(*codec.Frame); ok {
-				p.body = msg.Body()
+					p.message = v.Body
-			} else if len(m.opts.Codecs) == 0 {
-				p.body = msg.Body()
 				} else {
-				cf, ok := m.opts.Codecs[options.ContentType]
+					p.topic, _ = v.Header.Get(metadata.HeaderTopic)
-				if !ok {
+					p.message, err = m.opts.Codec.Marshal(v)
-					return fmt.Errorf("%s: %s", codec.ErrUnknownContentType, options.ContentType)
-				}
-				p.body, err = cf.Marshal(v)
 					if err != nil {
 						return err
 					}
 				}
-			msgTopicMap[p.topic] = append(msgTopicMap[p.topic], p)
+			*/
+			msgTopicMap[msg.Topic()] = append(msgTopicMap[p.topic], p)
 		}
 
 		eh := m.opts.ErrorHandler
@@ -133,83 +123,55 @@ func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ..
 		for t, ms := range msgTopicMap {
 			ts := time.Now()
 
-			m.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", t).Add(len(ms))
+			m.opts.Meter.Counter(PublishMessageInflight, "endpoint", t).Add(len(ms))
-			m.opts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", t).Add(len(ms))
+			m.opts.Meter.Counter(SubscribeMessageInflight, "endpoint", t).Add(len(ms))
 
 			m.RLock()
 			subs, ok := m.subscribers[t]
 			m.RUnlock()
 			if !ok {
-				m.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", t, "status", "failure").Add(len(ms))
+				m.opts.Meter.Counter(PublishMessageTotal, "endpoint", t, "status", "failure").Add(len(ms))
-				m.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", t).Add(-len(ms))
+				m.opts.Meter.Counter(PublishMessageInflight, "endpoint", t).Add(-len(ms))
-				m.opts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", t).Add(-len(ms))
+				m.opts.Meter.Counter(SubscribeMessageInflight, "endpoint", t).Add(-len(ms))
 				continue
 			}
 
-			m.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", t, "status", "success").Add(len(ms))
+			m.opts.Meter.Counter(PublishMessageTotal, "endpoint", t, "status", "success").Add(len(ms))
 			for _, sub := range subs {
 				if sub.opts.ErrorHandler != nil {
 					eh = sub.opts.ErrorHandler
 				}
 
-				switch mh := sub.handler.(type) {
-				case MessagesHandler:
-					mhs := make([]Message, 0, len(ms))
-					for _, m := range ms {
-						mhs = append(mhs, m)
-					}
-					if err = mh(mhs); err != nil {
-						m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "failure").Add(len(ms))
-						if eh != nil {
-							switch meh := eh.(type) {
-							case MessagesHandler:
-								_ = meh(mhs)
-							case MessageHandler:
-								for _, me := range mhs {
-									_ = meh(me)
-								}
-							}
-						} else if m.opts.Logger.V(logger.ErrorLevel) {
-							m.opts.Logger.Error(m.opts.Context, err.Error())
-						}
-					}
-				case MessageHandler:
 				for _, p := range ms {
-						if err = mh(p); err != nil {
+					if err = sub.handler(p); err != nil {
-							m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "failure").Inc()
+						m.opts.Meter.Counter(SubscribeMessageTotal, "endpoint", t, "status", "failure").Inc()
 						if eh != nil {
-								switch meh := eh.(type) {
+							_ = eh(p)
-								case MessageHandler:
-									_ = meh(p)
-								case MessagesHandler:
-									_ = meh([]Message{p})
-								}
 						} else if m.opts.Logger.V(logger.ErrorLevel) {
 							m.opts.Logger.Error(m.opts.Context, err.Error())
 						}
 					} else {
 						if sub.opts.AutoAck {
 							if err = p.Ack(); err != nil {
-									m.opts.Logger.Error(m.opts.Context, "ack failed: "+err.Error())
+								m.opts.Logger.Errorf(m.opts.Context, "ack failed: %v", err)
-									m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "failure").Inc()
+								m.opts.Meter.Counter(SubscribeMessageTotal, "endpoint", t, "status", "failure").Inc()
 							} else {
-									m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "success").Inc()
+								m.opts.Meter.Counter(SubscribeMessageTotal, "endpoint", t, "status", "success").Inc()
 							}
 						} else {
-								m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "success").Inc()
+							m.opts.Meter.Counter(SubscribeMessageTotal, "endpoint", t, "status", "success").Inc()
-							}
-						}
-						m.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", t).Add(-1)
-						m.opts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", t).Add(-1)
 						}
 					}
+					m.opts.Meter.Counter(PublishMessageInflight, "endpoint", t).Add(-1)
+					m.opts.Meter.Counter(SubscribeMessageInflight, "endpoint", t).Add(-1)
 				}
 
+			}
 			te := time.Since(ts)
-			m.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", t).Update(te.Seconds())
+			m.opts.Meter.Summary(PublishMessageLatencyMicroseconds, "endpoint", t).Update(te.Seconds())
-			m.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", t).Update(te.Seconds())
+			m.opts.Meter.Histogram(PublishMessageDurationSeconds, "endpoint", t).Update(te.Seconds())
-			m.opts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", t).Update(te.Seconds())
+			m.opts.Meter.Summary(SubscribeMessageLatencyMicroseconds, "endpoint", t).Update(te.Seconds())
-			m.opts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", t).Update(te.Seconds())
+			m.opts.Meter.Histogram(SubscribeMessageDurationSeconds, "endpoint", t).Update(te.Seconds())
 		}
 
 	}
@@ -217,7 +179,7 @@ func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ..
 	return nil
 }
 
-func (m *MemoryBroker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...options.Option) (Subscriber, error) {
+func (m *memoryBroker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...SubscribeOption) (Subscriber, error) {
 	m.RLock()
 	if !m.connected {
 		m.RUnlock()
@@ -262,11 +224,11 @@ func (m *MemoryBroker) Subscribe(ctx context.Context, topic string, handler inte
 	return sub, nil
 }
 
-func (m *MemoryBroker) String() string {
+func (m *memoryBroker) String() string {
 	return "memory"
 }
 
-func (m *MemoryBroker) Name() string {
+func (m *memoryBroker) Name() string {
 	return m.opts.Name
 }
 
@@ -274,7 +236,6 @@ type memoryMessage struct {
 	err   error
 	body  interface{}
 	topic string
-	header metadata.Metadata
 	opts  PublishOptions
 	ctx   context.Context
 }
@@ -283,10 +244,6 @@ func (m *memoryMessage) Topic() string {
 	return m.topic
 }
 
-func (m *memoryMessage) Header() metadata.Metadata {
-	return m.header
-}
-
 func (m *memoryMessage) Body() interface{} {
 	return m.body
 }
@@ -326,8 +283,8 @@ func (m *memorySubscriber) Unsubscribe(ctx context.Context) error {
 }
 
 // NewBroker return new memory broker
-func NewBroker(opts ...options.Option) *MemoryBroker {
+func NewBroker(opts ...Option) *memoryBroker {
-	return &MemoryBroker{
+	return &memoryBroker{
 		opts:        NewOptions(opts...),
 		subscribers: make(map[string][]*memorySubscriber),
 	}

broker/memory_test.go

@@ -19,35 +19,29 @@ func TestMemoryBatchBroker(t *testing.T) {
 	topic := "test"
 	count := 10
 
-	fn := func(evts []Message) error {
+	fn := func(evts Events) error {
-		var err error
+		return evts.Ack()
-		for _, evt := range evts {
-			if err = evt.Ack(); err != nil {
-				return err
-			}
-		}
-		return nil
 	}
 
-	sub, err := b.Subscribe(ctx, topic, fn)
+	sub, err := b.BatchSubscribe(ctx, topic, fn)
 	if err != nil {
 		t.Fatalf("Unexpected error subscribing %v", err)
 	}
 
-	msgs := make([]Message, 0, count)
+	msgs := make([]*Message, 0, count)
 	for i := 0; i < count; i++ {
-		message := &memoryMessage{
+		message := &Message{
-			header: metadata.Metadata{
+			Header: map[string]string{
-				metadata.HeaderTopic: []string{topic},
+				metadata.HeaderTopic: topic,
-				"foo":                []string{"bar"},
+				"foo":                "bar",
-				"id":                 []string{fmt.Sprintf("%d", i)},
+				"id":                 fmt.Sprintf("%d", i),
 			},
-			body: []byte(`"hello world"`),
+			Body: []byte(`"hello world"`),
 		}
 		msgs = append(msgs, message)
 	}
 
-	if err := b.Publish(ctx, msgs); err != nil {
+	if err := b.BatchPublish(ctx, msgs); err != nil {
 		t.Fatalf("Unexpected error publishing %v", err)
 	}
 
@@ -71,8 +65,8 @@ func TestMemoryBroker(t *testing.T) {
 	topic := "test"
 	count := 10
 
-	fn := func(p Message) error {
+	fn := func(p Event) error {
-		return p.Ack()
+		return nil
 	}
 
 	sub, err := b.Subscribe(ctx, topic, fn)
@@ -80,20 +74,24 @@ func TestMemoryBroker(t *testing.T) {
 		t.Fatalf("Unexpected error subscribing %v", err)
 	}
 
-	msgs := make([]Message, 0, count)
+	msgs := make([]*Message, 0, count)
 	for i := 0; i < count; i++ {
-		message := &memoryMessage{
+		message := &Message{
-			header: metadata.Metadata{
+			Header: map[string]string{
-				metadata.HeaderTopic: []string{topic},
+				metadata.HeaderTopic: topic,
-				"foo":                []string{"bar"},
+				"foo":                "bar",
-				"id":                 []string{fmt.Sprintf("%d", i)},
+				"id":                 fmt.Sprintf("%d", i),
 			},
-			body: []byte(`"hello world"`),
+			Body: []byte(`"hello world"`),
 		}
 		msgs = append(msgs, message)
+
+		if err := b.Publish(ctx, topic, message); err != nil {
+			t.Fatalf("Unexpected error publishing %d err: %v", i, err)
+		}
 	}
 
-	if err := b.Publish(ctx, msgs); err != nil {
+	if err := b.BatchPublish(ctx, msgs); err != nil {
 		t.Fatalf("Unexpected error publishing %v", err)
 	}
 

broker/options.go

@@ -9,12 +9,29 @@ import (
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/metadata"
 	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/register"
-	"go.unistack.org/micro/v4/sync"
 	"go.unistack.org/micro/v4/tracer"
 )
 
+var (
+	// PublishMessageDurationSeconds specifies meter metric name
+	PublishMessageDurationSeconds = "publish_message_duration_seconds"
+	// PublishMessageLatencyMicroseconds specifies meter metric name
+	PublishMessageLatencyMicroseconds = "publish_message_latency_microseconds"
+	// PublishMessageTotal specifies meter metric name
+	PublishMessageTotal = "publish_message_total"
+	// PublishMessageInflight specifies meter metric name
+	PublishMessageInflight = "publish_message_inflight"
+	// SubscribeMessageDurationSeconds specifies meter metric name
+	SubscribeMessageDurationSeconds = "subscribe_message_duration_seconds"
+	// SubscribeMessageLatencyMicroseconds specifies meter metric name
+	SubscribeMessageLatencyMicroseconds = "subscribe_message_latency_microseconds"
+	// SubscribeMessageTotal specifies meter metric name
+	SubscribeMessageTotal = "subscribe_message_total"
+	// SubscribeMessageInflight specifies meter metric name
+	SubscribeMessageInflight = "subscribe_message_inflight"
+)
+
 // Options struct
 type Options struct {
 	// Tracer used for tracing
@@ -31,51 +48,76 @@ type Options struct {
 	Context context.Context
 	// TLSConfig holds tls.TLSConfig options
 	TLSConfig *tls.Config
-	// ErrorHandler used when broker have error while processing message
+	// ErrorHandler used when broker can't unmarshal incoming message
-	ErrorHandler interface{}
+	ErrorHandler func(Message)
 	// Name holds the broker name
 	Name string
-	// Address holds the broker address
+	// Addrs holds the broker address
-	Address []string
+	Addrs []string
-
-	Wait *sync.WaitGroup
-
-	GracefulTimeout time.Duration
 }
 
+// Option func
+type Option func(*Options)
+
 // NewOptions create new Options
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
-	newOpts := Options{
+	options := Options{
 		Register: register.DefaultRegister,
 		Logger:   logger.DefaultLogger,
 		Context:  context.Background(),
 		Meter:    meter.DefaultMeter,
 		Codecs:   make(map[string]codec.Codec),
 		Tracer:   tracer.DefaultTracer,
-		GracefulTimeout: DefaultGracefulTimeout,
 	}
 	for _, o := range opts {
-		o(&newOpts)
+		o(&options)
 	}
-	return newOpts
+	return options
 }
 
+// Context sets the context option
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
+	}
+}
+
+// MessageOption func
+type MessageOption func(*MessageOptions)
+
+// MessageOptions struct
+type MessageOptions struct {
+	Metadata    metadata.Metadata
+	ContentType string
+}
+
+// MessageMetadata pass additional message metadata
+func MessageMetadata(md metadata.Metadata) MessageOption {
+	return func(o *MessageOptions) {
+		o.Metadata = md
+	}
+}
+
+// MessageContentType pass ContentType for message data
+func MessageContentType(ct string) MessageOption {
+	return func(o *MessageOptions) {
+		o.ContentType = ct
+	}
+}
+
+// PublishOption func
+type PublishOption func(*PublishOptions)
+
 // PublishOptions struct
 type PublishOptions struct {
 	// Context holds external options
 	Context context.Context
-	// Message metadata usually passed as message headers
-	Metadata metadata.Metadata
-	// Content-Type of message for marshal
-	ContentType string
-	// Topic destination
-	Topic string
 	// BodyOnly flag says the message contains raw body bytes
 	BodyOnly bool
 }
 
 // NewPublishOptions creates PublishOptions struct
-func NewPublishOptions(opts ...options.Option) PublishOptions {
+func NewPublishOptions(opts ...PublishOption) PublishOptions {
 	options := PublishOptions{
 		Context: context.Background(),
 	}
@@ -85,19 +127,12 @@ func NewPublishOptions(opts ...options.Option) PublishOptions {
 	return options
 }
 
-// PublishTopic pass topic for messages
-func PublishTopic(t string) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, t, ".Topic")
-	}
-}
-
 // SubscribeOptions struct
 type SubscribeOptions struct {
 	// Context holds external options
 	Context context.Context
-	// ErrorHandler used when broker have error while processing message
+	// ErrorHandler used when broker can't unmarshal incoming message
-	ErrorHandler interface{}
+	ErrorHandler func(Message)
 	// QueueGroup holds consumer group
 	QueueGroup string
 	// AutoAck flag specifies auto ack of incoming message when no error happens
@@ -110,16 +145,99 @@ type SubscribeOptions struct {
 	BatchWait time.Duration
 }
 
-// ErrorHandler will catch all broker errors that cant be handled
+// PublishBodyOnly publish only body of the message
-// in normal way, for example Codec errors
+func PublishBodyOnly(b bool) PublishOption {
-func ErrorHandler(h interface{}) options.Option {
+	return func(o *PublishOptions) {
-	return func(src interface{}) error {
+		o.BodyOnly = b
-		return options.Set(src, h, ".ErrorHandler")
 	}
 }
 
+// PublishContext sets the context
+func PublishContext(ctx context.Context) PublishOption {
+	return func(o *PublishOptions) {
+		o.Context = ctx
+	}
+}
+
+// Addrs sets the host addresses to be used by the broker
+func Addrs(addrs ...string) Option {
+	return func(o *Options) {
+		o.Addrs = addrs
+	}
+}
+
+// Codec sets the codec used for encoding/decoding used where
+// a broker does not support headers
+// Codec to be used to encode/decode requests for a given content type
+func Codec(contentType string, c codec.Codec) Option {
+	return func(o *Options) {
+		o.Codecs[contentType] = c
+	}
+}
+
+// ErrorHandler will catch all broker errors that cant be handled
+// in normal way, for example Codec errors
+func ErrorHandler(h func(Message)) Option {
+	return func(o *Options) {
+		o.ErrorHandler = h
+	}
+}
+
+// SubscribeErrorHandler will catch all broker errors that cant be handled
+// in normal way, for example Codec errors
+func SubscribeErrorHandler(h func(Message)) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.ErrorHandler = h
+	}
+}
+
+// Register sets register option
+func Register(r register.Register) Option {
+	return func(o *Options) {
+		o.Register = r
+	}
+}
+
+// TLSConfig sets the TLS Config
+func TLSConfig(t *tls.Config) Option {
+	return func(o *Options) {
+		o.TLSConfig = t
+	}
+}
+
+// Logger sets the logger
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Tracer to be used for tracing
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
+	}
+}
+
+// Meter sets the meter
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}
+
+// SubscribeOption func signature
+type SubscribeOption func(*SubscribeOptions)
+
 // NewSubscribeOptions creates new SubscribeOptions
-func NewSubscribeOptions(opts ...options.Option) SubscribeOptions {
+func NewSubscribeOptions(opts ...SubscribeOption) SubscribeOptions {
 	options := SubscribeOptions{
 		AutoAck: true,
 		Context: context.Background(),
@@ -130,38 +248,52 @@ func NewSubscribeOptions(opts ...options.Option) SubscribeOptions {
 	return options
 }
 
-// SubscribeAutoAck contol auto acking of messages
+// SubscribeContext set context
-// after they have been handled.
+func SubscribeContext(ctx context.Context) SubscribeOption {
-func SubscribeAutoAck(b bool) options.Option {
+	return func(o *SubscribeOptions) {
-	return func(src interface{}) error {
+		o.Context = ctx
-		return options.Set(src, b, ".AutoAck")
 	}
 }
 
-// BodyOnly transfer only body without
+// SubscribeAutoAck contol auto acking of messages
-func BodyOnly(b bool) options.Option {
+// after they have been handled.
-	return func(src interface{}) error {
+func SubscribeAutoAck(b bool) SubscribeOption {
-		return options.Set(src, b, ".BodyOnly")
+	return func(o *SubscribeOptions) {
+		o.AutoAck = b
+	}
+}
+
+// SubscribeBodyOnly consumes only body of the message
+func SubscribeBodyOnly(b bool) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.BodyOnly = b
 	}
 }
 
 // SubscribeBatchSize specifies max batch size
-func SubscribeBatchSize(n int) options.Option {
+func SubscribeBatchSize(n int) SubscribeOption {
-	return func(src interface{}) error {
+	return func(o *SubscribeOptions) {
-		return options.Set(src, n, ".BatchSize")
+		o.BatchSize = n
 	}
 }
 
 // SubscribeBatchWait specifies max batch wait time
-func SubscribeBatchWait(td time.Duration) options.Option {
+func SubscribeBatchWait(td time.Duration) SubscribeOption {
-	return func(src interface{}) error {
+	return func(o *SubscribeOptions) {
-		return options.Set(src, td, ".BatchWait")
+		o.BatchWait = td
 	}
 }
 
 // SubscribeQueueGroup sets the shared queue name distributed messages across subscribers
-func SubscribeQueueGroup(n string) options.Option {
+func SubscribeQueueGroup(n string) SubscribeOption {
-	return func(src interface{}) error {
+	return func(o *SubscribeOptions) {
-		return options.Set(src, n, ".QueueGroup")
+		o.QueueGroup = n
+	}
+}
+
+// SubscribeAutoAck control auto ack processing for handler
+func SubscribeAuthAck(b bool) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.AutoAck = b
 	}
 }

broker/subscriber.go

@@ -19,8 +19,8 @@ var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
 
 // Is this an exported - upper case - name?
 func isExported(name string) bool {
-	r, _ := utf8.DecodeRuneInString(name)
+	rune, _ := utf8.DecodeRuneInString(name)
-	return unicode.IsUpper(r)
+	return unicode.IsUpper(rune)
 }
 
 // Is this type exported or a builtin?

client/client.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/options"
 )
 
 var (
@@ -22,8 +21,6 @@ var (
 	DefaultRetries = 0
 	// DefaultRequestTimeout is the default request timeout
 	DefaultRequestTimeout = time.Second * 5
-	// DefaultDialTimeout the default dial timeout
-	DefaultDialTimeout = time.Second * 5
 	// DefaultPoolSize sets the connection pool size
 	DefaultPoolSize = 100
 	// DefaultPoolTTL sets the connection pool ttl
@@ -35,11 +32,11 @@ var (
 // It also supports bidirectional streaming of requests.
 type Client interface {
 	Name() string
-	Init(opts ...options.Option) error
+	Init(opts ...Option) error
 	Options() Options
-	NewRequest(service string, endpoint string, req interface{}, opts ...options.Option) Request
+	NewRequest(service string, endpoint string, req interface{}, opts ...RequestOption) Request
-	Call(ctx context.Context, req Request, rsp interface{}, opts ...options.Option) error
+	Call(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error
-	Stream(ctx context.Context, req Request, opts ...options.Option) (Stream, error)
+	Stream(ctx context.Context, req Request, opts ...CallOption) (Stream, error)
 	String() string
 }
 
@@ -100,3 +97,18 @@ type Stream interface {
 	// CloseSend closes the send direction of the stream
 	CloseSend() error
 }
+
+// Option used by the Client
+type Option func(*Options)
+
+// CallOption used by Call or Stream
+type CallOption func(*CallOptions)
+
+// PublishOption used by Publish
+type PublishOption func(*PublishOptions)
+
+// MessageOption used by NewMessage
+type MessageOption func(*MessageOptions)
+
+// RequestOption used by NewRequest
+type RequestOption func(*RequestOptions)

client/client_call_options.go

@@ -2,24 +2,22 @@ package client
 
 import (
 	"context"
-
-	"go.unistack.org/micro/v4/options"
 )
 
 type clientCallOptions struct {
 	Client
-	opts []options.Option
+	opts []CallOption
 }
 
-func (s *clientCallOptions) Call(ctx context.Context, req Request, rsp interface{}, opts ...options.Option) error {
+func (s *clientCallOptions) Call(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error {
 	return s.Client.Call(ctx, req, rsp, append(s.opts, opts...)...)
 }
 
-func (s *clientCallOptions) Stream(ctx context.Context, req Request, opts ...options.Option) (Stream, error) {
+func (s *clientCallOptions) Stream(ctx context.Context, req Request, opts ...CallOption) (Stream, error) {
 	return s.Client.Stream(ctx, req, append(s.opts, opts...)...)
 }
 
 // NewClientCallOptions add CallOption to every call
-func NewClientCallOptions(c Client, opts ...options.Option) Client {
+func NewClientCallOptions(c Client, opts ...CallOption) Client {
 	return &clientCallOptions{c, opts}
 }

client/client_call_options_test.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"testing"
 	"time"
-
-	"go.unistack.org/micro/v4/options"
 )
 
 func TestNewClientCallOptions(t *testing.T) {
@@ -15,11 +13,11 @@ func TestNewClientCallOptions(t *testing.T) {
 		return fn
 	}
 	c := NewClientCallOptions(NewClient(),
-		options.Address("127.0.0.1"),
+		WithAddress("127.0.0.1"),
 		WithCallWrapper(w),
-		RequestTimeout(1*time.Millisecond),
+		WithRequestTimeout(1*time.Millisecond),
-		Retries(0),
+		WithRetries(0),
-		Backoff(BackoffInterval(10*time.Millisecond, 100*time.Millisecond)),
+		WithBackoff(BackoffInterval(10*time.Millisecond, 100*time.Millisecond)),
 	)
 	_ = c.Call(context.TODO(), c.NewRequest("service", "endpoint", nil), nil)
 	if !flag {

client/context.go

@@ -22,3 +22,33 @@ func NewContext(ctx context.Context, c Client) context.Context {
 	}
 	return context.WithValue(ctx, clientKey{}, c)
 }
+
+// SetPublishOption returns a function to setup a context with given value
+func SetPublishOption(k, v interface{}) PublishOption {
+	return func(o *PublishOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}
+
+// SetCallOption returns a function to setup a context with given value
+func SetCallOption(k, v interface{}) CallOption {
+	return func(o *CallOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}
+
+// 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)
+	}
+}

client/context_test.go

@@ -38,3 +38,36 @@ func TestNewNilContext(t *testing.T) {
 		t.Fatal("NewContext not works")
 	}
 }
+
+func TestSetPublishOption(t *testing.T) {
+	type key struct{}
+	o := SetPublishOption(key{}, "test")
+	opts := &PublishOptions{}
+	o(opts)
+
+	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
+		t.Fatal("SetPublishOption not works")
+	}
+}
+
+func TestSetCallOption(t *testing.T) {
+	type key struct{}
+	o := SetCallOption(key{}, "test")
+	opts := &CallOptions{}
+	o(opts)
+
+	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
+		t.Fatal("SetCallOption 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")
+	}
+}

client/noop.go

@@ -8,9 +8,7 @@ import (
 	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/errors"
 	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/selector"
-	"go.unistack.org/micro/v4/semconv"
 )
 
 // DefaultCodecs will be used to encode/decode data
@@ -22,6 +20,12 @@ type noopClient struct {
 	opts Options
 }
 
+type noopMessage struct {
+	topic   string
+	payload interface{}
+	opts    MessageOptions
+}
+
 type noopRequest struct {
 	body        interface{}
 	codec       codec.Codec
@@ -33,12 +37,16 @@ type noopRequest struct {
 }
 
 // NewClient returns new noop client
-func NewClient(opts ...options.Option) Client {
+func NewClient(opts ...Option) Client {
 	nc := &noopClient{opts: NewOptions(opts...)}
 	// wrap in reverse
 
 	c := Client(nc)
 
+	for i := len(nc.opts.Wrappers); i > 0; i-- {
+		c = nc.opts.Wrappers[i-1](c)
+	}
+
 	return c
 }
 
@@ -133,6 +141,22 @@ func (n *noopStream) CloseSend() error {
 	return nil
 }
 
+func (n *noopMessage) Topic() string {
+	return n.topic
+}
+
+func (n *noopMessage) Payload() interface{} {
+	return n.payload
+}
+
+func (n *noopMessage) ContentType() string {
+	return n.opts.ContentType
+}
+
+func (n *noopMessage) Metadata() metadata.Metadata {
+	return n.opts.Metadata
+}
+
 func (n *noopClient) newCodec(contentType string) (codec.Codec, error) {
 	if cf, ok := n.opts.Codecs[contentType]; ok {
 		return cf, nil
@@ -143,7 +167,7 @@ func (n *noopClient) newCodec(contentType string) (codec.Codec, error) {
 	return nil, codec.ErrUnknownContentType
 }
 
-func (n *noopClient) Init(opts ...options.Option) error {
+func (n *noopClient) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&n.opts)
 	}
@@ -158,7 +182,7 @@ func (n *noopClient) String() string {
 	return "noop"
 }
 
-func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opts ...options.Option) error {
+func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error {
 	// make a copy of call opts
 	callOpts := n.opts.CallOptions
 	for _, opt := range opts {
@@ -175,7 +199,7 @@ func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opt
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		opt := RequestTimeout(time.Until(d))
+		opt := WithRequestTimeout(time.Until(d))
 		opt(&callOpts)
 	}
 
@@ -262,7 +286,7 @@ func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opt
 
 	ts := time.Now()
 	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", endpoint).Inc()
+	n.opts.Meter.Counter(ClientRequestInflight, "endpoint", endpoint).Inc()
 	for i := 0; i <= callOpts.Retries; i++ {
 		go func() {
 			ch <- call(i)
@@ -291,14 +315,14 @@ func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opt
 	}
 
 	if gerr != nil {
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", endpoint, "status", "failure").Inc()
+		n.opts.Meter.Counter(ClientRequestTotal, "endpoint", endpoint, "status", "failure").Inc()
 	} else {
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", endpoint, "status", "success").Inc()
+		n.opts.Meter.Counter(ClientRequestTotal, "endpoint", endpoint, "status", "success").Inc()
 	}
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", endpoint).Dec()
+	n.opts.Meter.Counter(ClientRequestInflight, "endpoint", endpoint).Dec()
 	te := time.Since(ts)
-	n.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", endpoint).Update(te.Seconds())
+	n.opts.Meter.Summary(ClientRequestLatencyMicroseconds, "endpoint", endpoint).Update(te.Seconds())
-	n.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", endpoint).Update(te.Seconds())
+	n.opts.Meter.Histogram(ClientRequestDurationSeconds, "endpoint", endpoint).Update(te.Seconds())
 
 	return gerr
 }
@@ -307,11 +331,11 @@ func (n *noopClient) call(ctx context.Context, addr string, req Request, rsp int
 	return nil
 }
 
-func (n *noopClient) NewRequest(service, endpoint string, req interface{}, opts ...options.Option) Request {
+func (n *noopClient) NewRequest(service, endpoint string, req interface{}, opts ...RequestOption) Request {
 	return &noopRequest{service: service, endpoint: endpoint}
 }
 
-func (n *noopClient) Stream(ctx context.Context, req Request, opts ...options.Option) (Stream, error) {
+func (n *noopClient) Stream(ctx context.Context, req Request, opts ...CallOption) (Stream, error) {
 	var err error
 
 	// make a copy of call opts
@@ -330,7 +354,7 @@ func (n *noopClient) Stream(ctx context.Context, req Request, opts ...options.Op
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		o := StreamTimeout(time.Until(d))
+		o := WithStreamTimeout(time.Until(d))
 		o(&callOpts)
 	}
 
@@ -399,12 +423,12 @@ func (n *noopClient) Stream(ctx context.Context, req Request, opts ...options.Op
 
 		// ts := time.Now()
 		endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
-		n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", endpoint).Inc()
+		n.opts.Meter.Counter(ClientRequestInflight, "endpoint", endpoint).Inc()
 		stream, cerr := n.stream(ctx, node, req, callOpts)
 		if cerr != nil {
-			n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", endpoint, "status", "failure").Inc()
+			n.opts.Meter.Counter(ClientRequestTotal, "endpoint", endpoint, "status", "failure").Inc()
 		} else {
-			n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", endpoint, "status", "success").Inc()
+			n.opts.Meter.Counter(ClientRequestTotal, "endpoint", endpoint, "status", "success").Inc()
 		}
 
 		// record the result of the call to inform future routing decisions

client/options.go

@@ -10,15 +10,29 @@ import (
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/metadata"
 	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/network/transport"
+	"go.unistack.org/micro/v4/register"
 	"go.unistack.org/micro/v4/router"
 	"go.unistack.org/micro/v4/selector"
 	"go.unistack.org/micro/v4/selector/random"
 	"go.unistack.org/micro/v4/tracer"
 )
 
+var (
+	// ClientRequestDurationSeconds specifies meter metric name
+	ClientRequestDurationSeconds = "client_request_duration_seconds"
+	// ClientRequestLatencyMicroseconds specifies meter metric name
+	ClientRequestLatencyMicroseconds = "client_request_latency_microseconds"
+	// ClientRequestTotal specifies meter metric name
+	ClientRequestTotal = "client_request_total"
+	// ClientRequestInflight specifies meter metric name
+	ClientRequestInflight = "client_request_inflight"
+)
+
 // Options holds client options
 type Options struct {
+	// Transport used for transfer messages
+	Transport transport.Transport
 	// Selector used to select needed address
 	Selector selector.Selector
 	// Logger used to log messages
@@ -43,6 +57,8 @@ type Options struct {
 	ContentType string
 	// Name is the client name
 	Name string
+	// Wrappers contains wrappers
+	Wrappers []Wrapper
 	// CallOptions contains default CallOptions
 	CallOptions CallOptions
 	// PoolSize connection pool size
@@ -51,12 +67,10 @@ type Options struct {
 	PoolTTL time.Duration
 	// ContextDialer used to connect
 	ContextDialer func(context.Context, string) (net.Conn, error)
-	// Hooks may contains Client func wrapper
-	Hooks options.Hooks
 }
 
 // NewCallOptions creates new call options struct
-func NewCallOptions(opts ...options.Option) CallOptions {
+func NewCallOptions(opts ...CallOption) CallOptions {
 	options := CallOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -105,14 +119,58 @@ type CallOptions struct {
 }
 
 // ContextDialer pass ContextDialer to client
-func ContextDialer(fn func(context.Context, string) (net.Conn, error)) options.Option {
+func ContextDialer(fn func(context.Context, string) (net.Conn, error)) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".ContextDialer")
+		o.ContextDialer = fn
 	}
 }
 
+// Context pass context to client
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
+	}
+}
+
+// NewPublishOptions create new PublishOptions struct from option
+func NewPublishOptions(opts ...PublishOption) PublishOptions {
+	options := PublishOptions{}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
+// PublishOptions holds publish options
+type PublishOptions struct {
+	// Context used for external options
+	Context context.Context
+	// Exchange topic exchange name
+	Exchange string
+	// BodyOnly will publish only message body
+	BodyOnly bool
+}
+
+// NewMessageOptions creates message options struct
+func NewMessageOptions(opts ...MessageOption) MessageOptions {
+	options := MessageOptions{Metadata: metadata.New(1)}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
+// MessageOptions holds client message options
+type MessageOptions struct {
+	// Metadata additional metadata
+	Metadata metadata.Metadata
+	// ContentType specify content-type of message
+	// deprecated
+	ContentType string
+}
+
 // NewRequestOptions creates new RequestOptions struct
-func NewRequestOptions(opts ...options.Option) RequestOptions {
+func NewRequestOptions(opts ...RequestOption) RequestOptions {
 	options := RequestOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -131,7 +189,7 @@ type RequestOptions struct {
 }
 
 // NewOptions creates new options struct
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
 		Context:     context.Background(),
 		ContentType: DefaultContentType,
@@ -142,7 +200,7 @@ func NewOptions(opts ...options.Option) Options {
 			Retry:          DefaultRetry,
 			Retries:        DefaultRetries,
 			RequestTimeout: DefaultRequestTimeout,
-			DialTimeout:    DefaultDialTimeout,
+			DialTimeout:    transport.DefaultDialTimeout,
 		},
 		Lookup:    LookupRoute,
 		PoolSize:  DefaultPoolSize,
@@ -152,6 +210,7 @@ func NewOptions(opts ...options.Option) Options {
 		Meter:     meter.DefaultMeter,
 		Tracer:    tracer.DefaultTracer,
 		Router:    router.DefaultRouter,
+		Transport: transport.DefaultTransport,
 	}
 
 	for _, o := range opts {
@@ -161,131 +220,374 @@ func NewOptions(opts ...options.Option) Options {
 	return options
 }
 
+// Tracer to be used for tracing
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
+	}
+}
+
+// Logger to be used for log mesages
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Meter to be used for metrics
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// Codec to be used to encode/decode requests for a given content type
+func Codec(contentType string, c codec.Codec) Option {
+	return func(o *Options) {
+		o.Codecs[contentType] = c
+	}
+}
+
+// ContentType used by default if not specified
+func ContentType(ct string) Option {
+	return func(o *Options) {
+		o.ContentType = ct
+	}
+}
+
 // Proxy sets the proxy address
-func Proxy(addr string) options.Option {
+func Proxy(addr string) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, addr, ".Proxy")
+		o.Proxy = addr
 	}
 }
 
 // PoolSize sets the connection pool size
-func PoolSize(d int) options.Option {
+func PoolSize(d int) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, d, ".PoolSize")
+		o.PoolSize = d
 	}
 }
 
 // PoolTTL sets the connection pool ttl
-func PoolTTL(td time.Duration) options.Option {
+func PoolTTL(d time.Duration) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, td, ".PoolTTL")
+		o.PoolTTL = d
+	}
+}
+
+// Transport to use for communication e.g http, rabbitmq, etc
+func Transport(t transport.Transport) Option {
+	return func(o *Options) {
+		o.Transport = t
+	}
+}
+
+// Register sets the routers register
+func Register(r register.Register) Option {
+	return func(o *Options) {
+		if o.Router != nil {
+			_ = o.Router.Init(router.Register(r))
+		}
+	}
+}
+
+// Router is used to lookup routes for a service
+func Router(r router.Router) Option {
+	return func(o *Options) {
+		o.Router = r
 	}
 }
 
 // Selector is used to select a route
-func Selector(s selector.Selector) options.Option {
+func Selector(s selector.Selector) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, s, ".Selector")
+		o.Selector = s
+	}
+}
+
+// Wrap adds a wrapper to the list of options passed into the client
+func Wrap(w Wrapper) Option {
+	return func(o *Options) {
+		o.Wrappers = append(o.Wrappers, w)
+	}
+}
+
+// WrapCall adds a wrapper to the list of CallFunc wrappers
+func WrapCall(cw ...CallWrapper) Option {
+	return func(o *Options) {
+		o.CallOptions.CallWrappers = append(o.CallOptions.CallWrappers, cw...)
 	}
 }
 
 // Backoff is used to set the backoff function used when retrying Calls
-func Backoff(fn BackoffFunc) options.Option {
+func Backoff(fn BackoffFunc) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".Backoff")
+		o.CallOptions.Backoff = fn
+	}
+}
+
+// Name sets the client name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
 	}
 }
 
 // Lookup sets the lookup function to use for resolving service names
-func Lookup(fn LookupFunc) options.Option {
+func Lookup(l LookupFunc) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".Lookup")
+		o.Lookup = l
 	}
 }
 
-// WithCallWrapper sets the retry function to be used when re-trying.
+// TLSConfig specifies a *tls.Config
-func WithCallWrapper(fn CallWrapper) options.Option {
+func TLSConfig(t *tls.Config) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".CallWrappers")
+		// set the internal tls
+		o.TLSConfig = t
+
+		// set the default transport if one is not
+		// already set. Required for Init call below.
+
+		// set the transport tls
+		_ = o.Transport.Init(
+			transport.TLSConfig(t),
+		)
 	}
 }
 
 // Retries sets the retry count when making the request.
-func Retries(n int) options.Option {
+func Retries(i int) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, n, ".Retries")
+		o.CallOptions.Retries = i
 	}
 }
 
 // Retry sets the retry function to be used when re-trying.
-func Retry(fn RetryFunc) options.Option {
+func Retry(fn RetryFunc) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".Retry")
+		o.CallOptions.Retry = fn
 	}
 }
 
 // RequestTimeout is the request timeout.
-func RequestTimeout(td time.Duration) options.Option {
+func RequestTimeout(d time.Duration) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, td, ".RequestTimeout")
+		o.CallOptions.RequestTimeout = d
 	}
 }
 
 // StreamTimeout sets the stream timeout
-func StreamTimeout(td time.Duration) options.Option {
+func StreamTimeout(d time.Duration) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, td, ".StreamTimeout")
+		o.CallOptions.StreamTimeout = d
 	}
 }
 
 // DialTimeout sets the dial timeout
-func DialTimeout(td time.Duration) options.Option {
+func DialTimeout(d time.Duration) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, td, ".DialTimeout")
+		o.CallOptions.DialTimeout = d
+	}
+}
+
+// WithExchange sets the exchange to route a message through
+// Deprecated
+func WithExchange(e string) PublishOption {
+	return func(o *PublishOptions) {
+		o.Exchange = e
+	}
+}
+
+// PublishExchange sets the exchange to route a message through
+func PublishExchange(e string) PublishOption {
+	return func(o *PublishOptions) {
+		o.Exchange = e
+	}
+}
+
+// WithBodyOnly publish only message body
+// DERECATED
+func WithBodyOnly(b bool) PublishOption {
+	return func(o *PublishOptions) {
+		o.BodyOnly = b
+	}
+}
+
+// PublishBodyOnly publish only message body
+func PublishBodyOnly(b bool) PublishOption {
+	return func(o *PublishOptions) {
+		o.BodyOnly = b
+	}
+}
+
+// PublishContext sets the context in publish options
+func PublishContext(ctx context.Context) PublishOption {
+	return func(o *PublishOptions) {
+		o.Context = ctx
+	}
+}
+
+// WithContextDialer pass ContextDialer to client call
+func WithContextDialer(fn func(context.Context, string) (net.Conn, error)) CallOption {
+	return func(o *CallOptions) {
+		o.ContextDialer = fn
+	}
+}
+
+// WithContentType specifies call content type
+func WithContentType(ct string) CallOption {
+	return func(o *CallOptions) {
+		o.ContentType = ct
+	}
+}
+
+// WithAddress sets the remote addresses to use rather than using service discovery
+func WithAddress(a ...string) CallOption {
+	return func(o *CallOptions) {
+		o.Address = a
+	}
+}
+
+// WithCallWrapper is a CallOption which adds to the existing CallFunc wrappers
+func WithCallWrapper(cw ...CallWrapper) CallOption {
+	return func(o *CallOptions) {
+		o.CallWrappers = append(o.CallWrappers, cw...)
+	}
+}
+
+// WithBackoff is a CallOption which overrides that which
+// set in Options.CallOptions
+func WithBackoff(fn BackoffFunc) CallOption {
+	return func(o *CallOptions) {
+		o.Backoff = fn
+	}
+}
+
+// WithRetry is a CallOption which overrides that which
+// set in Options.CallOptions
+func WithRetry(fn RetryFunc) CallOption {
+	return func(o *CallOptions) {
+		o.Retry = fn
+	}
+}
+
+// WithRetries is a CallOption which overrides that which
+// set in Options.CallOptions
+func WithRetries(i int) CallOption {
+	return func(o *CallOptions) {
+		o.Retries = i
 	}
 }
 
 // WithResponseMetadata is a CallOption which adds metadata.Metadata to Options.CallOptions
-func ResponseMetadata(md *metadata.Metadata) options.Option {
+func WithResponseMetadata(md *metadata.Metadata) CallOption {
-	return func(src interface{}) error {
+	return func(o *CallOptions) {
-		return options.Set(src, md, ".ResponseMetadata")
+		o.ResponseMetadata = md
 	}
 }
 
 // WithRequestMetadata is a CallOption which adds metadata.Metadata to Options.CallOptions
-func RequestMetadata(md metadata.Metadata) options.Option {
+func WithRequestMetadata(md metadata.Metadata) CallOption {
-	return func(src interface{}) error {
+	return func(o *CallOptions) {
-		return options.Set(src, metadata.Copy(md), ".RequestMetadata")
+		o.RequestMetadata = md
 	}
 }
 
-// AuthToken is a CallOption which overrides the
+// WithRequestTimeout is a CallOption which overrides that which
+// set in Options.CallOptions
+func WithRequestTimeout(d time.Duration) CallOption {
+	return func(o *CallOptions) {
+		o.RequestTimeout = d
+	}
+}
+
+// WithStreamTimeout sets the stream timeout
+func WithStreamTimeout(d time.Duration) CallOption {
+	return func(o *CallOptions) {
+		o.StreamTimeout = d
+	}
+}
+
+// WithDialTimeout is a CallOption which overrides that which
+// set in Options.CallOptions
+func WithDialTimeout(d time.Duration) CallOption {
+	return func(o *CallOptions) {
+		o.DialTimeout = d
+	}
+}
+
+// WithAuthToken is a CallOption which overrides the
 // authorization header with the services own auth token
-func AuthToken(t string) options.Option {
+func WithAuthToken(t string) CallOption {
-	return func(src interface{}) error {
+	return func(o *CallOptions) {
-		return options.Set(src, t, ".AuthToken")
+		o.AuthToken = t
 	}
 }
 
-// Network is a CallOption which sets the network attribute
+// WithNetwork is a CallOption which sets the network attribute
-func Network(n string) options.Option {
+func WithNetwork(n string) CallOption {
-	return func(src interface{}) error {
+	return func(o *CallOptions) {
-		return options.Set(src, n, ".Network")
+		o.Network = n
+	}
+}
+
+// WithRouter sets the router to use for this call
+func WithRouter(r router.Router) CallOption {
+	return func(o *CallOptions) {
+		o.Router = r
+	}
+}
+
+// WithSelector sets the selector to use for this call
+func WithSelector(s selector.Selector) CallOption {
+	return func(o *CallOptions) {
+		o.Selector = s
 	}
 }
 
-/*
 // WithSelectOptions sets the options to pass to the selector for this call
-func WithSelectOptions(sops ...selector.SelectOption) options.Option {
+func WithSelectOptions(sops ...selector.SelectOption) CallOption {
 	return func(o *CallOptions) {
 		o.SelectOptions = sops
 	}
 }
-*/
 
-// StreamingRequest specifies that request is streaming
+// WithMessageContentType sets the message content type
-func StreamingRequest(b bool) options.Option {
+// Deprecated
-	return func(src interface{}) error {
+func WithMessageContentType(ct string) MessageOption {
-		return options.Set(src, b, ".Stream")
+	return func(o *MessageOptions) {
+		o.Metadata.Set(metadata.HeaderContentType, ct)
+		o.ContentType = ct
+	}
+}
+
+// MessageContentType sets the message content type
+func MessageContentType(ct string) MessageOption {
+	return func(o *MessageOptions) {
+		o.Metadata.Set(metadata.HeaderContentType, ct)
+		o.ContentType = ct
+	}
+}
+
+// MessageMetadata sets the message metadata
+func MessageMetadata(k, v string) MessageOption {
+	return func(o *MessageOptions) {
+		o.Metadata.Set(k, v)
+	}
+}
+
+// StreamingRequest specifies that request is streaming
+func StreamingRequest(b bool) RequestOption {
+	return func(o *RequestOptions) {
+		o.Stream = b
+	}
+}
+
+// RequestContentType specifies request content type
+func RequestContentType(ct string) RequestOption {
+	return func(o *RequestOptions) {
+		o.ContentType = ct
 	}
 }

config/config.go

@@ -6,8 +6,6 @@ import (
 	"errors"
 	"reflect"
 	"time"
-
-	"go.unistack.org/micro/v4/options"
 )
 
 type Validator interface {
@@ -39,15 +37,15 @@ type Config interface {
 	// Name returns name of config
 	Name() string
 	// Init the config
-	Init(opts ...options.Option) error
+	Init(opts ...Option) error
 	// Options in the config
 	Options() Options
 	// Load config from sources
-	Load(context.Context, ...options.Option) error
+	Load(context.Context, ...LoadOption) error
 	// Save config to sources
-	Save(context.Context, ...options.Option) error
+	Save(context.Context, ...SaveOption) error
 	// Watch a config for changes
-	Watch(context.Context, ...options.Option) (Watcher, error)
+	Watch(context.Context, ...WatchOption) (Watcher, error)
 	// String returns config type name
 	String() string
 }
@@ -61,7 +59,7 @@ type Watcher interface {
 }
 
 // Load loads config from config sources
-func Load(ctx context.Context, cs []Config, opts ...options.Option) error {
+func Load(ctx context.Context, cs []Config, opts ...LoadOption) error {
 	var err error
 	for _, c := range cs {
 		if err = c.Init(); err != nil {
@@ -133,7 +131,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" BeforeLoad error "+err.Error())
+				c.Options().Logger.Errorf(ctx, "%s BeforeLoad err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -148,7 +146,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" AfterLoad error "+err.Error())
+				c.Options().Logger.Errorf(ctx, "%s AfterLoad err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -163,7 +161,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" BeforeSave error "+err.Error())
+				c.Options().Logger.Errorf(ctx, "%s BeforeSave err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -178,7 +176,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" AfterSave error "+err.Error())
+				c.Options().Logger.Errorf(ctx, "%s AfterSave err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -193,7 +191,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" BeforeInit error "+err.Error())
+				c.Options().Logger.Errorf(ctx, "%s BeforeInit err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -208,7 +206,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" AfterInit error "+err.Error())
+				c.Options().Logger.Errorf(ctx, "%s AfterInit err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}

config/context.go

@@ -22,3 +22,43 @@ func NewContext(ctx context.Context, c Config) context.Context {
 	}
 	return context.WithValue(ctx, configKey{}, c)
 }
+
+// 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)
+	}
+}
+
+// SetSaveOption returns a function to setup a context with given value
+func SetSaveOption(k, v interface{}) SaveOption {
+	return func(o *SaveOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}
+
+// SetLoadOption returns a function to setup a context with given value
+func SetLoadOption(k, v interface{}) LoadOption {
+	return func(o *LoadOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}
+
+// SetWatchOption returns a function to setup a context with given value
+func SetWatchOption(k, v interface{}) WatchOption {
+	return func(o *WatchOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}

config/context_test.go

@@ -40,3 +40,47 @@ 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")
+	}
+}
+
+func TestSetSaveOption(t *testing.T) {
+	type key struct{}
+	o := SetSaveOption(key{}, "test")
+	opts := &SaveOptions{}
+	o(opts)
+
+	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
+		t.Fatal("SetSaveOption not works")
+	}
+}
+
+func TestSetLoadOption(t *testing.T) {
+	type key struct{}
+	o := SetLoadOption(key{}, "test")
+	opts := &LoadOptions{}
+	o(opts)
+
+	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
+		t.Fatal("SetLoadOption not works")
+	}
+}
+
+func TestSetWatchOption(t *testing.T) {
+	type key struct{}
+	o := SetWatchOption(key{}, "test")
+	opts := &WatchOptions{}
+	o(opts)
+
+	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
+		t.Fatal("SetWatchOption not works")
+	}
+}

config/default.go

@@ -7,10 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"dario.cat/mergo"
+	"github.com/imdario/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"
 	mtime "go.unistack.org/micro/v4/util/time"
 )
@@ -23,7 +20,7 @@ func (c *defaultConfig) Options() Options {
 	return c.opts
 }
 
-func (c *defaultConfig) Init(opts ...options.Option) error {
+func (c *defaultConfig) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&c.opts)
 	}
@@ -39,11 +36,7 @@ func (c *defaultConfig) Init(opts ...options.Option) error {
 	return nil
 }
 
-func (c *defaultConfig) Load(ctx context.Context, opts ...options.Option) error {
+func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) 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
 	}
@@ -131,20 +124,6 @@ func fillValue(value reflect.Value, val string) error {
 		}
 		value.Set(reflect.ValueOf(v))
 	case reflect.String:
-		switch val {
-		case "micro:generate uuid":
-			uid, err := uuid.NewRandom()
-			if err != nil {
-				return err
-			}
-			val = uid.String()
-		case "micro:generate id":
-			uid, err := mid.New()
-			if err != nil {
-				return err
-			}
-			val = uid
-		}
 		value.Set(reflect.ValueOf(val))
 	case reflect.Float32:
 		v, err := strconv.ParseFloat(val, 32)
@@ -296,11 +275,7 @@ func fillValues(valueOf reflect.Value, tname string) error {
 	return nil
 }
 
-func (c *defaultConfig) Save(ctx context.Context, _ ...options.Option) error {
+func (c *defaultConfig) Save(ctx context.Context, opts ...SaveOption) error {
-	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
-		return nil
-	}
-
 	if err := DefaultBeforeSave(ctx, c); err != nil {
 		return err
 	}
@@ -320,12 +295,12 @@ func (c *defaultConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *defaultConfig) Watch(ctx context.Context, opts ...options.Option) (Watcher, error) {
+func (c *defaultConfig) Watch(ctx context.Context, opts ...WatchOption) (Watcher, error) {
 	return nil, ErrWatcherNotImplemented
 }
 
 // NewConfig returns new default config source
-func NewConfig(opts ...options.Option) Config {
+func NewConfig(opts ...Option) Config {
 	options := NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = "default"

config/default_test.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"go.unistack.org/micro/v4/config"
-	mid "go.unistack.org/micro/v4/util/id"
 	mtime "go.unistack.org/micro/v4/util/time"
 )
 
@@ -19,8 +18,6 @@ type cfg struct {
 	DurationValue  time.Duration   `default:"10s"`
 	MDurationValue mtime.Duration  `default:"10s"`
 	MapValue       map[string]bool `default:"key1=true,key2=false"`
-	UUIDValue      string          `default:"micro:generate uuid"`
-	IDValue        string          `default:"micro:generate id"`
 }
 
 type cfgStructValue struct {
@@ -31,9 +28,6 @@ func (c *cfg) Validate() error {
 	if c.IntValue != 10 {
 		return fmt.Errorf("invalid IntValue %d != %d", 10, c.IntValue)
 	}
-	if c.MapValue["key1"] != true {
-		return fmt.Errorf("invalid MapValue %t != %t", true, c.MapValue["key1"])
-	}
 	return nil
 }
 
@@ -77,18 +71,6 @@ func TestDefault(t *testing.T) {
 	if len(conf.MapValue) != 2 {
 		t.Fatalf("map value invalid: %#+v\n", conf.MapValue)
 	}
-
-	if conf.UUIDValue == "" {
-		t.Fatalf("uuid value empty")
-	} else if len(conf.UUIDValue) != 36 {
-		t.Fatalf("uuid value invalid: %s", conf.UUIDValue)
-	}
-
-	if conf.IDValue == "" {
-		t.Fatalf("id value empty")
-	} else if len(conf.IDValue) != mid.DefaultSize {
-		t.Fatalf("id value invalid: %s", conf.IDValue)
-	}
 	_ = conf
 	// t.Logf("%#+v\n", conf)
 }
@@ -108,19 +90,3 @@ func TestValidate(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
-func TestString(t *testing.T) {
-	cfg := config.NewConfig()
-	res := cfg.String()
-	if res != "default" {
-		t.Fatalf("string value invalid: %s", res)
-	}
-}
-
-func TestName(t *testing.T) {
-	cfg := config.NewConfig()
-	res := cfg.Name()
-	if res != "" {
-		t.Fatal("name value not empty")
-	}
-}

config/options.go

@@ -7,7 +7,6 @@ import (
 	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/tracer"
 )
 
@@ -43,14 +42,13 @@ 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
 }
 
+// Option function signature
+type Option func(o *Options)
+
 // NewOptions new options struct with filed values
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
 		Logger:  logger.DefaultLogger,
 		Meter:   meter.DefaultMeter,
@@ -64,16 +62,19 @@ func NewOptions(opts ...options.Option) Options {
 	return options
 }
 
+// LoadOption function signature
+type LoadOption func(o *LoadOptions)
+
 // LoadOptions struct
 type LoadOptions struct {
 	Struct   interface{}
-	Context  context.Context
 	Override bool
 	Append   bool
+	Context  context.Context
 }
 
 // NewLoadOptions create LoadOptions struct with provided opts
-func NewLoadOptions(opts ...options.Option) LoadOptions {
+func NewLoadOptions(opts ...LoadOption) LoadOptions {
 	options := LoadOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -82,27 +83,44 @@ func NewLoadOptions(opts ...options.Option) LoadOptions {
 }
 
 // LoadOverride override values when load
-func LoadOverride(b bool) options.Option {
+func LoadOverride(b bool) LoadOption {
-	return func(src interface{}) error {
+	return func(o *LoadOptions) {
-		return options.Set(src, b, ".Override")
+		o.Override = b
 	}
 }
 
 // LoadAppend override values when load
-func LoadAppend(b bool) options.Option {
+func LoadAppend(b bool) LoadOption {
-	return func(src interface{}) error {
+	return func(o *LoadOptions) {
-		return options.Set(src, b, ".Append")
+		o.Append = b
 	}
 }
 
+// LoadStruct override struct for loading
+func LoadStruct(src interface{}) LoadOption {
+	return func(o *LoadOptions) {
+		o.Struct = src
+	}
+}
+
+// SaveOption function signature
+type SaveOption func(o *SaveOptions)
+
 // SaveOptions struct
 type SaveOptions struct {
 	Struct  interface{}
 	Context context.Context
 }
 
+// SaveStruct override struct for save to config
+func SaveStruct(src interface{}) SaveOption {
+	return func(o *SaveOptions) {
+		o.Struct = src
+	}
+}
+
 // NewSaveOptions fill SaveOptions struct
-func NewSaveOptions(opts ...options.Option) SaveOptions {
+func NewSaveOptions(opts ...SaveOption) SaveOptions {
 	options := SaveOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -111,65 +129,100 @@ func NewSaveOptions(opts ...options.Option) SaveOptions {
 }
 
 // AllowFail allows config source to fail
-func AllowFail(b bool) options.Option {
+func AllowFail(b bool) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, b, ".AllowFail")
+		o.AllowFail = b
 	}
 }
 
 // BeforeInit run funcs before config Init
-func BeforeInit(fn ...func(context.Context, Config) error) options.Option {
+func BeforeInit(fn ...func(context.Context, Config) error) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".BeforeInit")
+		o.BeforeInit = fn
 	}
 }
 
 // AfterInit run funcs after config Init
-func AfterInit(fn ...func(context.Context, Config) error) options.Option {
+func AfterInit(fn ...func(context.Context, Config) error) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".AfterInit")
+		o.AfterInit = fn
 	}
 }
 
 // BeforeLoad run funcs before config load
-func BeforeLoad(fn ...func(context.Context, Config) error) options.Option {
+func BeforeLoad(fn ...func(context.Context, Config) error) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".BeforeLoad")
+		o.BeforeLoad = fn
 	}
 }
 
 // AfterLoad run funcs after config load
-func AfterLoad(fn ...func(context.Context, Config) error) options.Option {
+func AfterLoad(fn ...func(context.Context, Config) error) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".AfterLoad")
+		o.AfterLoad = fn
 	}
 }
 
 // BeforeSave run funcs before save
-func BeforeSave(fn ...func(context.Context, Config) error) options.Option {
+func BeforeSave(fn ...func(context.Context, Config) error) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".BeforeSave")
+		o.BeforeSave = fn
 	}
 }
 
 // AfterSave run fncs after save
-func AfterSave(fn ...func(context.Context, Config) error) options.Option {
+func AfterSave(fn ...func(context.Context, Config) error) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".AfterSave")
+		o.AfterSave = fn
+	}
+}
+
+// Context pass context
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
+	}
+}
+
+// Codec sets the source codec
+func Codec(c codec.Codec) Option {
+	return func(o *Options) {
+		o.Codec = c
+	}
+}
+
+// Logger sets the logger
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Tracer to be used for tracing
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
 	}
 }
 
 // Struct used as config
-func Struct(v interface{}) options.Option {
+func Struct(v interface{}) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, v, ".Struct")
+		o.Struct = v
 	}
 }
 
 // StructTag sets the struct tag that used for filling
-func StructTag(name string) options.Option {
+func StructTag(name string) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, name, ".StructTag")
+		o.StructTag = name
+	}
+}
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
 	}
 }
 
@@ -187,8 +240,11 @@ type WatchOptions struct {
 	Coalesce bool
 }
 
+// WatchOption func signature
+type WatchOption func(*WatchOptions)
+
 // NewWatchOptions create WatchOptions struct with provided opts
-func NewWatchOptions(opts ...options.Option) WatchOptions {
+func NewWatchOptions(opts ...WatchOption) WatchOptions {
 	options := WatchOptions{
 		Context:     context.Background(),
 		MinInterval: DefaultWatcherMinInterval,
@@ -200,20 +256,31 @@ func NewWatchOptions(opts ...options.Option) WatchOptions {
 	return options
 }
 
-// Coalesce controls watch event combining
+// WatchContext pass context
-func WatchCoalesce(b bool) options.Option {
+func WatchContext(ctx context.Context) WatchOption {
-	return func(src interface{}) error {
+	return func(o *WatchOptions) {
-		return options.Set(src, b, ".Coalesce")
+		o.Context = ctx
+	}
+}
+
+// WatchCoalesce controls watch event combining
+func WatchCoalesce(b bool) WatchOption {
+	return func(o *WatchOptions) {
+		o.Coalesce = b
 	}
 }
 
 // WatchInterval specifies min and max time.Duration for pulling changes
-func WatchInterval(min, max time.Duration) options.Option {
+func WatchInterval(min, max time.Duration) WatchOption {
-	return func(src interface{}) error {
+	return func(o *WatchOptions) {
-		var err error
+		o.MinInterval = min
-		if err = options.Set(src, min, ".MinInterval"); err == nil {
+		o.MaxInterval = max
-			err = options.Set(src, max, ".MaxInterval")
+	}
-		}
+}
-		return err
+
+// WatchStruct overrides struct for fill
+func WatchStruct(src interface{}) WatchOption {
+	return func(o *WatchOptions) {
+		o.Struct = src
 	}
 }

database/dsn.go

@@ -1,159 +0,0 @@
-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] != '/' {
-			continue
-		}
-
-		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

@@ -1,31 +0,0 @@
-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)
-	}
-}

flow/context.go

@@ -22,3 +22,13 @@ func NewContext(ctx context.Context, f Flow) context.Context {
 	}
 	return context.WithValue(ctx, flowKey{}, f)
 }
+
+// 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)
+	}
+}

flow/context_test.go

@@ -40,3 +40,14 @@ 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")
+	}
+}

flow/default.go

@@ -10,8 +10,6 @@ import (
 	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
-	moptions "go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/store"
 	"go.unistack.org/micro/v4/util/id"
 )
@@ -165,7 +163,7 @@ func (w *microWorkflow) Resume(ctx context.Context, id string) error {
 	return workflowStore.Write(ctx, "status", &codec.Frame{Data: []byte(StatusRunning.String())})
 }
 
-func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...options.Option) (string, error) {
+func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...ExecuteOption) (string, error) {
 	w.Lock()
 	if !w.init {
 		if err := w.g.Validate(); err != nil {
@@ -190,7 +188,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...optio
 	steps, err := w.getSteps(options.Start, options.Reverse)
 	if err != nil {
 		if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusPending.String())}); werr != nil {
-			w.opts.Logger.Error(w.opts.Context, "store write error", "error", werr.Error())
+			w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr)
 		}
 		return "", err
 	}
@@ -202,19 +200,19 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...optio
 	nctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
-	nopts := make([]moptions.Option, 0, len(opts)+5)
+	nopts := make([]ExecuteOption, 0, len(opts)+5)
 
 	nopts = append(nopts,
-		moptions.Client(w.opts.Client),
+		ExecuteClient(w.opts.Client),
-		moptions.Tracer(w.opts.Tracer),
+		ExecuteTracer(w.opts.Tracer),
-		moptions.Logger(w.opts.Logger),
+		ExecuteLogger(w.opts.Logger),
-		moptions.Meter(w.opts.Meter),
+		ExecuteMeter(w.opts.Meter),
 	)
 	nopts = append(nopts, opts...)
 	done := make(chan struct{})
 
 	if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusRunning.String())}); werr != nil {
-		w.opts.Logger.Error(w.opts.Context, "store write error", "error", werr.Error())
+		w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr)
 		return eid, werr
 	}
 	for idx := range steps {
@@ -239,7 +237,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...optio
 					return
 				}
 				if w.opts.Logger.V(logger.TraceLevel) {
-					w.opts.Logger.Trace(nctx, fmt.Sprintf("step will be executed %v", steps[idx][nidx]))
+					w.opts.Logger.Tracef(nctx, "will be executed %v", steps[idx][nidx])
 				}
 				cstep := steps[idx][nidx]
 				// nolint: nestif
@@ -259,21 +257,21 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...optio
 						if serr != nil {
 							step.SetStatus(StatusFailure)
 							if werr := stepStore.Write(ctx, step.ID()+w.opts.Store.Options().Separator+"rsp", serr); werr != nil && w.opts.Logger.V(logger.ErrorLevel) {
-								w.opts.Logger.Error(ctx, "store write error", "error", werr.Error())
+								w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
 							}
 							if werr := stepStore.Write(ctx, step.ID()+w.opts.Store.Options().Separator+"status", &codec.Frame{Data: []byte(StatusFailure.String())}); werr != nil && w.opts.Logger.V(logger.ErrorLevel) {
-								w.opts.Logger.Error(ctx, "store write error", "error", werr.Error())
+								w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
 							}
 							cherr <- serr
 							return
 						}
 						if werr := stepStore.Write(ctx, step.ID()+w.opts.Store.Options().Separator+"rsp", rsp); werr != nil {
-							w.opts.Logger.Error(ctx, "store write error", "error", werr.Error())
+							w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
 							cherr <- werr
 							return
 						}
 						if werr := stepStore.Write(ctx, step.ID()+w.opts.Store.Options().Separator+"status", &codec.Frame{Data: []byte(StatusSuccess.String())}); werr != nil {
-							w.opts.Logger.Error(ctx, "store write error", "error", werr.Error())
+							w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
 							cherr <- werr
 							return
 						}
@@ -292,16 +290,16 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...optio
 					if serr != nil {
 						cstep.SetStatus(StatusFailure)
 						if werr := stepStore.Write(ctx, cstep.ID()+w.opts.Store.Options().Separator+"rsp", serr); werr != nil && w.opts.Logger.V(logger.ErrorLevel) {
-							w.opts.Logger.Error(ctx, "store write error", "error", werr.Error())
+							w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
 						}
 						if werr := stepStore.Write(ctx, cstep.ID()+w.opts.Store.Options().Separator+"status", &codec.Frame{Data: []byte(StatusFailure.String())}); werr != nil && w.opts.Logger.V(logger.ErrorLevel) {
-							w.opts.Logger.Error(ctx, "store write error", "error", werr.Error())
+							w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
 						}
 						cherr <- serr
 						return
 					}
 					if werr := stepStore.Write(ctx, cstep.ID()+w.opts.Store.Options().Separator+"rsp", rsp); werr != nil {
-						w.opts.Logger.Error(ctx, "store write error", "error", werr.Error())
+						w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
 						cherr <- werr
 						return
 					}
@@ -319,7 +317,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...optio
 		return eid, nil
 	}
 
-	w.opts.Logger.Trace(ctx, "wait for finish or error")
+	logger.Tracef(ctx, "wait for finish or error")
 	select {
 	case <-nctx.Done():
 		err = nctx.Err()
@@ -335,15 +333,15 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...optio
 	switch {
 	case nctx.Err() != nil:
 		if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusAborted.String())}); werr != nil {
-			w.opts.Logger.Error(w.opts.Context, "store write error", "error", werr.Error())
+			w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr)
 		}
 	case err == nil:
 		if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusSuccess.String())}); werr != nil {
-			w.opts.Logger.Error(w.opts.Context, "store write error", "error", werr.Error())
+			w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr)
 		}
 	case err != nil:
 		if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusFailure.String())}); werr != nil {
-			w.opts.Logger.Error(w.opts.Context, "store write error", "error", werr.Error())
+			w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr)
 		}
 	}
 
@@ -351,7 +349,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...optio
 }
 
 // NewFlow create new flow
-func NewFlow(opts ...options.Option) Flow {
+func NewFlow(opts ...Option) Flow {
 	options := NewOptions(opts...)
 	return &microFlow{opts: options}
 }
@@ -360,7 +358,7 @@ func (f *microFlow) Options() Options {
 	return f.opts
 }
 
-func (f *microFlow) Init(opts ...options.Option) error {
+func (f *microFlow) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&f.opts)
 	}
@@ -489,17 +487,17 @@ func (s *microCallStep) SetStatus(status Status) {
 	s.status = status
 }
 
-func (s *microCallStep) Execute(ctx context.Context, req *Message, opts ...options.Option) (*Message, error) {
+func (s *microCallStep) Execute(ctx context.Context, req *Message, opts ...ExecuteOption) (*Message, error) {
 	options := NewExecuteOptions(opts...)
 	if options.Client == nil {
 		return nil, ErrMissingClient
 	}
 	rsp := &codec.Frame{}
-	copts := []moptions.Option{client.Retries(0)}
+	copts := []client.CallOption{client.WithRetries(0)}
 	if options.Timeout > 0 {
 		copts = append(copts,
-			client.RequestTimeout(options.Timeout),
+			client.WithRequestTimeout(options.Timeout),
-			client.DialTimeout(options.Timeout))
+			client.WithDialTimeout(options.Timeout))
 	}
 	nctx := metadata.NewOutgoingContext(ctx, req.Header)
 	err := options.Client.Call(nctx, options.Client.NewRequest(s.service, s.method, &codec.Frame{Data: req.Body}), rsp, copts...)
@@ -572,18 +570,18 @@ func (s *microPublishStep) SetStatus(status Status) {
 	s.status = status
 }
 
-func (s *microPublishStep) Execute(ctx context.Context, req *Message, opts ...options.Option) (*Message, error) {
+func (s *microPublishStep) Execute(ctx context.Context, req *Message, opts ...ExecuteOption) (*Message, error) {
 	return nil, nil
 }
 
 // NewCallStep create new step with client.Call
-func NewCallStep(service string, name string, method string, opts ...options.Option) Step {
+func NewCallStep(service string, name string, method string, opts ...StepOption) Step {
 	options := NewStepOptions(opts...)
 	return &microCallStep{service: service, method: name + "." + method, opts: options}
 }
 
 // NewPublishStep create new step with client.Publish
-func NewPublishStep(topic string, opts ...options.Option) Step {
+func NewPublishStep(topic string, opts ...StepOption) Step {
 	options := NewStepOptions(opts...)
 	return &microPublishStep{topic: topic, opts: options}
 }

flow/flow.go

@@ -8,7 +8,6 @@ import (
 	"sync/atomic"
 
 	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
 )
 
 var (
@@ -52,7 +51,7 @@ type Step interface {
 	// Endpoint returns rpc endpoint service_name.service_method or broker topic
 	Endpoint() string
 	// Execute step run
-	Execute(ctx context.Context, req *Message, opts ...options.Option) (*Message, error)
+	Execute(ctx context.Context, req *Message, opts ...ExecuteOption) (*Message, error)
 	// Requires returns dependent steps
 	Requires() []string
 	// Options returns step options
@@ -119,7 +118,7 @@ type Workflow interface {
 	// ID returns id of the workflow
 	ID() string
 	// Execute workflow with args, return execution id and error
-	Execute(ctx context.Context, req *Message, opts ...options.Option) (string, error)
+	Execute(ctx context.Context, req *Message, opts ...ExecuteOption) (string, error)
 	// RemoveSteps remove steps from workflow
 	RemoveSteps(steps ...Step) error
 	// AppendSteps append steps to workflow
@@ -141,7 +140,7 @@ type Flow interface {
 	// Options returns options
 	Options() Options
 	// Init initialize
-	Init(...options.Option) error
+	Init(...Option) error
 	// WorkflowCreate creates new workflow with specific id and steps
 	WorkflowCreate(ctx context.Context, id string, steps ...Step) (Workflow, error)
 	// WorkflowSave saves workflow

flow/flow_test.go

@@ -1,36 +0,0 @@
-package flow
-
-import (
-	"reflect"
-	"testing"
-)
-
-func FuzzMarshall(f *testing.F) {
-	f.Fuzz(func(t *testing.T, ref []byte) {
-		rm := RawMessage(ref)
-
-		b, err := rm.MarshalJSON()
-		if err != nil {
-			t.Errorf("Error MarshalJSON: %s", err)
-		}
-
-		if !reflect.DeepEqual(ref, b) {
-			t.Errorf("Error. Expected '%s', was '%s'", ref, b)
-		}
-	})
-}
-
-func FuzzUnmarshall(f *testing.F) {
-	f.Fuzz(func(t *testing.T, ref string) {
-		b := []byte(ref)
-		rm := RawMessage(b)
-
-		if err := rm.UnmarshalJSON(b); err != nil {
-			t.Errorf("Error UnmarshalJSON: %s", err)
-		}
-
-		if ref != string(rm) {
-			t.Errorf("Error. Expected '%s', was '%s'", ref, rm)
-		}
-	})
-}

flow/options.go

@@ -7,11 +7,13 @@ import (
 	"go.unistack.org/micro/v4/client"
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/store"
 	"go.unistack.org/micro/v4/tracer"
 )
 
+// Option func
+type Option func(*Options)
+
 // Options server struct
 type Options struct {
 	// Context holds the external options and can be used for flow shutdown
@@ -29,7 +31,7 @@ type Options struct {
 }
 
 // NewOptions returns new options struct with default or passed values
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
 		Context: context.Background(),
 		Logger:  logger.DefaultLogger,
@@ -45,12 +47,66 @@ func NewOptions(opts ...options.Option) Options {
 	return options
 }
 
+// Logger sets the logger option
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Meter sets the meter option
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// Client to use for sync/async communication
+func Client(c client.Client) Option {
+	return func(o *Options) {
+		o.Client = c
+	}
+}
+
+// Context specifies a context for the service.
+// Can be used to signal shutdown of the flow
+// or can be used for extra option values.
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
+	}
+}
+
+// Tracer mechanism for distributed tracking
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
+	}
+}
+
+// Store used for intermediate results
+func Store(s store.Store) Option {
+	return func(o *Options) {
+		o.Store = s
+	}
+}
+
+// WorkflowOption func signature
+type WorkflowOption func(*WorkflowOptions)
+
 // WorkflowOptions holds workflow options
 type WorkflowOptions struct {
 	Context context.Context
 	ID      string
 }
 
+// WorkflowID set workflow id
+func WorkflowID(id string) WorkflowOption {
+	return func(o *WorkflowOptions) {
+		o.ID = id
+	}
+}
+
 // ExecuteOptions holds execute options
 type ExecuteOptions struct {
 	// Client holds the client.Client
@@ -73,22 +129,67 @@ type ExecuteOptions struct {
 	Async bool
 }
 
-// Reverse says that dag must be run in reverse order
+// ExecuteOption func signature
-func Reverse(b bool) options.Option {
+type ExecuteOption func(*ExecuteOptions)
-	return func(src interface{}) error {
+
-		return options.Set(src, b, ".Reverse")
+// ExecuteClient pass client.Client to ExecuteOption
+func ExecuteClient(c client.Client) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Client = c
 	}
 }
 
-// Async says that caller does not wait for execution complete
+// ExecuteTracer pass tracer.Tracer to ExecuteOption
-func Async(b bool) options.Option {
+func ExecuteTracer(t tracer.Tracer) ExecuteOption {
-	return func(src interface{}) error {
+	return func(o *ExecuteOptions) {
-		return options.Set(src, b, ".Async")
+		o.Tracer = t
+	}
+}
+
+// ExecuteLogger pass logger.Logger to ExecuteOption
+func ExecuteLogger(l logger.Logger) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Logger = l
+	}
+}
+
+// ExecuteMeter pass meter.Meter to ExecuteOption
+func ExecuteMeter(m meter.Meter) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Meter = m
+	}
+}
+
+// ExecuteContext pass context.Context ot ExecuteOption
+func ExecuteContext(ctx context.Context) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Context = ctx
+	}
+}
+
+// ExecuteReverse says that dag must be run in reverse order
+func ExecuteReverse(b bool) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Reverse = b
+	}
+}
+
+// ExecuteTimeout pass timeout time.Duration for execution
+func ExecuteTimeout(td time.Duration) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Timeout = td
+	}
+}
+
+// ExecuteAsync says that caller does not wait for execution complete
+func ExecuteAsync(b bool) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Async = b
 	}
 }
 
 // NewExecuteOptions create new ExecuteOptions struct
-func NewExecuteOptions(opts ...options.Option) ExecuteOptions {
+func NewExecuteOptions(opts ...ExecuteOption) ExecuteOptions {
 	options := ExecuteOptions{
 		Client:  client.DefaultClient,
 		Logger:  logger.DefaultLogger,
@@ -110,8 +211,11 @@ type StepOptions struct {
 	Requires []string
 }
 
+// StepOption func signature
+type StepOption func(*StepOptions)
+
 // NewStepOptions create new StepOptions struct
-func NewStepOptions(opts ...options.Option) StepOptions {
+func NewStepOptions(opts ...StepOption) StepOptions {
 	options := StepOptions{
 		Context: context.Background(),
 	}
@@ -121,23 +225,23 @@ func NewStepOptions(opts ...options.Option) StepOptions {
 	return options
 }
 
-// Requires specifies required steps
+// StepID sets the step id for dag
-func Requires(steps ...string) options.Option {
+func StepID(id string) StepOption {
-	return func(src interface{}) error {
+	return func(o *StepOptions) {
-		return options.Set(src, steps, ".Requires")
+		o.ID = id
 	}
 }
 
-// Fallback set the step to run on error
+// StepRequires specifies required steps
-func Fallback(step string) options.Option {
+func StepRequires(steps ...string) StepOption {
-	return func(src interface{}) error {
+	return func(o *StepOptions) {
-		return options.Set(src, step, ".Fallback")
+		o.Requires = steps
 	}
 }
 
-// ID sets the step ID
+// StepFallback set the step to run on error
-func StepID(id string) options.Option {
+func StepFallback(step string) StepOption {
-	return func(src interface{}) error {
+	return func(o *StepOptions) {
-		return options.Set(src, id, ".ID")
+		o.Fallback = step
 	}
 }

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.Attrs("state", s.Name()))
+			sctx = logger.NewContext(sctx, logger.Fields("state", s.Name()))
 			return next(sctx, s, opts...)
 		}
 	}

go.mod

@@ -3,18 +3,17 @@ module go.unistack.org/micro/v4
 go 1.20
 
 require (
-	dario.cat/mergo v1.0.0
 	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/google/uuid v1.6.0
+	github.com/imdario/mergo v0.3.15
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5
-	golang.org/x/sync v0.6.0
+	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.16.0
+	golang.org/x/sys v0.7.0
-	google.golang.org/grpc v1.62.1
+	google.golang.org/grpc v1.54.0
-	google.golang.org/protobuf v1.32.0
+	google.golang.org/protobuf v1.30.0
 )
 
 require (
 	github.com/golang/protobuf v1.5.3 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 )

go.sum

@@ -1,33 +1,31 @@
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 h1:G/FZtUu7a6NTWl3KUHMV9jkLAh/Rvtf03NWMHaEDl+E=
 github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
+google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
+google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
-google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
+google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag=
-google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

logger/context.go

@@ -20,3 +20,13 @@ 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,3 +40,14 @@ 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

@@ -0,0 +1,230 @@
+package logger
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"os"
+	"runtime"
+	"strings"
+	"sync"
+	"time"
+)
+
+type defaultLogger struct {
+	enc  *json.Encoder
+	opts Options
+	sync.RWMutex
+}
+
+// Init(opts...) should only overwrite provided options
+func (l *defaultLogger) Init(opts ...Option) error {
+	l.Lock()
+	for _, o := range opts {
+		o(&l.opts)
+	}
+	l.enc = json.NewEncoder(l.opts.Out)
+	// wrap the Log func
+	l.Unlock()
+	return nil
+}
+
+func (l *defaultLogger) String() string {
+	return "micro"
+}
+
+func (l *defaultLogger) Clone(opts ...Option) Logger {
+	newopts := NewOptions(opts...)
+	oldopts := l.opts
+	for _, o := range opts {
+		o(&newopts)
+		o(&oldopts)
+	}
+
+	l.Lock()
+	cl := &defaultLogger{opts: oldopts, enc: json.NewEncoder(l.opts.Out)}
+	l.Unlock()
+
+	return cl
+}
+
+func (l *defaultLogger) V(level Level) bool {
+	l.RLock()
+	ok := l.opts.Level.Enabled(level)
+	l.RUnlock()
+	return ok
+}
+
+func (l *defaultLogger) Level(level Level) {
+	l.Lock()
+	l.opts.Level = level
+	l.Unlock()
+}
+
+func (l *defaultLogger) Fields(fields ...interface{}) Logger {
+	l.RLock()
+	nl := &defaultLogger{opts: l.opts, enc: l.enc}
+	if len(fields) == 0 {
+		l.RUnlock()
+		return nl
+	} else if len(fields)%2 != 0 {
+		fields = fields[:len(fields)-1]
+	}
+	nl.opts.Fields = copyFields(l.opts.Fields)
+	nl.opts.Fields = append(nl.opts.Fields, fields...)
+	l.RUnlock()
+	return nl
+}
+
+func copyFields(src []interface{}) []interface{} {
+	dst := make([]interface{}, len(src))
+	copy(dst, src)
+	return dst
+}
+
+// logCallerfilePath returns a package/file:line description of the caller,
+// preserving only the leaf directory name and file name.
+func logCallerfilePath(loggingFilePath string) string {
+	// To make sure we trim the path correctly on Windows too, we
+	// counter-intuitively need to use '/' and *not* os.PathSeparator here,
+	// because the path given originates from Go stdlib, specifically
+	// runtime.Caller() which (as of Mar/17) returns forward slashes even on
+	// Windows.
+	//
+	// See https://github.com/golang/go/issues/3335
+	// and https://github.com/golang/go/issues/18151
+	//
+	// for discussion on the issue on Go side.
+	idx := strings.LastIndexByte(loggingFilePath, '/')
+	if idx == -1 {
+		return loggingFilePath
+	}
+	idx = strings.LastIndexByte(loggingFilePath[:idx], '/')
+	if idx == -1 {
+		return loggingFilePath
+	}
+	return loggingFilePath[idx+1:]
+}
+
+func (l *defaultLogger) Info(ctx context.Context, args ...interface{}) {
+	l.Log(ctx, InfoLevel, args...)
+}
+
+func (l *defaultLogger) Error(ctx context.Context, args ...interface{}) {
+	l.Log(ctx, ErrorLevel, args...)
+}
+
+func (l *defaultLogger) Debug(ctx context.Context, args ...interface{}) {
+	l.Log(ctx, DebugLevel, args...)
+}
+
+func (l *defaultLogger) Warn(ctx context.Context, args ...interface{}) {
+	l.Log(ctx, WarnLevel, args...)
+}
+
+func (l *defaultLogger) Trace(ctx context.Context, args ...interface{}) {
+	l.Log(ctx, TraceLevel, args...)
+}
+
+func (l *defaultLogger) Fatal(ctx context.Context, args ...interface{}) {
+	l.Log(ctx, FatalLevel, args...)
+	os.Exit(1)
+}
+
+func (l *defaultLogger) Infof(ctx context.Context, msg string, args ...interface{}) {
+	l.Logf(ctx, InfoLevel, msg, args...)
+}
+
+func (l *defaultLogger) Errorf(ctx context.Context, msg string, args ...interface{}) {
+	l.Logf(ctx, ErrorLevel, msg, args...)
+}
+
+func (l *defaultLogger) Debugf(ctx context.Context, msg string, args ...interface{}) {
+	l.Logf(ctx, DebugLevel, msg, args...)
+}
+
+func (l *defaultLogger) Warnf(ctx context.Context, msg string, args ...interface{}) {
+	l.Logf(ctx, WarnLevel, msg, args...)
+}
+
+func (l *defaultLogger) Tracef(ctx context.Context, msg string, args ...interface{}) {
+	l.Logf(ctx, TraceLevel, msg, args...)
+}
+
+func (l *defaultLogger) Fatalf(ctx context.Context, msg string, args ...interface{}) {
+	l.Logf(ctx, FatalLevel, msg, args...)
+	os.Exit(1)
+}
+
+func (l *defaultLogger) Log(ctx context.Context, level Level, args ...interface{}) {
+	if !l.V(level) {
+		return
+	}
+
+	l.RLock()
+	fields := copyFields(l.opts.Fields)
+	l.RUnlock()
+
+	fields = append(fields, "level", level.String())
+
+	if _, file, line, ok := runtime.Caller(l.opts.CallerSkipCount); ok {
+		fields = append(fields, "caller", fmt.Sprintf("%s:%d", logCallerfilePath(file), line))
+	}
+	fields = append(fields, "timestamp", time.Now().Format("2006-01-02 15:04:05"))
+
+	if len(args) > 0 {
+		fields = append(fields, "msg", fmt.Sprint(args...))
+	}
+
+	out := make(map[string]interface{}, len(fields)/2)
+	for i := 0; i < len(fields); i += 2 {
+		out[fields[i].(string)] = fields[i+1]
+	}
+	l.RLock()
+	_ = l.enc.Encode(out)
+	l.RUnlock()
+}
+
+func (l *defaultLogger) Logf(ctx context.Context, level Level, msg string, args ...interface{}) {
+	if !l.V(level) {
+		return
+	}
+
+	l.RLock()
+	fields := copyFields(l.opts.Fields)
+	l.RUnlock()
+
+	fields = append(fields, "level", level.String())
+
+	if _, file, line, ok := runtime.Caller(l.opts.CallerSkipCount); ok {
+		fields = append(fields, "caller", fmt.Sprintf("%s:%d", logCallerfilePath(file), line))
+	}
+
+	fields = append(fields, "timestamp", time.Now().Format("2006-01-02 15:04:05"))
+	if len(args) > 0 {
+		fields = append(fields, "msg", fmt.Sprintf(msg, args...))
+	} else if msg != "" {
+		fields = append(fields, "msg", msg)
+	}
+
+	out := make(map[string]interface{}, len(fields)/2)
+	for i := 0; i < len(fields); i += 2 {
+		out[fields[i].(string)] = fields[i+1]
+	}
+	l.RLock()
+	_ = l.enc.Encode(out)
+	l.RUnlock()
+}
+
+func (l *defaultLogger) Options() Options {
+	return l.opts
+}
+
+// NewLogger builds a new logger based on options
+func NewLogger(opts ...Option) Logger {
+	l := &defaultLogger{
+		opts: NewOptions(opts...),
+	}
+	l.enc = json.NewEncoder(l.opts.Out)
+	return l
+}

logger/logger.go

@@ -1,19 +1,14 @@
 // Package logger provides a log interface
-package logger
+package logger // import "go.unistack.org/micro/v4/logger"
 
 import (
 	"context"
-
+	"os"
-	"go.unistack.org/micro/v4/options"
 )
 
-type ContextAttrFunc func(ctx context.Context) []interface{}
-
-var DefaultContextAttrFuncs []ContextAttrFunc
-
 var (
 	// DefaultLogger variable
-	DefaultLogger = NewLogger()
+	DefaultLogger = NewLogger(WithLevel(ParseLevel(os.Getenv("MICRO_LOG_LEVEL"))))
 	// DefaultLevel used by logger
 	DefaultLevel = InfoLevel
 	// DefaultCallerSkipCount used by logger
@@ -23,65 +18,110 @@ var (
 // Logger is a generic logging interface
 type Logger interface {
 	// Init initialises options
-	Init(opts ...options.Option) error
+	Init(opts ...Option) error
 	// Clone create logger copy with new options
-	Clone(opts ...options.Option) Logger
+	Clone(opts ...Option) Logger
 	// V compare provided verbosity level with current log level
 	V(level Level) bool
 	// Level sets the log level for logger
 	Level(level Level)
 	// The Logger options
 	Options() Options
-	// Attrs set attrs to always be logged with keyval pairs
+	// Fields set fields to always be logged with keyval pairs
-	Attrs(attrs ...interface{}) Logger
+	Fields(fields ...interface{}) Logger
 	// Info level message
-	Info(ctx context.Context, msg string, attrs ...interface{})
+	Info(ctx context.Context, args ...interface{})
-	// Tracef level message
+	// Trace level message
-	Trace(ctx context.Context, msg string, attrs ...interface{})
+	Trace(ctx context.Context, args ...interface{})
 	// Debug level message
-	Debug(ctx context.Context, msg string, attrs ...interface{})
+	Debug(ctx context.Context, args ...interface{})
 	// Warn level message
-	Warn(ctx context.Context, msg string, attrs ...interface{})
+	Warn(ctx context.Context, args ...interface{})
 	// Error level message
-	Error(ctx context.Context, msg string, attrs ...interface{})
+	Error(ctx context.Context, args ...interface{})
 	// Fatal level message
-	Fatal(ctx context.Context, msg string, attrs ...interface{})
+	Fatal(ctx context.Context, args ...interface{})
+	// Infof level message
+	Infof(ctx context.Context, msg string, args ...interface{})
+	// Tracef level message
+	Tracef(ctx context.Context, msg string, args ...interface{})
+	// Debug level message
+	Debugf(ctx context.Context, msg string, args ...interface{})
+	// Warn level message
+	Warnf(ctx context.Context, msg string, args ...interface{})
+	// Error level message
+	Errorf(ctx context.Context, msg string, args ...interface{})
+	// Fatal level message
+	Fatalf(ctx context.Context, msg string, args ...interface{})
 	// Log logs message with needed level
-	Log(ctx context.Context, level Level, msg string, attrs ...interface{})
+	Log(ctx context.Context, level Level, args ...interface{})
-	// String returns the type name of logger
+	// Logf logs message with needed level
-	String() string
+	Logf(ctx context.Context, level Level, msg string, args ...interface{})
 	// String returns the name of logger
-	Name() string
+	String() string
 }
 
-// Info writes formatted msg to default logger on info level
+// Field contains keyval pair
-func Info(ctx context.Context, msg string, attrs ...interface{}) {
+type Field interface{}
-	DefaultLogger.Info(ctx, msg, attrs...)
+
+// Info writes msg to default logger on info level
+func Info(ctx context.Context, args ...interface{}) {
+	DefaultLogger.Info(ctx, args...)
 }
 
-// Error writes formatted msg to default logger on error level
+// Error writes msg to default logger on error level
-func Error(ctx context.Context, msg string, attrs ...interface{}) {
+func Error(ctx context.Context, args ...interface{}) {
-	DefaultLogger.Error(ctx, msg, attrs...)
+	DefaultLogger.Error(ctx, args...)
 }
 
-// Debug writes formatted msg to default logger on debug level
+// Debug writes msg to default logger on debug level
-func Debug(ctx context.Context, msg string, attrs ...interface{}) {
+func Debug(ctx context.Context, args ...interface{}) {
-	DefaultLogger.Debug(ctx, msg, attrs...)
+	DefaultLogger.Debug(ctx, args...)
 }
 
-// Warn writes formatted msg to default logger on warn level
+// Warn writes msg to default logger on warn level
-func Warn(ctx context.Context, msg string, attrs ...interface{}) {
+func Warn(ctx context.Context, args ...interface{}) {
-	DefaultLogger.Warn(ctx, msg, attrs...)
+	DefaultLogger.Warn(ctx, args...)
 }
 
-// Trace writes formatted msg to default logger on trace level
+// Trace writes msg to default logger on trace level
-func Trace(ctx context.Context, msg string, attrs ...interface{}) {
+func Trace(ctx context.Context, args ...interface{}) {
-	DefaultLogger.Trace(ctx, msg, attrs...)
+	DefaultLogger.Trace(ctx, args...)
 }
 
-// Fatal writes formatted msg to default logger on fatal level
+// Fatal writes msg to default logger on fatal level
-func Fatal(ctx context.Context, msg string, attrs ...interface{}) {
+func Fatal(ctx context.Context, args ...interface{}) {
-	DefaultLogger.Fatal(ctx, msg, attrs...)
+	DefaultLogger.Fatal(ctx, args...)
+}
+
+// Infof writes formatted msg to default logger on info level
+func Infof(ctx context.Context, msg string, args ...interface{}) {
+	DefaultLogger.Infof(ctx, msg, args...)
+}
+
+// Errorf writes formatted msg to default logger on error level
+func Errorf(ctx context.Context, msg string, args ...interface{}) {
+	DefaultLogger.Errorf(ctx, msg, args...)
+}
+
+// Debugf writes formatted msg to default logger on debug level
+func Debugf(ctx context.Context, msg string, args ...interface{}) {
+	DefaultLogger.Debugf(ctx, msg, args...)
+}
+
+// Warnf writes formatted msg to default logger on warn level
+func Warnf(ctx context.Context, msg string, args ...interface{}) {
+	DefaultLogger.Warnf(ctx, msg, args...)
+}
+
+// Tracef writes formatted msg to default logger on trace level
+func Tracef(ctx context.Context, msg string, args ...interface{}) {
+	DefaultLogger.Tracef(ctx, msg, args...)
+}
+
+// Fatalf writes formatted msg to default logger on fatal level
+func Fatalf(ctx context.Context, msg string, args ...interface{}) {
+	DefaultLogger.Fatalf(ctx, msg, args...)
 }
 
 // V returns true if passed level enabled in default logger
@@ -89,12 +129,12 @@ func V(level Level) bool {
 	return DefaultLogger.V(level)
 }
 
-// Init initialize default logger
+// Init initialize logger
-func Init(opts ...options.Option) error {
+func Init(opts ...Option) error {
 	return DefaultLogger.Init(opts...)
 }
 
-// Attrs create default logger with specific attrs
+// Fields create logger with specific fields
-func Attrs(attrs ...interface{}) Logger {
+func Fields(fields ...interface{}) Logger {
-	return DefaultLogger.Attrs(attrs...)
+	return DefaultLogger.Fields(fields...)
 }

logger/logger_test.go

@@ -0,0 +1,138 @@
+package logger
+
+import (
+	"bytes"
+	"context"
+	"log"
+	"testing"
+)
+
+func TestContext(t *testing.T) {
+	ctx := context.TODO()
+	buf := bytes.NewBuffer(nil)
+	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	if err := l.Init(); err != nil {
+		t.Fatal(err)
+	}
+
+	nl, ok := FromContext(NewContext(ctx, l.Fields("key", "val")))
+	if !ok {
+		t.Fatal("context without logger")
+	}
+	nl.Info(ctx, "message")
+	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
+		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
+	}
+}
+
+func TestFields(t *testing.T) {
+	ctx := context.TODO()
+	buf := bytes.NewBuffer(nil)
+	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	if err := l.Init(); err != nil {
+		t.Fatal(err)
+	}
+
+	nl := l.Fields("key", "val")
+
+	nl.Info(ctx, "message")
+	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
+		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
+	}
+}
+
+func TestFromContextWithFields(t *testing.T) {
+	ctx := context.TODO()
+	buf := bytes.NewBuffer(nil)
+	var ok bool
+	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	if err := l.Init(); err != nil {
+		t.Fatal(err)
+	}
+	nl := l.Fields("key", "val")
+
+	ctx = NewContext(ctx, nl)
+
+	l, ok = FromContext(ctx)
+	if !ok {
+		t.Fatalf("context does not have logger")
+	}
+
+	l.Info(ctx, "message")
+	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
+		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
+	}
+}
+
+func TestClone(t *testing.T) {
+	ctx := context.TODO()
+	buf := bytes.NewBuffer(nil)
+	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	if err := l.Init(); err != nil {
+		t.Fatal(err)
+	}
+	nl := l.Clone(WithLevel(ErrorLevel))
+	if err := nl.Init(); err != nil {
+		t.Fatal(err)
+	}
+	nl.Info(ctx, "info message")
+	if len(buf.Bytes()) != 0 {
+		t.Fatal("message must not be logged")
+	}
+	l.Info(ctx, "info message")
+	if len(buf.Bytes()) == 0 {
+		t.Fatal("message must be logged")
+	}
+}
+
+func TestRedirectStdLogger(t *testing.T) {
+	buf := bytes.NewBuffer(nil)
+	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	if err := l.Init(); err != nil {
+		t.Fatal(err)
+	}
+	fn := RedirectStdLogger(l, ErrorLevel)
+	defer fn()
+	log.Print("test")
+	if !bytes.Contains(buf.Bytes(), []byte(`"level":"error","msg":"test","timestamp"`)) {
+		t.Fatalf("logger error, buf %s", buf.Bytes())
+	}
+}
+
+func TestStdLogger(t *testing.T) {
+	buf := bytes.NewBuffer(nil)
+	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	if err := l.Init(); err != nil {
+		t.Fatal(err)
+	}
+	lg := NewStdLogger(l, ErrorLevel)
+	lg.Print("test")
+	if !bytes.Contains(buf.Bytes(), []byte(`"level":"error","msg":"test","timestamp"`)) {
+		t.Fatalf("logger error, buf %s", buf.Bytes())
+	}
+}
+
+func TestLogger(t *testing.T) {
+	ctx := context.TODO()
+	buf := bytes.NewBuffer(nil)
+	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	if err := l.Init(); err != nil {
+		t.Fatal(err)
+	}
+	l.Trace(ctx, "trace_msg1")
+	l.Warn(ctx, "warn_msg1")
+	l.Fields("error", "test").Info(ctx, "error message")
+	l.Warn(ctx, "first", " ", "second")
+	if !bytes.Contains(buf.Bytes(), []byte(`"level":"trace","msg":"trace_msg1"`)) {
+		t.Fatalf("logger error, buf %s", buf.Bytes())
+	}
+	if !bytes.Contains(buf.Bytes(), []byte(`"warn","msg":"warn_msg1"`)) {
+		t.Fatalf("logger error, buf %s", buf.Bytes())
+	}
+	if !bytes.Contains(buf.Bytes(), []byte(`"error":"test","level":"info","msg":"error message"`)) {
+		t.Fatalf("logger error, buf %s", buf.Bytes())
+	}
+	if !bytes.Contains(buf.Bytes(), []byte(`"level":"warn","msg":"first second"`)) {
+		t.Fatalf("logger error, buf %s", buf.Bytes())
+	}
+}

logger/noop.go

@@ -1,75 +0,0 @@
-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) Name() string {
-	return l.opts.Name
-}
-
-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,241 +3,81 @@ package logger
 import (
 	"context"
 	"io"
-	"log/slog"
 	"os"
-	"reflect"
-	"time"
-
-	"go.unistack.org/micro/v4/options"
-	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
+// Option func
+type Option func(*Options)
+
 // Options holds logger options
 type Options struct {
 	// Out holds the output writer
 	Out io.Writer
 	// Context holds exernal options
 	Context context.Context
-	// TimeFunc used to obtain current time
+	// Fields holds additional metadata
-	TimeFunc func() time.Time
+	Fields []interface{}
-	// TimeKey is the key used for the time of the log call
-	TimeKey string
 	// Name holds the logger name
 	Name 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
-	// ErrorKey is the key used for the error info
-	ErrorKey string
-	// SourceKey is the key used for the source file and line of the log call
-	SourceKey string
-	// StacktraceKey is the key used for the stacktrace
-	StacktraceKey string
-	// Attrs holds additional attributes
-	Attrs []interface{}
-	// ContextAttrFuncs contains funcs that executed before log func on context
-	ContextAttrFuncs []ContextAttrFunc
-	// CallerSkipCount number of frmaes to skip
-	CallerSkipCount int
 	// The logging level the logger should log
 	Level Level
-	// AddStacktrace controls writing of stacktaces on error
+	// CallerSkipCount number of frmaes to skip
-	AddStacktrace bool
+	CallerSkipCount int
-	// AddSource enabled writing source file and position in log
-	AddSource bool
 }
 
 // NewOptions creates new options struct
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
 		Level:           DefaultLevel,
-		Attrs:            make([]interface{}, 0, 6),
+		Fields:          make([]interface{}, 0, 6),
 		Out:             os.Stderr,
 		CallerSkipCount: DefaultCallerSkipCount,
 		Context:         context.Background(),
-		ContextAttrFuncs: DefaultContextAttrFuncs,
-		AddSource:        true,
-		TimeFunc:         time.Now,
 	}
-
-	_ = WithMicroKeys()(&options)
-
 	for _, o := range opts {
-		_ = o(&options)
+		o(&options)
 	}
 	return options
 }
 
-// WithContextAttrFuncs appends default funcs for the context arrts filler
+// WithFields set default fields for the logger
-func WithContextAttrFuncs(fncs ...ContextAttrFunc) options.Option {
+func WithFields(fields ...interface{}) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		v, err := options.Get(src, ".ContextAttrFuncs")
+		o.Fields = fields
-		if err != nil {
-			return err
-		} else if rutil.IsZero(v) {
-			v = reflect.MakeSlice(reflect.TypeOf(v), 0, len(fncs)).Interface()
-		}
-		cv := reflect.ValueOf(v)
-		for _, l := range fncs {
-			cv = reflect.Append(cv, reflect.ValueOf(l))
-		}
-		return options.Set(src, cv.Interface(), ".ContextAttrFuncs")
-	}
-}
-
-// WithAttrs set default fields for the logger
-func WithAttrs(attrs ...interface{}) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, attrs, ".Attrs")
 	}
 }
 
 // WithLevel set default level for the logger
-func WithLevel(lvl Level) options.Option {
+func WithLevel(level Level) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, lvl, ".Level")
+		o.Level = level
 	}
 }
 
 // WithOutput set default output writer for the logger
-func WithOutput(out io.Writer) options.Option {
+func WithOutput(out io.Writer) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, out, ".Out")
+		o.Out = out
 	}
 }
 
 // WithCallerSkipCount set frame count to skip
-func WithCallerSkipCount(c int) options.Option {
+func WithCallerSkipCount(c int) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, c, ".CallerSkipCount")
+		o.CallerSkipCount = c
 	}
 }
 
-func WithZapKeys() options.Option {
+// WithContext set context
-	return func(src interface{}) error {
+func WithContext(ctx context.Context) Option {
-		var err error
+	return func(o *Options) {
-		if err = options.Set(src, "@timestamp", ".TimeKey"); err != nil {
+		o.Context = ctx
-			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
-		}
-		if err = options.Set(src, "stacktrace", ".StacktraceKey"); err != nil {
-			return err
-		}
-		if err = options.Set(src, "error", ".ErrorKey"); err != nil {
-			return err
-		}
-		return nil
 	}
 }
 
-func WithZerologKeys() options.Option {
+// WithName sets the name
-	return func(src interface{}) error {
+func WithName(n string) Option {
-		var err error
+	return func(o *Options) {
-		if err = options.Set(src, "time", ".TimeKey"); err != nil {
+		o.Name = n
-			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
-		}
-		if err = options.Set(src, "stacktrace", ".StacktraceKey"); err != nil {
-			return err
-		}
-		if err = options.Set(src, "error", ".ErrorKey"); 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
-		}
-		if err = options.Set(src, "stacktrace", ".StacktraceKey"); err != nil {
-			return err
-		}
-		if err = options.Set(src, "error", ".ErrorKey"); 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
-		}
-		if err = options.Set(src, "stacktrace", ".StacktraceKey"); err != nil {
-			return err
-		}
-		if err = options.Set(src, "error", ".ErrorKey"); err != nil {
-			return err
-		}
-		return nil
-	}
-}
-
-// WithAddCallerSkipCount add skip count for copy logger
-func WithAddCallerSkipCount(n int) options.Option {
-	return func(src interface{}) error {
-		c, err := options.Get(src, ".CallerSkipCount")
-		if err != nil {
-			return err
-		}
-		if err = options.Set(src, c.(int)+n, ".CallerSkipCount"); err != nil {
-			return err
-		}
-		return nil
-	}
-}
-
-// WithAddStacktrace controls writing stacktrace on error
-func WithAddStacktrace(v bool) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, v, ".AddStacktrace")
-	}
-}
-
-// WitAddSource controls writing source file and pos in log
-func WithAddSource(v bool) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, v, ".AddSource")
 	}
 }

logger/slog/slog.go

@@ -1,378 +0,0 @@
-package slog
-
-import (
-	"context"
-	"log/slog"
-	"os"
-	"regexp"
-	"runtime"
-	"strconv"
-	"sync"
-
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v4/tracer"
-)
-
-var reTrace = regexp.MustCompile(`.*/slog/logger\.go.*\n`)
-
-var (
-	traceValue = slog.StringValue("trace")
-	debugValue = slog.StringValue("debug")
-	infoValue  = slog.StringValue("info")
-	warnValue  = slog.StringValue("warn")
-	errorValue = slog.StringValue("error")
-	fatalValue = slog.StringValue("fatal")
-)
-
-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 = s.opts.SourceKey
-	case slog.TimeKey:
-		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 < logger.DebugLevel:
-			a.Value = traceValue
-		case lvl < logger.InfoLevel:
-			a.Value = debugValue
-		case lvl < logger.WarnLevel:
-			a.Value = infoValue
-		case lvl < logger.ErrorLevel:
-			a.Value = warnValue
-		case lvl < logger.FatalLevel:
-			a.Value = errorValue
-		case lvl >= logger.FatalLevel:
-			a.Value = fatalValue
-		default:
-			a.Value = infoValue
-		}
-	}
-
-	return a
-}
-
-type slogLogger struct {
-	leveler *slog.LevelVar
-	handler slog.Handler
-	opts    logger.Options
-	mu      sync.RWMutex
-}
-
-func (s *slogLogger) Clone(opts ...options.Option) logger.Logger {
-	s.mu.RLock()
-	options := s.opts
-	s.mu.RUnlock()
-
-	for _, o := range opts {
-		_ = o(&options)
-	}
-
-	l := &slogLogger{
-		opts: options,
-	}
-
-	l.leveler = new(slog.LevelVar)
-	handleOpt := &slog.HandlerOptions{
-		ReplaceAttr: l.renameAttr,
-		Level:       l.leveler,
-		AddSource:   l.opts.AddSource,
-	}
-	l.leveler.Set(loggerToSlogLevel(l.opts.Level))
-	l.handler = slog.New(slog.NewJSONHandler(options.Out, handleOpt)).With(options.Attrs...).Handler()
-
-	return l
-}
-
-func (s *slogLogger) V(level logger.Level) bool {
-	return s.opts.Level.Enabled(level)
-}
-
-func (s *slogLogger) Level(level logger.Level) {
-	s.leveler.Set(loggerToSlogLevel(level))
-}
-
-func (s *slogLogger) Options() logger.Options {
-	return s.opts
-}
-
-func (s *slogLogger) Attrs(attrs ...interface{}) logger.Logger {
-	s.mu.RLock()
-	level := s.leveler.Level()
-	options := s.opts
-	s.mu.RUnlock()
-
-	l := &slogLogger{opts: options}
-	l.leveler = new(slog.LevelVar)
-	l.leveler.Set(level)
-
-	handleOpt := &slog.HandlerOptions{
-		ReplaceAttr: l.renameAttr,
-		Level:       l.leveler,
-		AddSource:   l.opts.AddSource,
-	}
-
-	l.handler = slog.New(slog.NewJSONHandler(s.opts.Out, handleOpt)).With(attrs...).Handler()
-
-	return l
-}
-
-func (s *slogLogger) Init(opts ...options.Option) error {
-	s.mu.Lock()
-
-	if len(s.opts.ContextAttrFuncs) == 0 {
-		s.opts.ContextAttrFuncs = logger.DefaultContextAttrFuncs
-	}
-
-	for _, o := range opts {
-		if err := o(&s.opts); err != nil {
-			return err
-		}
-	}
-
-	s.leveler = new(slog.LevelVar)
-	handleOpt := &slog.HandlerOptions{
-		ReplaceAttr: s.renameAttr,
-		Level:       s.leveler,
-		AddSource:   s.opts.AddSource,
-	}
-	s.leveler.Set(loggerToSlogLevel(s.opts.Level))
-	s.handler = slog.New(slog.NewJSONHandler(s.opts.Out, handleOpt)).With(s.opts.Attrs...).Handler()
-	s.mu.Unlock()
-
-	return nil
-}
-
-func (s *slogLogger) Log(ctx context.Context, lvl logger.Level, msg string, attrs ...interface{}) {
-	if !s.V(lvl) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(s.opts.TimeFunc(), loggerToSlogLevel(lvl), msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	for idx, attr := range attrs {
-		if ve, ok := attr.(error); ok && ve != nil {
-			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
-			break
-		}
-	}
-	if s.opts.AddStacktrace && lvl == logger.ErrorLevel {
-		stackInfo := make([]byte, 1024*1024)
-		if stackSize := runtime.Stack(stackInfo, false); stackSize > 0 {
-			traceLines := reTrace.Split(string(stackInfo[:stackSize]), -1)
-			if len(traceLines) != 0 {
-				attrs = append(attrs, slog.String(s.opts.StacktraceKey, traceLines[len(traceLines)-1]))
-			}
-		}
-	}
-	r.Add(attrs...)
-	r.Attrs(func(a slog.Attr) bool {
-		if a.Key == s.opts.ErrorKey {
-			if span, ok := tracer.SpanFromContext(ctx); ok {
-				span.SetStatus(tracer.SpanStatusError, a.Value.String())
-				return false
-			}
-		}
-		return true
-	})
-	_ = s.handler.Handle(ctx, r)
-}
-
-func (s *slogLogger) Info(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(logger.InfoLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelInfo, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	for idx, attr := range attrs {
-		if ve, ok := attr.(error); ok && ve != nil {
-			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
-			break
-		}
-	}
-	r.Add(attrs...)
-	_ = s.handler.Handle(ctx, r)
-}
-
-func (s *slogLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(logger.DebugLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelDebug, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	for idx, attr := range attrs {
-		if ve, ok := attr.(error); ok && ve != nil {
-			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
-			break
-		}
-	}
-	r.Add(attrs...)
-	_ = s.handler.Handle(ctx, r)
-}
-
-func (s *slogLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(logger.TraceLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelDebug-1, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	for idx, attr := range attrs {
-		if ve, ok := attr.(error); ok && ve != nil {
-			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
-			break
-		}
-	}
-	r.Add(attrs...)
-	_ = s.handler.Handle(ctx, r)
-}
-
-func (s *slogLogger) Error(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(logger.ErrorLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelError, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	for idx, attr := range attrs {
-		if ve, ok := attr.(error); ok && ve != nil {
-			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
-			break
-		}
-	}
-	if s.opts.AddStacktrace {
-		stackInfo := make([]byte, 1024*1024)
-		if stackSize := runtime.Stack(stackInfo, false); stackSize > 0 {
-			traceLines := reTrace.Split(string(stackInfo[:stackSize]), -1)
-			if len(traceLines) != 0 {
-				attrs = append(attrs, slog.String(s.opts.StacktraceKey, traceLines[len(traceLines)-1]))
-			}
-		}
-	}
-	r.Add(attrs...)
-	r.Attrs(func(a slog.Attr) bool {
-		if a.Key == s.opts.ErrorKey {
-			if span, ok := tracer.SpanFromContext(ctx); ok {
-				span.SetStatus(tracer.SpanStatusError, a.Value.String())
-				return false
-			}
-		}
-		return true
-	})
-	_ = s.handler.Handle(ctx, r)
-}
-
-func (s *slogLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(logger.FatalLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelError+1, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	for idx, attr := range attrs {
-		if ve, ok := attr.(error); ok && ve != nil {
-			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
-			break
-		}
-	}
-	r.Add(attrs...)
-	_ = s.handler.Handle(ctx, r)
-	os.Exit(1)
-}
-
-func (s *slogLogger) Warn(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(logger.WarnLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelWarn, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	for idx, attr := range attrs {
-		if ve, ok := attr.(error); ok && ve != nil {
-			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
-			break
-		}
-	}
-	r.Add(attrs...)
-	_ = s.handler.Handle(ctx, r)
-}
-
-func (s *slogLogger) Name() string {
-	return s.opts.Name
-}
-
-func (s *slogLogger) String() string {
-	return "slog"
-}
-
-func NewLogger(opts ...options.Option) logger.Logger {
-	l := &slogLogger{
-		opts: logger.NewOptions(opts...),
-	}
-	return l
-}
-
-func loggerToSlogLevel(level logger.Level) slog.Level {
-	switch level {
-	case logger.DebugLevel:
-		return slog.LevelDebug
-	case logger.WarnLevel:
-		return slog.LevelWarn
-	case logger.ErrorLevel:
-		return slog.LevelError
-	case logger.TraceLevel:
-		return slog.LevelDebug - 1
-	case logger.FatalLevel:
-		return slog.LevelError + 1
-	default:
-		return slog.LevelInfo
-	}
-}
-
-func slogToLoggerLevel(level slog.Level) logger.Level {
-	switch level {
-	case slog.LevelDebug:
-		return logger.DebugLevel
-	case slog.LevelWarn:
-		return logger.WarnLevel
-	case slog.LevelError:
-		return logger.ErrorLevel
-	case slog.LevelDebug - 1:
-		return logger.TraceLevel
-	case slog.LevelError + 1:
-		return logger.FatalLevel
-	default:
-		return logger.InfoLevel
-	}
-}

logger/slog/slog_test.go

@@ -1,155 +0,0 @@
-package slog
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"log"
-	"testing"
-
-	"go.unistack.org/micro/v4/logger"
-)
-
-func TestError(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(buf), logger.WithAddStacktrace(true))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-	l.Error(ctx, "msg", fmt.Errorf("message"))
-	if !bytes.Contains(buf.Bytes(), []byte(`"stacktrace":"`)) {
-		t.Fatalf("logger stacktrace not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestContext(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	nl, ok := logger.FromContext(logger.NewContext(ctx, l.Attrs("key", "val")))
-	if !ok {
-		t.Fatal("context without logger")
-	}
-	nl.Info(ctx, "message")
-	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
-		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestAttrs(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	nl := l.Attrs("key", "val")
-
-	nl.Info(ctx, "message")
-	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
-		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestFromContextWithFields(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	var ok bool
-	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-	nl := l.Attrs("key", "val")
-
-	ctx = logger.NewContext(ctx, nl)
-
-	l, ok = logger.FromContext(ctx)
-	if !ok {
-		t.Fatalf("context does not have logger")
-	}
-
-	l.Info(ctx, "message")
-	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
-		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestClone(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-	nl := l.Clone(logger.WithLevel(logger.ErrorLevel))
-	if err := nl.Init(); err != nil {
-		t.Fatal(err)
-	}
-	nl.Info(ctx, "info message")
-	if len(buf.Bytes()) != 0 {
-		t.Fatal("message must not be logged")
-	}
-	l.Info(ctx, "info message")
-	if len(buf.Bytes()) == 0 {
-		t.Fatal("message must be logged")
-	}
-}
-
-func TestRedirectStdLogger(t *testing.T) {
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-	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"`))) {
-		t.Fatalf("logger error, buf %s", buf.Bytes())
-	}
-}
-
-func TestStdLogger(t *testing.T) {
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-	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())
-	}
-}
-
-func TestLogger(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-	l.Trace(ctx, "trace_msg1")
-	l.Warn(ctx, "warn_msg1")
-	l.Attrs("error", "test").Info(ctx, "error message")
-	l.Warn(ctx, "first second")
-
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"trace"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"trace_msg1"`))) {
-		t.Fatalf("logger tracer, buf %s", buf.Bytes())
-	}
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"warn"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"warn_msg1"`))) {
-		t.Fatalf("logger warn, buf %s", buf.Bytes())
-	}
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"info"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"error message","error":"test"`))) {
-		t.Fatalf("logger info, buf %s", buf.Bytes())
-	}
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"warn"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"first second"`))) {
-		t.Fatalf("logger warn, buf %s", buf.Bytes())
-	}
-}

logger/stdlogger.go

@@ -12,7 +12,7 @@ type stdLogger struct {
 
 // NewStdLogger returns new *log.Logger baked by logger.Logger implementation
 func NewStdLogger(l Logger, level Level) *log.Logger {
-	return log.New(&stdLogger{l: l.Clone(WithCallerSkipCount(l.Options().CallerSkipCount + 1)), level: level}, "" /* prefix */, 0 /* flags */)
+	return log.New(&stdLogger{l: l, level: level}, "" /* prefix */, 0 /* flags */)
 }
 
 func (sl *stdLogger) Write(p []byte) (int, error) {

logger/unwrap/unwrap.go

@@ -56,9 +56,9 @@ type Wrapper struct {
 	s                fmt.State
 	pointers         map[uintptr]int
 	opts             *Options
-	takeMap          map[int]bool
 	depth            int
 	ignoreNextType   bool
+	takeMap          map[int]bool
 	protoWrapperType bool
 	sqlWrapperType   bool
 }

logger/wrapper/wrapper.go

@@ -0,0 +1,399 @@
+// Package wrapper provides wrapper for Logger
+package wrapper
+
+import (
+	"context"
+	"fmt"
+
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/server"
+)
+
+var (
+	// DefaultClientCallObserver called by wrapper in client Call
+	DefaultClientCallObserver = func(ctx context.Context, req client.Request, rsp interface{}, opts []client.CallOption, err error) []string {
+		labels := []string{"service", req.Service(), "endpoint", req.Endpoint()}
+		if err != nil {
+			labels = append(labels, "error", err.Error())
+		}
+		return labels
+	}
+
+	// DefaultClientStreamObserver called by wrapper in client Stream
+	DefaultClientStreamObserver = func(ctx context.Context, req client.Request, opts []client.CallOption, stream client.Stream, err error) []string {
+		labels := []string{"service", req.Service(), "endpoint", req.Endpoint()}
+		if err != nil {
+			labels = append(labels, "error", err.Error())
+		}
+		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()}
+		if err != nil {
+			labels = append(labels, "error", err.Error())
+		}
+		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()}
+		if err != nil {
+			labels = append(labels, "error", err.Error())
+		}
+		return labels
+	}
+
+	// DefaultSkipEndpoints wrapper not called for this endpoints
+	DefaultSkipEndpoints = []string{"Meter.Metrics", "Health.Live", "Health.Ready", "Health.Version"}
+)
+
+type lWrapper struct {
+	client.Client
+	serverHandler    server.HandlerFunc
+	serverSubscriber server.SubscriberFunc
+	clientCallFunc   client.CallFunc
+	opts             Options
+}
+
+type (
+	// ClientCallObserver func signature
+	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
+type Options struct {
+	// Logger that used for log
+	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
+	SkipEndpoints []string
+	// Level for logger
+	Level logger.Level
+	// Enabled flag
+	Enabled bool
+}
+
+// Option func signature
+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,
+	}
+
+	for _, o := range opts {
+		o(&options)
+	}
+
+	return options
+}
+
+// WithEnabled enable/diable flag
+func WithEnabled(b bool) Option {
+	return func(o *Options) {
+		o.Enabled = b
+	}
+}
+
+// WithLevel log level
+func WithLevel(l logger.Level) Option {
+	return func(o *Options) {
+		o.Level = l
+	}
+}
+
+// WithLogger logger
+func WithLogger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// WithClientCallObservers funcs
+func WithClientCallObservers(ob ...ClientCallObserver) Option {
+	return func(o *Options) {
+		o.ClientCallObservers = ob
+	}
+}
+
+// WithClientStreamObservers funcs
+func WithClientStreamObservers(ob ...ClientStreamObserver) Option {
+	return func(o *Options) {
+		o.ClientStreamObservers = ob
+	}
+}
+
+// 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) {
+		o.ClientCallFuncObservers = ob
+	}
+}
+
+// WithServerHandlerObservers funcs
+func WithServerHandlerObservers(ob ...ServerHandlerObserver) Option {
+	return func(o *Options) {
+		o.ServerHandlerObservers = ob
+	}
+}
+
+// WithServerSubscriberObservers funcs
+func WithServerSubscriberObservers(ob ...ServerSubscriberObserver) Option {
+	return func(o *Options) {
+		o.ServerSubscriberObservers = ob
+	}
+}
+
+// SkipEndpoins
+func SkipEndpoints(eps ...string) Option {
+	return func(o *Options) {
+		o.SkipEndpoints = append(o.SkipEndpoints, eps...)
+	}
+}
+
+func (l *lWrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
+	err := l.Client.Call(ctx, req, rsp, opts...)
+
+	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
+	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.ClientCallObservers {
+		labels = append(labels, o(ctx, req, rsp, opts, err)...)
+	}
+	l.opts.Logger.Fields(labels).Log(ctx, l.opts.Level)
+
+	return err
+}
+
+func (l *lWrapper) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
+	stream, err := l.Client.Stream(ctx, req, opts...)
+
+	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
+	for _, ep := range l.opts.SkipEndpoints {
+		if ep == endpoint {
+			return stream, err
+		}
+	}
+
+	if !l.opts.Enabled {
+		return stream, err
+	}
+
+	var labels []string
+	for _, o := range l.opts.ClientStreamObservers {
+		labels = append(labels, o(ctx, req, opts, stream, err)...)
+	}
+	l.opts.Logger.Fields(labels).Log(ctx, l.opts.Level)
+
+	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)
+
+	endpoint := req.Endpoint()
+	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.ServerHandlerObservers {
+		labels = append(labels, o(ctx, req, rsp, err)...)
+	}
+	l.opts.Logger.Fields(labels).Log(ctx, l.opts.Level)
+
+	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 {
+		options := NewOptions()
+		for _, o := range opts {
+			o(&options)
+		}
+		return &lWrapper{opts: options, Client: c}
+	}
+}
+
+// NewClientCallWrapper accepts an options and returns a Call Wrapper
+func NewClientCallWrapper(opts ...Option) client.CallWrapper {
+	return func(h client.CallFunc) client.CallFunc {
+		options := NewOptions()
+		for _, o := range opts {
+			o(&options)
+		}
+
+		l := &lWrapper{opts: options, clientCallFunc: h}
+		return l.ClientCallFunc
+	}
+}
+
+func (l *lWrapper) ClientCallFunc(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
+	err := l.clientCallFunc(ctx, addr, req, rsp, opts)
+
+	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
+	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.ClientCallFuncObservers {
+		labels = append(labels, o(ctx, addr, req, rsp, opts, err)...)
+	}
+	l.opts.Logger.Fields(labels).Log(ctx, l.opts.Level)
+
+	return err
+}
+
+// NewServerHandlerWrapper accepts an options and returns a Handler Wrapper
+func NewServerHandlerWrapper(opts ...Option) server.HandlerWrapper {
+	return func(h server.HandlerFunc) server.HandlerFunc {
+		options := NewOptions()
+		for _, o := range opts {
+			o(&options)
+		}
+
+		l := &lWrapper{opts: options, serverHandler: h}
+		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
+	}
+}

metadata/context.go

@@ -17,11 +17,11 @@ func FromIncomingContext(ctx context.Context) (Metadata, bool) {
 	if ctx == nil {
 		return nil, false
 	}
-	md, ok := ctx.Value(mdIncomingKey{}).(Metadata)
+	md, ok := ctx.Value(mdIncomingKey{}).(*rawMetadata)
-	if !ok || md == nil {
+	if !ok || md.md == nil {
 		return nil, false
 	}
-	return md, ok
+	return md.md, ok
 }
 
 // FromOutgoingContext returns metadata from outgoing ctx
@@ -30,41 +30,74 @@ func FromOutgoingContext(ctx context.Context) (Metadata, bool) {
 	if ctx == nil {
 		return nil, false
 	}
-	md, ok := ctx.Value(mdOutgoingKey{}).(Metadata)
+	md, ok := ctx.Value(mdOutgoingKey{}).(*rawMetadata)
-	if !ok || md == nil {
+	if !ok || md.md == nil {
 		return nil, false
 	}
-	return md, ok
+	return md.md, ok
 }
 
 // FromContext returns metadata from the given context
 // returned metadata shoud not be modified or race condition happens
+//
+// Deprecated: use FromIncomingContext or FromOutgoingContext
 func FromContext(ctx context.Context) (Metadata, bool) {
 	if ctx == nil {
 		return nil, false
 	}
-	md, ok := ctx.Value(mdKey{}).(Metadata)
+	md, ok := ctx.Value(mdKey{}).(*rawMetadata)
-	if !ok || md == nil {
+	if !ok || md.md == nil {
 		return nil, false
 	}
-	return md, ok
+	return md.md, ok
 }
 
 // NewContext creates a new context with the given metadata
+//
+// Deprecated: use NewIncomingContext or NewOutgoingContext
 func NewContext(ctx context.Context, md Metadata) context.Context {
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	ctx = context.WithValue(ctx, mdKey{}, md)
+	ctx = context.WithValue(ctx, mdKey{}, &rawMetadata{md})
+	ctx = context.WithValue(ctx, mdIncomingKey{}, &rawMetadata{})
+	ctx = context.WithValue(ctx, mdOutgoingKey{}, &rawMetadata{})
 	return ctx
 }
 
+// SetOutgoingContext modify outgoing context with given metadata
+func SetOutgoingContext(ctx context.Context, md Metadata) bool {
+	if ctx == nil {
+		return false
+	}
+	if omd, ok := ctx.Value(mdOutgoingKey{}).(*rawMetadata); ok {
+		omd.md = md
+		return true
+	}
+	return false
+}
+
+// SetIncomingContext modify incoming context with given metadata
+func SetIncomingContext(ctx context.Context, md Metadata) bool {
+	if ctx == nil {
+		return false
+	}
+	if omd, ok := ctx.Value(mdIncomingKey{}).(*rawMetadata); ok {
+		omd.md = md
+		return true
+	}
+	return false
+}
+
 // NewIncomingContext creates a new context with incoming metadata attached
 func NewIncomingContext(ctx context.Context, md Metadata) context.Context {
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	ctx = context.WithValue(ctx, mdIncomingKey{}, md)
+	ctx = context.WithValue(ctx, mdIncomingKey{}, &rawMetadata{md})
+	if v, ok := ctx.Value(mdOutgoingKey{}).(*rawMetadata); !ok || v == nil {
+		ctx = context.WithValue(ctx, mdOutgoingKey{}, &rawMetadata{})
+	}
 	return ctx
 }
 
@@ -73,28 +106,41 @@ func NewOutgoingContext(ctx context.Context, md Metadata) context.Context {
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	ctx = context.WithValue(ctx, mdOutgoingKey{}, md)
+	ctx = context.WithValue(ctx, mdOutgoingKey{}, &rawMetadata{md})
+	if v, ok := ctx.Value(mdIncomingKey{}).(*rawMetadata); !ok || v == nil {
+		ctx = context.WithValue(ctx, mdIncomingKey{}, &rawMetadata{})
+	}
 	return ctx
 }
 
 // AppendOutgoingContext apends new md to context
 func AppendOutgoingContext(ctx context.Context, kv ...string) context.Context {
-	md := Pairs(kv...)
+	md, ok := Pairs(kv...)
+	if !ok {
+		return ctx
+	}
 	omd, ok := FromOutgoingContext(ctx)
 	if !ok {
 		return NewOutgoingContext(ctx, md)
 	}
-	nmd := Merge(omd, md, true)
+	for k, v := range md {
-	return NewOutgoingContext(ctx, nmd)
+		omd.Set(k, v)
+	}
+	return NewOutgoingContext(ctx, omd)
 }
 
 // AppendIncomingContext apends new md to context
 func AppendIncomingContext(ctx context.Context, kv ...string) context.Context {
-	md := Pairs(kv...)
+	md, ok := Pairs(kv...)
+	if !ok {
+		return ctx
+	}
 	omd, ok := FromIncomingContext(ctx)
 	if !ok {
 		return NewIncomingContext(ctx, md)
 	}
-	nmd := Merge(omd, md, true)
+	for k, v := range md {
-	return NewIncomingContext(ctx, nmd)
+		omd.Set(k, v)
+	}
+	return NewIncomingContext(ctx, omd)
 }

metadata/context_test.go

@@ -24,7 +24,7 @@ func TestNewNilContext(t *testing.T) {
 }
 
 func TestFromContext(t *testing.T) {
-	ctx := context.WithValue(context.TODO(), mdKey{}, New(0))
+	ctx := context.WithValue(context.TODO(), mdKey{}, &rawMetadata{New(0)})
 
 	c, ok := FromContext(ctx)
 	if c == nil || !ok {
@@ -42,7 +42,7 @@ func TestNewContext(t *testing.T) {
 }
 
 func TestFromIncomingContext(t *testing.T) {
-	ctx := context.WithValue(context.TODO(), mdIncomingKey{}, New(0))
+	ctx := context.WithValue(context.TODO(), mdIncomingKey{}, &rawMetadata{New(0)})
 
 	c, ok := FromIncomingContext(ctx)
 	if c == nil || !ok {
@@ -51,7 +51,7 @@ func TestFromIncomingContext(t *testing.T) {
 }
 
 func TestFromOutgoingContext(t *testing.T) {
-	ctx := context.WithValue(context.TODO(), mdOutgoingKey{}, New(0))
+	ctx := context.WithValue(context.TODO(), mdOutgoingKey{}, &rawMetadata{New(0)})
 
 	c, ok := FromOutgoingContext(ctx)
 	if c == nil || !ok {
@@ -59,6 +59,36 @@ func TestFromOutgoingContext(t *testing.T) {
 	}
 }
 
+func TestSetIncomingContext(t *testing.T) {
+	md := New(1)
+	md.Set("key", "val")
+	ctx := context.WithValue(context.TODO(), mdIncomingKey{}, &rawMetadata{})
+	if !SetIncomingContext(ctx, md) {
+		t.Fatal("SetIncomingContext not works")
+	}
+	md, ok := FromIncomingContext(ctx)
+	if md == nil || !ok {
+		t.Fatal("SetIncomingContext not works")
+	} else if v, ok := md.Get("key"); !ok || v != "val" {
+		t.Fatal("SetIncomingContext not works")
+	}
+}
+
+func TestSetOutgoingContext(t *testing.T) {
+	md := New(1)
+	md.Set("key", "val")
+	ctx := context.WithValue(context.TODO(), mdOutgoingKey{}, &rawMetadata{})
+	if !SetOutgoingContext(ctx, md) {
+		t.Fatal("SetOutgoingContext not works")
+	}
+	md, ok := FromOutgoingContext(ctx)
+	if md == nil || !ok {
+		t.Fatal("SetOutgoingContext not works")
+	} else if v, ok := md.Get("key"); !ok || v != "val" {
+		t.Fatal("SetOutgoingContext not works")
+	}
+}
+
 func TestNewIncomingContext(t *testing.T) {
 	md := New(1)
 	md.Set("key", "val")

metadata/metadata.go

@@ -1,9 +1,9 @@
 // Package metadata is a way of defining message headers
-package metadata
+package metadata // import "go.unistack.org/micro/v4/metadata"
 
 import (
 	"net/textproto"
-	"strings"
+	"sort"
 )
 
 var (
@@ -19,12 +19,50 @@ var (
 	HeaderTimeout = "Micro-Timeout"
 	// HeaderAuthorization specifies Authorization header
 	HeaderAuthorization = "Authorization"
-	// HeaderXRequestID specifies request id
-	HeaderXRequestID = "X-Request-Id"
 )
 
 // Metadata is our way of representing request headers internally.
-type Metadata map[string][]string
+// They're used at the RPC level and translate back and forth
+// from Transport headers.
+type Metadata map[string]string
+
+type rawMetadata struct {
+	md Metadata
+}
+
+// defaultMetadataSize used when need to init new Metadata
+var defaultMetadataSize = 2
+
+// Iterator used to iterate over metadata with order
+type Iterator struct {
+	md   Metadata
+	keys []string
+	cur  int
+	cnt  int
+}
+
+// Next advance iterator to next element
+func (iter *Iterator) Next(k, v *string) bool {
+	if iter.cur+1 > iter.cnt {
+		return false
+	}
+
+	*k = iter.keys[iter.cur]
+	*v = iter.md[*k]
+	iter.cur++
+	return true
+}
+
+// Iterator returns the itarator for metadata in sorted order
+func (md Metadata) Iterator() *Iterator {
+	iter := &Iterator{md: md, cnt: len(md)}
+	iter.keys = make([]string, 0, iter.cnt)
+	for k := range md {
+		iter.keys = append(iter.keys, k)
+	}
+	sort.Strings(iter.keys)
+	return iter
+}
 
 // Get returns value from metadata by key
 func (md Metadata) Get(key string) (string, bool) {
@@ -34,7 +72,7 @@ func (md Metadata) Get(key string) (string, bool) {
 		// slow path
 		val, ok = md[textproto.CanonicalMIMEHeaderKey(key)]
 	}
-	return strings.Join(val, ","), ok
+	return val, ok
 }
 
 // Set is used to store value in metadata
@@ -43,19 +81,10 @@ func (md Metadata) Set(kv ...string) {
 		kv = kv[:len(kv)-1]
 	}
 	for idx := 0; idx < len(kv); idx += 2 {
-		md[textproto.CanonicalMIMEHeaderKey(kv[idx])] = []string{kv[idx+1]}
+		md[textproto.CanonicalMIMEHeaderKey(kv[idx])] = kv[idx+1]
 	}
 }
 
-// Append is used to append value in metadata
-func (md Metadata) Append(k string, v ...string) {
-	if len(v) == 0 {
-		return
-	}
-	k = textproto.CanonicalMIMEHeaderKey(k)
-	md[k] = append(md[k], v...)
-}
-
 // Del is used to remove value from metadata
 func (md Metadata) Del(keys ...string) {
 	for _, key := range keys {
@@ -67,52 +96,46 @@ func (md Metadata) Del(keys ...string) {
 }
 
 // Copy makes a copy of the metadata
-func Copy(md Metadata, exclude ...string) Metadata {
+func Copy(md Metadata) Metadata {
-	nmd := make(Metadata, len(md))
+	nmd := New(len(md))
-	for k, v := range md {
+	for key, val := range md {
-		nmd[k] = v
+		nmd.Set(key, val)
 	}
-	nmd.Del(exclude...)
 	return nmd
 }
 
 // New return new sized metadata
 func New(size int) Metadata {
 	if size == 0 {
-		size = 2
+		size = defaultMetadataSize
 	}
 	return make(Metadata, size)
 }
 
 // Merge merges metadata to existing metadata, overwriting if specified
 func Merge(omd Metadata, mmd Metadata, overwrite bool) Metadata {
+	var ok bool
 	nmd := Copy(omd)
 	for key, val := range mmd {
-		nval, ok := nmd[key]
+		_, ok = nmd[key]
 		switch {
-		case ok && overwrite:
-			nmd[key] = nval
-			continue
 		case ok && !overwrite:
 			continue
-		case !ok:
+		case val != "":
-			for _, v := range val {
+			nmd.Set(key, val)
-				if v != "" {
+		case ok && val == "":
-					nval = append(nval, v)
+			nmd.Del(key)
-				}
-			}
-			nmd[key] = nval
 		}
 	}
 	return nmd
 }
 
 // Pairs from which metadata created
-func Pairs(kv ...string) Metadata {
+func Pairs(kv ...string) (Metadata, bool) {
 	if len(kv)%2 == 1 {
-		kv = kv[:len(kv)-1]
+		return nil, false
 	}
-	md := make(Metadata, len(kv)/2)
+	md := New(len(kv) / 2)
 	md.Set(kv...)
-	return md
+	return md, true
 }

metadata/metadata_test.go

@@ -33,52 +33,30 @@ func TestAppend(t *testing.T) {
 }
 
 func TestPairs(t *testing.T) {
-	md := Pairs("key1", "val1", "key2", "val2")
+	md, ok := Pairs("key1", "val1", "key2", "val2")
-
+	if !ok {
-	if _, ok := md.Get("key1"); !ok {
+		t.Fatal("odd number of kv")
+	}
+	if _, ok = md.Get("key1"); !ok {
 		t.Fatal("key1 not found")
 	}
 }
 
-func testIncomingCtx(ctx context.Context) {
+func testCtx(ctx context.Context) {
-	if md, ok := FromIncomingContext(ctx); ok && md != nil {
+	md := New(2)
 	md.Set("Key1", "Val1_new")
 	md.Set("Key3", "Val3")
-	}
+	SetOutgoingContext(ctx, md)
 }
 
-func testOutgoingCtx(ctx context.Context) {
+func TestPassing(t *testing.T) {
-	if md, ok := FromOutgoingContext(ctx); ok && md != nil {
-		md.Set("Key1", "Val1_new")
-		md.Set("Key3", "Val3")
-	}
-}
-
-func TestIncoming(t *testing.T) {
 	ctx := context.TODO()
 	md1 := New(2)
 	md1.Set("Key1", "Val1")
 	md1.Set("Key2", "Val2")
 
 	ctx = NewIncomingContext(ctx, md1)
-	testIncomingCtx(ctx)
+	testCtx(ctx)
-	md, ok := FromIncomingContext(ctx)
-	if !ok {
-		t.Fatalf("missing metadata from incoming context")
-	}
-	if v, ok := md.Get("Key1"); !ok || v != "Val1_new" {
-		t.Fatalf("invalid metadata value %#+v", md)
-	}
-}
-
-func TestOutgoing(t *testing.T) {
-	ctx := context.TODO()
-	md1 := New(2)
-	md1.Set("Key1", "Val1")
-	md1.Set("Key2", "Val2")
-
-	ctx = NewOutgoingContext(ctx, md1)
-	testOutgoingCtx(ctx)
 	md, ok := FromOutgoingContext(ctx)
 	if !ok {
 		t.Fatalf("missing metadata from outgoing context")
@@ -90,10 +68,10 @@ func TestOutgoing(t *testing.T) {
 
 func TestMerge(t *testing.T) {
 	omd := Metadata{
-		"key1": []string{"val1"},
+		"key1": "val1",
 	}
 	mmd := Metadata{
-		"key2": []string{"val2"},
+		"key2": "val2",
 	}
 
 	nmd := Merge(omd, mmd, true)
@@ -102,6 +80,21 @@ func TestMerge(t *testing.T) {
 	}
 }
 
+func TestIterator(t *testing.T) {
+	md := Metadata{
+		"1Last":   "last",
+		"2First":  "first",
+		"3Second": "second",
+	}
+
+	iter := md.Iterator()
+	var k, v string
+
+	for iter.Next(&k, &v) {
+		// fmt.Printf("k: %s, v: %s\n", k, v)
+	}
+}
+
 func TestMedataCanonicalKey(t *testing.T) {
 	md := New(1)
 	md.Set("x-request-id", "12345")
@@ -141,7 +134,10 @@ func TestMetadataSet(t *testing.T) {
 }
 
 func TestMetadataDelete(t *testing.T) {
-	md := Pairs("Foo", "bar", "Baz", "empty")
+	md := Metadata{
+		"Foo": "bar",
+		"Baz": "empty",
+	}
 
 	md.Del("Baz")
 	_, ok := md.Get("Baz")
@@ -160,19 +156,24 @@ func TestNilContext(t *testing.T) {
 }
 
 func TestMetadataCopy(t *testing.T) {
-	md := Pairs("Foo", "bar", "Bar", "baz")
+	md := Metadata{
+		"Foo": "bar",
+		"Bar": "baz",
+	}
 
 	cp := Copy(md)
 
 	for k, v := range md {
-		if cv := cp[k]; len(cv) != len(v) {
+		if cv := cp[k]; cv != v {
 			t.Fatalf("Got %s:%s for %s:%s", k, cv, k, v)
 		}
 	}
 }
 
 func TestMetadataContext(t *testing.T) {
-	md := Pairs("Foo", "bar")
+	md := Metadata{
+		"Foo": "bar",
+	}
 
 	ctx := NewContext(context.TODO(), md)
 
@@ -181,7 +182,7 @@ func TestMetadataContext(t *testing.T) {
 		t.Errorf("Unexpected error retrieving metadata, got %t", ok)
 	}
 
-	if len(emd["Foo"]) != len(md["Foo"]) {
+	if emd["Foo"] != md["Foo"] {
 		t.Errorf("Expected key: %s val: %s, got key: %s val: %s", "Foo", md["Foo"], "Foo", emd["Foo"])
 	}
 
@@ -189,14 +190,3 @@ func TestMetadataContext(t *testing.T) {
 		t.Errorf("Expected metadata length 1 got %d", i)
 	}
 }
-
-func TestCopy(t *testing.T) {
-	md := New(2)
-	md.Set("key1", "val1", "key2", "val2")
-	nmd := Copy(md, "key2")
-	if len(nmd) != 1 {
-		t.Fatal("Copy exclude not works")
-	} else if nmd["Key1"][0] != "val1" {
-		t.Fatal("Copy exclude not works")
-	}
-}

meter/context.go

@@ -22,3 +22,13 @@ func NewContext(ctx context.Context, c Meter) context.Context {
 	}
 	return context.WithValue(ctx, meterKey{}, c)
 }
+
+// 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)
+	}
+}

meter/context_test.go

@@ -40,3 +40,14 @@ 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")
+	}
+}

meter/meter.go

@@ -7,8 +7,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
-	"go.unistack.org/micro/v4/options"
 )
 
 var (
@@ -33,9 +31,9 @@ type Meter interface {
 	// Name returns meter name
 	Name() string
 	// Init initialize meter
-	Init(opts ...options.Option) error
+	Init(opts ...Option) error
 	// Clone create meter copy with new options
-	Clone(opts ...options.Option) Meter
+	Clone(opts ...Option) Meter
 	// Counter get or create counter
 	Counter(name string, labels ...string) Counter
 	// FloatCounter get or create float counter
@@ -43,7 +41,7 @@ type Meter interface {
 	// Gauge get or create gauge
 	Gauge(name string, fn func() float64, labels ...string) Gauge
 	// Set create new meter metrics set
-	Set(opts ...options.Option) Meter
+	Set(opts ...Option) Meter
 	// Histogram get or create histogram
 	Histogram(name string, labels ...string) Histogram
 	// Summary get or create summary
@@ -51,7 +49,7 @@ type Meter interface {
 	// SummaryExt get or create summary with spcified quantiles and window time
 	SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) Summary
 	// Write writes metrics to io.Writer
-	Write(w io.Writer, opts ...options.Option) error
+	Write(w io.Writer, opts ...Option) error
 	// Options returns meter options
 	Options() Options
 	// String return meter type

meter/noop.go

@@ -3,8 +3,6 @@ package meter
 import (
 	"io"
 	"time"
-
-	"go.unistack.org/micro/v4/options"
 )
 
 // NoopMeter is an noop implementation of Meter
@@ -13,12 +11,12 @@ type noopMeter struct {
 }
 
 // NewMeter returns a configured noop reporter:
-func NewMeter(opts ...options.Option) Meter {
+func NewMeter(opts ...Option) Meter {
 	return &noopMeter{opts: NewOptions(opts...)}
 }
 
 // Clone return old meter with new options
-func (r *noopMeter) Clone(opts ...options.Option) Meter {
+func (r *noopMeter) Clone(opts ...Option) Meter {
 	options := r.opts
 	for _, o := range opts {
 		o(&options)
@@ -31,7 +29,7 @@ func (r *noopMeter) Name() string {
 }
 
 // Init initialize options
-func (r *noopMeter) Init(opts ...options.Option) error {
+func (r *noopMeter) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&r.opts)
 	}
@@ -69,7 +67,7 @@ func (r *noopMeter) Histogram(name string, labels ...string) Histogram {
 }
 
 // Set implements the Meter interface
-func (r *noopMeter) Set(opts ...options.Option) Meter {
+func (r *noopMeter) Set(opts ...Option) Meter {
 	m := &noopMeter{opts: r.opts}
 
 	for _, o := range opts {
@@ -79,7 +77,7 @@ func (r *noopMeter) Set(opts ...options.Option) Meter {
 	return m
 }
 
-func (r *noopMeter) Write(_ io.Writer, _ ...options.Option) error {
+func (r *noopMeter) Write(w io.Writer, opts ...Option) error {
 	return nil
 }
 

meter/options.go

@@ -2,13 +2,13 @@ package meter
 
 import (
 	"context"
-	"reflect"
 
 	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/options"
-	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
+// Option powers the configuration for metrics implementations:
+type Option func(*Options)
+
 // Options for metrics implementations
 type Options struct {
 	// Logger used for logging
@@ -34,7 +34,7 @@ type Options struct {
 }
 
 // NewOptions prepares a set of options:
-func NewOptions(opt ...options.Option) Options {
+func NewOptions(opt ...Option) Options {
 	opts := Options{
 		Address:      DefaultAddress,
 		Path:         DefaultPath,
@@ -52,23 +52,37 @@ func NewOptions(opt ...options.Option) Options {
 }
 
 // LabelPrefix sets the labels prefix
-func LabelPrefix(pref string) options.Option {
+func LabelPrefix(pref string) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, pref, ".LabelPrefix")
+		o.LabelPrefix = pref
 	}
 }
 
 // MetricPrefix sets the metric prefix
-func MetricPrefix(pref string) options.Option {
+func MetricPrefix(pref string) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, pref, ".MetricPrefix")
+		o.MetricPrefix = pref
+	}
+}
+
+// Context sets the metrics context
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
 	}
 }
 
 // Path used to serve metrics over HTTP
-func Path(path string) options.Option {
+func Path(value string) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, path, ".Path")
+		o.Path = value
+	}
+}
+
+// Address is the listen address to serve metrics
+func Address(value string) Option {
+	return func(o *Options) {
+		o.Address = value
 	}
 }
 
@@ -81,34 +95,37 @@ func TimingObjectives(value map[float64]float64) Option {
 }
 */
 
+// Logger sets the logger
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
 // Labels sets the meter labels
-func Labels(ls ...string) options.Option {
+func Labels(ls ...string) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		v, err := options.Get(src, ".Labels")
+		o.Labels = append(o.Labels, ls...)
-		if err != nil {
-			return err
-		} else if rutil.IsZero(v) {
-			v = reflect.MakeSlice(reflect.TypeOf(v), 0, len(ls)).Interface()
 	}
-		cv := reflect.ValueOf(v)
+}
-		for _, l := range ls {
+
-			reflect.Append(cv, reflect.ValueOf(l))
+// Name sets the name
-		}
+func Name(n string) Option {
-		err = options.Set(src, cv, ".Labels")
+	return func(o *Options) {
-		return err
+		o.Name = n
 	}
 }
 
 // WriteProcessMetrics enable process metrics output for write
-func WriteProcessMetrics(b bool) options.Option {
+func WriteProcessMetrics(b bool) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, b, ".WriteProcessMetrics")
+		o.WriteProcessMetrics = b
 	}
 }
 
 // WriteFDMetrics enable fd metrics output for write
-func WriteFDMetrics(b bool) options.Option {
+func WriteFDMetrics(b bool) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, b, ".WriteFDMetrics")
+		o.WriteFDMetrics = b
 	}
 }

meter/wrapper/wrapper.go

@@ -1,4 +1,4 @@
-package wrapper
+package wrapper // import "go.unistack.org/micro/v4/meter/wrapper"
 
 import (
 	"context"
@@ -7,8 +7,6 @@ import (
 
 	"go.unistack.org/micro/v4/client"
 	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v4/semconv"
 	"go.unistack.org/micro/v4/server"
 )
 
@@ -25,7 +23,7 @@ var (
 // Options struct
 type Options struct {
 	Meter         meter.Meter
-	lopts         []options.Option
+	lopts         []meter.Option
 	SkipEndpoints []string
 }
 
@@ -36,7 +34,7 @@ type Option func(*Options)
 func NewOptions(opts ...Option) Options {
 	options := Options{
 		Meter:         meter.DefaultMeter,
-		lopts:         make([]options.Option, 0, 5),
+		lopts:         make([]meter.Option, 0, 5),
 		SkipEndpoints: DefaultSkipEndpoints,
 	}
 	for _, o := range opts {
@@ -119,26 +117,26 @@ func (w *wrapper) CallFunc(ctx context.Context, addr string, req client.Request,
 	labels := make([]string, 0, 4)
 	labels = append(labels, labelEndpoint, endpoint)
 
-	w.opts.Meter.Counter(semconv.ClientRequestInflight, labels...).Inc()
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
 	ts := time.Now()
 	err := w.callFunc(ctx, addr, req, rsp, opts)
 	te := time.Since(ts)
-	w.opts.Meter.Counter(semconv.ClientRequestInflight, labels...).Dec()
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Dec()
 
-	w.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-	w.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
 
 	if err == nil {
 		labels = append(labels, labelStatus, labelSuccess)
 	} else {
 		labels = append(labels, labelStatus, labelFailure)
 	}
-	w.opts.Meter.Counter(semconv.ClientRequestTotal, labels...).Inc()
+	w.opts.Meter.Counter(ClientRequestTotal, labels...).Inc()
 
 	return err
 }
 
-func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...options.Option) error {
+func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
 	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
 	for _, ep := range w.opts.SkipEndpoints {
 		if ep == endpoint {
@@ -149,26 +147,26 @@ func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{},
 	labels := make([]string, 0, 4)
 	labels = append(labels, labelEndpoint, endpoint)
 
-	w.opts.Meter.Counter(semconv.ClientRequestInflight, labels...).Inc()
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
 	ts := time.Now()
 	err := w.Client.Call(ctx, req, rsp, opts...)
 	te := time.Since(ts)
-	w.opts.Meter.Counter(semconv.ClientRequestInflight, labels...).Dec()
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Dec()
 
-	w.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-	w.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
 
 	if err == nil {
 		labels = append(labels, labelStatus, labelSuccess)
 	} else {
 		labels = append(labels, labelStatus, labelFailure)
 	}
-	w.opts.Meter.Counter(semconv.ClientRequestTotal, labels...).Inc()
+	w.opts.Meter.Counter(ClientRequestTotal, labels...).Inc()
 
 	return err
 }
 
-func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...options.Option) (client.Stream, error) {
+func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
 	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
 	for _, ep := range w.opts.SkipEndpoints {
 		if ep == endpoint {
@@ -179,21 +177,21 @@ func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...option
 	labels := make([]string, 0, 4)
 	labels = append(labels, labelEndpoint, endpoint)
 
-	w.opts.Meter.Counter(semconv.ClientRequestInflight, labels...).Inc()
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
 	ts := time.Now()
 	stream, err := w.Client.Stream(ctx, req, opts...)
 	te := time.Since(ts)
-	w.opts.Meter.Counter(semconv.ClientRequestInflight, labels...).Dec()
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Dec()
 
-	w.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-	w.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
 
 	if err == nil {
 		labels = append(labels, labelStatus, labelSuccess)
 	} else {
 		labels = append(labels, labelStatus, labelFailure)
 	}
-	w.opts.Meter.Counter(semconv.ClientRequestTotal, labels...).Inc()
+	w.opts.Meter.Counter(ClientRequestTotal, labels...).Inc()
 
 	return stream, err
 }
@@ -218,21 +216,21 @@ func (w *wrapper) HandlerFunc(fn server.HandlerFunc) server.HandlerFunc {
 		labels := make([]string, 0, 4)
 		labels = append(labels, labelEndpoint, endpoint)
 
-		w.opts.Meter.Counter(semconv.ServerRequestInflight, labels...).Inc()
+		w.opts.Meter.Counter(ServerRequestInflight, labels...).Inc()
 		ts := time.Now()
 		err := fn(ctx, req, rsp)
 		te := time.Since(ts)
-		w.opts.Meter.Counter(semconv.ServerRequestInflight, labels...).Dec()
+		w.opts.Meter.Counter(ServerRequestInflight, labels...).Dec()
 
-		w.opts.Meter.Summary(semconv.ServerRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+		w.opts.Meter.Summary(ServerRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-		w.opts.Meter.Histogram(semconv.ServerRequestDurationSeconds, labels...).Update(te.Seconds())
+		w.opts.Meter.Histogram(ServerRequestDurationSeconds, labels...).Update(te.Seconds())
 
 		if err == nil {
 			labels = append(labels, labelStatus, labelSuccess)
 		} else {
 			labels = append(labels, labelStatus, labelFailure)
 		}
-		w.opts.Meter.Counter(semconv.ServerRequestTotal, labels...).Inc()
+		w.opts.Meter.Counter(ServerRequestTotal, labels...).Inc()
 
 		return err
 	}

micro.go

@@ -1,98 +0,0 @@
-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
-		case targetType.Implements(tracerType):
-			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()
-	loggerType   = reflect.TypeOf((*logger.Logger)(nil)).Elem()
-	clientType   = reflect.TypeOf((*client.Client)(nil)).Elem()
-	serverType   = reflect.TypeOf((*server.Server)(nil)).Elem()
-	codecType    = reflect.TypeOf((*codec.Codec)(nil)).Elem()
-	flowType     = reflect.TypeOf((*flow.Flow)(nil)).Elem()
-	fsmType      = reflect.TypeOf((*fsm.FSM)(nil)).Elem()
-	meterType    = reflect.TypeOf((*meter.Meter)(nil)).Elem()
-	registerType = reflect.TypeOf((*register.Register)(nil)).Elem()
-	resolverType = reflect.TypeOf((*resolver.Resolver)(nil)).Elem()
-	routerType   = reflect.TypeOf((*router.Router)(nil)).Elem()
-	selectorType = reflect.TypeOf((*selector.Selector)(nil)).Elem()
-	storeType    = reflect.TypeOf((*store.Store)(nil)).Elem()
-	syncType     = reflect.TypeOf((*sync.Sync)(nil)).Elem()
-	tracerType   = reflect.TypeOf((*tracer.Tracer)(nil)).Elem()
-	serviceType  = reflect.TypeOf((*Service)(nil)).Elem()
-)

micro_test.go

@@ -1,103 +0,0 @@
-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) {}

network/network.go

@@ -0,0 +1,55 @@
+// Package network is for creating internetworks
+package network // import "go.unistack.org/micro/v4/network"
+
+import (
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/server"
+)
+
+// Error is network node errors
+type Error interface {
+	// Count is current count of errors
+	Count() int
+	// Msg is last error message
+	Msg() string
+}
+
+// Status is node status
+type Status interface {
+	// Error reports error status
+	Error() Error
+}
+
+// Node is network node
+type Node interface {
+	// Id is node id
+	Id() string
+	// Address is node bind address
+	Address() string
+	// Peers returns node peers
+	Peers() []Node
+	// Network is the network node is in
+	Network() Network
+	// Status returns node status
+	Status() Status
+}
+
+// Network is micro network
+type Network interface {
+	// Node is network node
+	Node
+	// Initialise options
+	Init(...Option) error
+	// Options returns the network options
+	Options() Options
+	// Name of the network
+	Name() string
+	// Connect starts the resolver and tunnel server
+	Connect() error
+	// Close stops the tunnel and resolving
+	Close() error
+	// Client is micro client
+	Client() client.Client
+	// Server is micro server
+	Server() server.Server
+}

network/options.go

@@ -0,0 +1,135 @@
+package network
+
+import (
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/network/tunnel"
+	"go.unistack.org/micro/v4/proxy"
+	"go.unistack.org/micro/v4/router"
+	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v4/util/id"
+)
+
+// Option func
+type Option func(*Options)
+
+// Options configure network
+type Options struct {
+	// Router used for routing
+	Router router.Router
+	// Proxy holds the proxy
+	Proxy proxy.Proxy
+	// Logger used for logging
+	Logger logger.Logger
+	// Meter used for metrics
+	Meter meter.Meter
+	// Tracer used for tracing
+	Tracer tracer.Tracer
+	// Tunnel used for transfer data
+	Tunnel tunnel.Tunnel
+	// ID of the node
+	ID string
+	// Name of the network
+	Name string
+	// Address to bind to
+	Address string
+	// Advertise sets the address to advertise
+	Advertise string
+	// Nodes is a list of nodes to connect to
+	Nodes []string
+}
+
+// ID sets the id of the network node
+func ID(id string) Option {
+	return func(o *Options) {
+		o.ID = id
+	}
+}
+
+// Name sets the network name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}
+
+// Address sets the network address
+func Address(a string) Option {
+	return func(o *Options) {
+		o.Address = a
+	}
+}
+
+// Advertise sets the address to advertise
+func Advertise(a string) Option {
+	return func(o *Options) {
+		o.Advertise = a
+	}
+}
+
+// Nodes is a list of nodes to connect to
+func Nodes(n ...string) Option {
+	return func(o *Options) {
+		o.Nodes = n
+	}
+}
+
+// Tunnel sets the network tunnel
+func Tunnel(t tunnel.Tunnel) Option {
+	return func(o *Options) {
+		o.Tunnel = t
+	}
+}
+
+// Router sets the network router
+func Router(r router.Router) Option {
+	return func(o *Options) {
+		o.Router = r
+	}
+}
+
+// Proxy sets the network proxy
+func Proxy(p proxy.Proxy) Option {
+	return func(o *Options) {
+		o.Proxy = p
+	}
+}
+
+// Logger sets the network logger
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Meter sets the meter
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// Tracer to be used for tracing
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
+	}
+}
+
+// NewOptions returns network default options
+func NewOptions(opts ...Option) Options {
+	options := Options{
+		ID:      id.Must(),
+		Name:    "go.micro",
+		Address: ":0",
+		Logger:  logger.DefaultLogger,
+		Meter:   meter.DefaultMeter,
+		Tracer:  tracer.DefaultTracer,
+	}
+
+	for _, o := range opts {
+		o(&options)
+	}
+
+	return options
+}

network/transport/context.go

@@ -0,0 +1,34 @@
+package transport
+
+import (
+	"context"
+)
+
+type transportKey struct{}
+
+// FromContext get transport from context
+func FromContext(ctx context.Context) (Transport, bool) {
+	if ctx == nil {
+		return nil, false
+	}
+	c, ok := ctx.Value(transportKey{}).(Transport)
+	return c, ok
+}
+
+// NewContext put transport in context
+func NewContext(ctx context.Context, c Transport) context.Context {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	return context.WithValue(ctx, transportKey{}, c)
+}
+
+// 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)
+	}
+}

network/transport/memory.go

@@ -0,0 +1,258 @@
+package transport
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net"
+	"sync"
+	"time"
+
+	maddr "go.unistack.org/micro/v4/util/addr"
+	mnet "go.unistack.org/micro/v4/util/net"
+	"go.unistack.org/micro/v4/util/rand"
+)
+
+type memorySocket struct {
+	ctx     context.Context
+	recv    chan *Message
+	exit    chan bool
+	lexit   chan bool
+	send    chan *Message
+	local   string
+	remote  string
+	timeout time.Duration
+	sync.RWMutex
+}
+
+type memoryClient struct {
+	*memorySocket
+	opts DialOptions
+}
+
+type memoryListener struct {
+	lopts ListenOptions
+	ctx   context.Context
+	exit  chan bool
+	conn  chan *memorySocket
+	addr  string
+	topts Options
+	sync.RWMutex
+}
+
+type memoryTransport struct {
+	listeners map[string]*memoryListener
+	opts      Options
+	sync.RWMutex
+}
+
+func (ms *memorySocket) Recv(m *Message) error {
+	ms.RLock()
+	defer ms.RUnlock()
+
+	ctx := ms.ctx
+	if ms.timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ms.ctx, ms.timeout)
+		defer cancel()
+	}
+
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-ms.exit:
+		return errors.New("connection closed")
+	case <-ms.lexit:
+		return errors.New("server connection closed")
+	case cm := <-ms.recv:
+		*m = *cm
+	}
+	return nil
+}
+
+func (ms *memorySocket) Local() string {
+	return ms.local
+}
+
+func (ms *memorySocket) Remote() string {
+	return ms.remote
+}
+
+func (ms *memorySocket) Send(m *Message) error {
+	ms.RLock()
+	defer ms.RUnlock()
+
+	ctx := ms.ctx
+	if ms.timeout > 0 {
+		var cancel context.CancelFunc
+		ctx, cancel = context.WithTimeout(ms.ctx, ms.timeout)
+		defer cancel()
+	}
+
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-ms.exit:
+		return errors.New("connection closed")
+	case <-ms.lexit:
+		return errors.New("server connection closed")
+	case ms.send <- m:
+	}
+	return nil
+}
+
+func (ms *memorySocket) Close() error {
+	ms.Lock()
+	defer ms.Unlock()
+	select {
+	case <-ms.exit:
+		return nil
+	default:
+		close(ms.exit)
+	}
+	return nil
+}
+
+func (m *memoryListener) Addr() string {
+	return m.addr
+}
+
+func (m *memoryListener) Close() error {
+	m.Lock()
+	defer m.Unlock()
+	select {
+	case <-m.exit:
+		return nil
+	default:
+		close(m.exit)
+	}
+	return nil
+}
+
+func (m *memoryListener) Accept(fn func(Socket)) error {
+	for {
+		select {
+		case <-m.exit:
+			return nil
+		case c := <-m.conn:
+			go fn(&memorySocket{
+				lexit:   c.lexit,
+				exit:    c.exit,
+				send:    c.recv,
+				recv:    c.send,
+				local:   c.Remote(),
+				remote:  c.Local(),
+				timeout: m.topts.Timeout,
+				ctx:     m.topts.Context,
+			})
+		}
+	}
+}
+
+func (m *memoryTransport) Dial(ctx context.Context, addr string, opts ...DialOption) (Client, error) {
+	m.RLock()
+	defer m.RUnlock()
+
+	listener, ok := m.listeners[addr]
+	if !ok {
+		return nil, errors.New("could not dial " + addr)
+	}
+
+	options := NewDialOptions(opts...)
+
+	client := &memoryClient{
+		&memorySocket{
+			send:    make(chan *Message),
+			recv:    make(chan *Message),
+			exit:    make(chan bool),
+			lexit:   listener.exit,
+			local:   addr,
+			remote:  addr,
+			timeout: m.opts.Timeout,
+			ctx:     m.opts.Context,
+		},
+		options,
+	}
+
+	// pseudo connect
+	select {
+	case <-listener.exit:
+		return nil, errors.New("connection error")
+	case listener.conn <- client.memorySocket:
+	}
+
+	return client, nil
+}
+
+func (m *memoryTransport) Listen(ctx context.Context, addr string, opts ...ListenOption) (Listener, error) {
+	m.Lock()
+	defer m.Unlock()
+
+	options := NewListenOptions(opts...)
+
+	host, port, err := net.SplitHostPort(addr)
+	if err != nil {
+		return nil, err
+	}
+
+	addr, err = maddr.Extract(host)
+	if err != nil {
+		return nil, err
+	}
+
+	// if zero port then randomly assign one
+	if len(port) > 0 && port == "0" {
+		var rng rand.Rand
+		i := rng.Intn(20000)
+		port = fmt.Sprintf("%d", 10000+i)
+	}
+
+	// set addr with port
+	addr = mnet.HostPort(addr, port)
+
+	if _, ok := m.listeners[addr]; ok {
+		return nil, errors.New("already listening on " + addr)
+	}
+
+	listener := &memoryListener{
+		lopts: options,
+		topts: m.opts,
+		addr:  addr,
+		conn:  make(chan *memorySocket),
+		exit:  make(chan bool),
+		ctx:   m.opts.Context,
+	}
+
+	m.listeners[addr] = listener
+
+	return listener, nil
+}
+
+func (m *memoryTransport) Init(opts ...Option) error {
+	for _, o := range opts {
+		o(&m.opts)
+	}
+	return nil
+}
+
+func (m *memoryTransport) Options() Options {
+	return m.opts
+}
+
+func (m *memoryTransport) String() string {
+	return "memory"
+}
+
+func (m *memoryTransport) Name() string {
+	return m.opts.Name
+}
+
+// NewTransport returns new memory transport with options
+func NewTransport(opts ...Option) Transport {
+	options := NewOptions(opts...)
+
+	return &memoryTransport{
+		opts:      options,
+		listeners: make(map[string]*memoryListener),
+	}
+}

network/transport/memory_test.go

@@ -0,0 +1,100 @@
+package transport
+
+import (
+	"context"
+	"os"
+	"testing"
+)
+
+func TestMemoryTransport(t *testing.T) {
+	tr := NewTransport()
+	ctx := context.Background()
+	// bind / listen
+	l, err := tr.Listen(ctx, "127.0.0.1:8080")
+	if err != nil {
+		t.Fatalf("Unexpected error listening %v", err)
+	}
+	defer l.Close()
+
+	cherr := make(chan error, 1)
+	// accept
+	go func() {
+		if nerr := l.Accept(func(sock Socket) {
+			for {
+				var m Message
+				if rerr := sock.Recv(&m); rerr != nil {
+					cherr <- rerr
+					return
+				}
+				if len(os.Getenv("INTEGRATION_TESTS")) == 0 {
+					t.Logf("Server Received %s", string(m.Body))
+				}
+				if cerr := sock.Send(&Message{
+					Body: []byte(`pong`),
+				}); cerr != nil {
+					cherr <- cerr
+					return
+				}
+			}
+		}); nerr != nil {
+			cherr <- err
+		}
+	}()
+
+	// dial
+	c, err := tr.Dial(ctx, "127.0.0.1:8080")
+	if err != nil {
+		t.Fatalf("Unexpected error dialing %v", err)
+	}
+	defer c.Close()
+
+	select {
+	case err := <-cherr:
+		t.Fatal(err)
+	default:
+		// send <=> receive
+		for i := 0; i < 3; i++ {
+			if err := c.Send(&Message{
+				Body: []byte(`ping`),
+			}); err != nil {
+				return
+			}
+			var m Message
+			if err := c.Recv(&m); err != nil {
+				return
+			}
+			if len(os.Getenv("INTEGRATION_TESTS")) == 0 {
+				t.Logf("Client Received %s", string(m.Body))
+			}
+		}
+	}
+}
+
+func TestListener(t *testing.T) {
+	tr := NewTransport()
+	ctx := context.Background()
+	// bind / listen on random port
+	l, err := tr.Listen(ctx, ":0")
+	if err != nil {
+		t.Fatalf("Unexpected error listening %v", err)
+	}
+	defer l.Close()
+
+	// try again
+	l2, err := tr.Listen(ctx, ":0")
+	if err != nil {
+		t.Fatalf("Unexpected error listening %v", err)
+	}
+	defer l2.Close()
+
+	// now make sure it still fails
+	l3, err := tr.Listen(ctx, ":8080")
+	if err != nil {
+		t.Fatalf("Unexpected error listening %v", err)
+	}
+	defer l3.Close()
+
+	if _, err := tr.Listen(ctx, ":8080"); err == nil {
+		t.Fatal("Expected error binding to :8080 got nil")
+	}
+}

network/transport/options.go

@@ -0,0 +1,175 @@
+package transport
+
+import (
+	"context"
+	"crypto/tls"
+	"time"
+
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/tracer"
+)
+
+// Options struct holds the transport options
+type Options struct {
+	// Meter used for metrics
+	Meter meter.Meter
+	// Tracer used for tracing
+	Tracer tracer.Tracer
+	// Codec used for marshal/unmarshal messages
+	Codec codec.Codec
+	// Logger used for logging
+	Logger logger.Logger
+	// Context holds external options
+	Context context.Context
+	// TLSConfig holds tls.TLSConfig options
+	TLSConfig *tls.Config
+	// Name holds the transport name
+	Name string
+	// Addrs holds the transport addrs
+	Addrs []string
+	// Timeout holds the timeout
+	Timeout time.Duration
+}
+
+// NewOptions returns new options
+func NewOptions(opts ...Option) Options {
+	options := Options{
+		Logger:  logger.DefaultLogger,
+		Meter:   meter.DefaultMeter,
+		Tracer:  tracer.DefaultTracer,
+		Context: context.Background(),
+	}
+
+	for _, o := range opts {
+		o(&options)
+	}
+
+	return options
+}
+
+// DialOptions struct
+type DialOptions struct {
+	// Context holds the external options
+	Context context.Context
+	// Timeout holds the timeout
+	Timeout time.Duration
+	// Stream flag
+	Stream bool
+}
+
+// NewDialOptions returns new DialOptions
+func NewDialOptions(opts ...DialOption) DialOptions {
+	options := DialOptions{
+		Timeout: DefaultDialTimeout,
+		Context: context.Background(),
+	}
+
+	for _, o := range opts {
+		o(&options)
+	}
+
+	return options
+}
+
+// ListenOptions struct
+type ListenOptions struct {
+	// TODO: add tls options when listening
+	// Currently set in global options
+	// Context holds the external options
+	Context context.Context
+	// TLSConfig holds the *tls.Config options
+	TLSConfig *tls.Config
+}
+
+// NewListenOptions returns new ListenOptions
+func NewListenOptions(opts ...ListenOption) ListenOptions {
+	options := ListenOptions{
+		Context: context.Background(),
+	}
+
+	for _, o := range opts {
+		o(&options)
+	}
+
+	return options
+}
+
+// Addrs to use for transport
+func Addrs(addrs ...string) Option {
+	return func(o *Options) {
+		o.Addrs = addrs
+	}
+}
+
+// Logger sets the logger
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Meter sets the meter
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// Context sets the context
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
+	}
+}
+
+// Codec sets the codec used for encoding where the transport
+// does not support message headers
+func Codec(c codec.Codec) Option {
+	return func(o *Options) {
+		o.Codec = c
+	}
+}
+
+// Timeout sets the timeout for Send/Recv execution
+func Timeout(t time.Duration) Option {
+	return func(o *Options) {
+		o.Timeout = t
+	}
+}
+
+// TLSConfig to be used for the transport.
+func TLSConfig(t *tls.Config) Option {
+	return func(o *Options) {
+		o.TLSConfig = t
+	}
+}
+
+// WithStream indicates whether this is a streaming connection
+func WithStream() DialOption {
+	return func(o *DialOptions) {
+		o.Stream = true
+	}
+}
+
+// WithTimeout used when dialling the remote side
+func WithTimeout(d time.Duration) DialOption {
+	return func(o *DialOptions) {
+		o.Timeout = d
+	}
+}
+
+// Tracer to be used for tracing
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
+	}
+}
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}

network/transport/transport.go

@@ -0,0 +1,63 @@
+// Package transport is an interface for synchronous connection based communication
+package transport // import "go.unistack.org/micro/v4/network/transport"
+
+import (
+	"context"
+	"time"
+
+	"go.unistack.org/micro/v4/metadata"
+)
+
+var (
+	// DefaultTransport is the global default transport
+	DefaultTransport Transport = NewTransport()
+	// DefaultDialTimeout the default dial timeout
+	DefaultDialTimeout = time.Second * 5
+)
+
+// Transport is an interface which is used for communication between
+// services. It uses connection based socket send/recv semantics and
+// has various implementations; http, grpc, quic.
+type Transport interface {
+	Init(...Option) error
+	Options() Options
+	Dial(ctx context.Context, addr string, opts ...DialOption) (Client, error)
+	Listen(ctx context.Context, addr string, opts ...ListenOption) (Listener, error)
+	String() string
+}
+
+// Message is used to transfer data
+type Message struct {
+	Header metadata.Metadata
+	Body   []byte
+}
+
+// Socket bastraction interface
+type Socket interface {
+	Recv(*Message) error
+	Send(*Message) error
+	Close() error
+	Local() string
+	Remote() string
+}
+
+// Client is the socket owner
+type Client interface {
+	Socket
+}
+
+// Listener is the interface for stream oriented messaging
+type Listener interface {
+	Addr() string
+	Close() error
+	Accept(func(Socket)) error
+}
+
+// Option is the option signature
+type Option func(*Options)
+
+// DialOption is the option signature
+type DialOption func(*DialOptions)
+
+// ListenOption is the option signature
+type ListenOption func(*ListenOptions)

network/tunnel/broker/broker.go

@@ -0,0 +1,356 @@
+// Package broker is a tunnel broker
+package broker // import "go.unistack.org/micro/v4/network/tunnel/broker"
+
+import (
+	"context"
+	"fmt"
+
+	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/network/transport"
+	"go.unistack.org/micro/v4/network/tunnel"
+)
+
+type tunBroker struct {
+	tunnel tunnel.Tunnel
+	opts   broker.Options
+}
+
+type tunSubscriber struct {
+	listener tunnel.Listener
+	handler  broker.Handler
+	closed   chan bool
+	topic    string
+	opts     broker.SubscribeOptions
+}
+
+type tunBatchSubscriber struct {
+	listener tunnel.Listener
+	handler  broker.BatchHandler
+	closed   chan bool
+	topic    string
+	opts     broker.SubscribeOptions
+}
+
+type tunEvent struct {
+	err     error
+	message *broker.Message
+	topic   string
+}
+
+// used to access tunnel from options context
+type (
+	tunnelKey  struct{}
+	tunnelAddr struct{}
+)
+
+func (t *tunBroker) Init(opts ...broker.Option) error {
+	for _, o := range opts {
+		o(&t.opts)
+	}
+	return nil
+}
+
+func (t *tunBroker) Name() string {
+	return t.opts.Name
+}
+
+func (t *tunBroker) Options() broker.Options {
+	return t.opts
+}
+
+func (t *tunBroker) Address() string {
+	return t.tunnel.Address()
+}
+
+func (t *tunBroker) Connect(ctx context.Context) error {
+	return t.tunnel.Connect(ctx)
+}
+
+func (t *tunBroker) Disconnect(ctx context.Context) error {
+	return t.tunnel.Close(ctx)
+}
+
+func (t *tunBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+	// TODO: this is probably inefficient, we might want to just maintain an open connection
+	// it may be easier to add broadcast to the tunnel
+	topicMap := make(map[string]tunnel.Session)
+
+	var err error
+	for _, msg := range msgs {
+		topic, _ := msg.Header.Get(metadata.HeaderTopic)
+		c, ok := topicMap[topic]
+		if !ok {
+			c, err = t.tunnel.Dial(ctx, topic, tunnel.DialMode(tunnel.Multicast))
+			if err != nil {
+				return err
+			}
+			defer c.Close()
+			topicMap[topic] = c
+		}
+
+		if err = c.Send(&transport.Message{
+			Header: msg.Header,
+			Body:   msg.Body,
+		}); err != nil {
+			//	msg.SetError(err)
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (t *tunBroker) Publish(ctx context.Context, topic string, m *broker.Message, opts ...broker.PublishOption) error {
+	// TODO: this is probably inefficient, we might want to just maintain an open connection
+	// it may be easier to add broadcast to the tunnel
+	c, err := t.tunnel.Dial(ctx, topic, tunnel.DialMode(tunnel.Multicast))
+	if err != nil {
+		return err
+	}
+	defer c.Close()
+
+	return c.Send(&transport.Message{
+		Header: m.Header,
+		Body:   m.Body,
+	})
+}
+
+func (t *tunBroker) BatchSubscribe(ctx context.Context, topic string, h broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+	l, err := t.tunnel.Listen(ctx, topic, tunnel.ListenMode(tunnel.Multicast))
+	if err != nil {
+		return nil, err
+	}
+
+	tunSub := &tunBatchSubscriber{
+		topic:    topic,
+		handler:  h,
+		opts:     broker.NewSubscribeOptions(opts...),
+		closed:   make(chan bool),
+		listener: l,
+	}
+
+	// start processing
+	go tunSub.run()
+
+	return tunSub, nil
+}
+
+func (t *tunBroker) Subscribe(ctx context.Context, topic string, h broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+	l, err := t.tunnel.Listen(ctx, topic, tunnel.ListenMode(tunnel.Multicast))
+	if err != nil {
+		return nil, err
+	}
+
+	tunSub := &tunSubscriber{
+		topic:    topic,
+		handler:  h,
+		opts:     broker.NewSubscribeOptions(opts...),
+		closed:   make(chan bool),
+		listener: l,
+	}
+
+	// start processing
+	go tunSub.run()
+
+	return tunSub, nil
+}
+
+func (t *tunBroker) String() string {
+	return "tunnel"
+}
+
+func (t *tunBatchSubscriber) run() {
+	for {
+		// accept a new connection
+		c, err := t.listener.Accept()
+		if err != nil {
+			select {
+			case <-t.closed:
+				return
+			default:
+				continue
+			}
+		}
+
+		// receive message
+		m := new(transport.Message)
+		if err := c.Recv(m); err != nil {
+			if logger.V(logger.ErrorLevel) {
+				logger.Error(t.opts.Context, err.Error())
+			}
+			if err = c.Close(); err != nil {
+				if logger.V(logger.ErrorLevel) {
+					logger.Error(t.opts.Context, err.Error())
+				}
+			}
+			continue
+		}
+
+		// close the connection
+		c.Close()
+
+		evts := broker.Events{&tunEvent{
+			topic: t.topic,
+			message: &broker.Message{
+				Header: m.Header,
+				Body:   m.Body,
+			},
+		}}
+		// handle the message
+		go func() {
+			_ = t.handler(evts)
+		}()
+
+	}
+}
+
+func (t *tunSubscriber) run() {
+	for {
+		// accept a new connection
+		c, err := t.listener.Accept()
+		if err != nil {
+			select {
+			case <-t.closed:
+				return
+			default:
+				continue
+			}
+		}
+
+		// receive message
+		m := new(transport.Message)
+		if err := c.Recv(m); err != nil {
+			if logger.V(logger.ErrorLevel) {
+				logger.Error(t.opts.Context, err.Error())
+			}
+			if err = c.Close(); err != nil {
+				if logger.V(logger.ErrorLevel) {
+					logger.Error(t.opts.Context, err.Error())
+				}
+			}
+			continue
+		}
+
+		// close the connection
+		c.Close()
+
+		// handle the message
+		go func() {
+			_ = t.handler(&tunEvent{
+				topic: t.topic,
+				message: &broker.Message{
+					Header: m.Header,
+					Body:   m.Body,
+				},
+			})
+		}()
+	}
+}
+
+func (t *tunBatchSubscriber) Options() broker.SubscribeOptions {
+	return t.opts
+}
+
+func (t *tunBatchSubscriber) Topic() string {
+	return t.topic
+}
+
+func (t *tunBatchSubscriber) Unsubscribe(ctx context.Context) error {
+	select {
+	case <-t.closed:
+		return nil
+	default:
+		close(t.closed)
+		return t.listener.Close()
+	}
+}
+
+func (t *tunSubscriber) Options() broker.SubscribeOptions {
+	return t.opts
+}
+
+func (t *tunSubscriber) Topic() string {
+	return t.topic
+}
+
+func (t *tunSubscriber) Unsubscribe(ctx context.Context) error {
+	select {
+	case <-t.closed:
+		return nil
+	default:
+		close(t.closed)
+		return t.listener.Close()
+	}
+}
+
+func (t *tunEvent) Topic() string {
+	return t.topic
+}
+
+func (t *tunEvent) Message() *broker.Message {
+	return t.message
+}
+
+func (t *tunEvent) Ack() error {
+	return nil
+}
+
+func (t *tunEvent) Error() error {
+	return t.err
+}
+
+func (t *tunEvent) SetError(err error) {
+	t.err = err
+}
+
+// NewBroker returns new tunnel broker
+func NewBroker(opts ...broker.Option) (broker.Broker, error) {
+	options := broker.NewOptions(opts...)
+
+	t, ok := options.Context.Value(tunnelKey{}).(tunnel.Tunnel)
+	if !ok {
+		return nil, fmt.Errorf("tunnel not set")
+	}
+
+	a, ok := options.Context.Value(tunnelAddr{}).(string)
+	if ok {
+		// initialise address
+		if err := t.Init(tunnel.Address(a)); err != nil {
+			return nil, err
+		}
+	}
+
+	if len(options.Addrs) > 0 {
+		// initialise nodes
+		if err := t.Init(tunnel.Nodes(options.Addrs...)); err != nil {
+			return nil, err
+		}
+	}
+
+	return &tunBroker{
+		opts:   options,
+		tunnel: t,
+	}, nil
+}
+
+// WithAddress sets the tunnel address
+func WithAddress(a string) broker.Option {
+	return func(o *broker.Options) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, tunnelAddr{}, a)
+	}
+}
+
+// WithTunnel sets the internal tunnel
+func WithTunnel(t tunnel.Tunnel) broker.Option {
+	return func(o *broker.Options) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, tunnelKey{}, t)
+	}
+}

network/tunnel/options.go

@@ -0,0 +1,192 @@
+package tunnel
+
+import (
+	"time"
+
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/network/transport"
+	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v4/util/id"
+)
+
+var (
+	// DefaultAddress is default tunnel bind address
+	DefaultAddress = ":0"
+	// DefaultToken the shared default token
+	DefaultToken = "go.micro.tunnel"
+)
+
+// Option func signature
+type Option func(*Options)
+
+// Options provides network configuration options
+type Options struct {
+	// Logger used for logging
+	Logger logger.Logger
+	// Meter used for metrics
+	Meter meter.Meter
+	// Tracer used for tracing
+	Tracer tracer.Tracer
+	// Transport used for communication
+	Transport transport.Transport
+	// Token the shared auth token
+	Token string
+	// Name holds the tunnel name
+	Name string
+	// ID holds the tunnel id
+	ID string
+	// Address holds the tunnel address
+	Address string
+	// Nodes holds the tunnel nodes
+	Nodes []string
+}
+
+// DialOption func
+type DialOption func(*DialOptions)
+
+// DialOptions provides dial options
+type DialOptions struct {
+	// Link specifies the link to use
+	Link string
+	// specify mode of the session
+	Mode Mode
+	// Wait for connection to be accepted
+	Wait bool
+	// the dial timeout
+	Timeout time.Duration
+}
+
+// ListenOption func
+type ListenOption func(*ListenOptions)
+
+// ListenOptions provides listen options
+type ListenOptions struct {
+	// Mode specify mode of the session
+	Mode Mode
+	// Timeout the read timeout
+	Timeout time.Duration
+}
+
+// ID sets the tunnel id
+func ID(id string) Option {
+	return func(o *Options) {
+		o.ID = id
+	}
+}
+
+// Logger sets the logger
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Meter sets the meter
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// Address sets the tunnel address
+func Address(a string) Option {
+	return func(o *Options) {
+		o.Address = a
+	}
+}
+
+// Nodes specify remote network nodes
+func Nodes(n ...string) Option {
+	return func(o *Options) {
+		o.Nodes = n
+	}
+}
+
+// Token sets the shared token for auth
+func Token(t string) Option {
+	return func(o *Options) {
+		o.Token = t
+	}
+}
+
+// Transport listens for incoming connections
+func Transport(t transport.Transport) Option {
+	return func(o *Options) {
+		o.Transport = t
+	}
+}
+
+// ListenMode option
+func ListenMode(m Mode) ListenOption {
+	return func(o *ListenOptions) {
+		o.Mode = m
+	}
+}
+
+// ListenTimeout for reads and writes on the listener session
+func ListenTimeout(t time.Duration) ListenOption {
+	return func(o *ListenOptions) {
+		o.Timeout = t
+	}
+}
+
+// DialMode multicast sets the multicast option to send only to those mapped
+func DialMode(m Mode) DialOption {
+	return func(o *DialOptions) {
+		o.Mode = m
+	}
+}
+
+// DialTimeout sets the dial timeout of the connection
+func DialTimeout(t time.Duration) DialOption {
+	return func(o *DialOptions) {
+		o.Timeout = t
+	}
+}
+
+// DialLink specifies the link to pin this connection to.
+// This is not applicable if the multicast option is set.
+func DialLink(id string) DialOption {
+	return func(o *DialOptions) {
+		o.Link = id
+	}
+}
+
+// DialWait specifies whether to wait for the connection
+// to be accepted before returning the session
+func DialWait(b bool) DialOption {
+	return func(o *DialOptions) {
+		o.Wait = b
+	}
+}
+
+// NewOptions returns router default options with filled values
+func NewOptions(opts ...Option) Options {
+	options := Options{
+		ID:      id.Must(),
+		Address: DefaultAddress,
+		Token:   DefaultToken,
+		Logger:  logger.DefaultLogger,
+		Meter:   meter.DefaultMeter,
+		Tracer:  tracer.DefaultTracer,
+	}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
+// Tracer to be used for tracing
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
+	}
+}
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}

network/tunnel/transport/listener.go

@@ -0,0 +1,30 @@
+package transport
+
+import (
+	"go.unistack.org/micro/v4/network/transport"
+	"go.unistack.org/micro/v4/network/tunnel"
+)
+
+type tunListener struct {
+	l tunnel.Listener
+}
+
+func (t *tunListener) Addr() string {
+	return t.l.Channel()
+}
+
+func (t *tunListener) Close() error {
+	return t.l.Close()
+}
+
+func (t *tunListener) Accept(fn func(socket transport.Socket)) error {
+	for {
+		// accept connection
+		c, err := t.l.Accept()
+		if err != nil {
+			return err
+		}
+		// execute the function
+		go fn(c)
+	}
+}

network/tunnel/transport/transport.go

@@ -0,0 +1,113 @@
+// Package transport provides a tunnel transport
+package transport // import "go.unistack.org/micro/v4/network/tunnel/transport"
+
+import (
+	"context"
+	"fmt"
+
+	"go.unistack.org/micro/v4/network/transport"
+	"go.unistack.org/micro/v4/network/tunnel"
+)
+
+type tunTransport struct {
+	tunnel  tunnel.Tunnel
+	options transport.Options
+}
+
+type tunnelKey struct{}
+
+type transportKey struct{}
+
+func (t *tunTransport) Init(opts ...transport.Option) error {
+	for _, o := range opts {
+		o(&t.options)
+	}
+
+	// close the existing tunnel
+	if t.tunnel != nil {
+		t.tunnel.Close(context.TODO())
+	}
+
+	// get the tunnel
+	tun, ok := t.options.Context.Value(tunnelKey{}).(tunnel.Tunnel)
+	if !ok {
+		return fmt.Errorf("tunnel not set")
+	}
+
+	// get the transport
+	tr, ok := t.options.Context.Value(transportKey{}).(transport.Transport)
+	if ok {
+		_ = tun.Init(tunnel.Transport(tr))
+	}
+
+	// set the tunnel
+	t.tunnel = tun
+
+	return nil
+}
+
+func (t *tunTransport) Dial(ctx context.Context, addr string, opts ...transport.DialOption) (transport.Client, error) {
+	if err := t.tunnel.Connect(ctx); err != nil {
+		return nil, err
+	}
+
+	c, err := t.tunnel.Dial(ctx, addr)
+	if err != nil {
+		return nil, err
+	}
+
+	return c, nil
+}
+
+func (t *tunTransport) Listen(ctx context.Context, addr string, opts ...transport.ListenOption) (transport.Listener, error) {
+	if err := t.tunnel.Connect(ctx); err != nil {
+		return nil, err
+	}
+
+	l, err := t.tunnel.Listen(ctx, addr)
+	if err != nil {
+		return nil, err
+	}
+
+	return &tunListener{l}, nil
+}
+
+func (t *tunTransport) Options() transport.Options {
+	return t.options
+}
+
+func (t *tunTransport) String() string {
+	return "tunnel"
+}
+
+// NewTransport honours the initialiser used in
+func NewTransport(opts ...transport.Option) transport.Transport {
+	t := &tunTransport{
+		options: transport.Options{},
+	}
+
+	// initialise
+	// t.Init(opts...)
+
+	return t
+}
+
+// WithTunnel sets the internal tunnel
+func WithTunnel(t tunnel.Tunnel) transport.Option {
+	return func(o *transport.Options) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, tunnelKey{}, t)
+	}
+}
+
+// WithTransport sets the internal transport
+func WithTransport(t transport.Transport) transport.Option {
+	return func(o *transport.Options) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, transportKey{}, t)
+	}
+}

network/tunnel/tunnel.go

@@ -0,0 +1,106 @@
+// Package tunnel provides gre network tunnelling
+package tunnel // import "go.unistack.org/micro/v4/network/transport/tunnel"
+
+import (
+	"context"
+	"errors"
+	"time"
+
+	"go.unistack.org/micro/v4/network/transport"
+)
+
+// DefaultTunnel contains default tunnel implementation
+var DefaultTunnel Tunnel
+
+const (
+	// Unicast send over one link
+	Unicast Mode = iota
+	// Multicast send to all channel listeners
+	Multicast
+	// Broadcast send to all links
+	Broadcast
+)
+
+var (
+	// DefaultDialTimeout is the dial timeout if none is specified
+	DefaultDialTimeout = time.Second * 5
+	// ErrDialTimeout is returned by a call to Dial where the timeout occurs
+	ErrDialTimeout = errors.New("dial timeout")
+	// ErrDiscoverChan is returned when we failed to receive the "announce" back from a discovery
+	ErrDiscoverChan = errors.New("failed to discover channel")
+	// ErrLinkNotFound is returned when a link is specified at dial time and does not exist
+	ErrLinkNotFound = errors.New("link not found")
+	// ErrLinkDisconnected is returned when a link we attempt to send to is disconnected
+	ErrLinkDisconnected = errors.New("link not connected")
+	// ErrLinkLoopback is returned when attempting to send an outbound message over loopback link
+	ErrLinkLoopback = errors.New("link is loopback")
+	// ErrLinkRemote is returned when attempting to send a loopback message over remote link
+	ErrLinkRemote = errors.New("link is remote")
+	// ErrReadTimeout is a timeout on session.Recv
+	ErrReadTimeout = errors.New("read timeout")
+	// ErrDecryptingData is for when theres a nonce error
+	ErrDecryptingData = errors.New("error decrypting data")
+)
+
+// Mode of the session
+type Mode uint8
+
+// Tunnel creates a gre tunnel on top of the micro/transport.
+// It establishes multiple streams using the Micro-Tunnel-Channel header
+// and Micro-Tunnel-Session header. The tunnel id is a hash of
+// the address being requested.
+type Tunnel interface {
+	// Init initializes tunnel with options
+	Init(opts ...Option) error
+	// Address returns the address the tunnel is listening on
+	Address() string
+	// Connect connects the tunnel
+	Connect(ctx context.Context) error
+	// Close closes the tunnel
+	Close(ctx context.Context) error
+	// Links returns all the links the tunnel is connected to
+	Links() []Link
+	// Dial allows a client to connect to a channel
+	Dial(ctx context.Context, channel string, opts ...DialOption) (Session, error)
+	// Listen allows to accept connections on a channel
+	Listen(ctx context.Context, channel string, opts ...ListenOption) (Listener, error)
+	// String returns the name of the tunnel implementation
+	String() string
+}
+
+// Link represents internal links to the tunnel
+type Link interface {
+	// Id returns the link unique Id
+	Id() string
+	// Delay is the current load on the link (lower is better)
+	Delay() int64
+	// Length returns the roundtrip time as nanoseconds (lower is better)
+	Length() int64
+	// Current transfer rate as bits per second (lower is better)
+	Rate() float64
+	// Is this a loopback link
+	Loopback() bool
+	// State of the link: connected/closed/error
+	State() string
+	// honours transport socket
+	transport.Socket
+}
+
+// Listener provides similar constructs to the transport.Listener
+type Listener interface {
+	Accept() (Session, error)
+	Channel() string
+	Close() error
+}
+
+// Session is a unique session created when dialling or accepting connections on the tunnel
+type Session interface {
+	// The unique session id
+	Id() string
+	// The channel name
+	Channel() string
+	// The link the session is on
+	Link() string
+	// a transport socket
+	transport.Socket
+}

options.go

@@ -11,7 +11,6 @@ import (
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/metadata"
 	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/register"
 	"go.unistack.org/micro/v4/router"
 	"go.unistack.org/micro/v4/server"
@@ -202,7 +201,7 @@ func Logger(l logger.Logger, opts ...LoggerOption) Option {
 		for _, srv := range o.Servers {
 			for _, os := range lopts.servers {
 				if srv.Name() == os || all {
-					if err = srv.Init(options.Logger(l)); err != nil {
+					if err = srv.Init(server.Logger(l)); err != nil {
 						return err
 					}
 				}
@@ -211,7 +210,7 @@ func Logger(l logger.Logger, opts ...LoggerOption) Option {
 		for _, cli := range o.Clients {
 			for _, oc := range lopts.clients {
 				if cli.Name() == oc || all {
-					if err = cli.Init(options.Logger(l)); err != nil {
+					if err = cli.Init(client.Logger(l)); err != nil {
 						return err
 					}
 				}
@@ -220,7 +219,7 @@ func Logger(l logger.Logger, opts ...LoggerOption) Option {
 		for _, brk := range o.Brokers {
 			for _, ob := range lopts.brokers {
 				if brk.Name() == ob || all {
-					if err = brk.Init(options.Logger(l)); err != nil {
+					if err = brk.Init(broker.Logger(l)); err != nil {
 						return err
 					}
 				}
@@ -238,7 +237,7 @@ func Logger(l logger.Logger, opts ...LoggerOption) Option {
 		for _, str := range o.Stores {
 			for _, or := range lopts.stores {
 				if str.Name() == or || all {
-					if err = str.Init(options.Logger(l)); err != nil {
+					if err = str.Init(store.Logger(l)); err != nil {
 						return err
 					}
 				}
@@ -247,7 +246,7 @@ func Logger(l logger.Logger, opts ...LoggerOption) Option {
 		for _, mtr := range o.Meters {
 			for _, or := range lopts.meters {
 				if mtr.Name() == or || all {
-					if err = mtr.Init(options.Logger(l)); err != nil {
+					if err = mtr.Init(meter.Logger(l)); err != nil {
 						return err
 					}
 				}
@@ -256,7 +255,7 @@ func Logger(l logger.Logger, opts ...LoggerOption) Option {
 		for _, trc := range o.Tracers {
 			for _, ot := range lopts.tracers {
 				if trc.Name() == ot || all {
-					if err = trc.Init(options.Logger(l)); err != nil {
+					if err = trc.Init(tracer.Logger(l)); err != nil {
 						return err
 					}
 				}
@@ -330,7 +329,7 @@ func Register(r register.Register, opts ...RegisterOption) Option {
 		for _, srv := range o.Servers {
 			for _, os := range ropts.servers {
 				if srv.Name() == os || all {
-					if err = srv.Init(options.Register(r)); err != nil {
+					if err = srv.Init(server.Register(r)); err != nil {
 						return err
 					}
 				}
@@ -339,7 +338,7 @@ func Register(r register.Register, opts ...RegisterOption) Option {
 		for _, brk := range o.Brokers {
 			for _, os := range ropts.brokers {
 				if brk.Name() == os || all {
-					if err = brk.Init(options.Register(r)); err != nil {
+					if err = brk.Init(broker.Register(r)); err != nil {
 						return err
 					}
 				}
@@ -396,7 +395,7 @@ func Tracer(t tracer.Tracer, opts ...TracerOption) Option {
 		for _, srv := range o.Servers {
 			for _, os := range topts.servers {
 				if srv.Name() == os || all {
-					if err = srv.Init(options.Tracer(t)); err != nil {
+					if err = srv.Init(server.Tracer(t)); err != nil {
 						return err
 					}
 				}
@@ -405,7 +404,7 @@ func Tracer(t tracer.Tracer, opts ...TracerOption) Option {
 		for _, cli := range o.Clients {
 			for _, os := range topts.clients {
 				if cli.Name() == os || all {
-					if err = cli.Init(options.Tracer(t)); err != nil {
+					if err = cli.Init(client.Tracer(t)); err != nil {
 						return err
 					}
 				}
@@ -414,7 +413,7 @@ func Tracer(t tracer.Tracer, opts ...TracerOption) Option {
 		for _, str := range o.Stores {
 			for _, os := range topts.stores {
 				if str.Name() == os || all {
-					if err = str.Init(options.Tracer(t)); err != nil {
+					if err = str.Init(store.Tracer(t)); err != nil {
 						return err
 					}
 				}
@@ -423,7 +422,7 @@ func Tracer(t tracer.Tracer, opts ...TracerOption) Option {
 		for _, brk := range o.Brokers {
 			for _, os := range topts.brokers {
 				if brk.Name() == os || all {
-					if err = brk.Init(options.Tracer(t)); err != nil {
+					if err = brk.Init(broker.Tracer(t)); err != nil {
 						return err
 					}
 				}
@@ -522,7 +521,7 @@ func Router(r router.Router, opts ...RouterOption) Option {
 		for _, cli := range o.Clients {
 			for _, os := range ropts.clients {
 				if cli.Name() == os || all {
-					if err = cli.Init(options.Router(r)); err != nil {
+					if err = cli.Init(client.Router(r)); err != nil {
 						return err
 					}
 				}
@@ -557,7 +556,7 @@ func Address(addr string) Option {
 		default:
 			return fmt.Errorf("cant set same address for multiple servers")
 		}
-		return o.Servers[0].Init(options.Address(addr))
+		return o.Servers[0].Init(server.Address(addr))
 	}
 }
 

options/options.go

@@ -1,221 +0,0 @@
-package options
-
-import (
-	"context"
-	"crypto/tls"
-	"reflect"
-	"time"
-
-	"go.unistack.org/micro/v4/metadata"
-	rutil "go.unistack.org/micro/v4/util/reflect"
-)
-
-// Option func signature
-type Option func(interface{}) error
-
-// Set assign value to struct by its path
-func Set(src interface{}, dst interface{}, path string) error {
-	return rutil.SetFieldByPath(src, dst, path)
-}
-
-// Get returns value from struct by its path
-func Get(src interface{}, path string) (interface{}, error) {
-	return rutil.StructFieldByPath(src, path)
-}
-
-// Name set Name value
-func Name(v ...string) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Name")
-	}
-}
-
-// Address set Address value to single string or slice of strings
-func Address(v ...string) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Address")
-	}
-}
-
-// Broker set Broker value
-func Broker(v interface{}) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Broker")
-	}
-}
-
-// Logger set Logger value
-func Logger(v interface{}) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Logger")
-	}
-}
-
-// Meter set Meter value
-func Meter(v interface{}) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Meter")
-	}
-}
-
-// Tracer set Tracer value
-func Tracer(v interface{}) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Tracer")
-	}
-}
-
-// Store set Store value
-func Store(v interface{}) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Store")
-	}
-}
-
-// Register set Register value
-func Register(v interface{}) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Register")
-	}
-}
-
-// Router set Router value
-func Router(v interface{}) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Router")
-	}
-}
-
-// Codec set Codec value
-func Codec(v interface{}) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Codec")
-	}
-}
-
-// Client set Client value
-func Client(v interface{}) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Client")
-	}
-}
-
-// Codecs to be used to encode/decode requests for a given content type
-func Codecs(ct string, v interface{}) Option {
-	return func(src interface{}) error {
-		cm, err := Get(src, ".Codecs")
-		if err != nil {
-			return err
-		} else if rutil.IsZero(cm) {
-			cm = reflect.MakeMap(reflect.TypeOf(cm)).Interface()
-		}
-		cv := reflect.ValueOf(cm)
-		cv.SetMapIndex(reflect.ValueOf(ct), reflect.ValueOf(v))
-		return Set(src, cv.Interface(), ".Codecs")
-	}
-}
-
-// Context set Context value
-func Context(v context.Context) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".Context")
-	}
-}
-
-// TLSConfig set TLSConfig value
-func TLSConfig(v *tls.Config) Option {
-	return func(src interface{}) error {
-		return Set(src, v, ".TLSConfig")
-	}
-}
-
-func ContextOption(k, v interface{}) Option {
-	return func(src interface{}) error {
-		ctx, err := Get(src, ".Context")
-		if err != nil {
-			return err
-		}
-		if ctx == nil {
-			ctx = context.Background()
-		}
-		err = Set(src, context.WithValue(ctx.(context.Context), k, v), ".Context")
-		return err
-	}
-}
-
-// ContentType pass ContentType for message data
-func ContentType(ct string) Option {
-	return func(src interface{}) error {
-		return Set(src, ct, ".ContentType")
-	}
-}
-
-// Metadata pass additional metadata
-func Metadata(md ...any) Option {
-	var result metadata.Metadata
-	if len(md) == 1 {
-		switch vt := md[0].(type) {
-		case metadata.Metadata:
-			result = metadata.Copy(vt)
-		case map[string]string:
-			result = make(metadata.Metadata, len(vt))
-			for k, v := range vt {
-				result.Set(k, v)
-			}
-		case map[string][]string:
-			result = metadata.Copy(vt)
-		default:
-			result = metadata.New(0)
-		}
-	} else {
-		result = metadata.New(len(md) / 2)
-		for idx := 0; idx <= len(md)/2; idx += 2 {
-			k, ok := md[idx].(string)
-			switch vt := md[idx+1].(type) {
-			case string:
-				if ok {
-					result.Set(k, vt)
-				}
-			case []string:
-				if ok {
-					result.Append(k, vt...)
-				}
-			}
-		}
-	}
-
-	return func(src interface{}) error {
-		return Set(src, result, ".Metadata")
-	}
-}
-
-// Namespace to use
-func Namespace(ns string) Option {
-	return func(src interface{}) error {
-		return Set(src, ns, ".Namespace")
-	}
-}
-
-// Labels sets the labels
-func Labels(ls ...interface{}) Option {
-	return func(src interface{}) error {
-		v, err := Get(src, ".Labels")
-		if err != nil {
-			return err
-		} else if rutil.IsZero(v) {
-			v = reflect.MakeSlice(reflect.TypeOf(v), 0, len(ls)).Interface()
-		}
-		cv := reflect.ValueOf(v)
-		for _, l := range ls {
-			cv = reflect.Append(cv, reflect.ValueOf(l))
-		}
-		return Set(src, cv.Interface(), ".Labels")
-	}
-}
-
-// Timeout pass timeout time.Duration
-func Timeout(td time.Duration) Option {
-	return func(src interface{}) error {
-		return Set(src, td, ".Timeout")
-	}
-}

options/options_test.go

@@ -1,149 +0,0 @@
-package options_test
-
-import (
-	"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) {
-	var err error
-
-	type s struct {
-		Address []string
-	}
-
-	src := &s{}
-	var opts []options.Option
-	opts = append(opts, options.Address("host:port"))
-
-	for _, o := range opts {
-		if err = o(src); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if src.Address[0] != "host:port" {
-		t.Fatal("failed to set Address")
-	}
-}
-
-func TestCodecs(t *testing.T) {
-	var err error
-
-	type s struct {
-		Codecs map[string]codec.Codec
-	}
-
-	src := &s{}
-	var opts []options.Option
-	c := codec.NewCodec()
-	opts = append(opts, options.Codecs("text/html", c))
-
-	for _, o := range opts {
-		if err = o(src); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	for k, v := range src.Codecs {
-		if k != "text/html" || v != c {
-			continue
-		}
-		return
-	}
-
-	t.Fatalf("failed to set Codecs")
-}
-
-func TestLabels(t *testing.T) {
-	type str1 struct {
-		Labels []string
-	}
-	type str2 struct {
-		Labels []interface{}
-	}
-
-	x1 := &str1{}
-
-	if err := options.Labels("one", "two")(x1); err != nil {
-		t.Fatal(err)
-	}
-	if len(x1.Labels) != 2 {
-		t.Fatal("failed to set labels")
-	}
-	x2 := &str2{}
-	if err := options.Labels("key", "val")(x2); err != nil {
-		t.Fatal(err)
-	}
-	if len(x2.Labels) != 2 {
-		t.Fatal("failed to set labels")
-	}
-	if x2.Labels[0] != "key" {
-		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",
-			[]any{"Strkey1", []string{"val1"}, "Strkey2", []string{"val2"}},
-			metadata.Pairs("Strkey1", "val1", "Strkey2", "val2"),
-		},
-		{
-			"strings_odd",
-			[]any{"key1", "val1", "key2"},
-			metadata.Pairs("Key1", "val1"),
-		},
-		{
-			Name: "map",
-			Data: map[string][]string{
-				"Mapkey1": {"val1"},
-				"Mapkey2": {"val2"},
-			},
-			Expected: metadata.Metadata{
-				"Mapkey1": []string{"val1"},
-				"Mapkey2": []string{"val2"},
-			},
-		},
-		{
-			"metadata.Metadata",
-			metadata.Pairs("key1", "val1", "key2", "val2"),
-			metadata.Pairs("Key1", "val1", "Key2", "val2"),
-		},
-	}
-
-	for _, tt := range testCases {
-		t.Run(tt.Name, func(t *testing.T) {
-			src := &s{}
-			var opts []options.Option
-			switch valData := tt.Data.(type) {
-			case []any:
-				opts = append(opts, options.Metadata(valData...))
-			case map[string]string, map[string][]string, metadata.Metadata:
-				opts = append(opts, options.Metadata(valData))
-			}
-
-			for _, o := range opts {
-				if err := o(src); err != nil {
-					t.Fatal(err)
-				}
-				if !reflect.Equal(tt.Expected, src.Metadata) {
-					t.Fatalf("expected: %v, actual: %v", tt.Expected, src.Metadata)
-				}
-			}
-		})
-	}
-}

proxy/options.go

@@ -0,0 +1,98 @@
+// Package proxy is a transparent proxy built on the micro/server
+package proxy
+
+import (
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/router"
+	"go.unistack.org/micro/v4/tracer"
+)
+
+// Options for proxy
+type Options struct {
+	// Tracer used for tracing
+	Tracer tracer.Tracer
+	// Client for communication
+	Client client.Client
+	// Router for routing
+	Router router.Router
+	// Logger used for logging
+	Logger logger.Logger
+	// Meter used for metrics
+	Meter meter.Meter
+	// Links holds the communication links
+	Links map[string]client.Client
+	// Endpoint holds the destination address
+	Endpoint string
+}
+
+// Option func signature
+type Option func(o *Options)
+
+// NewOptions returns new options struct that filled by opts
+func NewOptions(opts ...Option) Options {
+	options := Options{
+		Logger: logger.DefaultLogger,
+		Meter:  meter.DefaultMeter,
+		Tracer: tracer.DefaultTracer,
+	}
+
+	for _, o := range opts {
+		o(&options)
+	}
+
+	return options
+}
+
+// WithEndpoint sets a proxy endpoint
+func WithEndpoint(e string) Option {
+	return func(o *Options) {
+		o.Endpoint = e
+	}
+}
+
+// WithClient sets the client
+func WithClient(c client.Client) Option {
+	return func(o *Options) {
+		o.Client = c
+	}
+}
+
+// WithRouter specifies the router to use
+func WithRouter(r router.Router) Option {
+	return func(o *Options) {
+		o.Router = r
+	}
+}
+
+// WithLogger specifies the logger to use
+func WithLogger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// WithMeter specifies the meter to use
+func WithMeter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// WithLink sets a link for outbound requests
+func WithLink(name string, c client.Client) Option {
+	return func(o *Options) {
+		if o.Links == nil {
+			o.Links = make(map[string]client.Client)
+		}
+		o.Links[name] = c
+	}
+}
+
+// Tracer to be used for tracing
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
+	}
+}

proxy/proxy.go

@@ -0,0 +1,21 @@
+// Package proxy is a transparent proxy built on the micro/server
+package proxy // import "go.unistack.org/micro/v4/proxy"
+
+import (
+	"context"
+
+	"go.unistack.org/micro/v4/server"
+)
+
+// DefaultEndpoint holds default proxy address
+var DefaultEndpoint = "localhost:9090"
+
+// Proxy can be used as a proxy server for micro services
+type Proxy interface {
+	// ProcessMessage handles inbound messages
+	ProcessMessage(context.Context, server.Message) error
+	// ServeRequest handles inbound requests
+	ServeRequest(context.Context, server.Request, server.Response) error
+	// Name of the proxy protocol
+	String() string
+}

register/memory.go

@@ -1,13 +1,10 @@
-package memory
+package register
 
 import (
 	"context"
 	"sync"
 	"time"
 
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/register"
-
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/util/id"
 )
@@ -19,32 +16,32 @@ var (
 
 type node struct {
 	LastSeen time.Time
-	*register.Node
+	*Node
 	TTL time.Duration
 }
 
 type record struct {
 	Name      string
 	Version   string
-	Metadata  metadata.Metadata
+	Metadata  map[string]string
 	Nodes     map[string]*node
-	Endpoints []*register.Endpoint
+	Endpoints []*Endpoint
 }
 
 type memory struct {
+	sync.RWMutex
 	records  map[string]services
 	watchers map[string]*watcher
-	opts     register.Options
+	opts     Options
-	sync.RWMutex
 }
 
 // services is a KV map with service name as the key and a map of records as the value
 type services map[string]map[string]*record
 
 // NewRegister returns an initialized in-memory register
-func NewRegister(opts ...register.Option) register.Register {
+func NewRegister(opts ...Option) Register {
 	r := &memory{
-		opts:     register.NewOptions(opts...),
+		opts:     NewOptions(opts...),
 		records:  make(map[string]services),
 		watchers: make(map[string]*watcher),
 	}
@@ -66,7 +63,7 @@ func (m *memory) ttlPrune() {
 					for id, n := range record.Nodes {
 						if n.TTL != 0 && time.Since(n.LastSeen) > n.TTL {
 							if m.opts.Logger.V(logger.DebugLevel) {
-								m.opts.Logger.Debug(m.opts.Context, "RegisterTTL expired for node "+n.ID+" of service "+service)
+								m.opts.Logger.Debugf(m.opts.Context, "Register TTL expired for node %s of service %s", n.ID, service)
 							}
 							delete(m.records[domain][service][version].Nodes, id)
 						}
@@ -78,7 +75,7 @@ func (m *memory) ttlPrune() {
 	}
 }
 
-func (m *memory) sendEvent(r *register.Result) {
+func (m *memory) sendEvent(r *Result) {
 	m.RLock()
 	watchers := make([]*watcher, 0, len(m.watchers))
 	for _, w := range m.watchers {
@@ -102,24 +99,14 @@ func (m *memory) sendEvent(r *register.Result) {
 }
 
 func (m *memory) Connect(ctx context.Context) error {
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
 	return nil
 }
 
 func (m *memory) Disconnect(ctx context.Context) error {
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
 	return nil
 }
 
-func (m *memory) Init(opts ...register.Option) error {
+func (m *memory) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&m.opts)
 	}
@@ -131,20 +118,15 @@ func (m *memory) Init(opts ...register.Option) error {
 	return nil
 }
 
-func (m *memory) Options() register.Options {
+func (m *memory) Options() Options {
 	return m.opts
 }
 
-func (m *memory) Register(ctx context.Context, s *register.Service, opts ...register.RegisterOption) error {
+func (m *memory) Register(ctx context.Context, s *Service, opts ...RegisterOption) error {
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
 	m.Lock()
 	defer m.Unlock()
 
-	options := register.NewRegisterOptions(opts...)
+	options := NewRegisterOptions(opts...)
 
 	// get the services for this domain from the register
 	srvs, ok := m.records[options.Domain]
@@ -154,11 +136,11 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi
 
 	// domain is set in metadata so it can be passed to watchers
 	if s.Metadata == nil {
-		s.Metadata = metadata.New(0)
+		s.Metadata = map[string]string{"domain": options.Domain}
+	} else {
+		s.Metadata["domain"] = options.Domain
 	}
 
-	s.Metadata.Set("domain", options.Domain)
-
 	// ensure the service name exists
 	r := serviceToRecord(s, options.TTL)
 	if _, ok := srvs[s.Name]; !ok {
@@ -168,10 +150,10 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi
 	if _, ok := srvs[s.Name][s.Version]; !ok {
 		srvs[s.Name][s.Version] = r
 		if m.opts.Logger.V(logger.DebugLevel) {
-			m.opts.Logger.Debug(m.opts.Context, "register added new service: "+s.Name+", version "+s.Version)
+			m.opts.Logger.Debugf(m.opts.Context, "Register added new service: %s, version: %s", s.Name, s.Version)
 		}
 		m.records[options.Domain] = srvs
-		go m.sendEvent(&register.Result{Action: "create", Service: s})
+		go m.sendEvent(&Result{Action: "create", Service: s})
 	}
 
 	var addedNodes bool
@@ -182,12 +164,19 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi
 			continue
 		}
 
-		metadata := metadata.Copy(n.Metadata)
+		metadata := make(map[string]string, len(n.Metadata))
-		metadata.Set("domain", options.Domain)
+
+		// make copy of metadata
+		for k, v := range n.Metadata {
+			metadata[k] = v
+		}
+
+		// set the domain
+		metadata["domain"] = options.Domain
 
 		// add the node
 		srvs[s.Name][s.Version].Nodes[n.ID] = &node{
-			Node: &register.Node{
+			Node: &Node{
 				ID:       n.ID,
 				Address:  n.Address,
 				Metadata: metadata,
@@ -201,14 +190,14 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi
 
 	if addedNodes {
 		if m.opts.Logger.V(logger.DebugLevel) {
-			m.opts.Logger.Debug(m.opts.Context, "register added new node to service: "+s.Name+", version "+s.Version)
+			m.opts.Logger.Debugf(m.opts.Context, "Register added new node to service: %s, version: %s", s.Name, s.Version)
 		}
-		go m.sendEvent(&register.Result{Action: "update", Service: s})
+		go m.sendEvent(&Result{Action: "update", Service: s})
 	} else {
 		// refresh TTL and timestamp
 		for _, n := range s.Nodes {
 			if m.opts.Logger.V(logger.DebugLevel) {
-				m.opts.Logger.Debug(m.opts.Context, "updated registration for service: "+s.Name+", version "+s.Version)
+				m.opts.Logger.Debugf(m.opts.Context, "Updated registration for service: %s, version: %s", s.Name, s.Version)
 			}
 			srvs[s.Name][s.Version].Nodes[n.ID].TTL = options.TTL
 			srvs[s.Name][s.Version].Nodes[n.ID].LastSeen = time.Now()
@@ -219,17 +208,18 @@ func (m *memory) Register(ctx context.Context, s *register.Service, opts ...regi
 	return nil
 }
 
-func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...register.DeregisterOption) error {
+func (m *memory) Deregister(ctx context.Context, s *Service, opts ...DeregisterOption) error {
 	m.Lock()
 	defer m.Unlock()
 
-	options := register.NewDeregisterOptions(opts...)
+	options := NewDeregisterOptions(opts...)
 
 	// domain is set in metadata so it can be passed to watchers
 	if s.Metadata == nil {
-		s.Metadata = metadata.New(0)
+		s.Metadata = map[string]string{"domain": options.Domain}
+	} else {
+		s.Metadata["domain"] = options.Domain
 	}
-	s.Metadata.Set("domain", options.Domain)
 
 	// if the domain doesn't exist, there is nothing to deregister
 	services, ok := m.records[options.Domain]
@@ -252,7 +242,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
 	for _, n := range s.Nodes {
 		if _, ok := version.Nodes[n.ID]; ok {
 			if m.opts.Logger.V(logger.DebugLevel) {
-				m.opts.Logger.Debug(m.opts.Context, "register removed node from service: "+s.Name+", version "+s.Version)
+				m.opts.Logger.Debugf(m.opts.Context, "Register removed node from service: %s, version: %s", s.Name, s.Version)
 			}
 			delete(version.Nodes, n.ID)
 		}
@@ -262,7 +252,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
 	// is cleanup
 	if len(version.Nodes) > 0 {
 		m.records[options.Domain][s.Name][s.Version] = version
-		go m.sendEvent(&register.Result{Action: "update", Service: s})
+		go m.sendEvent(&Result{Action: "update", Service: s})
 		return nil
 	}
 
@@ -270,38 +260,38 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
 	// register and exit
 	if len(versions) == 1 {
 		delete(m.records[options.Domain], s.Name)
-		go m.sendEvent(&register.Result{Action: "delete", Service: s})
+		go m.sendEvent(&Result{Action: "delete", Service: s})
 
 		if m.opts.Logger.V(logger.DebugLevel) {
-			m.opts.Logger.Debug(m.opts.Context, "register removed service: "+s.Name)
+			m.opts.Logger.Debugf(m.opts.Context, "Register removed service: %s", s.Name)
 		}
 		return nil
 	}
 
 	// there are other versions of the service running, so only remove this version of it
 	delete(m.records[options.Domain][s.Name], s.Version)
-	go m.sendEvent(&register.Result{Action: "delete", Service: s})
+	go m.sendEvent(&Result{Action: "delete", Service: s})
 	if m.opts.Logger.V(logger.DebugLevel) {
-		m.opts.Logger.Debug(m.opts.Context, "register removed service: "+s.Name+", version "+s.Version)
+		m.opts.Logger.Debugf(m.opts.Context, "Register removed service: %s, version: %s", s.Name, s.Version)
 	}
 
 	return nil
 }
 
-func (m *memory) LookupService(ctx context.Context, name string, opts ...register.LookupOption) ([]*register.Service, error) {
+func (m *memory) LookupService(ctx context.Context, name string, opts ...LookupOption) ([]*Service, error) {
-	options := register.NewLookupOptions(opts...)
+	options := NewLookupOptions(opts...)
 
 	// if it's a wildcard domain, return from all domains
-	if options.Domain == register.WildcardDomain {
+	if options.Domain == WildcardDomain {
 		m.RLock()
 		recs := m.records
 		m.RUnlock()
 
-		var services []*register.Service
+		var services []*Service
 
 		for domain := range recs {
-			srvs, err := m.LookupService(ctx, name, append(opts, register.LookupDomain(domain))...)
+			srvs, err := m.LookupService(ctx, name, append(opts, LookupDomain(domain))...)
-			if err == register.ErrNotFound {
+			if err == ErrNotFound {
 				continue
 			} else if err != nil {
 				return nil, err
@@ -310,7 +300,7 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
 		}
 
 		if len(services) == 0 {
-			return nil, register.ErrNotFound
+			return nil, ErrNotFound
 		}
 		return services, nil
 	}
@@ -321,17 +311,17 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
 	// check the domain exists
 	services, ok := m.records[options.Domain]
 	if !ok {
-		return nil, register.ErrNotFound
+		return nil, ErrNotFound
 	}
 
 	// check the service exists
 	versions, ok := services[name]
 	if !ok || len(versions) == 0 {
-		return nil, register.ErrNotFound
+		return nil, ErrNotFound
 	}
 
 	// serialize the response
-	result := make([]*register.Service, len(versions))
+	result := make([]*Service, len(versions))
 
 	var i int
 
@@ -343,19 +333,19 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
 	return result, nil
 }
 
-func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption) ([]*register.Service, error) {
+func (m *memory) ListServices(ctx context.Context, opts ...ListOption) ([]*Service, error) {
-	options := register.NewListOptions(opts...)
+	options := NewListOptions(opts...)
 
 	// if it's a wildcard domain, list from all domains
-	if options.Domain == register.WildcardDomain {
+	if options.Domain == WildcardDomain {
 		m.RLock()
 		recs := m.records
 		m.RUnlock()
 
-		var services []*register.Service
+		var services []*Service
 
 		for domain := range recs {
-			srvs, err := m.ListServices(ctx, append(opts, register.ListDomain(domain))...)
+			srvs, err := m.ListServices(ctx, append(opts, ListDomain(domain))...)
 			if err != nil {
 				return nil, err
 			}
@@ -371,11 +361,11 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
 	// ensure the domain exists
 	services, ok := m.records[options.Domain]
 	if !ok {
-		return make([]*register.Service, 0), nil
+		return make([]*Service, 0), nil
 	}
 
 	// serialize the result, each version counts as an individual service
-	var result []*register.Service
+	var result []*Service
 
 	for _, service := range services {
 		for _, version := range service {
@@ -386,16 +376,16 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
 	return result, nil
 }
 
-func (m *memory) Watch(ctx context.Context, opts ...register.WatchOption) (register.Watcher, error) {
+func (m *memory) Watch(ctx context.Context, opts ...WatchOption) (Watcher, error) {
 	id, err := id.New()
 	if err != nil {
 		return nil, err
 	}
-	wo := register.NewWatchOptions(opts...)
+	wo := NewWatchOptions(opts...)
 	// construct the watcher
 	w := &watcher{
 		exit: make(chan bool),
-		res:  make(chan *register.Result),
+		res:  make(chan *Result),
 		id:   id,
 		wo:   wo,
 	}
@@ -416,13 +406,13 @@ func (m *memory) String() string {
 }
 
 type watcher struct {
-	res  chan *register.Result
+	res  chan *Result
 	exit chan bool
-	wo   register.WatchOptions
+	wo   WatchOptions
 	id   string
 }
 
-func (m *watcher) Next() (*register.Result, error) {
+func (m *watcher) Next() (*Result, error) {
 	for {
 		select {
 		case r := <-m.res:
@@ -434,28 +424,20 @@ func (m *watcher) Next() (*register.Result, error) {
 				continue
 			}
 
-			if m.wo.Domain == register.WildcardDomain {
-				return r, nil
-			}
-
-			if r.Service.Metadata == nil {
-				continue
-			}
-
 			// extract domain from service metadata
 			var domain string
-			if v, ok := r.Service.Metadata.Get("domain"); ok && v != "" {
+			if r.Service.Metadata != nil && len(r.Service.Metadata["domain"]) > 0 {
-				domain = v
+				domain = r.Service.Metadata["domain"]
 			} else {
-				domain = register.DefaultDomain
+				domain = DefaultDomain
 			}
 
 			// only send the event if watching the wildcard or this specific domain
-			if m.wo.Domain == domain {
+			if m.wo.Domain == WildcardDomain || m.wo.Domain == domain {
 				return r, nil
 			}
 		case <-m.exit:
-			return nil, register.ErrWatcherStopped
+			return nil, ErrWatcherStopped
 		}
 	}
 }
@@ -469,8 +451,11 @@ func (m *watcher) Stop() {
 	}
 }
 
-func serviceToRecord(s *register.Service, ttl time.Duration) *record {
+func serviceToRecord(s *Service, ttl time.Duration) *record {
-	metadata := metadata.Copy(s.Metadata)
+	metadata := make(map[string]string, len(s.Metadata))
+	for k, v := range s.Metadata {
+		metadata[k] = v
+	}
 
 	nodes := make(map[string]*node, len(s.Nodes))
 	for _, n := range s.Nodes {
@@ -481,8 +466,10 @@ func serviceToRecord(s *register.Service, ttl time.Duration) *record {
 		}
 	}
 
-	endpoints := make([]*register.Endpoint, len(s.Endpoints))
+	endpoints := make([]*Endpoint, len(s.Endpoints))
-	copy(endpoints, s.Endpoints)
+	for i, e := range s.Endpoints {
+		endpoints[i] = e
+	}
 
 	return &record{
 		Name:      s.Name,
@@ -493,14 +480,23 @@ func serviceToRecord(s *register.Service, ttl time.Duration) *record {
 	}
 }
 
-func recordToService(r *record, domain string) *register.Service {
+func recordToService(r *record, domain string) *Service {
-	endpoints := make([]*register.Endpoint, len(r.Endpoints))
+	metadata := make(map[string]string, len(r.Metadata))
-	for i, e := range r.Endpoints {
+	for k, v := range r.Metadata {
-		md := metadata.Copy(e.Metadata)
+		metadata[k] = v
-		// set the domain in metadata so it can be determined when a wildcard query is performed
+	}
-		md.Set("domain", domain)
 
-		endpoints[i] = &register.Endpoint{
+	// set the domain in metadata so it can be determined when a wildcard query is performed
+	metadata["domain"] = domain
+
+	endpoints := make([]*Endpoint, len(r.Endpoints))
+	for i, e := range r.Endpoints {
+		md := make(map[string]string, len(e.Metadata))
+		for k, v := range e.Metadata {
+			md[k] = v
+		}
+
+		endpoints[i] = &Endpoint{
 			Name:     e.Name,
 			Request:  e.Request,
 			Response: e.Response,
@@ -508,21 +504,26 @@ func recordToService(r *record, domain string) *register.Service {
 		}
 	}
 
-	nodes := make([]*register.Node, len(r.Nodes))
+	nodes := make([]*Node, len(r.Nodes))
 	i := 0
 	for _, n := range r.Nodes {
-		nodes[i] = &register.Node{
+		md := make(map[string]string, len(n.Metadata))
+		for k, v := range n.Metadata {
+			md[k] = v
+		}
+
+		nodes[i] = &Node{
 			ID:       n.ID,
 			Address:  n.Address,
-			Metadata: metadata.Copy(n.Metadata),
+			Metadata: md,
 		}
 		i++
 	}
 
-	return &register.Service{
+	return &Service{
 		Name:      r.Name,
 		Version:   r.Version,
-		Metadata:  metadata.Copy(r.Metadata),
+		Metadata:  metadata,
 		Endpoints: endpoints,
 		Nodes:     nodes,
 	}

register/memory_test.go

@@ -1,23 +1,19 @@
-package memory
+package register
 
 import (
 	"context"
 	"fmt"
-	"reflect"
 	"sync"
 	"testing"
 	"time"
-
-	"go.unistack.org/micro/v4"
-	"go.unistack.org/micro/v4/register"
 )
 
-var testData = map[string][]*register.Service{
+var testData = map[string][]*Service{
 	"foo": {
 		{
 			Name:    "foo",
 			Version: "1.0.0",
-			Nodes: []*register.Node{
+			Nodes: []*Node{
 				{
 					ID:      "foo-1.0.0-123",
 					Address: "localhost:9999",
@@ -31,7 +27,7 @@ var testData = map[string][]*register.Service{
 		{
 			Name:    "foo",
 			Version: "1.0.1",
-			Nodes: []*register.Node{
+			Nodes: []*Node{
 				{
 					ID:      "foo-1.0.1-321",
 					Address: "localhost:6666",
@@ -41,7 +37,7 @@ var testData = map[string][]*register.Service{
 		{
 			Name:    "foo",
 			Version: "1.0.3",
-			Nodes: []*register.Node{
+			Nodes: []*Node{
 				{
 					ID:      "foo-1.0.3-345",
 					Address: "localhost:8888",
@@ -53,7 +49,7 @@ var testData = map[string][]*register.Service{
 		{
 			Name:    "bar",
 			Version: "default",
-			Nodes: []*register.Node{
+			Nodes: []*Node{
 				{
 					ID:      "bar-1.0.0-123",
 					Address: "localhost:9999",
@@ -67,7 +63,7 @@ var testData = map[string][]*register.Service{
 		{
 			Name:    "bar",
 			Version: "latest",
-			Nodes: []*register.Node{
+			Nodes: []*Node{
 				{
 					ID:      "bar-1.0.1-321",
 					Address: "localhost:6666",
@@ -82,7 +78,7 @@ func TestMemoryRegistry(t *testing.T) {
 	ctx := context.TODO()
 	m := NewRegister()
 
-	fn := func(k string, v []*register.Service) {
+	fn := func(k string, v []*Service) {
 		services, err := m.LookupService(ctx, k)
 		if err != nil {
 			t.Errorf("Unexpected error getting service %s: %v", k, err)
@@ -159,8 +155,8 @@ func TestMemoryRegistry(t *testing.T) {
 	for _, v := range testData {
 		for _, service := range v {
 			services, err := m.LookupService(ctx, service.Name)
-			if err != register.ErrNotFound {
+			if err != ErrNotFound {
-				t.Errorf("Expected error: %v, got: %v", register.ErrNotFound, err)
+				t.Errorf("Expected error: %v, got: %v", ErrNotFound, err)
 			}
 			if len(services) != 0 {
 				t.Errorf("Expected %d services for %s, got %d", 0, service.Name, len(services))
@@ -175,7 +171,7 @@ func TestMemoryRegistryTTL(t *testing.T) {
 
 	for _, v := range testData {
 		for _, service := range v {
-			if err := m.Register(ctx, service, register.RegisterTTL(time.Millisecond)); err != nil {
+			if err := m.Register(ctx, service, RegisterTTL(time.Millisecond)); err != nil {
 				t.Fatal(err)
 			}
 		}
@@ -204,15 +200,15 @@ func TestMemoryRegistryTTLConcurrent(t *testing.T) {
 	ctx := context.TODO()
 	for _, v := range testData {
 		for _, service := range v {
-			if err := m.Register(ctx, service, register.RegisterTTL(waitTime/2)); err != nil {
+			if err := m.Register(ctx, service, RegisterTTL(waitTime/2)); err != nil {
 				t.Fatal(err)
 			}
 		}
 	}
 
-	// if len(os.Getenv("IN_TRAVIS_CI")) == 0 {
+	//if len(os.Getenv("IN_TRAVIS_CI")) == 0 {
 	//	t.Logf("test will wait %v, then check TTL timeouts", waitTime)
-	// }
+	//}
 
 	errChan := make(chan error, concurrency)
 	syncChan := make(chan struct{})
@@ -253,41 +249,34 @@ func TestMemoryWildcard(t *testing.T) {
 	m := NewRegister()
 	ctx := context.TODO()
 
-	if err := m.Init(); err != nil {
+	testSrv := &Service{Name: "foo", Version: "1.0.0"}
-		t.Fatal(err)
-	}
 
-	if err := m.Connect(ctx); err != nil {
+	if err := m.Register(ctx, testSrv, RegisterDomain("one")); err != nil {
-		t.Fatal(err)
-	}
-	testSrv := &register.Service{Name: "foo", Version: "1.0.0"}
-
-	if err := m.Register(ctx, testSrv, register.RegisterDomain("one")); err != nil {
 		t.Fatalf("Register err: %v", err)
 	}
-	if err := m.Register(ctx, testSrv, register.RegisterDomain("two")); err != nil {
+	if err := m.Register(ctx, testSrv, RegisterDomain("two")); err != nil {
 		t.Fatalf("Register err: %v", err)
 	}
 
-	if recs, err := m.ListServices(ctx, register.ListDomain("one")); err != nil {
+	if recs, err := m.ListServices(ctx, ListDomain("one")); err != nil {
 		t.Errorf("List err: %v", err)
 	} else if len(recs) != 1 {
 		t.Errorf("Expected 1 record, got %v", len(recs))
 	}
 
-	if recs, err := m.ListServices(ctx, register.ListDomain("*")); err != nil {
+	if recs, err := m.ListServices(ctx, ListDomain("*")); err != nil {
 		t.Errorf("List err: %v", err)
 	} else if len(recs) != 2 {
 		t.Errorf("Expected 2 records, got %v", len(recs))
 	}
 
-	if recs, err := m.LookupService(ctx, testSrv.Name, register.LookupDomain("one")); err != nil {
+	if recs, err := m.LookupService(ctx, testSrv.Name, LookupDomain("one")); err != nil {
 		t.Errorf("Lookup err: %v", err)
 	} else if len(recs) != 1 {
 		t.Errorf("Expected 1 record, got %v", len(recs))
 	}
 
-	if recs, err := m.LookupService(ctx, testSrv.Name, register.LookupDomain("*")); err != nil {
+	if recs, err := m.LookupService(ctx, testSrv.Name, LookupDomain("*")); err != nil {
 		t.Errorf("Lookup err: %v", err)
 	} else if len(recs) != 2 {
 		t.Errorf("Expected 2 records, got %v", len(recs))
@@ -295,16 +284,12 @@ func TestMemoryWildcard(t *testing.T) {
 }
 
 func TestWatcher(t *testing.T) {
-	testSrv := &register.Service{Name: "foo", Version: "1.0.0"}
+	testSrv := &Service{Name: "foo", Version: "1.0.0"}
 
 	ctx := context.TODO()
 	m := NewRegister()
-	if err := m.Init(); err != nil {
+	m.Init()
-		t.Fatal(err)
+	m.Connect(ctx)
-	}
-	if err := m.Connect(ctx); err != nil {
-		t.Fatal(err)
-	}
 	wc, err := m.Watch(ctx)
 	if err != nil {
 		t.Fatalf("cant watch: %v", err)
@@ -335,37 +320,3 @@ func TestWatcher(t *testing.T) {
 		t.Fatal("expected error on Next()")
 	}
 }
-
-func Test_service_Register(t *testing.T) {
-	t.Skip()
-	r := NewRegister()
-
-	type args struct {
-		names []string
-	}
-	tests := []struct {
-		name string
-		opts []micro.Option
-		args args
-		want register.Register
-	}{
-		{
-			name: "service.Register",
-			opts: []micro.Option{micro.Register(r)},
-			args: args{
-				names: []string{"memory"},
-			},
-			want: r,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := micro.NewService(tt.opts...)
-
-			if got := s.Register(tt.args.names...); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("service.Register() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

register/noop.go

@@ -1,72 +0,0 @@
-package register
-
-import "context"
-
-type noop struct {
-	opts Options
-}
-
-func NewRegister(opts ...Option) Register {
-	return &noop{
-		opts: NewOptions(opts...),
-	}
-}
-
-func (n *noop) Name() string {
-	return n.opts.Name
-}
-
-func (n *noop) Init(opts ...Option) error {
-	for _, o := range opts {
-		o(&n.opts)
-	}
-	return nil
-}
-
-func (n *noop) Options() Options {
-	return n.opts
-}
-
-func (n *noop) Connect(ctx context.Context) error {
-	return nil
-}
-
-func (n *noop) Disconnect(ctx context.Context) error {
-	return nil
-}
-
-func (n *noop) Register(ctx context.Context, service *Service, option ...RegisterOption) error {
-	return nil
-}
-
-func (n *noop) Deregister(ctx context.Context, service *Service, option ...DeregisterOption) error {
-	return nil
-}
-
-func (n *noop) LookupService(ctx context.Context, s string, option ...LookupOption) ([]*Service, error) {
-	return nil, nil
-}
-
-func (n *noop) ListServices(ctx context.Context, option ...ListOption) ([]*Service, error) {
-	return nil, nil
-}
-
-func (n *noop) Watch(ctx context.Context, opts ...WatchOption) (Watcher, error) {
-	wOpts := NewWatchOptions(opts...)
-
-	return &watcher{wo: wOpts}, nil
-}
-
-func (n *noop) String() string {
-	return "noop"
-}
-
-type watcher struct {
-	wo WatchOptions
-}
-
-func (m *watcher) Next() (*Result, error) {
-	return nil, nil
-}
-
-func (m *watcher) Stop() {}

register/register.go

@@ -4,6 +4,7 @@ package register // import "go.unistack.org/micro/v4/register"
 import (
 	"context"
 	"errors"
+
 	"go.unistack.org/micro/v4/metadata"
 )
 

semconv/broker.go

@@ -1,22 +0,0 @@
-package semconv
-
-var (
-	// PublishMessageDurationSeconds specifies meter metric name
-	PublishMessageDurationSeconds = "publish_message_duration_seconds"
-	// PublishMessageLatencyMicroseconds specifies meter metric name
-	PublishMessageLatencyMicroseconds = "publish_message_latency_microseconds"
-	// PublishMessageTotal specifies meter metric name
-	PublishMessageTotal = "publish_message_total"
-	// PublishMessageInflight specifies meter metric name
-	PublishMessageInflight = "publish_message_inflight"
-	// SubscribeMessageDurationSeconds specifies meter metric name
-	SubscribeMessageDurationSeconds = "subscribe_message_duration_seconds"
-	// SubscribeMessageLatencyMicroseconds specifies meter metric name
-	SubscribeMessageLatencyMicroseconds = "subscribe_message_latency_microseconds"
-	// SubscribeMessageTotal specifies meter metric name
-	SubscribeMessageTotal = "subscribe_message_total"
-	// SubscribeMessageInflight specifies meter metric name
-	SubscribeMessageInflight = "subscribe_message_inflight"
-	// BrokerGroupLag specifies broker lag
-	BrokerGroupLag = "broker_lag"
-)

semconv/cache.go

@@ -1,12 +0,0 @@
-package semconv
-
-var (
-	// CacheRequestDurationSeconds specifies meter metric name
-	CacheRequestDurationSeconds = "cache_request_duration_seconds"
-	// ClientRequestLatencyMicroseconds specifies meter metric name
-	CacheRequestLatencyMicroseconds = "cache_request_latency_microseconds"
-	// CacheRequestTotal specifies meter metric name
-	CacheRequestTotal = "cache_request_total"
-	// CacheRequestInflight specifies meter metric name
-	CacheRequestInflight = "cache_request_inflight"
-)

semconv/client.go

@@ -1,12 +0,0 @@
-package semconv
-
-var (
-	// ClientRequestDurationSeconds specifies meter metric name
-	ClientRequestDurationSeconds = "client_request_duration_seconds"
-	// ClientRequestLatencyMicroseconds specifies meter metric name
-	ClientRequestLatencyMicroseconds = "client_request_latency_microseconds"
-	// ClientRequestTotal specifies meter metric name
-	ClientRequestTotal = "client_request_total"
-	// ClientRequestInflight specifies meter metric name
-	ClientRequestInflight = "client_request_inflight"
-)

semconv/server.go

@@ -1,12 +0,0 @@
-package semconv
-
-var (
-	// ServerRequestDurationSeconds specifies meter metric name
-	ServerRequestDurationSeconds = "server_request_duration_seconds"
-	// ServerRequestLatencyMicroseconds specifies meter metric name
-	ServerRequestLatencyMicroseconds = "server_request_latency_microseconds"
-	// ServerRequestTotal specifies meter metric name
-	ServerRequestTotal = "server_request_total"
-	// ServerRequestInflight specifies meter metric name
-	ServerRequestInflight = "server_request_inflight"
-)

server/context.go

@@ -22,3 +22,23 @@ func NewContext(ctx context.Context, s Server) context.Context {
 	}
 	return context.WithValue(ctx, serverKey{}, s)
 }
+
+// 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)
+	}
+}
+
+// SetHandlerOption returns a function to setup a context with given value
+func SetHandlerOption(k, v interface{}) HandlerOption {
+	return func(o *HandlerOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}

server/context_test.go

@@ -40,3 +40,14 @@ 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")
+	}
+}

server/noop.go

@@ -8,7 +8,6 @@ import (
 
 	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/register"
 	maddr "go.unistack.org/micro/v4/util/addr"
 	mnet "go.unistack.org/micro/v4/util/net"
@@ -20,11 +19,15 @@ var DefaultCodecs = map[string]codec.Codec{
 	"application/octet-stream": codec.NewCodec(),
 }
 
+const (
+	defaultContentType = "application/json"
+)
+
 type noopServer struct {
-	h        *rpcHandler
+	h        Handler
 	wg       *sync.WaitGroup
 	rsvc     *register.Service
-	handlers map[string]*rpcHandler
+	handlers map[string]Handler
 	exit     chan chan error
 	opts     Options
 	sync.RWMutex
@@ -33,10 +36,10 @@ type noopServer struct {
 }
 
 // NewServer returns new noop server
-func NewServer(opts ...options.Option) Server {
+func NewServer(opts ...Option) Server {
 	n := &noopServer{opts: NewOptions(opts...)}
 	if n.handlers == nil {
-		n.handlers = make(map[string]*rpcHandler)
+		n.handlers = make(map[string]Handler)
 	}
 	if n.exit == nil {
 		n.exit = make(chan chan error)
@@ -44,8 +47,18 @@ func NewServer(opts ...options.Option) Server {
 	return n
 }
 
-func (n *noopServer) Handle(h interface{}, opts ...options.Option) error {
+func (n *noopServer) newCodec(contentType string) (codec.Codec, error) {
-	n.h = newRPCHandler(h, opts...)
+	if cf, ok := n.opts.Codecs[contentType]; ok {
+		return cf, nil
+	}
+	if cf, ok := DefaultCodecs[contentType]; ok {
+		return cf, nil
+	}
+	return nil, codec.ErrUnknownContentType
+}
+
+func (n *noopServer) Handle(handler Handler) error {
+	n.h = handler
 	return nil
 }
 
@@ -53,13 +66,17 @@ func (n *noopServer) Name() string {
 	return n.opts.Name
 }
 
-func (n *noopServer) Init(opts ...options.Option) error {
+func (n *noopServer) NewHandler(h interface{}, opts ...HandlerOption) Handler {
+	return newRPCHandler(h, opts...)
+}
+
+func (n *noopServer) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&n.opts)
 	}
 
 	if n.handlers == nil {
-		n.handlers = make(map[string]*rpcHandler, 1)
+		n.handlers = make(map[string]Handler, 1)
 	}
 
 	if n.exit == nil {
@@ -112,8 +129,8 @@ func (n *noopServer) Register() error {
 	}
 	n.RUnlock()
 
-	service.Nodes[0].Metadata.Set("protocol", "noop")
+	service.Nodes[0].Metadata["protocol"] = "noop"
-	service.Nodes[0].Metadata.Set("transport", "noop")
+	service.Nodes[0].Metadata["transport"] = service.Nodes[0].Metadata["protocol"]
 	service.Endpoints = endpoints
 
 	n.RLock()
@@ -122,7 +139,7 @@ func (n *noopServer) Register() error {
 
 	if !registered {
 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Info(n.opts.Context, "register ["+config.Register.String()+"] Registering node: "+service.Nodes[0].ID)
+			config.Logger.Infof(n.opts.Context, "register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].ID)
 		}
 	}
 
@@ -160,7 +177,7 @@ func (n *noopServer) Deregister() error {
 	}
 
 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Info(n.opts.Context, "deregistering node: "+service.Nodes[0].ID)
+		config.Logger.Infof(n.opts.Context, "deregistering node: %s", service.Nodes[0].ID)
 	}
 
 	if err := DefaultDeregisterFunc(service, config); err != nil {
@@ -204,7 +221,7 @@ func (n *noopServer) Start() error {
 	config.Address = addr
 
 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Info(n.opts.Context, "server [noop] Listening on "+config.Address)
+		config.Logger.Infof(n.opts.Context, "server [noop] Listening on %s", config.Address)
 	}
 
 	n.Lock()
@@ -217,13 +234,13 @@ func (n *noopServer) Start() error {
 	// nolint: nestif
 	if err := config.RegisterCheck(config.Context); err != nil {
 		if config.Logger.V(logger.ErrorLevel) {
-			config.Logger.Error(n.opts.Context, "server "+config.Name+"-"+config.ID+" register check error: "+err.Error())
+			config.Logger.Errorf(n.opts.Context, "server %s-%s register check error: %s", config.Name, config.ID, err)
 		}
 	} else {
 		// announce self to the world
 		if err := n.Register(); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Error(n.opts.Context, "server register error: "+err.Error())
+				config.Logger.Errorf(n.opts.Context, "server register error: %v", err)
 			}
 		}
 	}
@@ -252,23 +269,23 @@ func (n *noopServer) Start() error {
 				// nolint: nestif
 				if rerr != nil && registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Error(n.opts.Context, "server "+config.Name+"-"+config.ID+" register check error: ", rerr.Error())
+						config.Logger.Errorf(n.opts.Context, "server %s-%s register check error: %s, deregister it", config.Name, config.ID, rerr)
 					}
 					// deregister self in case of error
 					if err := n.Deregister(); err != nil {
 						if config.Logger.V(logger.ErrorLevel) {
-							config.Logger.Error(n.opts.Context, "server "+config.Name+"-"+config.ID+" deregister error: ", err.Error())
+							config.Logger.Errorf(n.opts.Context, "server %s-%s deregister error: %s", config.Name, config.ID, err)
 						}
 					}
 				} else if rerr != nil && !registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Error(n.opts.Context, "server "+config.Name+"-"+config.ID+" register check error: ", rerr.Error())
+						config.Logger.Errorf(n.opts.Context, "server %s-%s register check error: %s", config.Name, config.ID, rerr)
 					}
 					continue
 				}
 				if err := n.Register(); err != nil {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Error(n.opts.Context, "server "+config.Name+"-"+config.ID+" register error: ", err.Error())
+						config.Logger.Errorf(n.opts.Context, "server %s-%s register error: %s", config.Name, config.ID, err)
 					}
 				}
 			// wait for exit
@@ -280,7 +297,7 @@ func (n *noopServer) Start() error {
 		// deregister self
 		if err := n.Deregister(); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Error(n.opts.Context, "server deregister error: "+err.Error())
+				config.Logger.Errorf(n.opts.Context, "server deregister error: ", err)
 			}
 		}
 
@@ -322,14 +339,14 @@ func (n *noopServer) Stop() error {
 }
 
 type rpcHandler struct {
-	opts      HandleOptions
+	opts      HandlerOptions
 	handler   interface{}
 	name      string
 	endpoints []*register.Endpoint
 }
 
-func newRPCHandler(handler interface{}, opts ...options.Option) *rpcHandler {
+func newRPCHandler(handler interface{}, opts ...HandlerOption) Handler {
-	options := NewHandleOptions(opts...)
+	options := NewHandlerOptions(opts...)
 
 	typ := reflect.TypeOf(handler)
 	hdlr := reflect.ValueOf(handler)
@@ -369,6 +386,6 @@ func (r *rpcHandler) Endpoints() []*register.Endpoint {
 	return r.endpoints
 }
 
-func (r *rpcHandler) Options() HandleOptions {
+func (r *rpcHandler) Options() HandlerOptions {
 	return r.opts
 }

server/options.go

@@ -11,13 +11,27 @@ import (
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/metadata"
 	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/network/transport"
 	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/register"
-	msync "go.unistack.org/micro/v4/sync"
 	"go.unistack.org/micro/v4/tracer"
 	"go.unistack.org/micro/v4/util/id"
 )
 
+var (
+	// ServerRequestDurationSeconds specifies meter metric name
+	ServerRequestDurationSeconds = "server_request_duration_seconds"
+	// ServerRequestLatencyMicroseconds specifies meter metric name
+	ServerRequestLatencyMicroseconds = "server_request_latency_microseconds"
+	// ServerRequestTotal specifies meter metric name
+	ServerRequestTotal = "server_request_total"
+	// ServerRequestInflight specifies meter metric name
+	ServerRequestInflight = "server_request_inflight"
+)
+
+// Option func
+type Option func(*Options)
+
 // Options server struct
 type Options struct {
 	// Context holds the external options and can be used for server shutdown
@@ -30,10 +44,12 @@ type Options struct {
 	Logger logger.Logger
 	// Meter holds the meter
 	Meter meter.Meter
+	// Transport holds the transport
+	Transport transport.Transport
 	// Listener may be passed if already created
 	Listener net.Listener
 	// Wait group
-	Wait *msync.WaitGroup
+	Wait *sync.WaitGroup
 	// TLSConfig specifies tls.Config for secure serving
 	TLSConfig *tls.Config
 	// Metadata holds the server metadata
@@ -54,6 +70,8 @@ type Options struct {
 	Advertise string
 	// Version holds the server version
 	Version string
+	// HdlrWrappers holds the handler wrappers
+	HdlrWrappers []HandlerWrapper
 	// RegisterAttempts holds the number of register attempts before error
 	RegisterAttempts int
 	// RegisterInterval holds he interval for re-register
@@ -64,14 +82,12 @@ type Options struct {
 	MaxConn int
 	// DeregisterAttempts holds the number of deregister attempts before error
 	DeregisterAttempts int
-	// Hooks may contains HandleWrapper or Server func wrapper
+	// Hooks may contains HandlerWrapper or Server func wrapper
 	Hooks options.Hooks
-	// GracefulTimeout timeout for graceful stop server
-	GracefulTimeout time.Duration
 }
 
 // NewOptions returns new options struct with default or passed values
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
 		Codecs:           make(map[string]codec.Codec),
 		Context:          context.Background(),
@@ -83,11 +99,12 @@ func NewOptions(opts ...options.Option) Options {
 		Meter:            meter.DefaultMeter,
 		Tracer:           tracer.DefaultTracer,
 		Register:         register.DefaultRegister,
+		Transport:        transport.DefaultTransport,
 		Address:          DefaultAddress,
 		Name:             DefaultName,
 		Version:          DefaultVersion,
 		ID:               id.Must(),
-		GracefulTimeout:  DefaultGracefulTimeout,
+		Namespace:        DefaultNamespace,
 	}
 
 	for _, o := range opts {
@@ -97,45 +114,140 @@ func NewOptions(opts ...options.Option) Options {
 	return options
 }
 
+// Name sets the server name option
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}
+
+// Namespace to register handlers in
+func Namespace(n string) Option {
+	return func(o *Options) {
+		o.Namespace = n
+	}
+}
+
+// Logger sets the logger option
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Meter sets the meter option
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
 // ID unique server id
-func ID(id string) options.Option {
+func ID(id string) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, id, ".ID")
+		o.ID = id
 	}
 }
 
 // Version of the service
-func Version(v string) options.Option {
+func Version(v string) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, v, ".Version")
+		o.Version = v
+	}
+}
+
+// Address to bind to - host:port
+func Address(a string) Option {
+	return func(o *Options) {
+		o.Address = a
 	}
 }
 
 // Advertise the address to advertise for discovery - host:port
-func Advertise(a string) options.Option {
+func Advertise(a string) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, a, ".Advertise")
+		o.Advertise = a
+	}
+}
+
+// Codec to use to encode/decode requests for a given content type
+func Codec(contentType string, c codec.Codec) Option {
+	return func(o *Options) {
+		o.Codecs[contentType] = c
+	}
+}
+
+// Context specifies a context for the service.
+// Can be used to signal shutdown of the service
+// Can be used for extra option values.
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
+	}
+}
+
+// Register used for discovery
+func Register(r register.Register) Option {
+	return func(o *Options) {
+		o.Register = r
+	}
+}
+
+// Tracer mechanism for distributed tracking
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
+	}
+}
+
+// Transport mechanism for communication e.g http, rabbitmq, etc
+func Transport(t transport.Transport) Option {
+	return func(o *Options) {
+		o.Transport = t
+	}
+}
+
+// Metadata associated with the server
+func Metadata(md metadata.Metadata) Option {
+	return func(o *Options) {
+		o.Metadata = metadata.Copy(md)
 	}
 }
 
 // RegisterCheck run func before register service
-func RegisterCheck(fn func(context.Context) error) options.Option {
+func RegisterCheck(fn func(context.Context) error) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, fn, ".RegisterCheck")
+		o.RegisterCheck = fn
 	}
 }
 
 // RegisterTTL registers service with a TTL
-func RegisterTTL(td time.Duration) options.Option {
+func RegisterTTL(t time.Duration) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, td, ".RegisterTTL")
+		o.RegisterTTL = t
 	}
 }
 
 // RegisterInterval registers service with at interval
-func RegisterInterval(td time.Duration) options.Option {
+func RegisterInterval(t time.Duration) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, td, ".RegisterInterval")
+		o.RegisterInterval = t
+	}
+}
+
+// TLSConfig specifies a *tls.Config
+func TLSConfig(t *tls.Config) Option {
+	return func(o *Options) {
+		// set the internal tls
+		o.TLSConfig = t
+
+		// set the default transport if one is not
+		// already set. Required for Init call below.
+
+		// set the transport tls
+		_ = o.Transport.Init(
+			transport.TLSConfig(t),
+		)
 	}
 }
 
@@ -143,49 +255,50 @@ func RegisterInterval(td time.Duration) options.Option {
 // If `wg` is nil, server only wait for completion of rpc handler.
 // For user need finer grained control, pass a concrete `wg` here, server will
 // wait against it on stop.
-func Wait(wg *sync.WaitGroup) options.Option {
+func Wait(wg *sync.WaitGroup) Option {
+	return func(o *Options) {
 		if wg == nil {
 			wg = new(sync.WaitGroup)
 		}
+		o.Wait = wg
+	}
+}
 
-	wrap := msync.WrapWaitGroup(wg)
+// WrapHandler adds a handler Wrapper to a list of options passed into the server
-
+func WrapHandler(w HandlerWrapper) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, wrap, ".Wait")
+		o.HdlrWrappers = append(o.HdlrWrappers, w)
 	}
 }
 
 // MaxConn specifies maximum number of max simultaneous connections to server
-func MaxConn(n int) options.Option {
+func MaxConn(n int) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, n, ".MaxConn")
+		o.MaxConn = n
 	}
 }
 
 // Listener specifies the net.Listener to use instead of the default
-func Listener(nl net.Listener) options.Option {
+func Listener(l net.Listener) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, nl, ".Listener")
+		o.Listener = l
 	}
 }
 
-func GracefulTimeout(td time.Duration) options.Option {
+// HandlerOption func
-	return func(src interface{}) error {
+type HandlerOption func(*HandlerOptions)
-		return options.Set(src, td, ".GracefulTimeout")
-	}
-}
 
-// HandleOptions struct
+// HandlerOptions struct
-type HandleOptions struct {
+type HandlerOptions struct {
 	// Context holds external options
 	Context context.Context
 	// Metadata for handler
 	Metadata map[string]metadata.Metadata
 }
 
-// NewHandleOptions creates new HandleOptions
+// NewHandlerOptions creates new HandlerOptions
-func NewHandleOptions(opts ...options.Option) HandleOptions {
+func NewHandlerOptions(opts ...HandlerOption) HandlerOptions {
-	options := HandleOptions{
+	options := HandlerOptions{
 		Context:  context.Background(),
 		Metadata: make(map[string]metadata.Metadata),
 	}
@@ -196,3 +309,11 @@ func NewHandleOptions(opts ...options.Option) HandleOptions {
 
 	return options
 }
+
+// EndpointMetadata is a Handler option that allows metadata to be added to
+// individual endpoints.
+func EndpointMetadata(name string, md metadata.Metadata) HandlerOption {
+	return func(o *HandlerOptions) {
+		o.Metadata[name] = metadata.Copy(md)
+	}
+}

server/registry.go

@@ -77,8 +77,8 @@ func NewRegisterService(s Server) (*register.Service, error) {
 	}
 	node.Metadata = metadata.Copy(opts.Metadata)
 
-	node.Metadata.Set("server", s.String())
+	node.Metadata["server"] = s.String()
-	node.Metadata.Set("register", opts.Register.String())
+	node.Metadata["register"] = opts.Register.String()
 
 	return &register.Service{
 		Name:     opts.Name,

server/server.go

@@ -7,7 +7,7 @@ import (
 
 	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/register"
 )
 
 // DefaultServer default server
@@ -26,14 +26,14 @@ var (
 	DefaultRegisterInterval = time.Second * 30
 	// DefaultRegisterTTL holds register record ttl, must be multiple of DefaultRegisterInterval
 	DefaultRegisterTTL = time.Second * 90
-	// DefaultMaxMsgSize holds default max msg size
+	// DefaultNamespace will be used if no namespace passed
+	DefaultNamespace = "micro"
+	// DefaultMaxMsgSize holds default max msg ssize
 	DefaultMaxMsgSize = 1024 * 1024 * 4 // 4Mb
 	// DefaultMaxMsgRecvSize holds default max recv size
 	DefaultMaxMsgRecvSize = 1024 * 1024 * 4 // 4Mb
 	// DefaultMaxMsgSendSize holds default max send size
 	DefaultMaxMsgSendSize = 1024 * 1024 * 4 // 4Mb
-	// DefaultGracefulTimeout default time for graceful stop
-	DefaultGracefulTimeout = 5 * time.Second
 )
 
 // Server is a simple micro server abstraction
@@ -41,11 +41,13 @@ type Server interface {
 	// Name returns server name
 	Name() string
 	// Initialise options
-	Init(...options.Option) error
+	Init(...Option) error
 	// Retrieve the options
 	Options() Options
-	// Create and register new handler
+	// Register a handler
-	Handle(h interface{}, opts ...options.Option) error
+	Handle(h Handler) error
+	// Create a new handler
+	NewHandler(h interface{}, opts ...HandlerOption) Handler
 	// Start the server
 	Start() error
 	// Stop the server
@@ -108,3 +110,21 @@ type Stream interface {
 	// Close closes the stream
 	Close() error
 }
+
+// Handler interface represents a request handler. It's generated
+// by passing any type of public concrete object with endpoints into server.NewHandler.
+// Most will pass in a struct.
+//
+// Example:
+//
+//	type Greeter struct {}
+//
+//	func (g *Greeter) Hello(context, request, response) error {
+//	        return nil
+//	}
+type Handler interface {
+	Name() string
+	Handler() interface{}
+	Endpoints() []*register.Endpoint
+	Options() HandlerOptions
+}

service.go

@@ -10,7 +10,6 @@ import (
 	"go.unistack.org/micro/v4/config"
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/register"
 	"go.unistack.org/micro/v4/router"
 	"go.unistack.org/micro/v4/server"
@@ -63,8 +62,8 @@ type Service interface {
 }
 
 // RegisterHandler is syntactic sugar for registering a handler
-func RegisterHandler(s server.Server, h interface{}, opts ...options.Option) error {
+func RegisterHandler(s server.Server, h interface{}, opts ...server.HandlerOption) error {
-	return s.Handle(h, opts...)
+	return s.Handle(s.NewHandler(h, opts...))
 }
 
 type service struct {
@@ -100,13 +99,13 @@ func (s *service) Init(opts ...Option) error {
 			// skip config as the struct not passed
 			continue
 		}
-		if err = cfg.Init(options.Context(cfg.Options().Context)); err != nil {
+		if err = cfg.Init(config.Context(cfg.Options().Context)); err != nil {
 			return err
 		}
 	}
 
 	for _, log := range s.opts.Loggers {
-		if err = log.Init(options.Context(log.Options().Context)); err != nil {
+		if err = log.Init(logger.WithContext(log.Options().Context)); err != nil {
 			return err
 		}
 	}
@@ -118,25 +117,25 @@ func (s *service) Init(opts ...Option) error {
 	}
 
 	for _, brk := range s.opts.Brokers {
-		if err = brk.Init(options.Context(brk.Options().Context)); err != nil {
+		if err = brk.Init(broker.Context(brk.Options().Context)); err != nil {
 			return err
 		}
 	}
 
 	for _, str := range s.opts.Stores {
-		if err = str.Init(options.Context(str.Options().Context)); err != nil {
+		if err = str.Init(store.Context(str.Options().Context)); err != nil {
 			return err
 		}
 	}
 
 	for _, srv := range s.opts.Servers {
-		if err = srv.Init(options.Context(srv.Options().Context)); err != nil {
+		if err = srv.Init(server.Context(srv.Options().Context)); err != nil {
 			return err
 		}
 	}
 
 	for _, cli := range s.opts.Clients {
-		if err = cli.Init(options.Context(cli.Options().Context)); err != nil {
+		if err = cli.Init(client.Context(cli.Options().Context)); err != nil {
 			return err
 		}
 	}
@@ -258,7 +257,7 @@ func (s *service) Start() error {
 	}
 
 	if config.Loggers[0].V(logger.InfoLevel) {
-		config.Loggers[0].Info(s.opts.Context, "starting [service] "+s.Options().Name+" version "+s.Options().Version)
+		config.Loggers[0].Infof(s.opts.Context, "starting [service] %s version %s", s.Options().Name, s.Options().Version)
 	}
 
 	if len(s.opts.Servers) == 0 {
@@ -304,7 +303,7 @@ func (s *service) Stop() error {
 	s.RUnlock()
 
 	if config.Loggers[0].V(logger.InfoLevel) {
-		config.Loggers[0].Info(s.opts.Context, "stoppping [service] "+s.Name())
+		config.Loggers[0].Infof(s.opts.Context, "stoppping [service] %s", s.Name())
 	}
 
 	var err error
@@ -372,71 +371,19 @@ func (s *service) Run() error {
 	return s.Stop()
 }
 
-func getNameIndex(n string, ifaces interface{}) int {
+type nameIface interface {
-	switch values := ifaces.(type) {
+	Name() string
-	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
-						}
-					}
-		*/
-	}
 
+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
+		}
+	}
 	return 0
 }

service_test.go

@@ -1,7 +1,6 @@
 package micro
 
 import (
-	"go.unistack.org/micro/v4/register/memory"
 	"reflect"
 	"testing"
 
@@ -10,7 +9,6 @@ import (
 	"go.unistack.org/micro/v4/config"
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/register"
 	"go.unistack.org/micro/v4/router"
 	"go.unistack.org/micro/v4/server"
@@ -18,18 +16,20 @@ import (
 	"go.unistack.org/micro/v4/tracer"
 )
 
-func TestClient(t *testing.T) {
+type testItem struct {
-	c1 := client.NewClient(options.Name("test1"))
+	name string
-	c2 := client.NewClient(options.Name("test2"))
+}
 
-	svc := NewService(Client(c1, c2))
+func (ti *testItem) Name() string {
-	if err := svc.Init(); err != nil {
+	return ti.name
-		t.Fatal(err)
+}
-	}
 
-	x1 := svc.Client("test2")
+func TestGetNameIndex(t *testing.T) {
-	if x1.Name() != "test2" {
+	item1 := &testItem{name: "first"}
-		t.Fatal("invalid client")
+	item2 := &testItem{name: "second"}
+	items := []interface{}{item1, item2}
+	if idx := getNameIndex("second", items); idx != 1 {
+		t.Fatalf("getNameIndex func error, item not found")
 	}
 }
 
@@ -37,7 +37,7 @@ func TestRegisterHandler(t *testing.T) {
 	type args struct {
 		s    server.Server
 		h    interface{}
-		opts []options.Option
+		opts []server.HandlerOption
 	}
 	h := struct{}{}
 	tests := []struct {
@@ -426,7 +426,7 @@ func Test_service_Store(t *testing.T) {
 }
 
 func Test_service_Register(t *testing.T) {
-	r := memory.NewRegister()
+	r := register.NewRegister()
 	type fields struct {
 		opts Options
 	}
@@ -445,7 +445,7 @@ func Test_service_Register(t *testing.T) {
 				opts: Options{Registers: []register.Register{r}},
 			},
 			args: args{
-				names: []string{"memory"},
+				names: []string{"noop"},
 			},
 			want: r,
 		},

store/context.go

@@ -22,3 +22,63 @@ func NewContext(ctx context.Context, c Store) context.Context {
 	}
 	return context.WithValue(ctx, storeKey{}, c)
 }
+
+// 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)
+	}
+}
+
+// SetReadOption returns a function to setup a context with given value
+func SetReadOption(k, v interface{}) ReadOption {
+	return func(o *ReadOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}
+
+// SetWriteOption returns a function to setup a context with given value
+func SetWriteOption(k, v interface{}) WriteOption {
+	return func(o *WriteOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}
+
+// SetListOption returns a function to setup a context with given value
+func SetListOption(k, v interface{}) ListOption {
+	return func(o *ListOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}
+
+// SetDeleteOption returns a function to setup a context with given value
+func SetDeleteOption(k, v interface{}) DeleteOption {
+	return func(o *DeleteOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}
+
+// SetExistsOption returns a function to setup a context with given value
+func SetExistsOption(k, v interface{}) ExistsOption {
+	return func(o *ExistsOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}

store/context_test.go

@@ -3,8 +3,6 @@ package store
 import (
 	"context"
 	"testing"
-
-	"go.unistack.org/micro/v4/options"
 )
 
 func TestFromNilContext(t *testing.T) {
@@ -45,7 +43,10 @@ func TestNewContext(t *testing.T) {
 
 func TestSetOption(t *testing.T) {
 	type key struct{}
-	opts := NewOptions(options.ContextOption(key{}, "test"))
+	o := SetOption(key{}, "test")
+	opts := &Options{}
+	o(opts)
+
 	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
 		t.Fatal("SetOption not works")
 	}

store/memory.go

@@ -7,11 +7,10 @@ import (
 	"time"
 
 	"github.com/patrickmn/go-cache"
-	"go.unistack.org/micro/v4/options"
 )
 
 // NewStore returns a memory store
-func NewStore(opts ...options.Option) Store {
+func NewStore(opts ...Option) Store {
 	return &memoryStore{
 		opts:  NewOptions(opts...),
 		store: cache.New(cache.NoExpiration, 5*time.Minute),
@@ -101,7 +100,7 @@ func (m *memoryStore) list(prefix string, limit, offset uint) []string {
 	return allKeys
 }
 
-func (m *memoryStore) Init(opts ...options.Option) error {
+func (m *memoryStore) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&m.opts)
 	}
@@ -116,7 +115,7 @@ func (m *memoryStore) Name() string {
 	return m.opts.Name
 }
 
-func (m *memoryStore) Exists(ctx context.Context, key string, opts ...options.Option) error {
+func (m *memoryStore) Exists(ctx context.Context, key string, opts ...ExistsOption) error {
 	options := NewExistsOptions(opts...)
 	if options.Namespace == "" {
 		options.Namespace = m.opts.Namespace
@@ -124,7 +123,7 @@ func (m *memoryStore) Exists(ctx context.Context, key string, opts ...options.Op
 	return m.exists(options.Namespace, key)
 }
 
-func (m *memoryStore) Read(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
+func (m *memoryStore) Read(ctx context.Context, key string, val interface{}, opts ...ReadOption) error {
 	options := NewReadOptions(opts...)
 	if options.Namespace == "" {
 		options.Namespace = m.opts.Namespace
@@ -132,7 +131,7 @@ func (m *memoryStore) Read(ctx context.Context, key string, val interface{}, opt
 	return m.get(options.Namespace, key, val)
 }
 
-func (m *memoryStore) Write(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
+func (m *memoryStore) Write(ctx context.Context, key string, val interface{}, opts ...WriteOption) error {
 	options := NewWriteOptions(opts...)
 	if options.Namespace == "" {
 		options.Namespace = m.opts.Namespace
@@ -152,7 +151,7 @@ func (m *memoryStore) Write(ctx context.Context, key string, val interface{}, op
 	return nil
 }
 
-func (m *memoryStore) Delete(ctx context.Context, key string, opts ...options.Option) error {
+func (m *memoryStore) Delete(ctx context.Context, key string, opts ...DeleteOption) error {
 	options := NewDeleteOptions(opts...)
 	if options.Namespace == "" {
 		options.Namespace = m.opts.Namespace
@@ -166,7 +165,7 @@ func (m *memoryStore) Options() Options {
 	return m.opts
 }
 
-func (m *memoryStore) List(ctx context.Context, opts ...options.Option) ([]string, error) {
+func (m *memoryStore) List(ctx context.Context, opts ...ListOption) ([]string, error) {
 	options := NewListOptions(opts...)
 	if options.Namespace == "" {
 		options.Namespace = m.opts.Namespace

store/memory_test.go

@@ -5,13 +5,12 @@ import (
 	"testing"
 	"time"
 
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/store"
 )
 
 func TestMemoryReInit(t *testing.T) {
-	s := store.NewStore(options.Namespace("aaa"))
+	s := store.NewStore(store.Namespace("aaa"))
-	if err := s.Init(options.Namespace("")); err != nil {
+	if err := s.Init(store.Namespace("")); err != nil {
 		t.Fatal(err)
 	}
 	if len(s.Options().Namespace) > 0 {
@@ -29,7 +28,7 @@ func TestMemoryBasic(t *testing.T) {
 
 func TestMemoryPrefix(t *testing.T) {
 	s := store.NewStore()
-	if err := s.Init(options.Namespace("some-prefix")); err != nil {
+	if err := s.Init(store.Namespace("some-prefix")); err != nil {
 		t.Fatal(err)
 	}
 	basictest(s, t)
@@ -37,7 +36,7 @@ func TestMemoryPrefix(t *testing.T) {
 
 func TestMemoryNamespace(t *testing.T) {
 	s := store.NewStore()
-	if err := s.Init(options.Namespace("some-namespace")); err != nil {
+	if err := s.Init(store.Namespace("some-namespace")); err != nil {
 		t.Fatal(err)
 	}
 	basictest(s, t)
@@ -45,7 +44,7 @@ func TestMemoryNamespace(t *testing.T) {
 
 func TestMemoryNamespacePrefix(t *testing.T) {
 	s := store.NewStore()
-	if err := s.Init(options.Namespace("some-namespace")); err != nil {
+	if err := s.Init(store.Namespace("some-namespace")); err != nil {
 		t.Fatal(err)
 	}
 	basictest(s, t)

store/options.go

@@ -9,7 +9,6 @@ import (
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/metadata"
 	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/tracer"
 )
 
@@ -33,14 +32,16 @@ type Options struct {
 	Namespace string
 	// Separator used as key parts separator
 	Separator string
-	// Address contains store address
+	// Addrs contains store address
-	Address []string
+	Addrs []string
+	// Wrappers store wrapper that called before actual functions
+	// Wrappers []Wrapper
 	// Timeout specifies timeout duration for all operations
 	Timeout time.Duration
 }
 
 // NewOptions creates options struct
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
 		Logger:    logger.DefaultLogger,
 		Context:   context.Background(),
@@ -55,17 +56,85 @@ func NewOptions(opts ...options.Option) Options {
 	return options
 }
 
+// Option sets values in Options
+type Option func(o *Options)
+
+// TLSConfig specifies a *tls.Config
+func TLSConfig(t *tls.Config) Option {
+	return func(o *Options) {
+		o.TLSConfig = t
+	}
+}
+
+// Context pass context to store
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
+	}
+}
+
+// Codec sets the codec
+func Codec(c codec.Codec) Option {
+	return func(o *Options) {
+		o.Codec = c
+	}
+}
+
+// Logger sets the logger
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Meter sets the meter
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// Name the name of the store
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}
+
 // Separator the value used as key parts separator
-func Separator(s string) options.Option {
+func Separator(s string) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, s, "Separator")
+		o.Separator = s
+	}
+}
+
+// Namespace sets namespace of the store
+func Namespace(ns string) Option {
+	return func(o *Options) {
+		o.Namespace = ns
+	}
+}
+
+// Tracer sets the tracer
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
 	}
 }
 
 // Timeout sets the timeout
-func Timeout(td time.Duration) options.Option {
+func Timeout(td time.Duration) Option {
-	return func(src interface{}) error {
+	return func(o *Options) {
-		return options.Set(src, td, ".Timeout")
+		o.Timeout = td
+	}
+}
+
+// Addrs contains the addresses or other connection information of the backing storage.
+// For example, an etcd implementation would contain the nodes of the cluster.
+// A SQL implementation could contain one or more connection strings.
+func Addrs(addrs ...string) Option {
+	return func(o *Options) {
+		o.Addrs = addrs
 	}
 }
 
@@ -78,7 +147,7 @@ type ReadOptions struct {
 }
 
 // NewReadOptions fills ReadOptions struct with opts slice
-func NewReadOptions(opts ...options.Option) ReadOptions {
+func NewReadOptions(opts ...ReadOption) ReadOptions {
 	options := ReadOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -86,6 +155,23 @@ func NewReadOptions(opts ...options.Option) ReadOptions {
 	return options
 }
 
+// ReadOption sets values in ReadOptions
+type ReadOption func(r *ReadOptions)
+
+// ReadContext pass context.Context to ReadOptions
+func ReadContext(ctx context.Context) ReadOption {
+	return func(o *ReadOptions) {
+		o.Context = ctx
+	}
+}
+
+// ReadNamespace pass namespace to ReadOptions
+func ReadNamespace(ns string) ReadOption {
+	return func(o *ReadOptions) {
+		o.Namespace = ns
+	}
+}
+
 // WriteOptions configures an individual Write operation
 type WriteOptions struct {
 	// Context holds external options
@@ -99,7 +185,7 @@ type WriteOptions struct {
 }
 
 // NewWriteOptions fills WriteOptions struct with opts slice
-func NewWriteOptions(opts ...options.Option) WriteOptions {
+func NewWriteOptions(opts ...WriteOption) WriteOptions {
 	options := WriteOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -107,17 +193,34 @@ func NewWriteOptions(opts ...options.Option) WriteOptions {
 	return options
 }
 
+// WriteOption sets values in WriteOptions
+type WriteOption func(w *WriteOptions)
+
+// WriteContext pass context.Context to wirte options
+func WriteContext(ctx context.Context) WriteOption {
+	return func(o *WriteOptions) {
+		o.Context = ctx
+	}
+}
+
 // WriteMetadata add metadata.Metadata
-func WriteMetadata(md metadata.Metadata) options.Option {
+func WriteMetadata(md metadata.Metadata) WriteOption {
-	return func(src interface{}) error {
+	return func(o *WriteOptions) {
-		return options.Set(src, metadata.Copy(md), ".Metadata")
+		o.Metadata = metadata.Copy(md)
 	}
 }
 
 // WriteTTL is the time the record expires
-func WriteTTL(td time.Duration) options.Option {
+func WriteTTL(d time.Duration) WriteOption {
-	return func(src interface{}) error {
+	return func(o *WriteOptions) {
-		return options.Set(src, td, ".TTL")
+		o.TTL = d
+	}
+}
+
+// WriteNamespace pass namespace to write options
+func WriteNamespace(ns string) WriteOption {
+	return func(o *WriteOptions) {
+		o.Namespace = ns
 	}
 }
 
@@ -130,7 +233,7 @@ type DeleteOptions struct {
 }
 
 // NewDeleteOptions fills DeleteOptions struct with opts slice
-func NewDeleteOptions(opts ...options.Option) DeleteOptions {
+func NewDeleteOptions(opts ...DeleteOption) DeleteOptions {
 	options := DeleteOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -138,6 +241,23 @@ func NewDeleteOptions(opts ...options.Option) DeleteOptions {
 	return options
 }
 
+// DeleteOption sets values in DeleteOptions
+type DeleteOption func(d *DeleteOptions)
+
+// DeleteContext pass context.Context to delete options
+func DeleteContext(ctx context.Context) DeleteOption {
+	return func(o *DeleteOptions) {
+		o.Context = ctx
+	}
+}
+
+// DeleteNamespace pass namespace to delete options
+func DeleteNamespace(ns string) DeleteOption {
+	return func(o *DeleteOptions) {
+		o.Namespace = ns
+	}
+}
+
 // ListOptions configures an individual List operation
 type ListOptions struct {
 	Context   context.Context
@@ -149,7 +269,7 @@ type ListOptions struct {
 }
 
 // NewListOptions fills ListOptions struct with opts slice
-func NewListOptions(opts ...options.Option) ListOptions {
+func NewListOptions(opts ...ListOption) ListOptions {
 	options := ListOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -157,31 +277,48 @@ func NewListOptions(opts ...options.Option) ListOptions {
 	return options
 }
 
+// ListOption sets values in ListOptions
+type ListOption func(l *ListOptions)
+
+// ListContext pass context.Context to list options
+func ListContext(ctx context.Context) ListOption {
+	return func(o *ListOptions) {
+		o.Context = ctx
+	}
+}
+
 // ListPrefix returns all keys that are prefixed with key
-func ListPrefix(s string) options.Option {
+func ListPrefix(s string) ListOption {
-	return func(src interface{}) error {
+	return func(o *ListOptions) {
-		return options.Set(src, s, ".Prefix")
+		o.Prefix = s
 	}
 }
 
 // ListSuffix returns all keys that end with key
-func ListSuffix(s string) options.Option {
+func ListSuffix(s string) ListOption {
-	return func(src interface{}) error {
+	return func(o *ListOptions) {
-		return options.Set(src, s, ".Prefix")
+		o.Suffix = s
 	}
 }
 
 // ListLimit limits the number of returned keys
-func ListLimit(n uint) options.Option {
+func ListLimit(n uint) ListOption {
-	return func(src interface{}) error {
+	return func(o *ListOptions) {
-		return options.Set(src, n, ".Limit")
+		o.Limit = n
 	}
 }
 
 // ListOffset use with Limit for pagination
-func ListOffset(n uint) options.Option {
+func ListOffset(n uint) ListOption {
-	return func(src interface{}) error {
+	return func(o *ListOptions) {
-		return options.Set(src, n, ".Offset")
+		o.Offset = n
+	}
+}
+
+// ListNamespace pass namespace to list options
+func ListNamespace(ns string) ListOption {
+	return func(o *ListOptions) {
+		o.Namespace = ns
 	}
 }
 
@@ -193,8 +330,11 @@ type ExistsOptions struct {
 	Namespace string
 }
 
+// ExistsOption specifies Exists call options
+type ExistsOption func(*ExistsOptions)
+
 // NewExistsOptions helper for Exists method
-func NewExistsOptions(opts ...options.Option) ExistsOptions {
+func NewExistsOptions(opts ...ExistsOption) ExistsOptions {
 	options := ExistsOptions{
 		Context: context.Background(),
 	}
@@ -203,3 +343,26 @@ func NewExistsOptions(opts ...options.Option) ExistsOptions {
 	}
 	return options
 }
+
+// ExistsContext pass context.Context to exist options
+func ExistsContext(ctx context.Context) ExistsOption {
+	return func(o *ExistsOptions) {
+		o.Context = ctx
+	}
+}
+
+// ExistsNamespace pass namespace to exist options
+func ExistsNamespace(ns string) ExistsOption {
+	return func(o *ExistsOptions) {
+		o.Namespace = ns
+	}
+}
+
+/*
+// WrapStore adds a store Wrapper to a list of options passed into the store
+func WrapStore(w Wrapper) Option {
+	return func(o *Options) {
+		o.Wrappers = append(o.Wrappers, w)
+	}
+}
+*/