move to v4

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/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,7 +14,7 @@ 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

broker/broker.go

@@ -5,20 +5,18 @@ import (
 	"context"
 	"errors"
 
+	"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 = NewBroker()
 
 var (
 	// ErrNotConnected returns when broker used but not connected yet
 	ErrNotConnected = errors.New("broker not connected")
 	// ErrDisconnected returns when broker disconnected
 	ErrDisconnected = errors.New("broker disconnected")
-	// ErrInvalidMessage returns when message has nvalid format
-	ErrInvalidMessage = errors.New("broker message has invalid format")
 )
 
 // Broker is an interface used for asynchronous messaging.
@@ -26,7 +24,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
@@ -35,29 +33,72 @@ 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
+	// Publish message to broker topic
-	Publish(ctx context.Context, msg interface{}, opts ...options.Option) error
+	Publish(ctx context.Context, topic string, msg *Message, 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, h Handler, opts ...SubscribeOption) (Subscriber, error)
+	// BatchPublish messages to broker with multiple topics
+	BatchPublish(ctx context.Context, msgs []*Message, opts ...PublishOption) error
+	// BatchSubscribe subscribes to topic messages via handler
+	BatchSubscribe(ctx context.Context, topic string, h BatchHandler, opts ...SubscribeOption) (Subscriber, error)
 	// String type of broker
 	String() string
 }
 
-// Message is given to a subscription handler for processing
+// Handler is used to process messages via a subscription of a topic.
-type Message interface {
+type Handler func(Event) error
-	// Context for the message
+
-	Context() context.Context
+// Events contains multiple events
-	// Topic
+type Events []Event
+
+// Ack try to ack all events and return
+func (evs Events) Ack() error {
+	var err error
+	for _, ev := range evs {
+		if err = ev.Ack(); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// SetError sets error on event
+func (evs Events) SetError(err error) {
+	for _, ev := range evs {
+		ev.SetError(err)
+	}
+}
+
+// BatchHandler is used to process messages in batches via a subscription of a topic.
+type BatchHandler func(Events) error
+
+// Event is given to a subscription handler for processing
+type Event interface {
+	// Topic returns event topic
 	Topic() string
-	// Header returns message headers
+	// Message returns broker message
-	Header() metadata.Metadata
+	Message() *Message
-	// Body returns broker message may be []byte slice or some go struct
-	Body() interface{}
 	// Ack acknowledge message
 	Ack() error
 	// Error returns message error (like decoding errors or some other)
-	// In this case Body contains raw []byte from broker
 	Error() error
+	// SetError set event processing error
+	SetError(err error)
+}
+
+// Message is used to transfer data
+type Message struct {
+	// Header contains message metadata
+	Header metadata.Metadata
+	// Body contains message body
+	Body codec.RawMessage
+}
+
+// NewMessage create broker message with topic filled
+func NewMessage(topic string) *Message {
+	m := &Message{Header: metadata.New(2)}
+	m.Header.Set(metadata.HeaderTopic, topic)
+	return m
 }
 
 // Subscriber is a convenience return type for the Subscribe method
@@ -69,9 +110,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

@@ -2,22 +2,17 @@ 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 +20,32 @@ type MemoryBroker struct {
 	connected bool
 }
 
-func (m *MemoryBroker) Options() Options {
+type memoryEvent struct {
+	err     error
+	message interface{}
+	topic   string
+	opts    Options
+}
+
+type memorySubscriber struct {
+	ctx          context.Context
+	exit         chan bool
+	handler      Handler
+	batchhandler BatchHandler
+	id           string
+	topic        string
+	opts         SubscribeOptions
+}
+
+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 +69,35 @@ 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
-		}
 	}
 
+	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) Publish(ctx context.Context, topic string, msg *Message, opts ...PublishOption) error {
+	msg.Header.Set(metadata.HeaderTopic, topic)
+	return m.publish(ctx, []*Message{msg}, opts...)
+}
+
+func (m *memoryBroker) BatchPublish(ctx context.Context, msgs []*Message, opts ...PublishOption) error {
+	return m.publish(ctx, msgs, opts...)
+}
+
+func (m *memoryBroker) publish(ctx context.Context, msgs []*Message, opts ...PublishOption) error {
 	m.RLock()
 	if !m.connected {
 		m.RUnlock()
@@ -98,29 +112,17 @@ func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ..
 		return ctx.Err()
 	default:
 		options := NewPublishOptions(opts...)
-		var msgs []Message
+
-		switch v := message.(type) {
+		msgTopicMap := make(map[string]Events)
-		case []Message:
+		for _, v := range msgs {
-			msgs = v
+			p := &memoryEvent{opts: m.opts}
-		case Message:
+
-			msgs = append(msgs, v)
+			if m.opts.Codec == nil || options.BodyOnly {
-		default:
+				p.topic, _ = v.Header.Get(metadata.HeaderTopic)
-			return ErrInvalidMessage
+				p.message = v.Body
-		}
-		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 {
-				p.body = msg.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
 				}
@@ -128,96 +130,110 @@ func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ..
 			msgTopicMap[p.topic] = append(msgTopicMap[p.topic], p)
 		}
 
+		beh := m.opts.BatchErrorHandler
 		eh := m.opts.ErrorHandler
 
 		for t, ms := range msgTopicMap {
-			ts := time.Now()
-
-			m.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", t).Add(len(ms))
-			m.opts.Meter.Counter(semconv.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(semconv.PublishMessageInflight, "endpoint", t).Add(-len(ms))
-				m.opts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", t).Add(-len(ms))
 				continue
 			}
 
-			m.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", t, "status", "success").Add(len(ms))
 			for _, sub := range subs {
+				if sub.opts.BatchErrorHandler != nil {
+					beh = sub.opts.BatchErrorHandler
+				}
 				if sub.opts.ErrorHandler != nil {
 					eh = sub.opts.ErrorHandler
 				}
 
-				switch mh := sub.handler.(type) {
+				switch {
-				case MessagesHandler:
+				// batch processing
-					mhs := make([]Message, 0, len(ms))
+				case sub.batchhandler != nil:
-					for _, m := range ms {
+					if err = sub.batchhandler(ms); err != nil {
-						mhs = append(mhs, m)
+						ms.SetError(err)
-					}
+						if beh != nil {
-					if err = mh(mhs); err != nil {
+							_ = beh(ms)
-						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())
 						}
+					} else if sub.opts.AutoAck {
+						if err = ms.Ack(); err != nil {
+							m.opts.Logger.Errorf(m.opts.Context, "ack failed: %v", err)
+						}
 					}
-				case MessageHandler:
+					// single processing
+				case sub.handler != nil:
 					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()
+							p.SetError(err)
 							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 {
+						} else if sub.opts.AutoAck {
-							if sub.opts.AutoAck {
+							if err = p.Ack(); err != nil {
-								if err = p.Ack(); err != nil {
+								m.opts.Logger.Errorf(m.opts.Context, "ack failed: %v", err)
-									m.opts.Logger.Error(m.opts.Context, "ack failed: "+err.Error())
-									m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "failure").Inc()
-								} else {
-									m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "success").Inc()
-								}
-							} else {
-								m.opts.Meter.Counter(semconv.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)
 					}
 				}
 			}
-
-			te := time.Since(ts)
-			m.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", t).Update(te.Seconds())
-			m.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", t).Update(te.Seconds())
-			m.opts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", t).Update(te.Seconds())
-			m.opts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", t).Update(te.Seconds())
 		}
-
 	}
 
 	return nil
 }
 
-func (m *MemoryBroker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...options.Option) (Subscriber, error) {
+func (m *memoryBroker) BatchSubscribe(ctx context.Context, topic string, handler BatchHandler, opts ...SubscribeOption) (Subscriber, error) {
+	m.RLock()
+	if !m.connected {
+		m.RUnlock()
+		return nil, ErrNotConnected
+	}
+	m.RUnlock()
+
+	sid, err := id.New()
+	if err != nil {
+		return nil, err
+	}
+
+	options := NewSubscribeOptions(opts...)
+
+	sub := &memorySubscriber{
+		exit:         make(chan bool, 1),
+		id:           sid,
+		topic:        topic,
+		batchhandler: handler,
+		opts:         options,
+		ctx:          ctx,
+	}
+
+	m.Lock()
+	m.subscribers[topic] = append(m.subscribers[topic], sub)
+	m.Unlock()
+
+	go func() {
+		<-sub.exit
+		m.Lock()
+		newSubscribers := make([]*memorySubscriber, 0, len(m.subscribers)-1)
+		for _, sb := range m.subscribers[topic] {
+			if sb.id == sub.id {
+				continue
+			}
+			newSubscribers = append(newSubscribers, sb)
+		}
+		m.subscribers[topic] = newSubscribers
+		m.Unlock()
+	}()
+
+	return sub, nil
+}
+
+func (m *memoryBroker) Subscribe(ctx context.Context, topic string, handler Handler, opts ...SubscribeOption) (Subscriber, error) {
 	m.RLock()
 	if !m.connected {
 		m.RUnlock()
@@ -262,54 +278,46 @@ 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
 }
 
-type memoryMessage struct {
+func (m *memoryEvent) Topic() string {
-	err    error
-	body   interface{}
-	topic  string
-	header metadata.Metadata
-	opts   PublishOptions
-	ctx    context.Context
-}
-
-func (m *memoryMessage) Topic() string {
 	return m.topic
 }
 
-func (m *memoryMessage) Header() metadata.Metadata {
+func (m *memoryEvent) Message() *Message {
-	return m.header
+	switch v := m.message.(type) {
-}
+	case *Message:
+		return v
+	case []byte:
+		msg := &Message{}
+		if err := m.opts.Codec.Unmarshal(v, msg); err != nil {
+			if m.opts.Logger.V(logger.ErrorLevel) {
+				m.opts.Logger.Error(m.opts.Context, "[memory]: failed to unmarshal: %v", err)
+			}
+			return nil
+		}
+		return msg
+	}
 
-func (m *memoryMessage) Body() interface{} {
-	return m.body
-}
-
-func (m *memoryMessage) Ack() error {
 	return nil
 }
 
-func (m *memoryMessage) Error() error {
+func (m *memoryEvent) Ack() error {
+	return nil
+}
+
+func (m *memoryEvent) Error() error {
 	return m.err
 }
 
-func (m *memoryMessage) Context() context.Context {
+func (m *memoryEvent) SetError(err error) {
-	return m.ctx
+	m.err = err
-}
-
-type memorySubscriber struct {
-	ctx     context.Context
-	exit    chan bool
-	handler interface{}
-	id      string
-	topic   string
-	opts    SubscribeOptions
 }
 
 func (m *memorySubscriber) Options() SubscribeOptions {
@@ -326,8 +334,8 @@ func (m *memorySubscriber) Unsubscribe(ctx context.Context) error {
 }
 
 // NewBroker return new memory broker
-func NewBroker(opts ...options.Option) *MemoryBroker {
+func NewBroker(opts ...Option) Broker {
-	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: map[string]string{
+			Header: map[string]string{
 				metadata.HeaderTopic: topic,
 				"foo":                "bar",
 				"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: map[string]string{
+			Header: map[string]string{
 				metadata.HeaderTopic: topic,
 				"foo":                "bar",
 				"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

@@ -7,9 +7,7 @@ import (
 
 	"go.unistack.org/micro/v4/codec"
 	"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/tracer"
 )
@@ -20,8 +18,8 @@ type Options struct {
 	Tracer tracer.Tracer
 	// Register can be used for clustering
 	Register register.Register
-	// Codecs holds the codec for marshal/unmarshal
+	// Codec holds the codec for marshal/unmarshal
-	Codecs map[string]codec.Codec
+	Codec codec.Codec
 	// Logger used for logging
 	Logger logger.Logger
 	// Meter used for metrics
@@ -30,22 +28,24 @@ 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 Handler
+	// BatchErrorHandler used when broker can't unmashal incoming messages
+	BatchErrorHandler BatchHandler
 	// Name holds the broker name
 	Name string
-	// Address holds the broker address
+	// Addrs holds the broker address
-	Address []string
+	Addrs []string
 }
 
 // NewOptions create new Options
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
 		Register: register.DefaultRegister,
 		Logger:   logger.DefaultLogger,
 		Context:  context.Background(),
 		Meter:    meter.DefaultMeter,
-		Codecs:   make(map[string]codec.Codec),
+		Codec:    codec.DefaultCodec,
 		Tracer:   tracer.DefaultTracer,
 	}
 	for _, o := range opts {
@@ -54,22 +54,23 @@ func NewOptions(opts ...options.Option) Options {
 	return options
 }
 
+// Context sets the context option
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
+	}
+}
+
 // PublishOptions struct
 type PublishOptions struct {
 	// Context holds external options
 	Context context.Context
 	// BodyOnly flag says the message contains raw body bytes
 	BodyOnly bool
-	// Message metadata usually passed as message headers
-	Metadata metadata.Metadata
-	// Content-Type of message for marshal
-	ContentType string
-	// Topic destination
-	Topic string
 }
 
 // NewPublishOptions creates PublishOptions struct
-func NewPublishOptions(opts ...options.Option) PublishOptions {
+func NewPublishOptions(opts ...PublishOption) PublishOptions {
 	options := PublishOptions{
 		Context: context.Background(),
 	}
@@ -79,21 +80,16 @@ 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 Handler
-	// QueueGroup holds consumer group
+	// BatchErrorHandler used when broker can't unmashal incoming messages
-	QueueGroup string
+	BatchErrorHandler BatchHandler
+	// Group holds consumer group
+	Group string
 	// AutoAck flag specifies auto ack of incoming message when no error happens
 	AutoAck bool
 	// BodyOnly flag specifies that message contains only body bytes without header
@@ -104,16 +100,179 @@ type SubscribeOptions struct {
 	BatchWait time.Duration
 }
 
-// ErrorHandler will catch all broker errors that cant be handled
+// Option func
-// in normal way, for example Codec errors
+type Option func(*Options)
-func ErrorHandler(h interface{}) options.Option {
+
-	return func(src interface{}) error {
+// PublishOption func
-		return options.Set(src, h, ".ErrorHandler")
+type PublishOption func(*PublishOptions)
+
+// PublishBodyOnly publish only body of the message
+func PublishBodyOnly(b bool) PublishOption {
+	return func(o *PublishOptions) {
+		o.BodyOnly = b
 	}
 }
 
+// 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
+func Codec(c codec.Codec) Option {
+	return func(o *Options) {
+		o.Codec = c
+	}
+}
+
+// ErrorHandler will catch all broker errors that cant be handled
+// in normal way, for example Codec errors
+func ErrorHandler(h Handler) Option {
+	return func(o *Options) {
+		o.ErrorHandler = h
+	}
+}
+
+// BatchErrorHandler will catch all broker errors that cant be handled
+// in normal way, for example Codec errors
+func BatchErrorHandler(h BatchHandler) Option {
+	return func(o *Options) {
+		o.BatchErrorHandler = h
+	}
+}
+
+// SubscribeErrorHandler will catch all broker errors that cant be handled
+// in normal way, for example Codec errors
+func SubscribeErrorHandler(h Handler) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.ErrorHandler = h
+	}
+}
+
+// SubscribeBatchErrorHandler will catch all broker errors that cant be handled
+// in normal way, for example Codec errors
+func SubscribeBatchErrorHandler(h BatchHandler) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.BatchErrorHandler = h
+	}
+}
+
+// Queue sets the subscribers queue
+// Deprecated
+func Queue(name string) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.Group = name
+	}
+}
+
+// SubscribeGroup sets the name of the queue to share messages on
+func SubscribeGroup(name string) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.Group = name
+	}
+}
+
+// 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
+	}
+}
+
+// SubscribeContext set context
+func SubscribeContext(ctx context.Context) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.Context = ctx
+	}
+}
+
+// DisableAutoAck disables auto ack
+// Deprecated
+func DisableAutoAck() SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.AutoAck = false
+	}
+}
+
+// SubscribeAutoAck contol auto acking of messages
+// after they have been handled.
+func SubscribeAutoAck(b bool) SubscribeOption {
+	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) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.BatchSize = n
+	}
+}
+
+// SubscribeBatchWait specifies max batch wait time
+func SubscribeBatchWait(td time.Duration) SubscribeOption {
+	return func(o *SubscribeOptions) {
+		o.BatchWait = td
+	}
+}
+
+// SubscribeOption func
+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(),
@@ -123,39 +282,3 @@ func NewSubscribeOptions(opts ...options.Option) SubscribeOptions {
 	}
 	return options
 }
-
-// SubscribeAutoAck contol auto acking of messages
-// after they have been handled.
-func SubscribeAutoAck(b bool) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, b, ".AutoAck")
-	}
-}
-
-// BodyOnly transfer only body without
-func BodyOnly(b bool) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, b, ".BodyOnly")
-	}
-}
-
-// SubscribeBatchSize specifies max batch size
-func SubscribeBatchSize(n int) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, n, ".BatchSize")
-	}
-}
-
-// SubscribeBatchWait specifies max batch wait time
-func SubscribeBatchWait(td time.Duration) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, td, ".BatchWait")
-	}
-}
-
-// SubscribeQueueGroup sets the shared queue name distributed messages across subscribers
-func SubscribeQueueGroup(n string) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, n, ".QueueGroup")
-	}
-}

broker/subscriber.go

@@ -1,98 +0,0 @@
-package broker
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-const (
-	subSig      = "func(context.Context, interface{}) error"
-	batchSubSig = "func([]context.Context, []interface{}) error"
-)
-
-// Precompute the reflect type for error. Can't use error directly
-// because Typeof takes an empty interface value. This is annoying.
-var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
-
-// Is this an exported - upper case - name?
-func isExported(name string) bool {
-	rune, _ := utf8.DecodeRuneInString(name)
-	return unicode.IsUpper(rune)
-}
-
-// Is this type exported or a builtin?
-func isExportedOrBuiltinType(t reflect.Type) bool {
-	for t.Kind() == reflect.Ptr {
-		t = t.Elem()
-	}
-	// PkgPath will be non-empty even for an exported type,
-	// so we need to check the type name as well.
-	return isExported(t.Name()) || t.PkgPath() == ""
-}
-
-// ValidateSubscriber func signature
-func ValidateSubscriber(sub interface{}) error {
-	typ := reflect.TypeOf(sub)
-	var argType reflect.Type
-	switch typ.Kind() {
-	case reflect.Func:
-		name := "Func"
-		switch typ.NumIn() {
-		case 1: // func(Message) error
-
-		case 2: // func(context.Context, Message) error or func(context.Context, []Message) error
-			argType = typ.In(2)
-			// if sub.Options().Batch {
-			if argType.Kind() != reflect.Slice {
-				return fmt.Errorf("subscriber %v dont have required signature %s", name, batchSubSig)
-			}
-			if strings.Compare(fmt.Sprintf("%v", argType), "[]interface{}") == 0 {
-				return fmt.Errorf("subscriber %v dont have required signaure %s", name, batchSubSig)
-			}
-		//	}
-		default:
-			return fmt.Errorf("subscriber %v takes wrong number of args: %v required signature %s or %s", name, typ.NumIn(), subSig, batchSubSig)
-		}
-		if !isExportedOrBuiltinType(argType) {
-			return fmt.Errorf("subscriber %v argument type not exported: %v", name, argType)
-		}
-		if typ.NumOut() != 1 {
-			return fmt.Errorf("subscriber %v has wrong number of return values: %v require signature %s or %s",
-				name, typ.NumOut(), subSig, batchSubSig)
-		}
-		if returnType := typ.Out(0); returnType != typeOfError {
-			return fmt.Errorf("subscriber %v returns %v not error", name, returnType.String())
-		}
-	default:
-		hdlr := reflect.ValueOf(sub)
-		name := reflect.Indirect(hdlr).Type().Name()
-
-		for m := 0; m < typ.NumMethod(); m++ {
-			method := typ.Method(m)
-			switch method.Type.NumIn() {
-			case 3:
-				argType = method.Type.In(2)
-			default:
-				return fmt.Errorf("subscriber %v.%v takes wrong number of args: %v required signature %s or %s",
-					name, method.Name, method.Type.NumIn(), subSig, batchSubSig)
-			}
-
-			if !isExportedOrBuiltinType(argType) {
-				return fmt.Errorf("%v argument type not exported: %v", name, argType)
-			}
-			if method.Type.NumOut() != 1 {
-				return fmt.Errorf(
-					"subscriber %v.%v has wrong number of return values: %v require signature %s or %s",
-					name, method.Name, method.Type.NumOut(), subSig, batchSubSig)
-			}
-			if returnType := method.Type.Out(0); returnType != typeOfError {
-				return fmt.Errorf("subscriber %v.%v returns %v not error", name, method.Name, returnType.String())
-			}
-		}
-	}
-
-	return nil
-}

client/client.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/metadata"
 )
 
 var (
@@ -22,8 +22,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,14 +33,25 @@ 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
+	NewMessage(topic string, msg interface{}, opts ...MessageOption) Message
-	Call(ctx context.Context, req Request, rsp interface{}, opts ...options.Option) error
+	NewRequest(service string, endpoint string, req interface{}, opts ...RequestOption) Request
-	Stream(ctx context.Context, req Request, opts ...options.Option) (Stream, error)
+	Call(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error
+	Stream(ctx context.Context, req Request, opts ...CallOption) (Stream, error)
+	Publish(ctx context.Context, msg Message, opts ...PublishOption) error
+	BatchPublish(ctx context.Context, msg []Message, opts ...PublishOption) error
 	String() string
 }
 
+// Message is the interface for publishing asynchronously
+type Message interface {
+	Topic() string
+	Payload() interface{}
+	ContentType() string
+	Metadata() metadata.Metadata
+}
+
 // Request is the interface for a synchronous request used by Call or Stream
 type Request interface {
 	// The service to call
@@ -59,22 +68,16 @@ type Request interface {
 	Codec() codec.Codec
 	// indicates whether the request will be a streaming one rather than unary
 	Stream() bool
-	// Header data
-	// Header() metadata.Metadata
 }
 
 // Response is the response received from a service
 type Response interface {
 	// Read the response
 	Codec() codec.Codec
-	// The content type
-	// ContentType() string
 	// Header data
-	// Header() metadata.Metadata
+	Header() metadata.Metadata
 	// Read the undecoded response
 	Read() ([]byte, error)
-	// The unencoded request body
-	// Body() interface{}
 }
 
 // Stream is the interface for a bidirectional synchronous stream
@@ -100,3 +103,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

@@ -5,12 +5,11 @@ import (
 	"fmt"
 	"time"
 
+	"go.unistack.org/micro/v4/broker"
 	"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 +21,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 +38,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 +142,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 +168,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 +183,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 +200,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)
 	}
 
@@ -260,9 +285,6 @@ func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opt
 	ch := make(chan error, callOpts.Retries)
 	var gerr error
 
-	ts := time.Now()
-	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", endpoint).Inc()
 	for i := 0; i <= callOpts.Retries; i++ {
 		go func() {
 			ch <- call(i)
@@ -290,16 +312,6 @@ 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()
-	} else {
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", endpoint, "status", "success").Inc()
-	}
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", endpoint).Dec()
-	te := time.Since(ts)
-	n.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", endpoint).Update(te.Seconds())
-	n.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", endpoint).Update(te.Seconds())
-
 	return gerr
 }
 
@@ -307,11 +319,16 @@ 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) NewMessage(topic string, msg interface{}, opts ...MessageOption) Message {
+	options := NewMessageOptions(append([]MessageOption{MessageContentType(n.opts.ContentType)}, opts...)...)
+	return &noopMessage{topic: topic, payload: msg, opts: options}
+}
+
+func (n *noopClient) Stream(ctx context.Context, req Request, opts ...CallOption) (Stream, error) {
 	var err error
 
 	// make a copy of call opts
@@ -330,7 +347,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)
 	}
 
@@ -397,15 +414,7 @@ func (n *noopClient) Stream(ctx context.Context, req Request, opts ...options.Op
 
 		node := next()
 
-		// ts := time.Now()
-		endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
-		n.opts.Meter.Counter(semconv.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()
-		} else {
-			n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", endpoint, "status", "success").Inc()
-		}
 
 		// record the result of the call to inform future routing decisions
 		if verr := n.opts.Selector.Record(node, cerr); verr != nil {
@@ -459,6 +468,64 @@ func (n *noopClient) Stream(ctx context.Context, req Request, opts ...options.Op
 	return nil, grr
 }
 
-func (n *noopClient) stream(ctx context.Context, addr string, req Request, opts CallOptions) (*noopStream, error) {
+func (n *noopClient) stream(ctx context.Context, addr string, req Request, opts CallOptions) (Stream, error) {
 	return &noopStream{}, nil
 }
+
+func (n *noopClient) BatchPublish(ctx context.Context, ps []Message, opts ...PublishOption) error {
+	return n.publish(ctx, ps, opts...)
+}
+
+func (n *noopClient) Publish(ctx context.Context, p Message, opts ...PublishOption) error {
+	return n.publish(ctx, []Message{p}, opts...)
+}
+
+func (n *noopClient) publish(ctx context.Context, ps []Message, opts ...PublishOption) error {
+	options := NewPublishOptions(opts...)
+
+	msgs := make([]*broker.Message, 0, len(ps))
+
+	for _, p := range ps {
+		md, ok := metadata.FromOutgoingContext(ctx)
+		if !ok {
+			md = metadata.New(0)
+		}
+		md[metadata.HeaderContentType] = p.ContentType()
+
+		topic := p.Topic()
+
+		// get the exchange
+		if len(options.Exchange) > 0 {
+			topic = options.Exchange
+		}
+
+		md[metadata.HeaderTopic] = topic
+
+		var body []byte
+
+		// passed in raw data
+		if d, ok := p.Payload().(*codec.Frame); ok {
+			body = d.Data
+		} else {
+			// use codec for payload
+			cf, err := n.newCodec(p.ContentType())
+			if err != nil {
+				return errors.InternalServerError("go.micro.client", err.Error())
+			}
+
+			// set the body
+			b, err := cf.Marshal(p.Payload())
+			if err != nil {
+				return errors.InternalServerError("go.micro.client", err.Error())
+			}
+			body = b
+		}
+
+		msgs = append(msgs, &broker.Message{Header: md, Body: body})
+	}
+
+	return n.opts.Broker.BatchPublish(ctx, msgs,
+		broker.PublishContext(options.Context),
+		broker.PublishBodyOnly(options.BodyOnly),
+	)
+}

client/options.go

@@ -6,11 +6,13 @@ import (
 	"net"
 	"time"
 
+	"go.unistack.org/micro/v4/broker"
 	"go.unistack.org/micro/v4/codec"
 	"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"
@@ -19,12 +21,16 @@ import (
 
 // 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
 	Logger logger.Logger
 	// Tracer used for tracing
 	Tracer tracer.Tracer
+	// Broker used to publish messages
+	Broker broker.Broker
 	// Meter used for metrics
 	Meter meter.Meter
 	// Context is used for external options
@@ -43,6 +49,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 +59,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 +111,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 +181,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,16 +192,18 @@ func NewOptions(opts ...options.Option) Options {
 			Retry:          DefaultRetry,
 			Retries:        DefaultRetries,
 			RequestTimeout: DefaultRequestTimeout,
-			DialTimeout:    DefaultDialTimeout,
+			DialTimeout:    transport.DefaultDialTimeout,
 		},
-		Lookup:   LookupRoute,
+		Lookup:    LookupRoute,
-		PoolSize: DefaultPoolSize,
+		PoolSize:  DefaultPoolSize,
-		PoolTTL:  DefaultPoolTTL,
+		PoolTTL:   DefaultPoolTTL,
-		Selector: random.NewSelector(),
+		Selector:  random.NewSelector(),
-		Logger:   logger.DefaultLogger,
+		Logger:    logger.DefaultLogger,
-		Meter:    meter.DefaultMeter,
+		Broker:    broker.DefaultBroker,
-		Tracer:   tracer.DefaultTracer,
+		Meter:     meter.DefaultMeter,
-		Router:   router.DefaultRouter,
+		Tracer:    tracer.DefaultTracer,
+		Router:    router.DefaultRouter,
+		Transport: transport.DefaultTransport,
 	}
 
 	for _, o := range opts {
@@ -161,131 +213,381 @@ func NewOptions(opts ...options.Option) Options {
 	return options
 }
 
+// Broker to be used for pub/sub
+func Broker(b broker.Broker) Option {
+	return func(o *Options) {
+		o.Broker = b
+	}
+}
+
+// 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"
 
-	"github.com/google/uuid"
+	"github.com/imdario/mergo"
-	"dario.cat/mergo"
-	"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,7 +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 err := DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
@@ -127,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)
@@ -292,7 +275,7 @@ func fillValues(valueOf reflect.Value, tname string) error {
 	return nil
 }
 
-func (c *defaultConfig) Save(ctx context.Context, opts ...options.Option) error {
+func (c *defaultConfig) Save(ctx context.Context, opts ...SaveOption) error {
 	if err := DefaultBeforeSave(ctx, c); err != nil {
 		return err
 	}
@@ -312,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"
 )
 
@@ -15,12 +14,9 @@ type cfg struct {
 	StringValue    string `default:"string_value"`
 	IgnoreValue    string `json:"-"`
 	StructValue    *cfgStructValue
-	IntValue       int             `default:"99"`
+	IntValue       int            `default:"99"`
-	DurationValue  time.Duration   `default:"10s"`
+	DurationValue  time.Duration  `default:"10s"`
-	MDurationValue mtime.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 {
@@ -71,21 +67,6 @@ func TestDefault(t *testing.T) {
 	if conf.StringValue != "after_load" {
 		t.Fatal("AfterLoad option not working")
 	}
-	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)
 }

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"
 )
 
@@ -45,8 +44,11 @@ type Options struct {
 	AllowFail 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,
@@ -60,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)
@@ -78,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)
@@ -107,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
 	}
 }
 
@@ -183,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,
@@ -196,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
 	}
 }

event.go

@@ -0,0 +1,27 @@
+package micro
+
+import (
+	"context"
+
+	"go.unistack.org/micro/v4/client"
+)
+
+// Event is used to publish messages to a topic
+type Event interface {
+	// Publish publishes a message to the event topic
+	Publish(ctx context.Context, msg interface{}, opts ...client.PublishOption) error
+}
+
+type event struct {
+	c     client.Client
+	topic string
+}
+
+// NewEvent creates a new event publisher
+func NewEvent(topic string, c client.Client) Event {
+	return &event{c, topic}
+}
+
+func (e *event) Publish(ctx context.Context, msg interface{}, opts ...client.PublishOption) error {
+	return e.c.Publish(ctx, e.c.NewMessage(e.topic, msg), opts...)
+}

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/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
 	}
 }

go.mod

@@ -3,19 +3,8 @@ 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.3.1
+	github.com/imdario/mergo v0.3.14
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5
+	github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35
-	golang.org/x/sync v0.3.0
-	golang.org/x/sys v0.12.0
-	google.golang.org/grpc v1.58.2
-	google.golang.org/protobuf v1.31.0
-)
-
-require (
-	github.com/golang/protobuf v1.5.3 // indirect
-	golang.org/x/net v0.15.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
 )

go.sum

@@ -1,34 +1,11 @@
-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/imdario/mergo v0.3.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-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.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 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-20211117232152-9d50aa809f35 h1:4mohWoM/UGg1BvFFiqSPRl5uwJY3rVV0HQX0ETqauqQ=
-github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
-google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
-google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
-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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.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,23 +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"))))
-		WithLevel(ParseLevel(os.Getenv("MICRO_LOG_LEVEL"))),
-		WithContextAttrFuncs(DefaultContextAttrFuncs...),
-	)
 	// DefaultLevel used by logger
 	DefaultLevel = InfoLevel
 	// DefaultCallerSkipCount used by logger
@@ -27,63 +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{})
+	// Logf logs message with needed level
+	Logf(ctx context.Context, level Level, msg string, args ...interface{})
 	// String returns the name of logger
 	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 msg to default logger on debug level
+func Debug(ctx context.Context, args ...interface{}) {
+	DefaultLogger.Debug(ctx, args...)
+}
+
+// Warn writes msg to default logger on warn level
+func Warn(ctx context.Context, args ...interface{}) {
+	DefaultLogger.Warn(ctx, args...)
+}
+
+// Trace writes msg to default logger on trace level
+func Trace(ctx context.Context, args ...interface{}) {
+	DefaultLogger.Trace(ctx, args...)
+}
+
+// Fatal writes msg to default logger on fatal level
+func Fatal(ctx context.Context, args ...interface{}) {
+	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, attrs ...interface{}) {
+func Debugf(ctx context.Context, msg string, args ...interface{}) {
-	DefaultLogger.Debug(ctx, msg, attrs...)
+	DefaultLogger.Debugf(ctx, msg, args...)
 }
 
-// Warn writes formatted msg to default logger on warn level
+// Warnf writes formatted msg to default logger on warn level
-func Warn(ctx context.Context, msg string, attrs ...interface{}) {
+func Warnf(ctx context.Context, msg string, args ...interface{}) {
-	DefaultLogger.Warn(ctx, msg, attrs...)
+	DefaultLogger.Warnf(ctx, msg, args...)
 }
 
-// Trace writes formatted msg to default logger on trace level
+// Tracef writes formatted msg to default logger on trace level
-func Trace(ctx context.Context, msg string, attrs ...interface{}) {
+func Tracef(ctx context.Context, msg string, args ...interface{}) {
-	DefaultLogger.Trace(ctx, msg, attrs...)
+	DefaultLogger.Tracef(ctx, msg, args...)
 }
 
-// Fatal writes formatted msg to default logger on fatal level
+// Fatalf writes formatted msg to default logger on fatal level
-func Fatal(ctx context.Context, msg string, attrs ...interface{}) {
+func Fatalf(ctx context.Context, msg string, args ...interface{}) {
-	DefaultLogger.Fatal(ctx, msg, attrs...)
+	DefaultLogger.Fatalf(ctx, msg, args...)
 }
 
 // V returns true if passed level enabled in default logger
@@ -91,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

@@ -15,7 +15,7 @@ func TestContext(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	nl, ok := FromContext(NewContext(ctx, l.Attrs("key", "val")))
+	nl, ok := FromContext(NewContext(ctx, l.Fields("key", "val")))
 	if !ok {
 		t.Fatal("context without logger")
 	}
@@ -25,7 +25,7 @@ func TestContext(t *testing.T) {
 	}
 }
 
-func TestAttrs(t *testing.T) {
+func TestFields(t *testing.T) {
 	ctx := context.TODO()
 	buf := bytes.NewBuffer(nil)
 	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
@@ -33,7 +33,7 @@ func TestAttrs(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	nl := l.Attrs("key", "val")
+	nl := l.Fields("key", "val")
 
 	nl.Info(ctx, "message")
 	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
@@ -49,7 +49,7 @@ func TestFromContextWithFields(t *testing.T) {
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}
-	nl := l.Attrs("key", "val")
+	nl := l.Fields("key", "val")
 
 	ctx = NewContext(ctx, nl)
 
@@ -87,14 +87,14 @@ func TestClone(t *testing.T) {
 
 func TestRedirectStdLogger(t *testing.T) {
 	buf := bytes.NewBuffer(nil)
-	l := NewLogger(WithLevel(ErrorLevel), WithOutput(buf))
+	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"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"test"`))) {
+	if !bytes.Contains(buf.Bytes(), []byte(`"level":"error","msg":"test","timestamp"`)) {
 		t.Fatalf("logger error, buf %s", buf.Bytes())
 	}
 }
@@ -107,7 +107,7 @@ func TestStdLogger(t *testing.T) {
 	}
 	lg := NewStdLogger(l, ErrorLevel)
 	lg.Print("test")
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"error"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"test"`))) {
+	if !bytes.Contains(buf.Bytes(), []byte(`"level":"error","msg":"test","timestamp"`)) {
 		t.Fatalf("logger error, buf %s", buf.Bytes())
 	}
 }
@@ -121,19 +121,18 @@ func TestLogger(t *testing.T) {
 	}
 	l.Trace(ctx, "trace_msg1")
 	l.Warn(ctx, "warn_msg1")
-	l.Attrs("error", "test").Info(ctx, "error message")
+	l.Fields("error", "test").Info(ctx, "error message")
-	l.Warn(ctx, "first second")
+	l.Warn(ctx, "first", " ", "second")
-
+	if !bytes.Contains(buf.Bytes(), []byte(`"level":"trace","msg":"trace_msg1"`)) {
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"trace"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"trace_msg1"`))) {
+		t.Fatalf("logger error, buf %s", buf.Bytes())
-		t.Fatalf("logger tracer, buf %s", buf.Bytes())
 	}
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"warn"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"warn_msg1"`))) {
+	if !bytes.Contains(buf.Bytes(), []byte(`"warn","msg":"warn_msg1"`)) {
-		t.Fatalf("logger warn, buf %s", buf.Bytes())
+		t.Fatalf("logger error, buf %s", buf.Bytes())
 	}
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"info"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"error message","error":"test"`))) {
+	if !bytes.Contains(buf.Bytes(), []byte(`"error":"test","level":"info","msg":"error message"`)) {
-		t.Fatalf("logger info, buf %s", buf.Bytes())
+		t.Fatalf("logger error, buf %s", buf.Bytes())
 	}
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"warn"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"first second"`))) {
+	if !bytes.Contains(buf.Bytes(), []byte(`"level":"warn","msg":"first second"`)) {
-		t.Fatalf("logger warn, buf %s", buf.Bytes())
+		t.Fatalf("logger error, buf %s", buf.Bytes())
 	}
 }

logger/options.go

@@ -2,179 +2,82 @@ package logger
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"os"
-	"reflect"
-
-	"go.unistack.org/micro/v4/options"
-	rutil "go.unistack.org/micro/v4/util/reflect"
-	"golang.org/x/exp/slog"
 )
 
+// 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
-	// Attrs holds additional attributes
+	// Fields holds additional metadata
-	Attrs []interface{}
+	Fields []interface{}
 	// Name holds the logger name
 	Name string
 	// The logging level the logger should log
 	Level Level
 	// CallerSkipCount number of frmaes to skip
 	CallerSkipCount int
-	// ContextAttrFuncs contains funcs that executed before log func on context
-	ContextAttrFuncs []ContextAttrFunc
-	// TimeKey is the key used for the time of the log call
-	TimeKey string
-	// LevelKey is the key used for the level of the log call
-	LevelKey string
-	// MessageKey is the key used for the message of the log call
-	MessageKey string
-	// SourceKey is the key used for the source file and line of the log call
-	SourceKey string
 }
 
 // NewOptions creates new options struct
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
-		Level:            DefaultLevel,
+		Level:           DefaultLevel,
-		Attrs:            make([]interface{}, 0, 6),
+		Fields:          make([]interface{}, 0, 6),
-		Out:              os.Stderr,
+		Out:             os.Stderr,
-		CallerSkipCount:  DefaultCallerSkipCount,
+		CallerSkipCount: DefaultCallerSkipCount,
-		Context:          context.Background(),
+		Context:         context.Background(),
-		ContextAttrFuncs: DefaultContextAttrFuncs,
 	}
-
-	WithMicroKeys()(&options)
-
 	for _, o := range opts {
 		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))
-		}
-		fmt.Printf("EEEE %#+v\n", cv.Interface())
-		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
-		}
-		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
-		}
-		return nil
-	}
-}
-
-func WithSlogKeys() options.Option {
-	return func(src interface{}) error {
-		var err error
-		if err = options.Set(src, slog.TimeKey, ".TimeKey"); err != nil {
-			return err
-		}
-		if err = options.Set(src, slog.LevelKey, ".LevelKey"); err != nil {
-			return err
-		}
-		if err = options.Set(src, slog.MessageKey, ".MessageKey"); err != nil {
-			return err
-		}
-		if err = options.Set(src, slog.SourceKey, ".SourceKey"); err != nil {
-			return err
-		}
-		return nil
-	}
-}
-
-func WithMicroKeys() options.Option {
-	return func(src interface{}) error {
-		var err error
-		if err = options.Set(src, "timestamp", ".TimeKey"); err != nil {
-			return err
-		}
-		if err = options.Set(src, "level", ".LevelKey"); err != nil {
-			return err
-		}
-		if err = options.Set(src, "msg", ".MessageKey"); err != nil {
-			return err
-		}
-		if err = options.Set(src, "caller", ".SourceKey"); err != nil {
-			return err
-		}
-		return nil
 	}
 }

logger/slog.go

@@ -1,291 +0,0 @@
-package logger
-
-import (
-	"context"
-	"log/slog"
-	"os"
-	"runtime"
-	"strconv"
-	"time"
-
-	"go.unistack.org/micro/v4/options"
-)
-
-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 < DebugLevel:
-			a.Value = traceValue
-		case lvl < InfoLevel:
-			a.Value = debugValue
-		case lvl < WarnLevel:
-			a.Value = infoValue
-		case lvl < ErrorLevel:
-			a.Value = warnValue
-		case lvl < FatalLevel:
-			a.Value = errorValue
-		case lvl >= FatalLevel:
-			a.Value = fatalValue
-		default:
-			a.Value = infoValue
-		}
-	}
-
-	return a
-}
-
-type slogLogger struct {
-	slog    *slog.Logger
-	leveler *slog.LevelVar
-	opts    Options
-}
-
-func (s *slogLogger) Clone(opts ...options.Option) Logger {
-	options := s.opts
-
-	for _, o := range opts {
-		o(&options)
-	}
-
-	l := &slogLogger{
-		opts: options,
-	}
-
-	if slog, ok := s.opts.Context.Value(loggerKey{}).(*slog.Logger); ok {
-		l.slog = slog
-		return nil
-	}
-
-	l.leveler = new(slog.LevelVar)
-	handleOpt := &slog.HandlerOptions{
-		ReplaceAttr: s.renameAttr,
-		Level:       l.leveler,
-		AddSource:   true,
-	}
-	l.leveler.Set(loggerToSlogLevel(l.opts.Level))
-	handler := slog.NewJSONHandler(options.Out, handleOpt)
-	l.slog = slog.New(handler).With(options.Attrs...)
-
-	return l
-}
-
-func (s *slogLogger) V(level Level) bool {
-	return s.opts.Level.Enabled(level)
-}
-
-func (s *slogLogger) Level(level Level) {
-	s.leveler.Set(loggerToSlogLevel(level))
-}
-
-func (s *slogLogger) Options() Options {
-	return s.opts
-}
-
-func (s *slogLogger) Attrs(attrs ...interface{}) Logger {
-	nl := &slogLogger{opts: s.opts}
-	nl.leveler = new(slog.LevelVar)
-	nl.leveler.Set(s.leveler.Level())
-
-	handleOpt := &slog.HandlerOptions{
-		ReplaceAttr: nl.renameAttr,
-		Level:       s.leveler,
-		AddSource:   true,
-	}
-
-	handler := slog.NewJSONHandler(s.opts.Out, handleOpt)
-	nl.slog = slog.New(handler).With(attrs...)
-
-	return nl
-}
-
-func (s *slogLogger) Init(opts ...options.Option) error {
-	if len(s.opts.ContextAttrFuncs) == 0 {
-		s.opts.ContextAttrFuncs = DefaultContextAttrFuncs
-	}
-	for _, o := range opts {
-		if err := o(&s.opts); err != nil {
-			return err
-		}
-	}
-	if slog, ok := s.opts.Context.Value(loggerKey{}).(*slog.Logger); ok {
-		s.slog = slog
-		return nil
-	}
-
-	s.leveler = new(slog.LevelVar)
-	handleOpt := &slog.HandlerOptions{
-		ReplaceAttr: s.renameAttr,
-		Level:       s.leveler,
-		AddSource:   true,
-	}
-	s.leveler.Set(loggerToSlogLevel(s.opts.Level))
-	handler := slog.NewJSONHandler(s.opts.Out, handleOpt)
-	s.slog = slog.New(handler).With(s.opts.Attrs...)
-
-	return nil
-}
-
-func (s *slogLogger) Log(ctx context.Context, lvl 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(time.Now(), loggerToSlogLevel(lvl), msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	r.Add(attrs...)
-	_ = s.slog.Handler().Handle(ctx, r)
-}
-
-func (s *slogLogger) Info(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(time.Now(), slog.LevelInfo, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	r.Add(attrs...)
-	_ = s.slog.Handler().Handle(ctx, r)
-}
-
-func (s *slogLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(time.Now(), slog.LevelDebug, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	r.Add(attrs...)
-	_ = s.slog.Handler().Handle(ctx, r)
-}
-
-func (s *slogLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(time.Now(), slog.LevelDebug-1, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	r.Add(attrs...)
-	_ = s.slog.Handler().Handle(ctx, r)
-}
-
-func (s *slogLogger) Error(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(time.Now(), slog.LevelError, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	r.Add(attrs...)
-	_ = s.slog.Handler().Handle(ctx, r)
-}
-
-func (s *slogLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(time.Now(), slog.LevelError+1, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	r.Add(attrs...)
-	_ = s.slog.Handler().Handle(ctx, r)
-	os.Exit(1)
-}
-
-func (s *slogLogger) Warn(ctx context.Context, msg string, attrs ...interface{}) {
-	if !s.V(InfoLevel) {
-		return
-	}
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
-	r := slog.NewRecord(time.Now(), slog.LevelWarn, msg, pcs[0])
-	for _, fn := range s.opts.ContextAttrFuncs {
-		attrs = append(attrs, fn(ctx)...)
-	}
-	r.Add(attrs...)
-	_ = s.slog.Handler().Handle(ctx, r)
-}
-
-func (s *slogLogger) String() string {
-	return "slog"
-}
-
-func NewLogger(opts ...options.Option) Logger {
-	l := &slogLogger{
-		opts: NewOptions(opts...),
-	}
-	return l
-}
-
-func loggerToSlogLevel(level Level) slog.Level {
-	switch level {
-	case DebugLevel:
-		return slog.LevelDebug
-	case WarnLevel:
-		return slog.LevelWarn
-	case ErrorLevel:
-		return slog.LevelError
-	case TraceLevel:
-		return slog.LevelDebug - 1
-	case FatalLevel:
-		return slog.LevelError + 1
-	default:
-		return slog.LevelInfo
-	}
-}
-
-func slogToLoggerLevel(level slog.Level) Level {
-	switch level {
-	case slog.LevelDebug:
-		return DebugLevel
-	case slog.LevelWarn:
-		return WarnLevel
-	case slog.LevelError:
-		return ErrorLevel
-	case slog.LevelDebug - 1:
-		return TraceLevel
-	case slog.LevelError + 1:
-		return FatalLevel
-	default:
-		return InfoLevel
-	}
-}

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/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

@@ -39,6 +39,8 @@ func FromOutgoingContext(ctx context.Context) (Metadata, bool) {
 
 // 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
@@ -51,6 +53,8 @@ func FromContext(ctx context.Context) (Metadata, bool) {
 }
 
 // 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()

metadata/metadata.go

@@ -19,8 +19,6 @@ 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.

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()
+// Name sets the name
-		}
+func Name(n string) Option {
-		cv := reflect.ValueOf(v)
+	return func(o *Options) {
-		for _, l := range ls {
+		o.Name = n
-			reflect.Append(cv, reflect.ValueOf(l))
-		}
-		err = options.Set(src, cv, ".Labels")
-		return err
 	}
 }
 
 // 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,12 +7,43 @@ 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"
 )
 
 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"
+	// 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"
+	// 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"
+
 	labelSuccess  = "success"
 	labelFailure  = "failure"
 	labelStatus   = "status"
@@ -25,7 +56,7 @@ var (
 // Options struct
 type Options struct {
 	Meter         meter.Meter
-	lopts         []options.Option
+	lopts         []meter.Option
 	SkipEndpoints []string
 }
 
@@ -36,7 +67,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 +150,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 +180,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,25 +210,59 @@ 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
 }
 
+func (w *wrapper) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
+	endpoint := p.Topic()
+
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(PublishMessageInflight, labels...).Inc()
+	ts := time.Now()
+	err := w.Client.Publish(ctx, p, opts...)
+	te := time.Since(ts)
+	w.opts.Meter.Counter(PublishMessageInflight, labels...).Dec()
+
+	w.opts.Meter.Summary(PublishMessageLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(PublishMessageDurationSeconds, labels...).Update(te.Seconds())
+
+	if err == nil {
+		labels = append(labels, labelStatus, labelSuccess)
+	} else {
+		labels = append(labels, labelStatus, labelFailure)
+	}
+	w.opts.Meter.Counter(PublishMessageTotal, labels...).Inc()
+
+	return err
+}
+
+// NewHandlerWrapper create new server handler wrapper
+// deprecated
+func NewHandlerWrapper(opts ...Option) server.HandlerWrapper {
+	handler := &wrapper{
+		opts: NewOptions(opts...),
+	}
+	return handler.HandlerFunc
+}
+
 // NewServerHandlerWrapper create new server handler wrapper
 func NewServerHandlerWrapper(opts ...Option) server.HandlerWrapper {
 	handler := &wrapper{
@@ -218,21 +283,64 @@ 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
+	}
+}
+
+// NewSubscriberWrapper create server subscribe wrapper
+// deprecated
+func NewSubscriberWrapper(opts ...Option) server.SubscriberWrapper {
+	handler := &wrapper{
+		opts: NewOptions(opts...),
+	}
+	return handler.SubscriberFunc
+}
+
+func NewServerSubscriberWrapper(opts ...Option) server.SubscriberWrapper {
+	handler := &wrapper{
+		opts: NewOptions(opts...),
+	}
+	return handler.SubscriberFunc
+}
+
+func (w *wrapper) SubscriberFunc(fn server.SubscriberFunc) server.SubscriberFunc {
+	return func(ctx context.Context, msg server.Message) error {
+		endpoint := msg.Topic()
+
+		labels := make([]string, 0, 4)
+		labels = append(labels, labelEndpoint, endpoint)
+
+		w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Inc()
+		ts := time.Now()
+		err := fn(ctx, msg)
+		te := time.Since(ts)
+		w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Dec()
+
+		w.opts.Meter.Summary(SubscribeMessageLatencyMicroseconds, labels...).Update(te.Seconds())
+		w.opts.Meter.Histogram(SubscribeMessageDurationSeconds, labels...).Update(te.Seconds())
+
+		if err == nil {
+			labels = append(labels, labelStatus, labelSuccess)
+		} else {
+			labels = append(labels, labelStatus, labelFailure)
+		}
+		w.opts.Meter.Counter(SubscribeMessageTotal, labels...).Inc()
 
 		return err
 	}

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"
@@ -91,7 +90,33 @@ type Option func(*Options) error
 // Broker to be used for client and server
 func Broker(b broker.Broker, opts ...BrokerOption) Option {
 	return func(o *Options) error {
-		o.Brokers = []broker.Broker{b}
+		var err error
+		bopts := brokerOptions{}
+		for _, opt := range opts {
+			opt(&bopts)
+		}
+		all := false
+		if len(opts) == 0 {
+			all = true
+		}
+		for _, srv := range o.Servers {
+			for _, os := range bopts.servers {
+				if srv.Name() == os || all {
+					if err = srv.Init(server.Broker(b)); err != nil {
+						return err
+					}
+				}
+			}
+		}
+		for _, cli := range o.Clients {
+			for _, oc := range bopts.clients {
+				if cli.Name() == oc || all {
+					if err = cli.Init(client.Broker(b)); err != nil {
+						return err
+					}
+				}
+			}
+		}
 		return nil
 	}
 }
@@ -202,7 +227,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 +236,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 +245,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 +263,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 +272,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 +281,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 +355,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 +364,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 +421,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 +430,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 +439,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 +448,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 +547,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 +582,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,189 +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 metadata.Metadata) Option {
-	return func(src interface{}) error {
-		return Set(src, metadata.Copy(md), ".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,86 +0,0 @@
-package options_test
-
-import (
-	"testing"
-
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/options"
-)
-
-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")
-	}
-}

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

@@ -63,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)
 						}
@@ -150,7 +150,7 @@ func (m *memory) Register(ctx context.Context, s *Service, opts ...RegisterOptio
 	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(&Result{Action: "create", Service: s})
@@ -190,14 +190,14 @@ func (m *memory) Register(ctx context.Context, s *Service, opts ...RegisterOptio
 
 	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(&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()
@@ -242,7 +242,7 @@ func (m *memory) Deregister(ctx context.Context, s *Service, opts ...DeregisterO
 	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)
 		}
@@ -263,7 +263,7 @@ func (m *memory) Deregister(ctx context.Context, s *Service, opts ...DeregisterO
 		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
 	}
@@ -272,7 +272,7 @@ func (m *memory) Deregister(ctx context.Context, s *Service, opts ...DeregisterO
 	delete(m.records[options.Domain][s.Name], s.Version)
 	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
@@ -467,7 +467,7 @@ func serviceToRecord(s *Service, ttl time.Duration) *record {
 	}
 
 	endpoints := make([]*Endpoint, len(s.Endpoints))
-	for i, e := range s.Endpoints { // TODO: vtolstov use copy
+	for i, e := range s.Endpoints {
 		endpoints[i] = e
 	}
 

semconv/broker.go

@@ -1,20 +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"
-)

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,33 @@ 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)
+	}
+}
+
+// SetSubscriberOption returns a function to setup a context with given value
+func SetSubscriberOption(k, v interface{}) SubscriberOption {
+	return func(o *SubscriberOptions) {
+		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,25 @@ 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 TestSetSubscriberOption(t *testing.T) {
+	type key struct{}
+	o := SetSubscriberOption(key{}, "test")
+	opts := &SubscriberOptions{}
+	o(opts)
+
+	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
+		t.Fatal("SetSubscriberOption not works")
+	}
+}

server/handler.go

@@ -0,0 +1,59 @@
+package server
+
+import (
+	"reflect"
+
+	"go.unistack.org/micro/v4/register"
+)
+
+type rpcHandler struct {
+	opts      HandlerOptions
+	handler   interface{}
+	name      string
+	endpoints []*register.Endpoint
+}
+
+func newRPCHandler(handler interface{}, opts ...HandlerOption) Handler {
+	options := NewHandlerOptions(opts...)
+
+	typ := reflect.TypeOf(handler)
+	hdlr := reflect.ValueOf(handler)
+	name := reflect.Indirect(hdlr).Type().Name()
+
+	var endpoints []*register.Endpoint
+
+	for m := 0; m < typ.NumMethod(); m++ {
+		if e := register.ExtractEndpoint(typ.Method(m)); e != nil {
+			e.Name = name + "." + e.Name
+
+			for k, v := range options.Metadata[e.Name] {
+				e.Metadata[k] = v
+			}
+
+			endpoints = append(endpoints, e)
+		}
+	}
+
+	return &rpcHandler{
+		name:      name,
+		handler:   handler,
+		endpoints: endpoints,
+		opts:      options,
+	}
+}
+
+func (r *rpcHandler) Name() string {
+	return r.name
+}
+
+func (r *rpcHandler) Handler() interface{} {
+	return r.handler
+}
+
+func (r *rpcHandler) Endpoints() []*register.Endpoint {
+	return r.endpoints
+}
+
+func (r *rpcHandler) Options() HandlerOptions {
+	return r.opts
+}

server/noop.go

@@ -1,14 +1,14 @@
 package server
 
 import (
-	"reflect"
+	"fmt"
 	"sort"
 	"sync"
 	"time"
 
+	"go.unistack.org/micro/v4/broker"
 	"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,23 +20,31 @@ 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
+	wg          *sync.WaitGroup
-	rsvc     *register.Service
+	rsvc        *register.Service
-	handlers map[string]*rpcHandler
+	handlers    map[string]Handler
-	exit     chan chan error
+	subscribers map[*subscriber][]broker.Subscriber
-	opts     Options
+	exit        chan chan error
+	opts        Options
 	sync.RWMutex
 	registered bool
 	started    bool
 }
 
 // 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.subscribers == nil {
+		n.subscribers = make(map[*subscriber][]broker.Subscriber)
 	}
 	if n.exit == nil {
 		n.exit = make(chan chan error)
@@ -44,8 +52,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 +71,47 @@ func (n *noopServer) Name() string {
 	return n.opts.Name
 }
 
-func (n *noopServer) Init(opts ...options.Option) error {
+func (n *noopServer) Subscribe(sb Subscriber) error {
+	sub, ok := sb.(*subscriber)
+	if !ok {
+		return fmt.Errorf("invalid subscriber: expected *subscriber")
+	} else if len(sub.handlers) == 0 {
+		return fmt.Errorf("invalid subscriber: no handler functions")
+	}
+
+	if err := ValidateSubscriber(sb); err != nil {
+		return err
+	}
+
+	n.Lock()
+	if _, ok = n.subscribers[sub]; ok {
+		n.Unlock()
+		return fmt.Errorf("subscriber %v already exists", sub)
+	}
+
+	n.subscribers[sub] = nil
+	n.Unlock()
+	return nil
+}
+
+func (n *noopServer) NewHandler(h interface{}, opts ...HandlerOption) Handler {
+	return newRPCHandler(h, opts...)
+}
+
+func (n *noopServer) NewSubscriber(topic string, sb interface{}, opts ...SubscriberOption) Subscriber {
+	return newSubscriber(topic, sb, 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.subscribers == nil {
+		n.subscribers = make(map[*subscriber][]broker.Subscriber, 1)
 	}
 
 	if n.exit == nil {
@@ -106,10 +158,21 @@ func (n *noopServer) Register() error {
 
 	sort.Strings(handlerList)
 
-	endpoints := make([]*register.Endpoint, 0, len(handlerList))
+	subscriberList := make([]*subscriber, 0, len(n.subscribers))
+	for e := range n.subscribers {
+		subscriberList = append(subscriberList, e)
+	}
+	sort.Slice(subscriberList, func(i, j int) bool {
+		return subscriberList[i].topic > subscriberList[j].topic
+	})
+
+	endpoints := make([]*register.Endpoint, 0, len(handlerList)+len(subscriberList))
 	for _, h := range handlerList {
 		endpoints = append(endpoints, n.handlers[h].Endpoints()...)
 	}
+	for _, e := range subscriberList {
+		endpoints = append(endpoints, e.Endpoints()...)
+	}
 	n.RUnlock()
 
 	service.Nodes[0].Metadata["protocol"] = "noop"
@@ -122,7 +185,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)
 		}
 	}
 
@@ -139,6 +202,39 @@ func (n *noopServer) Register() error {
 	n.Lock()
 	defer n.Unlock()
 
+	cx := config.Context
+
+	var sub broker.Subscriber
+
+	for sb := range n.subscribers {
+		if sb.Options().Context != nil {
+			cx = sb.Options().Context
+		}
+
+		opts := []broker.SubscribeOption{broker.SubscribeContext(cx), broker.SubscribeAutoAck(sb.Options().AutoAck)}
+		if queue := sb.Options().Queue; len(queue) > 0 {
+			opts = append(opts, broker.SubscribeGroup(queue))
+		}
+
+		if sb.Options().Batch {
+			// batch processing handler
+			sub, err = config.Broker.BatchSubscribe(cx, sb.Topic(), n.newBatchSubHandler(sb, config), opts...)
+		} else {
+			// single processing handler
+			sub, err = config.Broker.Subscribe(cx, sb.Topic(), n.newSubHandler(sb, config), opts...)
+		}
+
+		if err != nil {
+			return err
+		}
+
+		if config.Logger.V(logger.InfoLevel) {
+			config.Logger.Infof(n.opts.Context, "subscribing to topic: %s", sb.Topic())
+		}
+
+		n.subscribers[sb] = []broker.Subscriber{sub}
+	}
+
 	n.registered = true
 	if cacheService {
 		n.rsvc = service
@@ -160,7 +256,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 {
@@ -177,6 +273,33 @@ func (n *noopServer) Deregister() error {
 
 	n.registered = false
 
+	cx := config.Context
+
+	wg := sync.WaitGroup{}
+	for sb, subs := range n.subscribers {
+		for idx := range subs {
+			if sb.Options().Context != nil {
+				cx = sb.Options().Context
+			}
+
+			ncx := cx
+			wg.Add(1)
+			go func(s broker.Subscriber) {
+				defer wg.Done()
+				if config.Logger.V(logger.InfoLevel) {
+					config.Logger.Infof(n.opts.Context, "unsubscribing from topic: %s", s.Topic())
+				}
+				if err := s.Unsubscribe(ncx); err != nil {
+					if config.Logger.V(logger.ErrorLevel) {
+						config.Logger.Errorf(n.opts.Context, "unsubscribing from topic: %s err: %v", s.Topic(), err)
+					}
+				}
+			}(subs[idx])
+		}
+		n.subscribers[sb] = nil
+	}
+	wg.Wait()
+
 	n.Unlock()
 	return nil
 }
@@ -204,7 +327,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()
@@ -213,17 +336,32 @@ func (n *noopServer) Start() error {
 	}
 	n.Unlock()
 
+	// only connect if we're subscribed
+	if len(n.subscribers) > 0 {
+		// connect to the broker
+		if err := config.Broker.Connect(config.Context); err != nil {
+			if config.Logger.V(logger.ErrorLevel) {
+				config.Logger.Errorf(n.opts.Context, "broker [%s] connect error: %v", config.Broker.String(), err)
+			}
+			return err
+		}
+
+		if config.Logger.V(logger.InfoLevel) {
+			config.Logger.Infof(n.opts.Context, "broker [%s] Connected to %s", config.Broker.String(), config.Broker.Address())
+		}
+	}
+
 	// use RegisterCheck func before register
 	// 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 +390,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 +418,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)
 			}
 		}
 
@@ -291,6 +429,16 @@ func (n *noopServer) Start() error {
 
 		// close transport
 		ch <- nil
+
+		if config.Logger.V(logger.InfoLevel) {
+			config.Logger.Infof(n.opts.Context, "broker [%s] Disconnected from %s", config.Broker.String(), config.Broker.Address())
+		}
+		// disconnect broker
+		if err := config.Broker.Disconnect(config.Context); err != nil {
+			if config.Logger.V(logger.ErrorLevel) {
+				config.Logger.Errorf(n.opts.Context, "broker [%s] disconnect error: %v", config.Broker.String(), err)
+			}
+		}
 	}()
 
 	// mark the server as started
@@ -320,55 +468,3 @@ func (n *noopServer) Stop() error {
 
 	return err
 }
-
-type rpcHandler struct {
-	opts      HandleOptions
-	handler   interface{}
-	name      string
-	endpoints []*register.Endpoint
-}
-
-func newRPCHandler(handler interface{}, opts ...options.Option) *rpcHandler {
-	options := NewHandleOptions(opts...)
-
-	typ := reflect.TypeOf(handler)
-	hdlr := reflect.ValueOf(handler)
-	name := reflect.Indirect(hdlr).Type().Name()
-
-	var endpoints []*register.Endpoint
-
-	for m := 0; m < typ.NumMethod(); m++ {
-		if e := register.ExtractEndpoint(typ.Method(m)); e != nil {
-			e.Name = name + "." + e.Name
-
-			for k, v := range options.Metadata[e.Name] {
-				e.Metadata[k] = v
-			}
-
-			endpoints = append(endpoints, e)
-		}
-	}
-
-	return &rpcHandler{
-		name:      name,
-		handler:   handler,
-		endpoints: endpoints,
-		opts:      options,
-	}
-}
-
-func (r *rpcHandler) Name() string {
-	return r.name
-}
-
-func (r *rpcHandler) Handler() interface{} {
-	return r.handler
-}
-
-func (r *rpcHandler) Endpoints() []*register.Endpoint {
-	return r.endpoints
-}
-
-func (r *rpcHandler) Options() HandleOptions {
-	return r.opts
-}

server/noop_test.go

@@ -0,0 +1,104 @@
+package server_test
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/server"
+)
+
+type TestHandler struct {
+	t *testing.T
+}
+
+type TestMessage struct {
+	Name string
+}
+
+func (h *TestHandler) SingleSubHandler(ctx context.Context, msg *codec.Frame) error {
+	// fmt.Printf("msg %s\n", msg.Data)
+	return nil
+}
+
+func (h *TestHandler) BatchSubHandler(ctxs []context.Context, msgs []*codec.Frame) error {
+	if len(msgs) != 8 {
+		h.t.Fatal("invalid number of messages received")
+	}
+	for idx := 0; idx < len(msgs); idx++ {
+		md, _ := metadata.FromIncomingContext(ctxs[idx])
+		_ = md
+		//	fmt.Printf("msg md %v\n", md)
+	}
+	return nil
+}
+
+func TestNoopSub(t *testing.T) {
+	ctx := context.Background()
+
+	b := broker.NewBroker()
+
+	if err := b.Init(); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := b.Connect(ctx); err != nil {
+		t.Fatal(err)
+	}
+
+	logger.DefaultLogger.Init(logger.WithLevel(logger.ErrorLevel))
+	s := server.NewServer(
+		server.Broker(b),
+		server.Codec("application/octet-stream", codec.NewCodec()),
+	)
+	if err := s.Init(); err != nil {
+		t.Fatal(err)
+	}
+
+	c := client.NewClient(
+		client.Broker(b),
+		client.Codec("application/octet-stream", codec.NewCodec()),
+		client.ContentType("application/octet-stream"),
+	)
+	if err := c.Init(); err != nil {
+		t.Fatal(err)
+	}
+	h := &TestHandler{t: t}
+
+	if err := s.Subscribe(s.NewSubscriber("single_topic", h.SingleSubHandler,
+		server.SubscriberQueue("queue"),
+	)); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := s.Subscribe(s.NewSubscriber("batch_topic", h.BatchSubHandler,
+		server.SubscriberQueue("queue"),
+		server.SubscriberBatch(true),
+	)); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := s.Start(); err != nil {
+		t.Fatal(err)
+	}
+
+	msgs := make([]client.Message, 0, 8)
+	for i := 0; i < 8; i++ {
+		msgs = append(msgs, c.NewMessage("batch_topic", &codec.Frame{Data: []byte(fmt.Sprintf(`{"name": "test_name %d"}`, i))}))
+	}
+
+	if err := c.BatchPublish(ctx, msgs); err != nil {
+		t.Fatal(err)
+	}
+
+	defer func() {
+		if err := s.Stop(); err != nil {
+			t.Fatal(err)
+		}
+	}()
+}

server/options.go

@@ -7,20 +7,27 @@ import (
 	"sync"
 	"time"
 
+	"go.unistack.org/micro/v4/broker"
 	"go.unistack.org/micro/v4/codec"
 	"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"
 	"go.unistack.org/micro/v4/tracer"
 	"go.unistack.org/micro/v4/util/id"
 )
 
+// Option func
+type Option func(*Options)
+
 // Options server struct
 type Options struct {
 	// Context holds the external options and can be used for server shutdown
 	Context context.Context
+	// Broker holds the server broker
+	Broker broker.Broker
 	// Register holds the register
 	Register register.Register
 	// Tracer holds the tracer
@@ -29,6 +36,14 @@ type Options struct {
 	Logger logger.Logger
 	// Meter holds the meter
 	Meter meter.Meter
+	// Transport holds the transport
+	Transport transport.Transport
+
+	/*
+		// Router for requests
+		Router Router
+	*/
+
 	// Listener may be passed if already created
 	Listener net.Listener
 	// Wait group
@@ -53,6 +68,12 @@ type Options struct {
 	Advertise string
 	// Version holds the server version
 	Version string
+	// SubWrappers holds the server subscribe wrappers
+	SubWrappers []SubscriberWrapper
+	// BatchSubWrappers holds the server batch subscribe wrappers
+	BatchSubWrappers []BatchSubscriberWrapper
+	// 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
@@ -63,12 +84,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 SubscriberWrapper, HandlerWrapper or Server func wrapper
 	Hooks options.Hooks
 }
 
 // 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(),
@@ -79,11 +100,14 @@ func NewOptions(opts ...options.Option) Options {
 		Logger:           logger.DefaultLogger,
 		Meter:            meter.DefaultMeter,
 		Tracer:           tracer.DefaultTracer,
+		Broker:           broker.DefaultBroker,
 		Register:         register.DefaultRegister,
+		Transport:        transport.DefaultTransport,
 		Address:          DefaultAddress,
 		Name:             DefaultName,
 		Version:          DefaultVersion,
 		ID:               id.Must(),
+		Namespace:        DefaultNamespace,
 	}
 
 	for _, o := range opts {
@@ -93,86 +117,221 @@ 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
+	}
+}
+
+// Broker to use for pub/sub
+func Broker(b broker.Broker) Option {
+	return func(o *Options) {
+		o.Broker = b
+	}
+}
+
+// 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),
+		)
+	}
+}
+
+/*
+// WithRouter sets the request router
+func WithRouter(r Router) Option {
+	return func(o *Options) {
+		o.Router = r
+	}
+}
+*/
+
 // Wait tells the server to wait for requests to finish before exiting
 // 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 {
-	if wg == nil {
+	return func(o *Options) {
-		wg = new(sync.WaitGroup)
+		if wg == nil {
+			wg = new(sync.WaitGroup)
+		}
+		o.Wait = wg
 	}
-	return func(src interface{}) error {
+}
-		return options.Set(src, wg, ".Wait")
+
+// WrapHandler adds a handler Wrapper to a list of options passed into the server
+func WrapHandler(w HandlerWrapper) Option {
+	return func(o *Options) {
+		o.HdlrWrappers = append(o.HdlrWrappers, w)
+	}
+}
+
+// WrapSubscriber adds a subscriber Wrapper to a list of options passed into the server
+func WrapSubscriber(w SubscriberWrapper) Option {
+	return func(o *Options) {
+		o.SubWrappers = append(o.SubWrappers, w)
+	}
+}
+
+// WrapBatchSubscriber adds a batch subscriber Wrapper to a list of options passed into the server
+func WrapBatchSubscriber(w BatchSubscriberWrapper) Option {
+	return func(o *Options) {
+		o.BatchSubWrappers = append(o.BatchSubWrappers, 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
 	}
 }
 
-// HandleOptions struct
+// HandlerOption func
-type HandleOptions struct {
+type HandlerOption func(*HandlerOptions)
+
+// HandlerOptions 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),
 	}
@@ -183,3 +342,111 @@ func NewHandleOptions(opts ...options.Option) HandleOptions {
 
 	return options
 }
+
+// SubscriberOption func
+type SubscriberOption func(*SubscriberOptions)
+
+// SubscriberOptions struct
+type SubscriberOptions struct {
+	// Context holds the external options
+	Context context.Context
+	// Queue holds the subscription queue
+	Queue string
+	// AutoAck flag for auto ack messages after processing
+	AutoAck bool
+	// BodyOnly flag specifies that message without headers
+	BodyOnly bool
+	// Batch flag specifies that message processed in batches
+	Batch bool
+	// BatchSize flag specifies max size of batch
+	BatchSize int
+	// BatchWait flag specifies max wait time for batch filling
+	BatchWait time.Duration
+}
+
+// NewSubscriberOptions create new SubscriberOptions
+func NewSubscriberOptions(opts ...SubscriberOption) SubscriberOptions {
+	options := SubscriberOptions{
+		AutoAck: true,
+		Context: context.Background(),
+	}
+
+	for _, o := range opts {
+		o(&options)
+	}
+
+	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)
+	}
+}
+
+// DisableAutoAck will disable auto acking of messages
+// after they have been handled.
+func DisableAutoAck() SubscriberOption {
+	return func(o *SubscriberOptions) {
+		o.AutoAck = false
+	}
+}
+
+// SubscriberQueue sets the shared queue name distributed messages across subscribers
+func SubscriberQueue(n string) SubscriberOption {
+	return func(o *SubscriberOptions) {
+		o.Queue = n
+	}
+}
+
+// SubscriberGroup sets the shared group name distributed messages across subscribers
+func SubscriberGroup(n string) SubscriberOption {
+	return func(o *SubscriberOptions) {
+		o.Queue = n
+	}
+}
+
+// SubscriberBodyOnly says broker that message contains raw data with absence of micro broker.Message format
+func SubscriberBodyOnly(b bool) SubscriberOption {
+	return func(o *SubscriberOptions) {
+		o.BodyOnly = b
+	}
+}
+
+// SubscriberContext set context options to allow broker SubscriberOption passed
+func SubscriberContext(ctx context.Context) SubscriberOption {
+	return func(o *SubscriberOptions) {
+		o.Context = ctx
+	}
+}
+
+// SubscriberAck control auto ack processing for handler
+func SubscriberAck(b bool) SubscriberOption {
+	return func(o *SubscriberOptions) {
+		o.AutoAck = b
+	}
+}
+
+// SubscriberBatch control batch processing for handler
+func SubscriberBatch(b bool) SubscriberOption {
+	return func(o *SubscriberOptions) {
+		o.Batch = b
+	}
+}
+
+// SubscriberBatchSize control batch filling size for handler
+// Batch filling max waiting time controlled by SubscriberBatchWait
+func SubscriberBatchSize(n int) SubscriberOption {
+	return func(o *SubscriberOptions) {
+		o.BatchSize = n
+	}
+}
+
+// SubscriberBatchWait control batch filling wait time for handler
+func SubscriberBatchWait(td time.Duration) SubscriberOption {
+	return func(o *SubscriberOptions) {
+		o.BatchWait = td
+	}
+}

server/registry.go

@@ -78,6 +78,7 @@ func NewRegisterService(s Server) (*register.Service, error) {
 	node.Metadata = metadata.Copy(opts.Metadata)
 
 	node.Metadata["server"] = s.String()
+	node.Metadata["broker"] = opts.Broker.String()
 	node.Metadata["register"] = opts.Register.String()
 
 	return &register.Service{

server/request.go

@@ -0,0 +1,35 @@
+package server
+
+import (
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/metadata"
+)
+
+type rpcMessage struct {
+	payload     interface{}
+	codec       codec.Codec
+	header      metadata.Metadata
+	topic       string
+	contentType string
+	body        []byte
+}
+
+func (r *rpcMessage) ContentType() string {
+	return r.contentType
+}
+
+func (r *rpcMessage) Topic() string {
+	return r.topic
+}
+
+func (r *rpcMessage) Body() interface{} {
+	return r.payload
+}
+
+func (r *rpcMessage) Header() metadata.Metadata {
+	return r.header
+}
+
+func (r *rpcMessage) Codec() codec.Codec {
+	return r.codec
+}

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,7 +26,9 @@ 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
@@ -39,11 +41,17 @@ 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
+	// Create a new subscriber
+	NewSubscriber(topic string, h interface{}, opts ...SubscriberOption) Subscriber
+	// Register a subscriber
+	Subscribe(s Subscriber) error
 	// Start the server
 	Start() error
 	// Stop the server
@@ -52,6 +60,30 @@ type Server interface {
 	String() string
 }
 
+/*
+// Router handle serving messages
+type Router interface {
+	// ProcessMessage processes a message
+	ProcessMessage(ctx context.Context, msg Message) error
+	// ServeRequest processes a request to completion
+	ServeRequest(ctx context.Context, req Request, rsp Response) error
+}
+*/
+
+// Message is an async message interface
+type Message interface {
+	// Topic of the message
+	Topic() string
+	// The decoded payload value
+	Body() interface{}
+	// The content type of the payload
+	ContentType() string
+	// The raw headers of the message
+	Header() metadata.Metadata
+	// Codec used to decode the message
+	Codec() codec.Codec
+}
+
 // Request is a synchronous request interface
 type Request interface {
 	// Service name requested
@@ -106,3 +138,32 @@ 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
+}
+
+// Subscriber interface represents a subscription to a given topic using
+// a specific subscriber function or object with endpoints. It mirrors
+// the handler in its behaviour.
+type Subscriber interface {
+	Topic() string
+	Subscriber() interface{}
+	Endpoints() []*register.Endpoint
+	Options() SubscriberOptions
+}

server/subscriber.go

@@ -0,0 +1,440 @@
+package server
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"reflect"
+	"runtime/debug"
+	"strings"
+	"unicode"
+	"unicode/utf8"
+
+	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/errors"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/register"
+)
+
+const (
+	subSig      = "func(context.Context, interface{}) error"
+	batchSubSig = "func([]context.Context, []interface{}) error"
+)
+
+// Precompute the reflect type for error. Can't use error directly
+// because Typeof takes an empty interface value. This is annoying.
+var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
+
+type handler struct {
+	reqType reflect.Type
+	ctxType reflect.Type
+	method  reflect.Value
+}
+
+type subscriber struct {
+	typ        reflect.Type
+	subscriber interface{}
+	topic      string
+	endpoints  []*register.Endpoint
+	handlers   []*handler
+	opts       SubscriberOptions
+	rcvr       reflect.Value
+}
+
+// Is this an exported - upper case - name?
+func isExported(name string) bool {
+	rune, _ := utf8.DecodeRuneInString(name)
+	return unicode.IsUpper(rune)
+}
+
+// Is this type exported or a builtin?
+func isExportedOrBuiltinType(t reflect.Type) bool {
+	for t.Kind() == reflect.Ptr {
+		t = t.Elem()
+	}
+	// PkgPath will be non-empty even for an exported type,
+	// so we need to check the type name as well.
+	return isExported(t.Name()) || t.PkgPath() == ""
+}
+
+// ValidateSubscriber func signature
+func ValidateSubscriber(sub Subscriber) error {
+	typ := reflect.TypeOf(sub.Subscriber())
+	var argType reflect.Type
+	switch typ.Kind() {
+	case reflect.Func:
+		name := "Func"
+		switch typ.NumIn() {
+		case 2:
+			argType = typ.In(1)
+			if sub.Options().Batch {
+				if argType.Kind() != reflect.Slice {
+					return fmt.Errorf("subscriber %v dont have required signature %s", name, batchSubSig)
+				}
+				if strings.Compare(fmt.Sprintf("%v", argType), "[]interface{}") == 0 {
+					return fmt.Errorf("subscriber %v dont have required signaure %s", name, batchSubSig)
+				}
+			}
+		default:
+			return fmt.Errorf("subscriber %v takes wrong number of args: %v required signature %s or %s", name, typ.NumIn(), subSig, batchSubSig)
+		}
+		if !isExportedOrBuiltinType(argType) {
+			return fmt.Errorf("subscriber %v argument type not exported: %v", name, argType)
+		}
+		if typ.NumOut() != 1 {
+			return fmt.Errorf("subscriber %v has wrong number of return values: %v require signature %s or %s",
+				name, typ.NumOut(), subSig, batchSubSig)
+		}
+		if returnType := typ.Out(0); returnType != typeOfError {
+			return fmt.Errorf("subscriber %v returns %v not error", name, returnType.String())
+		}
+	default:
+		hdlr := reflect.ValueOf(sub.Subscriber())
+		name := reflect.Indirect(hdlr).Type().Name()
+
+		for m := 0; m < typ.NumMethod(); m++ {
+			method := typ.Method(m)
+			switch method.Type.NumIn() {
+			case 3:
+				argType = method.Type.In(2)
+			default:
+				return fmt.Errorf("subscriber %v.%v takes wrong number of args: %v required signature %s or %s",
+					name, method.Name, method.Type.NumIn(), subSig, batchSubSig)
+			}
+
+			if !isExportedOrBuiltinType(argType) {
+				return fmt.Errorf("%v argument type not exported: %v", name, argType)
+			}
+			if method.Type.NumOut() != 1 {
+				return fmt.Errorf(
+					"subscriber %v.%v has wrong number of return values: %v require signature %s or %s",
+					name, method.Name, method.Type.NumOut(), subSig, batchSubSig)
+			}
+			if returnType := method.Type.Out(0); returnType != typeOfError {
+				return fmt.Errorf("subscriber %v.%v returns %v not error", name, method.Name, returnType.String())
+			}
+		}
+	}
+
+	return nil
+}
+
+func newSubscriber(topic string, sub interface{}, opts ...SubscriberOption) Subscriber {
+	var endpoints []*register.Endpoint
+	var handlers []*handler
+
+	options := NewSubscriberOptions(opts...)
+
+	if typ := reflect.TypeOf(sub); typ.Kind() == reflect.Func {
+		h := &handler{
+			method: reflect.ValueOf(sub),
+		}
+
+		switch typ.NumIn() {
+		case 1:
+			h.reqType = typ.In(0)
+		case 2:
+			h.ctxType = typ.In(0)
+			h.reqType = typ.In(1)
+		}
+
+		handlers = append(handlers, h)
+		ep := &register.Endpoint{
+			Name:     "Func",
+			Request:  register.ExtractSubValue(typ),
+			Metadata: metadata.New(2),
+		}
+		ep.Metadata.Set("topic", topic)
+		ep.Metadata.Set("subscriber", "true")
+		endpoints = append(endpoints, ep)
+	} else {
+		hdlr := reflect.ValueOf(sub)
+		name := reflect.Indirect(hdlr).Type().Name()
+
+		for m := 0; m < typ.NumMethod(); m++ {
+			method := typ.Method(m)
+			h := &handler{
+				method: method.Func,
+			}
+
+			switch method.Type.NumIn() {
+			case 2:
+				h.reqType = method.Type.In(1)
+			case 3:
+				h.ctxType = method.Type.In(1)
+				h.reqType = method.Type.In(2)
+			}
+
+			handlers = append(handlers, h)
+			ep := &register.Endpoint{
+				Name:     name + "." + method.Name,
+				Request:  register.ExtractSubValue(method.Type),
+				Metadata: metadata.New(2),
+			}
+			ep.Metadata.Set("topic", topic)
+			ep.Metadata.Set("subscriber", "true")
+			endpoints = append(endpoints, ep)
+		}
+	}
+
+	return &subscriber{
+		rcvr:       reflect.ValueOf(sub),
+		typ:        reflect.TypeOf(sub),
+		topic:      topic,
+		subscriber: sub,
+		handlers:   handlers,
+		endpoints:  endpoints,
+		opts:       options,
+	}
+}
+
+//nolint:gocyclo
+func (n *noopServer) newBatchSubHandler(sb *subscriber, opts Options) broker.BatchHandler {
+	return func(ps broker.Events) (err error) {
+		defer func() {
+			if r := recover(); r != nil {
+				n.RLock()
+				config := n.opts
+				n.RUnlock()
+				if config.Logger.V(logger.ErrorLevel) {
+					config.Logger.Error(n.opts.Context, "panic recovered: ", r)
+					config.Logger.Error(n.opts.Context, string(debug.Stack()))
+				}
+				err = errors.InternalServerError(n.opts.Name+".subscriber", "panic recovered: %v", r)
+			}
+		}()
+
+		msgs := make([]Message, 0, len(ps))
+		ctxs := make([]context.Context, 0, len(ps))
+		for _, p := range ps {
+			msg := p.Message()
+			// if we don't have headers, create empty map
+			if msg.Header == nil {
+				msg.Header = metadata.New(2)
+			}
+
+			ct, _ := msg.Header.Get(metadata.HeaderContentType)
+			if len(ct) == 0 {
+				msg.Header.Set(metadata.HeaderContentType, defaultContentType)
+				ct = defaultContentType
+			}
+			hdr := metadata.Copy(msg.Header)
+			topic, _ := msg.Header.Get(metadata.HeaderTopic)
+			ctxs = append(ctxs, metadata.NewIncomingContext(sb.opts.Context, hdr))
+			msgs = append(msgs, &rpcMessage{
+				topic:       topic,
+				contentType: ct,
+				header:      msg.Header,
+				body:        msg.Body,
+			})
+		}
+		results := make(chan error, len(sb.handlers))
+
+		for i := 0; i < len(sb.handlers); i++ {
+			handler := sb.handlers[i]
+
+			var req reflect.Value
+
+			switch handler.reqType.Kind() {
+			case reflect.Ptr:
+				req = reflect.New(handler.reqType.Elem())
+			default:
+				req = reflect.New(handler.reqType.Elem()).Elem()
+			}
+
+			reqType := handler.reqType
+			var cf codec.Codec
+			for _, msg := range msgs {
+				cf, err = n.newCodec(msg.ContentType())
+				if err != nil {
+					return err
+				}
+				rb := reflect.New(req.Type().Elem())
+				if err = cf.ReadBody(bytes.NewReader(msg.(*rpcMessage).body), rb.Interface()); err != nil {
+					return err
+				}
+				msg.(*rpcMessage).codec = cf
+				msg.(*rpcMessage).payload = rb.Interface()
+			}
+
+			fn := func(ctxs []context.Context, ms []Message) error {
+				var vals []reflect.Value
+				if sb.typ.Kind() != reflect.Func {
+					vals = append(vals, sb.rcvr)
+				}
+				if handler.ctxType != nil {
+					vals = append(vals, reflect.ValueOf(ctxs))
+				}
+				payloads := reflect.MakeSlice(reqType, 0, len(ms))
+				for _, m := range ms {
+					payloads = reflect.Append(payloads, reflect.ValueOf(m.Body()))
+				}
+				vals = append(vals, payloads)
+
+				returnValues := handler.method.Call(vals)
+				if rerr := returnValues[0].Interface(); rerr != nil {
+					return rerr.(error)
+				}
+				return nil
+			}
+
+			for i := len(opts.BatchSubWrappers); i > 0; i-- {
+				fn = opts.BatchSubWrappers[i-1](fn)
+			}
+
+			if n.wg != nil {
+				n.wg.Add(1)
+			}
+			go func() {
+				if n.wg != nil {
+					defer n.wg.Done()
+				}
+				results <- fn(ctxs, msgs)
+			}()
+		}
+
+		var errors []string
+		for i := 0; i < len(sb.handlers); i++ {
+			if rerr := <-results; rerr != nil {
+				errors = append(errors, rerr.Error())
+			}
+		}
+		if len(errors) > 0 {
+			err = fmt.Errorf("subscriber error: %s", strings.Join(errors, "\n"))
+		}
+		return err
+	}
+}
+
+//nolint:gocyclo
+func (n *noopServer) newSubHandler(sb *subscriber, opts Options) broker.Handler {
+	return func(p broker.Event) (err error) {
+		defer func() {
+			if r := recover(); r != nil {
+				n.RLock()
+				config := n.opts
+				n.RUnlock()
+				if config.Logger.V(logger.ErrorLevel) {
+					config.Logger.Error(n.opts.Context, "panic recovered: ", r)
+					config.Logger.Error(n.opts.Context, string(debug.Stack()))
+				}
+				err = errors.InternalServerError(n.opts.Name+".subscriber", "panic recovered: %v", r)
+			}
+		}()
+
+		msg := p.Message()
+		// if we don't have headers, create empty map
+		if msg.Header == nil {
+			msg.Header = metadata.New(2)
+		}
+
+		ct := msg.Header["Content-Type"]
+		if len(ct) == 0 {
+			msg.Header.Set(metadata.HeaderContentType, defaultContentType)
+			ct = defaultContentType
+		}
+		cf, err := n.newCodec(ct)
+		if err != nil {
+			return err
+		}
+
+		hdr := metadata.New(len(msg.Header))
+		for k, v := range msg.Header {
+			if k == "Content-Type" {
+				continue
+			}
+			hdr.Set(k, v)
+		}
+
+		ctx := metadata.NewIncomingContext(sb.opts.Context, hdr)
+
+		results := make(chan error, len(sb.handlers))
+
+		for i := 0; i < len(sb.handlers); i++ {
+			handler := sb.handlers[i]
+
+			var isVal bool
+			var req reflect.Value
+
+			if handler.reqType.Kind() == reflect.Ptr {
+				req = reflect.New(handler.reqType.Elem())
+			} else {
+				req = reflect.New(handler.reqType)
+				isVal = true
+			}
+			if isVal {
+				req = req.Elem()
+			}
+
+			if err = cf.ReadBody(bytes.NewBuffer(msg.Body), req.Interface()); err != nil {
+				return err
+			}
+
+			fn := func(ctx context.Context, msg Message) error {
+				var vals []reflect.Value
+				if sb.typ.Kind() != reflect.Func {
+					vals = append(vals, sb.rcvr)
+				}
+				if handler.ctxType != nil {
+					vals = append(vals, reflect.ValueOf(ctx))
+				}
+
+				vals = append(vals, reflect.ValueOf(msg.Body()))
+
+				returnValues := handler.method.Call(vals)
+				if rerr := returnValues[0].Interface(); rerr != nil {
+					return rerr.(error)
+				}
+				return nil
+			}
+
+			for i := len(opts.SubWrappers); i > 0; i-- {
+				fn = opts.SubWrappers[i-1](fn)
+			}
+
+			if n.wg != nil {
+				n.wg.Add(1)
+			}
+			go func() {
+				if n.wg != nil {
+					defer n.wg.Done()
+				}
+				cerr := fn(ctx, &rpcMessage{
+					topic:       sb.topic,
+					contentType: ct,
+					payload:     req.Interface(),
+					header:      msg.Header,
+				})
+				results <- cerr
+			}()
+		}
+		var errors []string
+		for i := 0; i < len(sb.handlers); i++ {
+			if rerr := <-results; rerr != nil {
+				errors = append(errors, rerr.Error())
+			}
+		}
+		if len(errors) > 0 {
+			err = fmt.Errorf("subscriber error: %s", strings.Join(errors, "\n"))
+		}
+		return err
+	}
+}
+
+func (s *subscriber) Topic() string {
+	return s.topic
+}
+
+func (s *subscriber) Subscriber() interface{} {
+	return s.subscriber
+}
+
+func (s *subscriber) Endpoints() []*register.Endpoint {
+	return s.endpoints
+}
+
+func (s *subscriber) Options() SubscriberOptions {
+	return s.opts
+}

server/wrapper.go

@@ -9,9 +9,25 @@ import (
 // request and response types.
 type HandlerFunc func(ctx context.Context, req Request, rsp interface{}) error
 
+// SubscriberFunc represents a single method of a subscriber. It's used primarily
+// for the wrappers. What's handed to the actual method is the concrete
+// publication message.
+type SubscriberFunc func(ctx context.Context, msg Message) error
+
+// BatchSubscriberFunc represents a single method of a subscriber. It's used primarily
+// for the wrappers. What's handed to the actual method is the concrete
+// publication message. This func used by batch subscribers
+type BatchSubscriberFunc func(ctxs []context.Context, msgs []Message) error
+
 // HandlerWrapper wraps the HandlerFunc and returns the equivalent
 type HandlerWrapper func(HandlerFunc) HandlerFunc
 
+// SubscriberWrapper wraps the SubscriberFunc and returns the equivalent
+type SubscriberWrapper func(SubscriberFunc) SubscriberFunc
+
+// BatchSubscriberWrapper wraps the SubscriberFunc and returns the equivalent
+type BatchSubscriberWrapper func(BatchSubscriberFunc) BatchSubscriberFunc
+
 // StreamWrapper wraps a Stream interface and returns the equivalent.
 // Because streams exist for the lifetime of a method invocation this
 // is a convenient way to wrap a Stream as its in use for trace, monitoring,

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,13 @@ 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...))
+}
+
+// RegisterSubscriber is syntactic sugar for registering a subscriber
+func RegisterSubscriber(topic string, s server.Server, h interface{}, opts ...server.SubscriberOption) error {
+	return s.Subscribe(s.NewSubscriber(topic, h, opts...))
 }
 
 type service struct {
@@ -84,7 +88,6 @@ func (s *service) Name() string {
 // Init initialises options. Additionally it calls cmd.Init
 // which parses command line flags. cmd.Init is only called
 // on first Init.
-//
 //nolint:gocyclo
 func (s *service) Init(opts ...Option) error {
 	var err error
@@ -100,13 +103,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 +121,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 +261,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 +307,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

service_test.go

@@ -1,6 +1,7 @@
 package micro
 
 import (
+	"context"
 	"reflect"
 	"testing"
 
@@ -9,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"
@@ -38,7 +38,7 @@ func TestRegisterHandler(t *testing.T) {
 	type args struct {
 		s    server.Server
 		h    interface{}
-		opts []options.Option
+		opts []server.HandlerOption
 	}
 	h := struct{}{}
 	tests := []struct {
@@ -65,6 +65,41 @@ func TestRegisterHandler(t *testing.T) {
 	}
 }
 
+func TestRegisterSubscriber(t *testing.T) {
+	type args struct {
+		topic string
+		s     server.Server
+		h     interface{}
+		opts  []server.SubscriberOption
+	}
+	h := func(_ context.Context, _ interface{}) error {
+		return nil
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{
+			name: "RegisterSubscriber",
+			args: args{
+				topic: "test",
+				s:     server.DefaultServer,
+				h:     h,
+				opts:  nil,
+			},
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := RegisterSubscriber(tt.args.topic, tt.args.s, tt.args.h, tt.args.opts...); (err != nil) != tt.wantErr {
+				t.Errorf("RegisterSubscriber() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
 func TestNewService(t *testing.T) {
 	type args struct {
 		opts []Option
@@ -187,6 +222,7 @@ func Test_service_Options(t *testing.T) {
 }
 
 func Test_service_Broker(t *testing.T) {
+	b := broker.NewBroker()
 	type fields struct {
 		opts Options
 	}
@@ -202,12 +238,12 @@ func Test_service_Broker(t *testing.T) {
 		{
 			name: "service.Broker",
 			fields: fields{
-				opts: Options{Brokers: []broker.Broker{broker.DefaultBroker}},
+				opts: Options{Brokers: []broker.Broker{b}},
 			},
 			args: args{
 				names: []string{"noop"},
 			},
-			want: broker.DefaultBroker,
+			want: b,
 		},
 	}
 	for _, tt := range tests {

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)
+	}
+}
+*/

store/store.go

@@ -4,8 +4,6 @@ package store // import "go.unistack.org/micro/v4/store"
 import (
 	"context"
 	"errors"
-
-	"go.unistack.org/micro/v4/options"
 )
 
 var (
@@ -23,21 +21,21 @@ var (
 type Store interface {
 	Name() string
 	// Init initialises the store
-	Init(opts ...options.Option) error
+	Init(opts ...Option) error
 	// Connect is used when store needs to be connected
 	Connect(ctx context.Context) error
 	// Options allows you to view the current options.
 	Options() Options
 	// Exists check that key exists in store
-	Exists(ctx context.Context, key string, opts ...options.Option) error
+	Exists(ctx context.Context, key string, opts ...ExistsOption) error
-	// Read reads a single key name to provided value with optional options
+	// Read reads a single key name to provided value with optional ReadOptions
-	Read(ctx context.Context, key string, val interface{}, opts ...options.Option) error
+	Read(ctx context.Context, key string, val interface{}, opts ...ReadOption) error
-	// Write writes a value to key name to the store with optional options
+	// Write writes a value to key name to the store with optional WriteOption
-	Write(ctx context.Context, key string, val interface{}, opts ...options.Option) error
+	Write(ctx context.Context, key string, val interface{}, opts ...WriteOption) error
-	// Delete removes the record with the corresponding key from the store with optional options
+	// Delete removes the record with the corresponding key from the store.
-	Delete(ctx context.Context, key string, opts ...options.Option) error
+	Delete(ctx context.Context, key string, opts ...DeleteOption) error
-	// List returns any keys that match, or an empty list with no error if none matched with optional options
+	// List returns any keys that match, or an empty list with no error if none matched.
-	List(ctx context.Context, opts ...options.Option) ([]string, error)
+	List(ctx context.Context, opts ...ListOption) ([]string, error)
 	// Disconnect the store
 	Disconnect(ctx context.Context) error
 	// String returns the name of the implementation.

store/wrapper.go

@@ -2,10 +2,15 @@ package store
 
 import (
 	"context"
-
-	"go.unistack.org/micro/v4/options"
 )
 
+// LogfFunc function used for Logf method
+// type LogfFunc func(ctx context.Context, level Level, msg string, args ...interface{})
+// type Wrapper interface {
+//   Logf logs message with needed level
+//   Logf(LogfFunc) LogfFunc
+// }
+
 // NamespaceStore wrap store with namespace
 type NamespaceStore struct {
 	s  Store
@@ -18,7 +23,7 @@ func NewNamespaceStore(s Store, ns string) Store {
 	return &NamespaceStore{s: s, ns: ns}
 }
 
-func (w *NamespaceStore) Init(opts ...options.Option) error {
+func (w *NamespaceStore) Init(opts ...Option) error {
 	return w.s.Init(opts...)
 }
 
@@ -30,24 +35,24 @@ func (w *NamespaceStore) Disconnect(ctx context.Context) error {
 	return w.s.Disconnect(ctx)
 }
 
-func (w *NamespaceStore) Read(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
+func (w *NamespaceStore) Read(ctx context.Context, key string, val interface{}, opts ...ReadOption) error {
-	return w.s.Read(ctx, key, val, append(opts, options.Namespace(w.ns))...)
+	return w.s.Read(ctx, key, val, append(opts, ReadNamespace(w.ns))...)
 }
 
-func (w *NamespaceStore) Write(ctx context.Context, key string, val interface{}, opts ...options.Option) error {
+func (w *NamespaceStore) Write(ctx context.Context, key string, val interface{}, opts ...WriteOption) error {
-	return w.s.Write(ctx, key, val, append(opts, options.Namespace(w.ns))...)
+	return w.s.Write(ctx, key, val, append(opts, WriteNamespace(w.ns))...)
 }
 
-func (w *NamespaceStore) Delete(ctx context.Context, key string, opts ...options.Option) error {
+func (w *NamespaceStore) Delete(ctx context.Context, key string, opts ...DeleteOption) error {
-	return w.s.Delete(ctx, key, append(opts, options.Namespace(w.ns))...)
+	return w.s.Delete(ctx, key, append(opts, DeleteNamespace(w.ns))...)
 }
 
-func (w *NamespaceStore) Exists(ctx context.Context, key string, opts ...options.Option) error {
+func (w *NamespaceStore) Exists(ctx context.Context, key string, opts ...ExistsOption) error {
-	return w.s.Exists(ctx, key, append(opts, options.Namespace(w.ns))...)
+	return w.s.Exists(ctx, key, append(opts, ExistsNamespace(w.ns))...)
 }
 
-func (w *NamespaceStore) List(ctx context.Context, opts ...options.Option) ([]string, error) {
+func (w *NamespaceStore) List(ctx context.Context, opts ...ListOption) ([]string, error) {
-	return w.s.List(ctx, append(opts, options.Namespace(w.ns))...)
+	return w.s.List(ctx, append(opts, ListNamespace(w.ns))...)
 }
 
 func (w *NamespaceStore) Options() Options {
@@ -61,3 +66,17 @@ func (w *NamespaceStore) Name() string {
 func (w *NamespaceStore) String() string {
 	return w.s.String()
 }
+
+// type NamespaceWrapper struct{}
+
+// func NewNamespaceWrapper() Wrapper {
+//	return &NamespaceWrapper{}
+// }
+
+/*
+func (w *OmitWrapper) Logf(fn LogfFunc) LogfFunc {
+	return func(ctx context.Context, level Level, msg string, args ...interface{}) {
+		fn(ctx, level, msg, getArgs(args)...)
+	}
+}
+*/

tools.go

@@ -1,3 +0,0 @@
-package micro
-
-//go:generate go install golang.org/x/tools/cmd/stringer@latest

tracer/context.go

@@ -46,3 +46,13 @@ func NewSpanContext(ctx context.Context, span Span) context.Context {
 	}
 	return context.WithValue(ctx, spanKey{}, span)
 }
+
+// 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)
+	}
+}

tracer/noop.go

@@ -2,45 +2,26 @@ package tracer
 
 import (
 	"context"
-
-	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v4/util/id"
 )
 
-var _ Tracer = (*noopTracer)(nil)
-
 type noopTracer struct {
-	opts  Options
+	opts Options
-	spans []Span
 }
 
-func (t *noopTracer) Spans() []Span {
+func (t *noopTracer) Start(ctx context.Context, name string, opts ...SpanOption) (context.Context, Span) {
-	return t.spans
-}
-
-func (t *noopTracer) Start(ctx context.Context, name string, opts ...options.Option) (context.Context, Span) {
-	options := NewSpanOptions(opts...)
 	span := &noopSpan{
 		name:   name,
 		ctx:    ctx,
 		tracer: t,
-		labels: options.Labels,
+		opts:   NewSpanOptions(opts...),
-		kind:   options.Kind,
 	}
-	span.spanID.s, _ = id.New()
-	span.traceID.s, _ = id.New()
 	if span.ctx == nil {
 		span.ctx = context.Background()
 	}
-	t.spans = append(t.spans, span)
 	return NewSpanContext(ctx, span), span
 }
 
-func (t *noopTracer) Flush(ctx context.Context) error {
+func (t *noopTracer) Init(opts ...Option) error {
-	return nil
-}
-
-func (t *noopTracer) Init(opts ...options.Option) error {
 	for _, o := range opts {
 		o(&t.opts)
 	}
@@ -51,34 +32,16 @@ func (t *noopTracer) Name() string {
 	return t.opts.Name
 }
 
-type noopEvent struct {
-	name   string
-	labels []interface{}
-}
-
-type noopStringer struct {
-	s string
-}
-
-func (s noopStringer) String() string {
-	return s.s
-}
-
 type noopSpan struct {
 	ctx       context.Context
 	tracer    Tracer
 	name      string
-	statusMsg string
+	opts      SpanOptions
-	traceID   noopStringer
-	spanID    noopStringer
-	events    []*noopEvent
-	labels    []interface{}
-	logs      []interface{}
-	kind      SpanKind
 	status    SpanStatus
+	statusMsg string
 }
 
-func (s *noopSpan) Finish(opts ...options.Option) {
+func (s *noopSpan) Finish(opts ...SpanOption) {
 }
 
 func (s *noopSpan) Context() context.Context {
@@ -89,33 +52,23 @@ func (s *noopSpan) Tracer() Tracer {
 	return s.tracer
 }
 
-func (s *noopSpan) AddEvent(name string, opts ...options.Option) {
+func (s *noopSpan) AddEvent(name string, opts ...EventOption) {
-	options := NewEventOptions(opts...)
-	s.events = append(s.events, &noopEvent{name: name, labels: options.Labels})
 }
 
 func (s *noopSpan) SetName(name string) {
 	s.name = name
 }
 
-func (s *noopSpan) AddLogs(kv ...interface{}) {
+func (s *noopSpan) SetLabels(labels ...interface{}) {
-	s.logs = append(s.logs, kv...)
+	s.opts.Labels = labels
 }
 
-func (s *noopSpan) AddLabels(kv ...interface{}) {
+func (s *noopSpan) AddLabels(labels ...interface{}) {
-	s.labels = append(s.labels, kv...)
+	s.opts.Labels = append(s.opts.Labels, labels...)
 }
 
 func (s *noopSpan) Kind() SpanKind {
-	return s.kind
+	return s.opts.Kind
-}
-
-func (s *noopSpan) TraceID() string {
-	return s.traceID.String()
-}
-
-func (s *noopSpan) SpanID() string {
-	return s.spanID.String()
 }
 
 func (s *noopSpan) Status() (SpanStatus, string) {
@@ -128,7 +81,7 @@ func (s *noopSpan) SetStatus(st SpanStatus, msg string) {
 }
 
 // NewTracer returns new memory tracer
-func NewTracer(opts ...options.Option) Tracer {
+func NewTracer(opts ...Option) Tracer {
 	return &noopTracer{
 		opts: NewOptions(opts...),
 	}

tracer/options.go

@@ -2,11 +2,8 @@ package tracer
 
 import (
 	"context"
-	"reflect"
 
 	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/options"
-	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 type SpanStatus int
@@ -90,51 +87,24 @@ type SpanOptions struct {
 	Kind   SpanKind
 }
 
-// EventOptions contains event options
+// SpanOption func signature
-type EventOptions struct {
+type SpanOption func(o *SpanOptions)
-	Labels []interface{}
-}
 
-func WithSpanLabels(ls ...interface{}) options.Option {
+// EventOptions contains event options
-	return func(src interface{}) error {
+type EventOptions struct{}
-		v, err := options.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 {
-			reflect.Append(cv, reflect.ValueOf(l))
-		}
-		err = options.Set(src, cv, ".Labels")
-		return err
-	}
-}
 
 // EventOption func signature
 type EventOption func(o *EventOptions)
 
-func WithEventLabels(ls ...interface{}) options.Option {
+func WithSpanLabels(labels ...interface{}) SpanOption {
-	return func(src interface{}) error {
+	return func(o *SpanOptions) {
-		v, err := options.Get(src, ".Labels")
+		o.Labels = 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 {
-			reflect.Append(cv, reflect.ValueOf(l))
-		}
-		err = options.Set(src, cv, ".Labels")
-		return err
 	}
 }
 
-func WithSpanKind(k SpanKind) options.Option {
+func WithSpanKind(k SpanKind) SpanOption {
-	return func(src interface{}) error {
+	return func(o *SpanOptions) {
-		return options.Set(src, k, ".Kind")
+		o.Kind = k
 	}
 }
 
@@ -148,8 +118,18 @@ type Options struct {
 	Name string
 }
 
+// Option func signature
+type Option func(o *Options)
+
+// Logger sets the logger
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
 // NewSpanOptions returns default SpanOptions
-func NewSpanOptions(opts ...options.Option) SpanOptions {
+func NewSpanOptions(opts ...SpanOption) SpanOptions {
 	options := SpanOptions{
 		Kind: SpanKindInternal,
 	}
@@ -159,17 +139,8 @@ func NewSpanOptions(opts ...options.Option) SpanOptions {
 	return options
 }
 
-// NewEventOptions returns default EventOptions
-func NewEventOptions(opts ...options.Option) EventOptions {
-	options := EventOptions{}
-	for _, o := range opts {
-		o(&options)
-	}
-	return options
-}
-
 // NewOptions returns default options
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
 		Logger: logger.DefaultLogger,
 	}
@@ -178,3 +149,10 @@ func NewOptions(opts ...options.Option) Options {
 	}
 	return options
 }
+
+// Name sets the name
+func Name(n string) Option {
+	return func(o *Options) {
+		o.Name = n
+	}
+}

tracer/tracer.go

@@ -3,11 +3,6 @@ package tracer // import "go.unistack.org/micro/v4/tracer"
 
 import (
 	"context"
-	"fmt"
-	"sort"
-
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/options"
 )
 
 // DefaultTracer is the global default tracer
@@ -18,18 +13,18 @@ type Tracer interface {
 	// Name return tracer name
 	Name() string
 	// Init tracer with options
-	Init(...options.Option) error
+	Init(...Option) error
 	// Start a trace
-	Start(ctx context.Context, name string, opts ...options.Option) (context.Context, Span)
+	Start(ctx context.Context, name string, opts ...SpanOption) (context.Context, Span)
-	// Flush flushes spans
-	Flush(ctx context.Context) error
 }
 
 type Span interface {
 	// Tracer return underlining tracer
 	Tracer() Tracer
 	// Finish complete and send span
-	Finish(opts ...options.Option)
+	Finish(opts ...SpanOption)
+	// AddEvent add event to span
+	AddEvent(name string, opts ...EventOption)
 	// Context return context with span
 	Context() context.Context
 	// SetName set the span name
@@ -38,59 +33,10 @@ type Span interface {
 	SetStatus(status SpanStatus, msg string)
 	// Status returns span status and msg
 	Status() (SpanStatus, string)
-	// AddLabels append labels to span
+	// SetLabels set the span labels
-	AddLabels(kv ...interface{})
+	SetLabels(labels ...interface{})
-	// AddEvent append event to span
+	// AddLabels append the span labels
-	AddEvent(name string, opts ...options.Option)
+	AddLabels(labels ...interface{})
-	// AddLogs append logs to span
-	AddLogs(kv ...interface{})
 	// Kind returns span kind
 	Kind() SpanKind
-	// TraceID returns trace id
-	TraceID() string
-	// SpanID returns span id
-	SpanID() string
-}
-
-func init() {
-	logger.DefaultContextAttrFuncs = append(logger.DefaultContextAttrFuncs, func(ctx context.Context) []interface{} {
-		span, ok := SpanFromContext(ctx)
-		if !ok || span == nil {
-			return nil
-		}
-		return []interface{}{"trace", span.TraceID(), "span", span.SpanID()}
-	})
-}
-
-// sort labels alphabeticaly by label name
-type byKey []interface{}
-
-func (k byKey) Len() int           { return len(k) / 2 }
-func (k byKey) Less(i, j int) bool { return fmt.Sprintf("%s", k[i*2]) < fmt.Sprintf("%s", k[j*2]) }
-func (k byKey) Swap(i, j int) {
-	k[i*2], k[j*2] = k[j*2], k[i*2]
-	k[i*2+1], k[j*2+1] = k[j*2+1], k[i*2+1]
-}
-
-func UniqLabels(labels []interface{}) []interface{} {
-	if len(labels)%2 == 1 {
-		labels = labels[:len(labels)-1]
-	}
-	if len(labels) > 2 {
-		sort.Sort(byKey(labels))
-
-		idx := 0
-		for {
-			if labels[idx] == labels[idx+2] {
-				copy(labels[idx:], labels[idx+2:])
-				labels = labels[:len(labels)-2]
-			} else {
-				idx += 2
-			}
-			if idx+2 >= len(labels) {
-				break
-			}
-		}
-	}
-	return labels
 }

tracer/tracer_test.go

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

tracer/wrapper/wrapper.go

@@ -4,72 +4,114 @@ package wrapper // import "go.unistack.org/micro/v4/tracer/wrapper"
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"go.unistack.org/micro/v4/client"
 	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/server"
 	"go.unistack.org/micro/v4/tracer"
 )
 
-var DefaultHeadersExctract = []string{metadata.HeaderTopic, metadata.HeaderEndpoint, metadata.HeaderService, metadata.HeaderXRequestID}
-
-func ExtractDefaultLabels(md metadata.Metadata) []interface{} {
-	labels := make([]interface{}, 0, len(DefaultHeadersExctract))
-	for _, k := range DefaultHeadersExctract {
-		if v, ok := md.Get(k); ok {
-			labels = append(labels, strings.ToLower(k), v)
-		}
-	}
-	return labels
-}
-
 var (
-	DefaultClientCallObserver = func(ctx context.Context, req client.Request, rsp interface{}, opts []options.Option, sp tracer.Span, err error) {
+	DefaultClientCallObserver = func(ctx context.Context, req client.Request, rsp interface{}, opts []client.CallOption, sp tracer.Span, err error) {
 		sp.SetName(fmt.Sprintf("Call %s.%s", req.Service(), req.Method()))
 		var labels []interface{}
 		if md, ok := metadata.FromOutgoingContext(ctx); ok {
-			labels = append(labels, ExtractDefaultLabels(md)...)
+			labels = make([]interface{}, 0, len(md)+1)
+			for k, v := range md {
+				labels = append(labels, k, v)
+			}
 		}
 		if err != nil {
+			labels = append(labels, "error", err.Error())
 			sp.SetStatus(tracer.SpanStatusError, err.Error())
 		}
-		sp.AddLabels(labels...)
+		labels = append(labels, "kind", sp.Kind())
+		sp.SetLabels(labels...)
 	}
 
-	DefaultClientStreamObserver = func(ctx context.Context, req client.Request, opts []options.Option, stream client.Stream, sp tracer.Span, err error) {
+	DefaultClientStreamObserver = func(ctx context.Context, req client.Request, opts []client.CallOption, stream client.Stream, sp tracer.Span, err error) {
+		sp.SetName(fmt.Sprintf("Stream %s.%s", req.Service(), req.Method()))
 		var labels []interface{}
 		if md, ok := metadata.FromOutgoingContext(ctx); ok {
-			labels = append(labels, ExtractDefaultLabels(md)...)
+			labels = make([]interface{}, 0, len(md))
+			for k, v := range md {
+				labels = append(labels, k, v)
+			}
 		}
 		if err != nil {
+			labels = append(labels, "error", err.Error())
 			sp.SetStatus(tracer.SpanStatusError, err.Error())
 		}
-		sp.AddLabels(labels...)
+		labels = append(labels, "kind", sp.Kind())
+		sp.SetLabels(labels...)
+	}
+
+	DefaultClientPublishObserver = func(ctx context.Context, msg client.Message, opts []client.PublishOption, sp tracer.Span, err error) {
+		sp.SetName(fmt.Sprintf("Publish %s", msg.Topic()))
+		var labels []interface{}
+		if md, ok := metadata.FromOutgoingContext(ctx); ok {
+			labels = make([]interface{}, 0, len(md))
+			for k, v := range md {
+				labels = append(labels, k, v)
+			}
+		}
+		if err != nil {
+			labels = append(labels, "error", err.Error())
+			sp.SetStatus(tracer.SpanStatusError, err.Error())
+		}
+		labels = append(labels, "kind", sp.Kind())
+		sp.SetLabels(labels...)
 	}
 
 	DefaultServerHandlerObserver = func(ctx context.Context, req server.Request, rsp interface{}, sp tracer.Span, err error) {
+		sp.SetName(fmt.Sprintf("Handler %s.%s", req.Service(), req.Method()))
 		var labels []interface{}
 		if md, ok := metadata.FromIncomingContext(ctx); ok {
-			labels = append(labels, ExtractDefaultLabels(md)...)
+			labels = make([]interface{}, 0, len(md))
+			for k, v := range md {
+				labels = append(labels, k, v)
+			}
 		}
 		if err != nil {
+			labels = append(labels, "error", err.Error())
 			sp.SetStatus(tracer.SpanStatusError, err.Error())
 		}
-		sp.AddLabels(labels...)
+		labels = append(labels, "kind", sp.Kind())
+		sp.SetLabels(labels...)
+	}
+
+	DefaultServerSubscriberObserver = func(ctx context.Context, msg server.Message, sp tracer.Span, err error) {
+		sp.SetName(fmt.Sprintf("Subscriber %s", msg.Topic()))
+		var labels []interface{}
+		if md, ok := metadata.FromIncomingContext(ctx); ok {
+			labels = make([]interface{}, 0, len(md))
+			for k, v := range md {
+				labels = append(labels, k, v)
+			}
+		}
+		if err != nil {
+			labels = append(labels, "error", err.Error())
+			sp.SetStatus(tracer.SpanStatusError, err.Error())
+		}
+		labels = append(labels, "kind", sp.Kind())
+		sp.SetLabels(labels...)
 	}
 
 	DefaultClientCallFuncObserver = func(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions, sp tracer.Span, err error) {
-		sp.SetName(fmt.Sprintf("%s.%s call", req.Service(), req.Method()))
+		sp.SetName(fmt.Sprintf("Call %s.%s", req.Service(), req.Method()))
 		var labels []interface{}
 		if md, ok := metadata.FromOutgoingContext(ctx); ok {
-			labels = append(labels, ExtractDefaultLabels(md)...)
+			labels = make([]interface{}, 0, len(md))
+			for k, v := range md {
+				labels = append(labels, k, v)
+			}
 		}
 		if err != nil {
+			labels = append(labels, "error", err.Error())
 			sp.SetStatus(tracer.SpanStatusError, err.Error())
 		}
-		sp.AddLabels(labels...)
+		labels = append(labels, "kind", sp.Kind())
+		sp.SetLabels(labels...)
 	}
 
 	DefaultSkipEndpoints = []string{"Meter.Metrics", "Health.Live", "Health.Ready", "Health.Version"}
@@ -77,16 +119,19 @@ var (
 
 type tWrapper struct {
 	client.Client
-	serverHandler  server.HandlerFunc
+	serverHandler    server.HandlerFunc
-	clientCallFunc client.CallFunc
+	serverSubscriber server.SubscriberFunc
-	opts           Options
+	clientCallFunc   client.CallFunc
+	opts             Options
 }
 
 type (
-	ClientCallObserver     func(context.Context, client.Request, interface{}, []options.Option, tracer.Span, error)
+	ClientCallObserver       func(context.Context, client.Request, interface{}, []client.CallOption, tracer.Span, error)
-	ClientStreamObserver   func(context.Context, client.Request, []options.Option, client.Stream, tracer.Span, error)
+	ClientStreamObserver     func(context.Context, client.Request, []client.CallOption, client.Stream, tracer.Span, error)
-	ClientCallFuncObserver func(context.Context, string, client.Request, interface{}, client.CallOptions, tracer.Span, error)
+	ClientPublishObserver    func(context.Context, client.Message, []client.PublishOption, tracer.Span, error)
-	ServerHandlerObserver  func(context.Context, server.Request, interface{}, tracer.Span, error)
+	ClientCallFuncObserver   func(context.Context, string, client.Request, interface{}, client.CallOptions, tracer.Span, error)
+	ServerHandlerObserver    func(context.Context, server.Request, interface{}, tracer.Span, error)
+	ServerSubscriberObserver func(context.Context, server.Message, tracer.Span, error)
 )
 
 // Options struct
@@ -97,10 +142,14 @@ type Options struct {
 	ClientCallObservers []ClientCallObserver
 	// ClientStreamObservers funcs
 	ClientStreamObservers []ClientStreamObserver
+	// ClientPublishObservers funcs
+	ClientPublishObservers []ClientPublishObserver
 	// ClientCallFuncObservers funcs
 	ClientCallFuncObservers []ClientCallFuncObserver
 	// ServerHandlerObservers funcs
 	ServerHandlerObservers []ServerHandlerObserver
+	// ServerSubscriberObservers funcs
+	ServerSubscriberObservers []ServerSubscriberObserver
 	// SkipEndpoints
 	SkipEndpoints []string
 }
@@ -111,12 +160,14 @@ type Option func(*Options)
 // NewOptions create Options from Option slice
 func NewOptions(opts ...Option) Options {
 	options := Options{
-		Tracer:                  tracer.DefaultTracer,
+		Tracer:                    tracer.DefaultTracer,
-		ClientCallObservers:     []ClientCallObserver{DefaultClientCallObserver},
+		ClientCallObservers:       []ClientCallObserver{DefaultClientCallObserver},
-		ClientStreamObservers:   []ClientStreamObserver{DefaultClientStreamObserver},
+		ClientStreamObservers:     []ClientStreamObserver{DefaultClientStreamObserver},
-		ClientCallFuncObservers: []ClientCallFuncObserver{DefaultClientCallFuncObserver},
+		ClientPublishObservers:    []ClientPublishObserver{DefaultClientPublishObserver},
-		ServerHandlerObservers:  []ServerHandlerObserver{DefaultServerHandlerObserver},
+		ClientCallFuncObservers:   []ClientCallFuncObserver{DefaultClientCallFuncObserver},
-		SkipEndpoints:           DefaultSkipEndpoints,
+		ServerHandlerObservers:    []ServerHandlerObserver{DefaultServerHandlerObserver},
+		ServerSubscriberObservers: []ServerSubscriberObserver{DefaultServerSubscriberObserver},
+		SkipEndpoints:             DefaultSkipEndpoints,
 	}
 
 	for _, o := range opts {
@@ -154,6 +205,13 @@ func WithClientStreamObservers(ob ...ClientStreamObserver) Option {
 	}
 }
 
+// WithClientPublishObservers funcs
+func WithClientPublishObservers(ob ...ClientPublishObserver) Option {
+	return func(o *Options) {
+		o.ClientPublishObservers = ob
+	}
+}
+
 // WithClientCallFuncObservers funcs
 func WithClientCallFuncObservers(ob ...ClientCallFuncObserver) Option {
 	return func(o *Options) {
@@ -168,7 +226,14 @@ func WithServerHandlerObservers(ob ...ServerHandlerObserver) Option {
 	}
 }
 
-func (ot *tWrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...options.Option) error {
+// WithServerSubscriberObservers funcs
+func WithServerSubscriberObservers(ob ...ServerSubscriberObserver) Option {
+	return func(o *Options) {
+		o.ServerSubscriberObservers = ob
+	}
+}
+
+func (ot *tWrapper) 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 ot.opts.SkipEndpoints {
 		if ep == endpoint {
@@ -176,28 +241,22 @@ func (ot *tWrapper) Call(ctx context.Context, req client.Request, rsp interface{
 		}
 	}
 
-	nctx, sp := ot.opts.Tracer.Start(ctx, fmt.Sprintf("%s.%s rpc-client", req.Service(), req.Method()),
+	sp, ok := tracer.SpanFromContext(ctx)
-		tracer.WithSpanKind(tracer.SpanKindClient),
+	if !ok {
-		options.Labels(
+		ctx, sp = ot.opts.Tracer.Start(ctx, "", tracer.WithSpanKind(tracer.SpanKindClient))
-			"rpc.service", req.Service(),
+	}
-			"rpc.method", req.Method(),
-			"rpc.flavor", "rpc",
-			"rpc.call", "/"+req.Service()+"/"+req.Endpoint(),
-			"rpc.call_type", "unary",
-		),
-	)
 	defer sp.Finish()
 
-	err := ot.Client.Call(nctx, req, rsp, opts...)
+	err := ot.Client.Call(ctx, req, rsp, opts...)
 
 	for _, o := range ot.opts.ClientCallObservers {
-		o(nctx, req, rsp, opts, sp, err)
+		o(ctx, req, rsp, opts, sp, err)
 	}
 
 	return err
 }
 
-func (ot *tWrapper) Stream(ctx context.Context, req client.Request, opts ...options.Option) (client.Stream, error) {
+func (ot *tWrapper) 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 ot.opts.SkipEndpoints {
 		if ep == endpoint {
@@ -205,27 +264,37 @@ func (ot *tWrapper) Stream(ctx context.Context, req client.Request, opts ...opti
 		}
 	}
 
-	nctx, sp := ot.opts.Tracer.Start(ctx, fmt.Sprintf("%s.%s rpc-client", req.Service(), req.Method()),
+	sp, ok := tracer.SpanFromContext(ctx)
-		tracer.WithSpanKind(tracer.SpanKindClient),
+	if !ok {
-		options.Labels(
+		ctx, sp = ot.opts.Tracer.Start(ctx, "", tracer.WithSpanKind(tracer.SpanKindClient))
-			"rpc.service", req.Service(),
+	}
-			"rpc.method", req.Method(),
-			"rpc.flavor", "rpc",
-			"rpc.call", "/"+req.Service()+"/"+req.Endpoint(),
-			"rpc.call_type", "stream",
-		),
-	)
 	defer sp.Finish()
 
-	stream, err := ot.Client.Stream(nctx, req, opts...)
+	stream, err := ot.Client.Stream(ctx, req, opts...)
 
 	for _, o := range ot.opts.ClientStreamObservers {
-		o(nctx, req, opts, stream, sp, err)
+		o(ctx, req, opts, stream, sp, err)
 	}
 
 	return stream, err
 }
 
+func (ot *tWrapper) Publish(ctx context.Context, msg client.Message, opts ...client.PublishOption) error {
+	sp, ok := tracer.SpanFromContext(ctx)
+	if !ok {
+		ctx, sp = ot.opts.Tracer.Start(ctx, "", tracer.WithSpanKind(tracer.SpanKindProducer))
+	}
+	defer sp.Finish()
+
+	err := ot.Client.Publish(ctx, msg, opts...)
+
+	for _, o := range ot.opts.ClientPublishObservers {
+		o(ctx, msg, opts, sp, err)
+	}
+
+	return err
+}
+
 func (ot *tWrapper) ServerHandler(ctx context.Context, req server.Request, rsp interface{}) error {
 	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Method())
 	for _, ep := range ot.opts.SkipEndpoints {
@@ -234,27 +303,32 @@ func (ot *tWrapper) ServerHandler(ctx context.Context, req server.Request, rsp i
 		}
 	}
 
-	callType := "unary"
+	sp, ok := tracer.SpanFromContext(ctx)
-	if req.Stream() {
+	if !ok {
-		callType = "stream"
+		ctx, sp = ot.opts.Tracer.Start(ctx, "", tracer.WithSpanKind(tracer.SpanKindServer))
 	}
-
-	nctx, sp := ot.opts.Tracer.Start(ctx, fmt.Sprintf("%s.%s rpc-server", req.Service(), req.Method()),
-		tracer.WithSpanKind(tracer.SpanKindServer),
-		options.Labels(
-			"rpc.service", req.Service(),
-			"rpc.method", req.Method(),
-			"rpc.flavor", "rpc",
-			"rpc.call", "/"+req.Service()+"/"+req.Endpoint(),
-			"rpc.call_type", callType,
-		),
-	)
 	defer sp.Finish()
 
-	err := ot.serverHandler(nctx, req, rsp)
+	err := ot.serverHandler(ctx, req, rsp)
 
 	for _, o := range ot.opts.ServerHandlerObservers {
-		o(nctx, req, rsp, sp, err)
+		o(ctx, req, rsp, sp, err)
+	}
+
+	return err
+}
+
+func (ot *tWrapper) ServerSubscriber(ctx context.Context, msg server.Message) error {
+	sp, ok := tracer.SpanFromContext(ctx)
+	if !ok {
+		ctx, sp = ot.opts.Tracer.Start(ctx, "", tracer.WithSpanKind(tracer.SpanKindConsumer))
+	}
+	defer sp.Finish()
+
+	err := ot.serverSubscriber(ctx, msg)
+
+	for _, o := range ot.opts.ServerSubscriberObservers {
+		o(ctx, msg, sp, err)
 	}
 
 	return err
@@ -292,23 +366,16 @@ func (ot *tWrapper) ClientCallFunc(ctx context.Context, addr string, req client.
 		}
 	}
 
-	nctx, sp := ot.opts.Tracer.Start(ctx, fmt.Sprintf("%s.%s rpc-client", req.Service(), req.Method()),
+	sp, ok := tracer.SpanFromContext(ctx)
-		tracer.WithSpanKind(tracer.SpanKindClient),
+	if !ok {
-		options.Labels(
+		ctx, sp = ot.opts.Tracer.Start(ctx, "", tracer.WithSpanKind(tracer.SpanKindClient))
-			"rpc.service", req.Service(),
+	}
-			"rpc.method", req.Method(),
-			"rpc.flavor", "rpc",
-			"rpc.call", "/"+req.Service()+"/"+req.Endpoint(),
-			"rpc.call_type", "unary",
-		),
-	)
-
 	defer sp.Finish()
 
-	err := ot.clientCallFunc(nctx, addr, req, rsp, opts)
+	err := ot.clientCallFunc(ctx, addr, req, rsp, opts)
 
 	for _, o := range ot.opts.ClientCallFuncObservers {
-		o(nctx, addr, req, rsp, opts, sp, err)
+		o(ctx, addr, req, rsp, opts, sp, err)
 	}
 
 	return err
@@ -326,3 +393,16 @@ func NewServerHandlerWrapper(opts ...Option) server.HandlerWrapper {
 		return ot.ServerHandler
 	}
 }
+
+// NewServerSubscriberWrapper accepts an opentracing Tracer 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)
+		}
+
+		ot := &tWrapper{opts: options, serverSubscriber: h}
+		return ot.ServerSubscriber
+	}
+}

util/addr/addr.go

@@ -58,7 +58,6 @@ func IsLocal(addr string) bool {
 }
 
 // Extract returns a real ip
-//
 //nolint:gocyclo
 func Extract(addr string) (string, error) {
 	// if addr specified then its returned

util/ctx/ctx.go

@@ -1,63 +0,0 @@
-package ctx
-
-import "context"
-
-// Mixin mixes a typically shorter-lived (service, etc.) context passed in
-// “shortctx” into a long-living context “longctx”, returning a derived “mixed”
-// context. The “mixed” context is derived from the long-living context and
-// additionally gets the deadline (if any) and cancellation of the mixed-in
-// “shortctx”.
-//
-// Please note that it is essential to always call the additionally returned
-// cancel function in order to not leak go routines. Calling this cancel
-// function won't cancel the long-living and short-lived contexts, just clean
-// up. This follows the established context pattern of [context.WithCancel],
-// [context.WithDeadline] and [context.WithTimeout].
-func Mixin(longctx, shortctx context.Context) (mixedctx context.Context, mixedcancel context.CancelFunc) {
-	if longctx == nil {
-		panic("wye.Mixin: cannot mix into nil context")
-	}
-	if shortctx == nil {
-		panic("wye.Mixin: cannot mix-in nil context")
-	}
-	mixedctx = longctx
-	shortDone := shortctx.Done()
-	if shortDone == nil {
-		// In case the shorter-living context isn't cancellable at all, then we
-		// cannot cancel it and the cancel function returned must be a "no
-		// operation". There's no need to mix in something, so we can pass on
-		// the long-lived context.
-		mixedcancel = func() {}
-		return
-	}
-	// Nota bene: cancelled contexts "trickle down", so if a context higher up
-	// the hierarchy was cancelled, this will automatically propagate down to
-	// all child contexts, and so on.
-	//
-	// In case the shorter-lived context has a deadline, we need to carry it
-	// over into the final mixed context.
-	if deadline, ok := shortctx.Deadline(); ok {
-		mixedctx, mixedcancel = context.WithDeadline(mixedctx, deadline)
-	}
-	// As the shorter-living context can be cancelled, we will need to supervise
-	// it so we notice when it gets cancelled and then cancel the mixed context.
-	mixedctx, mixedcancel = context.WithCancel(mixedctx)
-	go func(ctx context.Context, cancel context.CancelFunc) {
-		select {
-		case <-shortDone:
-			// In case the shorter-living context was cancelled (but it did
-			// not pass a deadline) then we need to propagate this mixed
-			// context. Please note this correctly won't cancel the original
-			// longer context, because that's a long-living context we
-			// shouldn't interfere with.
-			if shortctx.Err() == context.Canceled {
-				cancel()
-			}
-		case <-ctx.Done():
-			// The final mixed context was either cancelled itself or its parent
-			// deadline context met its fate; here, do not touch short-lived
-			// context.
-		}
-	}(mixedctx, mixedcancel)
-	return
-}

util/grpc/tracer.go

@@ -1,256 +0,0 @@
-package grpc_util
-
-import (
-	"context"
-	"net"
-	"strconv"
-	"strings"
-	"sync/atomic"
-	"time"
-
-	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v4/tracer"
-	grpc_codes "google.golang.org/grpc/codes"
-	"google.golang.org/grpc/peer"
-	"google.golang.org/grpc/stats"
-	"google.golang.org/grpc/status"
-)
-
-type gRPCContextKey struct{}
-
-type gRPCContext struct {
-	messagesReceived int64
-	messagesSent     int64
-}
-
-type Options struct {
-	Tracer tracer.Tracer
-}
-
-// NewServerHandler creates a stats.Handler for gRPC server.
-func NewServerHandler(tr tracer.Tracer) stats.Handler {
-	h := &serverHandler{
-		tr: tr,
-	}
-	return h
-}
-
-type serverHandler struct {
-	tr tracer.Tracer
-}
-
-// TagRPC can attach some information to the given context.
-func (h *serverHandler) TagRPC(ctx context.Context, info *stats.RPCTagInfo) context.Context {
-	name, attrs := parseFullMethod(info.FullMethodName)
-	attrs = append(attrs, "rpc.system", "grpc")
-	ctx, _ = h.tr.Start(
-		ctx,
-		name,
-		tracer.WithSpanKind(tracer.SpanKindServer),
-		options.Labels(attrs...),
-	)
-
-	gctx := gRPCContext{}
-	return context.WithValue(ctx, gRPCContextKey{}, &gctx)
-}
-
-// HandleRPC processes the RPC stats.
-func (h *serverHandler) HandleRPC(ctx context.Context, rs stats.RPCStats) {
-	handleRPC(ctx, rs)
-}
-
-// TagConn can attach some information to the given context.
-func (h *serverHandler) TagConn(ctx context.Context, info *stats.ConnTagInfo) context.Context {
-	if span, ok := tracer.SpanFromContext(ctx); ok {
-		attrs := peerAttr(peerFromCtx(ctx))
-		span.AddLabels(attrs...)
-	}
-	return ctx
-}
-
-// HandleConn processes the Conn stats.
-func (h *serverHandler) HandleConn(ctx context.Context, info stats.ConnStats) {
-}
-
-type clientHandler struct {
-	tr tracer.Tracer
-}
-
-// NewClientHandler creates a stats.Handler for gRPC client.
-func NewClientHandler(tr tracer.Tracer) stats.Handler {
-	h := &clientHandler{
-		tr: tr,
-	}
-	return h
-}
-
-// TagRPC can attach some information to the given context.
-func (h *clientHandler) TagRPC(ctx context.Context, info *stats.RPCTagInfo) context.Context {
-	name, attrs := parseFullMethod(info.FullMethodName)
-	attrs = append(attrs, "rpc.system", "grpc", "rpc.flavor", "grpc", "rpc.call", info.FullMethodName)
-	ctx, _ = h.tr.Start(
-		ctx,
-		name,
-		tracer.WithSpanKind(tracer.SpanKindClient),
-		options.Labels(attrs...),
-	)
-
-	gctx := gRPCContext{}
-
-	return context.WithValue(ctx, gRPCContextKey{}, &gctx)
-}
-
-// HandleRPC processes the RPC stats.
-func (h *clientHandler) HandleRPC(ctx context.Context, rs stats.RPCStats) {
-	handleRPC(ctx, rs)
-}
-
-// TagConn can attach some information to the given context.
-func (h *clientHandler) TagConn(ctx context.Context, cti *stats.ConnTagInfo) context.Context {
-	// TODO
-	if span, ok := tracer.SpanFromContext(ctx); ok {
-		attrs := peerAttr(cti.RemoteAddr.String())
-		span.AddLabels(attrs...)
-	}
-	return ctx
-}
-
-// HandleConn processes the Conn stats.
-func (h *clientHandler) HandleConn(context.Context, stats.ConnStats) {
-	// no-op
-}
-
-func handleRPC(ctx context.Context, rs stats.RPCStats) {
-	span, ok := tracer.SpanFromContext(ctx)
-	gctx, _ := ctx.Value(gRPCContextKey{}).(*gRPCContext)
-	var messageID int64
-	if rs.IsClient() {
-		span.AddLabels("span.kind", "client")
-	} else {
-		span.AddLabels("span.kind", "server")
-	}
-
-	switch rs := rs.(type) {
-	case *stats.Begin:
-		if rs.IsClientStream || rs.IsServerStream {
-			span.AddLabels("rpc.call_type", "stream")
-		} else {
-			span.AddLabels("rpc.call_type", "unary")
-		}
-		span.AddEvent("message",
-			options.Labels(
-				"message.begin_time", rs.BeginTime.Format(time.RFC3339),
-			),
-		)
-	case *stats.InPayload:
-		if gctx != nil {
-			messageID = atomic.AddInt64(&gctx.messagesReceived, 1)
-		}
-		if ok {
-			span.AddEvent("message",
-				options.Labels(
-					"message.recv_time", rs.RecvTime.Format(time.RFC3339),
-					"message.type", "RECEIVED",
-					"message.id", messageID,
-					"message.compressed_size", rs.CompressedLength,
-					"message.uncompressed_size", rs.Length,
-				),
-			)
-		}
-	case *stats.OutPayload:
-		if gctx != nil {
-			messageID = atomic.AddInt64(&gctx.messagesSent, 1)
-		}
-		if ok {
-			span.AddEvent("message",
-				options.Labels(
-					"message.sent_time", rs.SentTime.Format(time.RFC3339),
-					"message.type", "SENT",
-					"message.id", messageID,
-					"message.compressed_size", rs.CompressedLength,
-					"message.uncompressed_size", rs.Length,
-				),
-			)
-		}
-	case *stats.End:
-		if ok {
-			span.AddEvent("message",
-				options.Labels(
-					"message.begin_time", rs.BeginTime.Format(time.RFC3339),
-					"message.end_time", rs.EndTime.Format(time.RFC3339),
-				),
-			)
-			if rs.Error != nil {
-				s, _ := status.FromError(rs.Error)
-				span.SetStatus(tracer.SpanStatusError, s.Message())
-				span.AddLabels("rpc.grpc.status_code", s.Code())
-			} else {
-				span.AddLabels("rpc.grpc.status_code", grpc_codes.OK)
-			}
-			span.Finish()
-		}
-	default:
-		return
-	}
-}
-
-func parseFullMethod(fullMethod string) (string, []interface{}) {
-	if !strings.HasPrefix(fullMethod, "/") {
-		// Invalid format, does not follow `/package.service/method`.
-		return fullMethod, nil
-	}
-	name := fullMethod[1:]
-	pos := strings.LastIndex(name, "/")
-	if pos < 0 {
-		// Invalid format, does not follow `/package.service/method`.
-		return name, nil
-	}
-	service, method := name[:pos], name[pos+1:]
-
-	var attrs []interface{}
-	if service != "" {
-		attrs = append(attrs, "rpc.service", service)
-	}
-	if method != "" {
-		attrs = append(attrs, "rpc.method", method)
-	}
-	return name, attrs
-}
-
-func peerAttr(addr string) []interface{} {
-	host, p, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil
-	}
-
-	if host == "" {
-		host = "127.0.0.1"
-	}
-	port, err := strconv.Atoi(p)
-	if err != nil {
-		return nil
-	}
-
-	var attr []interface{}
-	if ip := net.ParseIP(host); ip != nil {
-		attr = []interface{}{
-			"net.sock.peer.addr", host,
-			"net.sock.peer.port", port,
-		}
-	} else {
-		attr = []interface{}{
-			"net.peer.name", host,
-			"net.peer.port", port,
-		}
-	}
-
-	return attr
-}
-
-func peerFromCtx(ctx context.Context) string {
-	p, ok := peer.FromContext(ctx)
-	if !ok {
-		return ""
-	}
-	return p.Addr.String()
-}