Merge pull request 'add options in broker' (#333) from devstigneev/micro:master into master

Reviewed-on: #333

.gitea/pkgdashcli.yaml

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

.gitea/workflows/autoupdate.yml

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

.gitea/workflows/coverage.yml

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

.gitea/workflows/job_coverage.yml

@@ -1,51 +0,0 @@
-name: coverage
-
-on:
-  push:
-    branches: [ main, v3, v4 ]
-  pull_request:
-    branches: [ main, v3, v4 ]
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable' 
-
-    - name: test coverage
-      run: |
-        go test -v -cover ./... -covermode=count -coverprofile coverage.out -coverpkg ./...
-        go tool cover -func coverage.out -o coverage.out
-
-    - name: coverage badge
-      uses: tj-actions/coverage-badge-go@v2
-      with:
-        green: 80
-        filename: coverage.out
-
-    - uses: stefanzweifel/git-auto-commit-action@v4
-      name: autocommit
-      with:
-        commit_message: Apply Code Coverage Badge
-        skip_fetch: true
-        skip_checkout: true
-        file_pattern: ./README.md
-
-    - name: push
-      if: steps.auto-commit-action.outputs.changes_detected == 'true'
-      uses: ad-m/github-push-action@master
-      with:
-        github_token: ${{ github.token }}
-        branch: ${{ github.ref }}

.gitea/workflows/job_lint.yml

@@ -1,29 +0,0 @@
-name: lint
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable' 
-    - name: setup deps
-      run: go get -v ./...
-    - name: run lint
-      uses: https://github.com/golangci/golangci-lint-action@v6
-      with:
-        version: 'latest'

.gitea/workflows/job_test.yml

@@ -1,34 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-  push:
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup deps
-      run: go get -v ./...
-    - name: run test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...

.gitea/workflows/job_tests.yml

@@ -1,53 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-  push:
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: checkout tests
-      uses: actions/checkout@v4
-      with:
-        ref: master
-        filter: 'blob:none'
-        repository: unistack-org/micro-tests
-        path: micro-tests
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup go work
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        go work init
-        go work use .
-        go work use micro-tests
-    - name: setup deps
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: go get -v ./...
-    - name: run tests
-      env:
-        INTEGRATION_TESTS: yes
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        cd micro-tests
-        go test -mod readonly -v ./... || true

.gitea/workflows/lint.yml

@@ -0,0 +1,24 @@
+name: lint
+on:
+  pull_request:
+    branches:
+    - master
+    - v3
+jobs:
+  lint:
+    name: lint
+    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: deps
+      run: go get -v -d ./...
+    - name: lint
+      uses: https://github.com/golangci/golangci-lint-action@v3.4.0
+      continue-on-error: true
+      with:
+        version: v1.52

.gitea/workflows/pr.yml

@@ -0,0 +1,23 @@
+name: pr
+on:
+  pull_request:
+    branches:
+    - master
+    - v3
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: https://gitea.com/actions/checkout@v3
+    - name: setup-go
+      uses: https://gitea.com/actions/setup-go@v3
+      with:
+        go-version: 1.21
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -v -mod readonly -race -coverprofile=coverage.txt -covermode=atomic ./...

.golangci.yml

@@ -1,5 +1,42 @@
 run:
-  concurrency: 8
-  deadline: 5m
+  concurrency: 4
   issues-exit-code: 1
   tests: true
+
+linters-settings:
+  govet:
+    check-shadowing: true
+    enable:
+      - fieldalignment
+
+linters:
+  enable:
+    - govet
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - typecheck
+    - unused
+    - spancheck
+    - bodyclose
+    - gci
+    - goconst
+    - gocritic
+    - gosimple
+    - gofmt
+    - gofumpt
+    - goimports
+    - revive
+    - gosec
+    - makezero
+    - misspell
+    - nakedret
+    - nestif
+    - nilerr
+    - noctx
+    - prealloc
+    - unconvert
+    - unparam
+    - unused
+  disable-all: false

README.md

@@ -1,9 +1,4 @@
-# Micro
-![Coverage](https://img.shields.io/badge/Coverage-43.9%25-yellow)
-[![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Doc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/go.unistack.org/micro/v3?tab=overview)
-[![Status](https://git.unistack.org/unistack-org/micro/actions/workflows/job_tests.yml/badge.svg?branch=v3)](https://git.unistack.org/unistack-org/micro/actions?query=workflow%3Abuild+branch%3Av3+event%3Apush)
-[![Lint](https://goreportcard.com/badge/go.unistack.org/micro/v3)](https://goreportcard.com/report/go.unistack.org/micro/v3)
+# Micro [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Doc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/go.unistack.org/micro/v4?tab=overview) [![Status](https://github.com/unistack-org/micro/workflows/build/badge.svg?branch=master)](https://github.com/unistack-org/micro/actions?query=workflow%3Abuild+branch%3Amaster+event%3Apush) [![Lint](https://goreportcard.com/badge/go.unistack.org/micro/v4)](https://goreportcard.com/report/go.unistack.org/micro/v4) [![Coverage](https://codecov.io/gh/unistack-org/micro/branch/v4/graph/badge.svg?token=OZPO2LP7VS)](https://codecov.io/gh/unistack-org/micro)
 
 Micro is a standard library for microservices.
 
@@ -15,20 +10,30 @@ Micro provides the core requirements for distributed systems development includi
 
 Micro abstracts away the details of distributed systems. Here are the main features.
 
+- **Authentication** - Auth is built in as a first class citizen. Authentication and authorization enable secure 
+zero trust networking by providing every service an identity and certificates. This additionally includes rule 
+based access control.
+
 - **Dynamic Config** - Load and hot reload dynamic config from anywhere. The config interface provides a way to load application 
-level config from any source such as env vars, cmdline, file, consul, vault... You can merge the sources and even define fallbacks.
+level config from any source such as env vars, file, etcd. You can merge the sources and even define fallbacks.
 
 - **Data Storage** - A simple data store interface to read, write and delete records. It includes support for memory, file and 
-s3. State and persistence becomes a core requirement beyond prototyping and Micro looks to build that into the framework.
+CockroachDB by default. State and persistence becomes a core requirement beyond prototyping and Micro looks to build that into the framework.
 
 - **Service Discovery** - Automatic service registration and name resolution. Service discovery is at the core of micro service 
 development. When service A needs to speak to service B it needs the location of that service.
 
+- **Load Balancing** - Client side load balancing built on service discovery. Once we have the addresses of any number of instances 
+of a service we now need a way to decide which node to route to. We use random hashed load balancing to provide even distribution 
+across the services and retry a different node if there's a problem. 
+
 - **Message Encoding** - Dynamic message encoding based on content-type. The client and server will use codecs along with content-type 
 to seamlessly encode and decode Go types for you. Any variety of messages could be encoded and sent from different clients. The client 
 and server handle this by default.
 
-- **Async Messaging** - Pub/Sub is built in as a first class citizen for asynchronous communication and event driven architectures.
+- **Transport** - gRPC or http based request/response with support for bidirectional streaming. We provide an abstraction for synchronous communication. A request made to a service will be automatically resolved, load balanced, dialled and streamed.
+
+- **Async Messaging** - PubSub is built in as a first class citizen for asynchronous communication and event driven architectures.
 Event notifications are a core pattern in micro service development.
 
 - **Synchronization** - Distributed systems are often built in an eventually consistent manner. Support for distributed locking and 
@@ -37,6 +42,10 @@ leadership are built in as a Sync interface. When using an eventually consistent
 - **Pluggable Interfaces** - Micro makes use of Go interfaces for each system abstraction. Because of this these interfaces 
 are pluggable and allows Micro to be runtime agnostic.
 
+## Getting Started
+
+To be created.
+
 ## License
 
 Micro is Apache 2.0 licensed.

broker/broker.go

@@ -1,13 +1,13 @@
 // Package broker is an interface used for asynchronous messaging
-package broker
+package broker // import "go.unistack.org/micro/v4/broker"
 
 import (
 	"context"
 	"errors"
 	"time"
 
-	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/options"
 )
 
 // DefaultBroker default memory broker
@@ -18,10 +18,8 @@ var (
 	ErrNotConnected = errors.New("broker not connected")
 	// ErrDisconnected returns when broker disconnected
 	ErrDisconnected = errors.New("broker disconnected")
-	// ErrInvalidMessage returns when invalid Message passed
-	ErrInvalidMessage = errors.New("invalid message")
-	// ErrInvalidHandler returns when subscriber passed to Subscribe
-	ErrInvalidHandler = errors.New("invalid handler")
+	// ErrInvalidMessage returns when message has nvalid format
+	ErrInvalidMessage = errors.New("broker message has invalid format")
 	// DefaultGracefulTimeout
 	DefaultGracefulTimeout = 5 * time.Second
 )
@@ -31,7 +29,7 @@ type Broker interface {
 	// Name returns broker instance name
 	Name() string
 	// Init initilize broker
-	Init(opts ...Option) error
+	Init(opts ...options.Option) error
 	// Options returns broker options
 	Options() Options
 	// Address return configured address
@@ -40,44 +38,29 @@ type Broker interface {
 	Connect(ctx context.Context) error
 	// Disconnect disconnect from broker
 	Disconnect(ctx context.Context) error
-	// NewMessage create new broker message to publish.
-	NewMessage(ctx context.Context, hdr metadata.Metadata, body interface{}, opts ...PublishOption) (Message, error)
-	// Publish message to broker topic
-	Publish(ctx context.Context, topic string, messages ...Message) error
+	// Publish message, msg can be single broker.Message or []broker.Message
+	Publish(ctx context.Context, msg interface{}, opts ...options.Option) error
 	// Subscribe subscribes to topic message via handler
-	Subscribe(ctx context.Context, topic string, handler interface{}, opts ...SubscribeOption) (Subscriber, error)
+	Subscribe(ctx context.Context, topic string, handler interface{}, opts ...options.Option) (Subscriber, error)
 	// String type of broker
 	String() string
-	// Live returns broker liveness
-	Live() bool
-	// Ready returns broker readiness
-	Ready() bool
-	// Health returns broker health
-	Health() bool
 }
 
-type (
-	FuncPublish   func(ctx context.Context, topic string, messages ...Message) error
-	HookPublish   func(next FuncPublish) FuncPublish
-	FuncSubscribe func(ctx context.Context, topic string, handler interface{}, opts ...SubscribeOption) (Subscriber, error)
-	HookSubscribe func(next FuncSubscribe) FuncSubscribe
-)
-
 // Message is given to a subscription handler for processing
 type Message interface {
-	// Context for the message.
+	// Context for the message
 	Context() context.Context
-	// Topic returns message destination topic.
+	// Topic
 	Topic() string
-	// Header returns message headers.
+	// Header returns message headers
 	Header() metadata.Metadata
-	// Body returns broker message []byte slice
-	Body() []byte
-	// Unmarshal try to decode message body to dst.
-	// This is helper method that uses codec.Unmarshal.
-	Unmarshal(dst interface{}, opts ...codec.Option) error
-	// Ack acknowledge message if supported.
+	// 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
 }
 
 // Subscriber is a convenience return type for the Subscribe method
@@ -89,3 +72,9 @@ 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

@@ -15,15 +15,6 @@ func FromContext(ctx context.Context) (Broker, bool) {
 	return c, ok
 }
 
-// MustContext returns broker from passed context
-func MustContext(ctx context.Context) Broker {
-	b, ok := FromContext(ctx)
-	if !ok {
-		panic("missing broker")
-	}
-	return b
-}
-
 // NewContext savess broker in context
 func NewContext(ctx context.Context, s Broker) context.Context {
 	if ctx == nil {
@@ -31,23 +22,3 @@ 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)
-	}
-}

broker/context_test.go

@@ -37,25 +37,3 @@ 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 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

@@ -0,0 +1,334 @@
+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 {
+	subscribers map[string][]*memorySubscriber
+	addr        string
+	opts        Options
+	sync.RWMutex
+	connected bool
+}
+
+func (m *MemoryBroker) Options() Options {
+	return m.opts
+}
+
+func (m *MemoryBroker) Address() string {
+	return m.addr
+}
+
+func (m *MemoryBroker) Connect(ctx context.Context) error {
+	m.Lock()
+	defer m.Unlock()
+
+	if m.connected {
+		return nil
+	}
+
+	// use 127.0.0.1 to avoid scan of all network interfaces
+	addr, err := maddr.Extract("127.0.0.1")
+	if err != nil {
+		return err
+	}
+	var rng rand.Rand
+	i := rng.Intn(20000)
+	// set addr with port
+	addr = mnet.HostPort(addr, 10000+i)
+
+	m.addr = addr
+	m.connected = true
+
+	return nil
+}
+
+func (m *MemoryBroker) Disconnect(ctx context.Context) error {
+	m.Lock()
+	defer m.Unlock()
+
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	default:
+		if m.connected {
+			m.connected = false
+		}
+	}
+
+	return nil
+}
+
+func (m *MemoryBroker) Init(opts ...options.Option) error {
+	var err error
+	for _, o := range opts {
+		if err = o(&m.opts); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ...options.Option) error {
+	m.RLock()
+	if !m.connected {
+		m.RUnlock()
+		return ErrNotConnected
+	}
+	m.RUnlock()
+
+	var err error
+
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	default:
+		options := NewPublishOptions(opts...)
+		var msgs []Message
+		switch v := message.(type) {
+		case []Message:
+			msgs = v
+		case Message:
+			msgs = append(msgs, v)
+		default:
+			return ErrInvalidMessage
+		}
+		msgTopicMap := make(map[string][]*memoryMessage)
+		for _, msg := range msgs {
+			p := &memoryMessage{opts: options}
+			p.topic, _ = msg.Header().Get(metadata.HeaderTopic)
+			if v, ok := msg.Body().(*codec.Frame); ok {
+				p.body = msg.Body()
+			} else if len(m.opts.Codecs) == 0 {
+				p.body = msg.Body()
+			} else {
+				cf, ok := m.opts.Codecs[options.ContentType]
+				if !ok {
+					return fmt.Errorf("%s: %s", codec.ErrUnknownContentType, options.ContentType)
+				}
+				p.body, err = cf.Marshal(v)
+				if err != nil {
+					return err
+				}
+			}
+			msgTopicMap[p.topic] = append(msgTopicMap[p.topic], p)
+		}
+
+		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.ErrorHandler != nil {
+					eh = sub.opts.ErrorHandler
+				}
+
+				switch mh := sub.handler.(type) {
+				case MessagesHandler:
+					mhs := make([]Message, 0, len(ms))
+					for _, m := range ms {
+						mhs = append(mhs, m)
+					}
+					if err = mh(mhs); err != nil {
+						m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "failure").Add(len(ms))
+						if eh != nil {
+							switch meh := eh.(type) {
+							case MessagesHandler:
+								_ = meh(mhs)
+							case MessageHandler:
+								for _, me := range mhs {
+									_ = meh(me)
+								}
+							}
+						} else if m.opts.Logger.V(logger.ErrorLevel) {
+							m.opts.Logger.Error(m.opts.Context, err.Error())
+						}
+					}
+				case MessageHandler:
+					for _, p := range ms {
+						if err = mh(p); err != nil {
+							m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "failure").Inc()
+							if eh != nil {
+								switch meh := eh.(type) {
+								case MessageHandler:
+									_ = meh(p)
+								case MessagesHandler:
+									_ = meh([]Message{p})
+								}
+							} else if m.opts.Logger.V(logger.ErrorLevel) {
+								m.opts.Logger.Error(m.opts.Context, err.Error())
+							}
+						} else {
+							if sub.opts.AutoAck {
+								if err = p.Ack(); err != nil {
+									m.opts.Logger.Error(m.opts.Context, "ack failed: "+err.Error())
+									m.opts.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) {
+	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,
+		handler: 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) String() string {
+	return "memory"
+}
+
+func (m *MemoryBroker) Name() string {
+	return m.opts.Name
+}
+
+type memoryMessage struct {
+	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 {
+	return m.header
+}
+
+func (m *memoryMessage) Body() interface{} {
+	return m.body
+}
+
+func (m *memoryMessage) Ack() error {
+	return nil
+}
+
+func (m *memoryMessage) Error() error {
+	return m.err
+}
+
+func (m *memoryMessage) Context() context.Context {
+	return m.ctx
+}
+
+type memorySubscriber struct {
+	ctx     context.Context
+	exit    chan bool
+	handler interface{}
+	id      string
+	topic   string
+	opts    SubscribeOptions
+}
+
+func (m *memorySubscriber) Options() SubscribeOptions {
+	return m.opts
+}
+
+func (m *memorySubscriber) Topic() string {
+	return m.topic
+}
+
+func (m *memorySubscriber) Unsubscribe(ctx context.Context) error {
+	m.exit <- true
+	return nil
+}
+
+// NewBroker return new memory broker
+func NewBroker(opts ...options.Option) *MemoryBroker {
+	return &MemoryBroker{
+		opts:        NewOptions(opts...),
+		subscribers: make(map[string][]*memorySubscriber),
+	}
+}

broker/memory/memory.go

@@ -1,338 +0,0 @@
-package broker
-
-import (
-	"context"
-	"strings"
-	"sync"
-
-	"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/options"
-	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 Broker struct {
-	funcPublish   broker.FuncPublish
-	funcSubscribe broker.FuncSubscribe
-	subscribers   map[string][]*Subscriber
-	addr          string
-	opts          broker.Options
-	sync.RWMutex
-	connected bool
-}
-
-type memoryMessage struct {
-	c     codec.Codec
-	topic string
-	ctx   context.Context
-	body  []byte
-	hdr   metadata.Metadata
-	opts  broker.PublishOptions
-}
-
-func (m *memoryMessage) Ack() error {
-	return nil
-}
-
-func (m *memoryMessage) Body() []byte {
-	return m.body
-}
-
-func (m *memoryMessage) Header() metadata.Metadata {
-	return m.hdr
-}
-
-func (m *memoryMessage) Context() context.Context {
-	return m.ctx
-}
-
-func (m *memoryMessage) Topic() string {
-	return ""
-}
-
-func (m *memoryMessage) Unmarshal(dst interface{}, opts ...codec.Option) error {
-	return m.c.Unmarshal(m.body, dst)
-}
-
-type Subscriber struct {
-	ctx     context.Context
-	exit    chan bool
-	handler interface{}
-	id      string
-	topic   string
-	opts    broker.SubscribeOptions
-}
-
-func (b *Broker) newCodec(ct string) (codec.Codec, error) {
-	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
-		ct = ct[:idx]
-	}
-	b.RLock()
-	c, ok := b.opts.Codecs[ct]
-	b.RUnlock()
-	if ok {
-		return c, nil
-	}
-	return nil, codec.ErrUnknownContentType
-}
-
-func (b *Broker) Options() broker.Options {
-	return b.opts
-}
-
-func (b *Broker) Address() string {
-	return b.addr
-}
-
-func (b *Broker) Connect(ctx context.Context) error {
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
-
-	b.Lock()
-	defer b.Unlock()
-
-	if b.connected {
-		return nil
-	}
-
-	// use 127.0.0.1 to avoid scan of all network interfaces
-	addr, err := maddr.Extract("127.0.0.1")
-	if err != nil {
-		return err
-	}
-	var rng rand.Rand
-	i := rng.Intn(20000)
-	// set addr with port
-	addr = mnet.HostPort(addr, 10000+i)
-
-	b.addr = addr
-	b.connected = true
-
-	return nil
-}
-
-func (b *Broker) Disconnect(ctx context.Context) error {
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
-
-	b.Lock()
-	defer b.Unlock()
-
-	if !b.connected {
-		return nil
-	}
-
-	b.connected = false
-	return nil
-}
-
-func (b *Broker) Init(opts ...broker.Option) error {
-	for _, o := range opts {
-		o(&b.opts)
-	}
-
-	b.funcPublish = b.fnPublish
-	b.funcSubscribe = b.fnSubscribe
-
-	b.opts.Hooks.EachPrev(func(hook options.Hook) {
-		switch h := hook.(type) {
-		case broker.HookPublish:
-			b.funcPublish = h(b.funcPublish)
-		case broker.HookSubscribe:
-			b.funcSubscribe = h(b.funcSubscribe)
-		}
-	})
-
-	return nil
-}
-
-func (b *Broker) NewMessage(ctx context.Context, hdr metadata.Metadata, body interface{}, opts ...broker.PublishOption) (broker.Message, error) {
-	options := broker.NewPublishOptions(opts...)
-	m := &memoryMessage{ctx: ctx, hdr: hdr, opts: options}
-	c, err := b.newCodec(m.opts.ContentType)
-	if err == nil {
-		m.body, err = c.Marshal(body)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	return m, nil
-}
-
-func (b *Broker) Publish(ctx context.Context, topic string, messages ...broker.Message) error {
-	return b.funcPublish(ctx, topic, messages...)
-}
-
-func (b *Broker) fnPublish(ctx context.Context, topic string, messages ...broker.Message) error {
-	return b.publish(ctx, topic, messages...)
-}
-
-func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.Message) error {
-	b.RLock()
-	if !b.connected {
-		b.RUnlock()
-		return broker.ErrNotConnected
-	}
-	b.RUnlock()
-
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
-
-	b.RLock()
-	subs, ok := b.subscribers[topic]
-	b.RUnlock()
-	if !ok {
-		return nil
-	}
-
-	var err error
-
-	for _, sub := range subs {
-		switch s := sub.handler.(type) {
-		default:
-			if b.opts.Logger.V(logger.ErrorLevel) {
-				b.opts.Logger.Error(ctx, "broker  handler error", broker.ErrInvalidHandler)
-			}
-		case func(broker.Message) error:
-			for _, message := range messages {
-				msg, ok := message.(*memoryMessage)
-				if !ok {
-					if b.opts.Logger.V(logger.ErrorLevel) {
-						b.opts.Logger.Error(ctx, "broker handler error", broker.ErrInvalidMessage)
-					}
-				}
-				msg.topic = topic
-				if err = s(msg); err == nil && sub.opts.AutoAck {
-					err = msg.Ack()
-				}
-				if err != nil {
-					if b.opts.Logger.V(logger.ErrorLevel) {
-						b.opts.Logger.Error(ctx, "broker handler error", err)
-					}
-				}
-			}
-		case func([]broker.Message) error:
-			if err = s(messages); err == nil && sub.opts.AutoAck {
-				for _, message := range messages {
-					err = message.Ack()
-					if err != nil {
-						if b.opts.Logger.V(logger.ErrorLevel) {
-							b.opts.Logger.Error(ctx, "broker handler error", err)
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
-func (b *Broker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	return b.funcSubscribe(ctx, topic, handler, opts...)
-}
-
-func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	if err := broker.IsValidHandler(handler); err != nil {
-		return nil, err
-	}
-
-	b.RLock()
-	if !b.connected {
-		b.RUnlock()
-		return nil, broker.ErrNotConnected
-	}
-	b.RUnlock()
-
-	sid, err := id.New()
-	if err != nil {
-		return nil, err
-	}
-
-	options := broker.NewSubscribeOptions(opts...)
-
-	sub := &Subscriber{
-		exit:    make(chan bool, 1),
-		id:      sid,
-		topic:   topic,
-		handler: handler,
-		opts:    options,
-		ctx:     ctx,
-	}
-
-	b.Lock()
-	b.subscribers[topic] = append(b.subscribers[topic], sub)
-	b.Unlock()
-
-	go func() {
-		<-sub.exit
-		b.Lock()
-		newSubscribers := make([]*Subscriber, 0, len(b.subscribers)-1)
-		for _, sb := range b.subscribers[topic] {
-			if sb.id == sub.id {
-				continue
-			}
-			newSubscribers = append(newSubscribers, sb)
-		}
-		b.subscribers[topic] = newSubscribers
-		b.Unlock()
-	}()
-
-	return sub, nil
-}
-
-func (b *Broker) String() string {
-	return "memory"
-}
-
-func (b *Broker) Name() string {
-	return b.opts.Name
-}
-
-func (b *Broker) Live() bool {
-	return true
-}
-
-func (b *Broker) Ready() bool {
-	return true
-}
-
-func (b *Broker) Health() bool {
-	return true
-}
-
-func (m *Subscriber) Options() broker.SubscribeOptions {
-	return m.opts
-}
-
-func (m *Subscriber) Topic() string {
-	return m.topic
-}
-
-func (m *Subscriber) Unsubscribe(ctx context.Context) error {
-	m.exit <- true
-	return nil
-}
-
-// NewBroker return new memory broker
-func NewBroker(opts ...broker.Option) broker.Broker {
-	return &Broker{
-		opts:        broker.NewOptions(opts...),
-		subscribers: make(map[string][]*Subscriber),
-	}
-}

broker/memory/memory_test.go

@@ -1,74 +0,0 @@
-package broker
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"go.uber.org/atomic"
-	"go.unistack.org/micro/v4/broker"
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/metadata"
-)
-
-type hldr struct {
-	c atomic.Int64
-}
-
-func (h *hldr) Handler(m broker.Message) error {
-	h.c.Add(1)
-	return nil
-}
-
-func TestMemoryBroker(t *testing.T) {
-	b := NewBroker(broker.Codec("application/octet-stream", codec.NewCodec()))
-	ctx := context.Background()
-
-	if err := b.Init(); err != nil {
-		t.Fatalf("Unexpected init error %v", err)
-	}
-
-	if err := b.Connect(ctx); err != nil {
-		t.Fatalf("Unexpected connect error %v", err)
-	}
-
-	topic := "test"
-	count := int64(10)
-
-	h := &hldr{}
-
-	sub, err := b.Subscribe(ctx, topic, h.Handler)
-	if err != nil {
-		t.Fatalf("Unexpected error subscribing %v", err)
-	}
-
-	for i := int64(0); i < count; i++ {
-		message, err := b.NewMessage(ctx,
-			metadata.Pairs(
-				"foo", "bar",
-				"id", fmt.Sprintf("%d", i),
-			),
-			[]byte(`"hello world"`),
-			broker.PublishContentType("application/octet-stream"),
-		)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if err := b.Publish(ctx, topic, message); err != nil {
-			t.Fatalf("Unexpected error publishing %d err: %v", i, err)
-		}
-	}
-
-	if err := sub.Unsubscribe(ctx); err != nil {
-		t.Fatalf("Unexpected error unsubscribing from %s: %v", topic, err)
-	}
-
-	if err := b.Disconnect(ctx); err != nil {
-		t.Fatalf("Unexpected connect error %v", err)
-	}
-
-	if h.c.Load() != count {
-		t.Fatal("invalid messages count received")
-	}
-}

broker/memory_test.go

@@ -0,0 +1,107 @@
+package broker
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"go.unistack.org/micro/v4/metadata"
+)
+
+func TestMemoryBatchBroker(t *testing.T) {
+	b := NewBroker()
+	ctx := context.Background()
+
+	if err := b.Connect(ctx); err != nil {
+		t.Fatalf("Unexpected connect error %v", err)
+	}
+
+	topic := "test"
+	count := 10
+
+	fn := func(evts []Message) error {
+		var err error
+		for _, evt := range evts {
+			if err = evt.Ack(); err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+
+	sub, err := b.Subscribe(ctx, topic, fn)
+	if err != nil {
+		t.Fatalf("Unexpected error subscribing %v", err)
+	}
+
+	msgs := make([]Message, 0, count)
+	for i := 0; i < count; i++ {
+		message := &memoryMessage{
+			header: metadata.Metadata{
+				metadata.HeaderTopic: []string{topic},
+				"foo":                []string{"bar"},
+				"id":                 []string{fmt.Sprintf("%d", i)},
+			},
+			body: []byte(`"hello world"`),
+		}
+		msgs = append(msgs, message)
+	}
+
+	if err := b.Publish(ctx, msgs); err != nil {
+		t.Fatalf("Unexpected error publishing %v", err)
+	}
+
+	if err := sub.Unsubscribe(ctx); err != nil {
+		t.Fatalf("Unexpected error unsubscribing from %s: %v", topic, err)
+	}
+
+	if err := b.Disconnect(ctx); err != nil {
+		t.Fatalf("Unexpected connect error %v", err)
+	}
+}
+
+func TestMemoryBroker(t *testing.T) {
+	b := NewBroker()
+	ctx := context.Background()
+
+	if err := b.Connect(ctx); err != nil {
+		t.Fatalf("Unexpected connect error %v", err)
+	}
+
+	topic := "test"
+	count := 10
+
+	fn := func(p Message) error {
+		return p.Ack()
+	}
+
+	sub, err := b.Subscribe(ctx, topic, fn)
+	if err != nil {
+		t.Fatalf("Unexpected error subscribing %v", err)
+	}
+
+	msgs := make([]Message, 0, count)
+	for i := 0; i < count; i++ {
+		message := &memoryMessage{
+			header: metadata.Metadata{
+				metadata.HeaderTopic: []string{topic},
+				"foo":                []string{"bar"},
+				"id":                 []string{fmt.Sprintf("%d", i)},
+			},
+			body: []byte(`"hello world"`),
+		}
+		msgs = append(msgs, message)
+	}
+
+	if err := b.Publish(ctx, msgs); err != nil {
+		t.Fatalf("Unexpected error publishing %v", err)
+	}
+
+	if err := sub.Unsubscribe(ctx); err != nil {
+		t.Fatalf("Unexpected error unsubscribing from %s: %v", topic, err)
+	}
+
+	if err := b.Disconnect(ctx); err != nil {
+		t.Fatalf("Unexpected connect error %v", err)
+	}
+}

broker/noop.go

@@ -1,176 +0,0 @@
-package broker
-
-import (
-	"context"
-	"strings"
-	"sync"
-
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
-)
-
-type NoopBroker struct {
-	funcPublish   FuncPublish
-	funcSubscribe FuncSubscribe
-	opts          Options
-	sync.RWMutex
-}
-
-func (b *NoopBroker) newCodec(ct string) (codec.Codec, error) {
-	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
-		ct = ct[:idx]
-	}
-	b.RLock()
-	c, ok := b.opts.Codecs[ct]
-	b.RUnlock()
-	if ok {
-		return c, nil
-	}
-	return nil, codec.ErrUnknownContentType
-}
-
-func NewBroker(opts ...Option) *NoopBroker {
-	b := &NoopBroker{opts: NewOptions(opts...)}
-	b.funcPublish = b.fnPublish
-	b.funcSubscribe = b.fnSubscribe
-
-	return b
-}
-
-func (b *NoopBroker) Health() bool {
-	return true
-}
-
-func (b *NoopBroker) Live() bool {
-	return true
-}
-
-func (b *NoopBroker) Ready() bool {
-	return true
-}
-
-func (b *NoopBroker) Name() string {
-	return b.opts.Name
-}
-
-func (b *NoopBroker) String() string {
-	return "noop"
-}
-
-func (b *NoopBroker) Options() Options {
-	return b.opts
-}
-
-func (b *NoopBroker) Init(opts ...Option) error {
-	for _, opt := range opts {
-		opt(&b.opts)
-	}
-
-	b.funcPublish = b.fnPublish
-	b.funcSubscribe = b.fnSubscribe
-
-	b.opts.Hooks.EachPrev(func(hook options.Hook) {
-		switch h := hook.(type) {
-		case HookPublish:
-			b.funcPublish = h(b.funcPublish)
-		case HookSubscribe:
-			b.funcSubscribe = h(b.funcSubscribe)
-		}
-	})
-
-	return nil
-}
-
-func (b *NoopBroker) Connect(_ context.Context) error {
-	return nil
-}
-
-func (b *NoopBroker) Disconnect(_ context.Context) error {
-	return nil
-}
-
-func (b *NoopBroker) Address() string {
-	return strings.Join(b.opts.Addrs, ",")
-}
-
-type noopMessage struct {
-	c    codec.Codec
-	ctx  context.Context
-	body []byte
-	hdr  metadata.Metadata
-	opts PublishOptions
-}
-
-func (m *noopMessage) Ack() error {
-	return nil
-}
-
-func (m *noopMessage) Body() []byte {
-	return m.body
-}
-
-func (m *noopMessage) Header() metadata.Metadata {
-	return m.hdr
-}
-
-func (m *noopMessage) Context() context.Context {
-	return m.ctx
-}
-
-func (m *noopMessage) Topic() string {
-	return ""
-}
-
-func (m *noopMessage) Unmarshal(dst interface{}, opts ...codec.Option) error {
-	return m.c.Unmarshal(m.body, dst)
-}
-
-func (b *NoopBroker) NewMessage(ctx context.Context, hdr metadata.Metadata, body interface{}, opts ...PublishOption) (Message, error) {
-	options := NewPublishOptions(opts...)
-	m := &noopMessage{ctx: ctx, hdr: hdr, opts: options}
-	c, err := b.newCodec(m.opts.ContentType)
-	if err == nil {
-		m.body, err = c.Marshal(body)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	return m, nil
-}
-
-func (b *NoopBroker) fnPublish(_ context.Context, _ string, _ ...Message) error {
-	return nil
-}
-
-func (b *NoopBroker) Publish(ctx context.Context, topic string, msg ...Message) error {
-	return b.funcPublish(ctx, topic, msg...)
-}
-
-type NoopSubscriber struct {
-	ctx     context.Context
-	topic   string
-	handler interface{}
-	opts    SubscribeOptions
-}
-
-func (b *NoopBroker) fnSubscribe(ctx context.Context, topic string, handler interface{}, opts ...SubscribeOption) (Subscriber, error) {
-	return &NoopSubscriber{ctx: ctx, topic: topic, opts: NewSubscribeOptions(opts...), handler: handler}, nil
-}
-
-func (b *NoopBroker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...SubscribeOption) (Subscriber, error) {
-	return b.funcSubscribe(ctx, topic, handler, opts...)
-}
-
-func (s *NoopSubscriber) Options() SubscribeOptions {
-	return s.opts
-}
-
-func (s *NoopSubscriber) Topic() string {
-	return s.topic
-}
-
-func (s *NoopSubscriber) Unsubscribe(_ context.Context) error {
-	return nil
-}

broker/noop_test.go

@@ -1,35 +0,0 @@
-package broker
-
-import (
-	"context"
-	"testing"
-)
-
-type testHook struct {
-	f bool
-}
-
-func (t *testHook) Publish1(fn FuncPublish) FuncPublish {
-	return func(ctx context.Context, topic string, messages ...Message) error {
-		t.f = true
-		return fn(ctx, topic, messages...)
-	}
-}
-
-func TestNoopHook(t *testing.T) {
-	h := &testHook{}
-
-	b := NewBroker(Hooks(HookPublish(h.Publish1)))
-
-	if err := b.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := b.Publish(context.TODO(), "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if !h.f {
-		t.Fatal("hook not works")
-	}
-}

broker/options.go

@@ -7,6 +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"
@@ -16,14 +17,11 @@ import (
 
 // Options struct
 type Options struct {
-	// Name holds the broker name
-	Name string
-
 	// Tracer used for tracing
 	Tracer tracer.Tracer
 	// Register can be used for clustering
 	Register register.Register
-	// Codecs holds the codecs for marshal/unmarshal based on content-type
+	// Codecs holds the codec for marshal/unmarshal
 	Codecs map[string]codec.Codec
 	// Logger used for logging
 	Logger logger.Logger
@@ -31,25 +29,23 @@ type Options struct {
 	Meter meter.Meter
 	// Context holds external options
 	Context context.Context
-
-	// Wait waits for a collection of goroutines to finish
-	Wait *sync.WaitGroup
 	// TLSConfig holds tls.TLSConfig options
 	TLSConfig *tls.Config
+	// ErrorHandler used when broker have error while processing message
+	ErrorHandler interface{}
+	// Name holds the broker name
+	Name string
+	// Address holds the broker address
+	Address []string
 
-	// Addrs holds the broker address
-	Addrs []string
-	// Hooks can be run before broker Publish/BatchPublish and
-	// Subscribe/BatchSubscribe methods
-	Hooks options.Hooks
+	Wait *sync.WaitGroup
 
-	// GracefulTimeout contains time to wait to finish in flight requests
 	GracefulTimeout time.Duration
 }
 
 // NewOptions create new Options
-func NewOptions(opts ...Option) Options {
-	options := Options{
+func NewOptions(opts ...options.Option) Options {
+	newOpts := Options{
 		Register:        register.DefaultRegister,
 		Logger:          logger.DefaultLogger,
 		Context:         context.Background(),
@@ -58,44 +54,52 @@ func NewOptions(opts ...Option) Options {
 		Tracer:          tracer.DefaultTracer,
 		GracefulTimeout: DefaultGracefulTimeout,
 	}
-
 	for _, o := range opts {
-		o(&options)
-	}
-	return options
-}
-
-// Context sets the context option
-func Context(ctx context.Context) Option {
-	return func(o *Options) {
-		o.Context = ctx
+		o(&newOpts)
 	}
+	return newOpts
 }
 
 // PublishOptions struct
 type PublishOptions struct {
-	// ContentType for message body
+	// Context holds external options
+	Context context.Context
+	// Message metadata usually passed as message headers
+	Metadata metadata.Metadata
+	// Content-Type of message for marshal
 	ContentType string
-	// BodyOnly flag says the message contains raw body bytes and don't need
-	// codec Marshal method
+	// Topic destination
+	Topic string
+	// BodyOnly flag says the message contains raw body bytes
 	BodyOnly bool
 }
 
 // NewPublishOptions creates PublishOptions struct
-func NewPublishOptions(opts ...PublishOption) PublishOptions {
-	options := PublishOptions{}
+func NewPublishOptions(opts ...options.Option) PublishOptions {
+	options := PublishOptions{
+		Context: context.Background(),
+	}
 	for _, o := range opts {
 		o(&options)
 	}
 	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
-	// Group holds consumer group
-	Group string
+	// ErrorHandler used when broker have error while processing message
+	ErrorHandler interface{}
+	// QueueGroup holds consumer group
+	QueueGroup 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
@@ -106,137 +110,16 @@ type SubscribeOptions struct {
 	BatchWait time.Duration
 }
 
-// Option func
-type Option func(*Options)
-
-// PublishOption func
-type PublishOption func(*PublishOptions)
-
-// PublishContentType sets message content-type that used to Marshal
-func PublishContentType(ct string) PublishOption {
-	return func(o *PublishOptions) {
-		o.ContentType = ct
+// ErrorHandler will catch all broker errors that cant be handled
+// in normal way, for example Codec errors
+func ErrorHandler(h interface{}) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, h, ".ErrorHandler")
 	}
 }
 
-// PublishBodyOnly publish only body of the message
-func PublishBodyOnly(b bool) PublishOption {
-	return func(o *PublishOptions) {
-		o.BodyOnly = b
-	}
-}
-
-// 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 messages
-func Codec(ct string, c codec.Codec) Option {
-	return func(o *Options) {
-		o.Codecs[ct] = c
-	}
-}
-
-// 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
-	}
-}
-
-// Hooks sets hook runs before action
-func Hooks(h ...options.Hook) Option {
-	return func(o *Options) {
-		o.Hooks = append(o.Hooks, h...)
-	}
-}
-
-// SubscribeContext set context
-func SubscribeContext(ctx context.Context) SubscribeOption {
-	return func(o *SubscribeOptions) {
-		o.Context = ctx
-	}
-}
-
-// 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 ...SubscribeOption) SubscribeOptions {
+func NewSubscribeOptions(opts ...options.Option) SubscribeOptions {
 	options := SubscribeOptions{
 		AutoAck: true,
 		Context: context.Background(),
@@ -246,3 +129,39 @@ func NewSubscribeOptions(opts ...SubscribeOption) 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

@@ -3,13 +3,14 @@ package broker
 import (
 	"fmt"
 	"reflect"
+	"strings"
 	"unicode"
 	"unicode/utf8"
 )
 
 const (
-	messageSig  = "func(broker.Message) error"
-	messagesSig = "func([]broker.Message) error"
+	subSig      = "func(context.Context, interface{}) error"
+	batchSubSig = "func([]context.Context, []interface{}) error"
 )
 
 // Precompute the reflect type for error. Can't use error directly
@@ -32,25 +33,35 @@ func isExportedOrBuiltinType(t reflect.Type) bool {
 	return isExported(t.Name()) || t.PkgPath() == ""
 }
 
-// IsValidHandler func signature
-func IsValidHandler(sub interface{}) error {
+// 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:
-			argType = typ.In(0)
+		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", name, typ.NumIn(), messageSig)
+			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",
-				name, typ.NumOut(), messageSig)
+			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())
@@ -65,8 +76,8 @@ func IsValidHandler(sub interface{}) error {
 			case 3:
 				argType = method.Type.In(2)
 			default:
-				return fmt.Errorf("subscriber %v.%v takes wrong number of args: %v required signature %s",
-					name, method.Name, method.Type.NumIn(), messageSig)
+				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) {
@@ -74,8 +85,8 @@ func IsValidHandler(sub interface{}) error {
 			}
 			if method.Type.NumOut() != 1 {
 				return fmt.Errorf(
-					"subscriber %v.%v has wrong number of return values: %v require signature %s",
-					name, method.Name, method.Type.NumOut(), messageSig)
+					"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())

client/backoff.go

@@ -17,13 +17,13 @@ func BackoffExp(_ context.Context, _ Request, attempts int) (time.Duration, erro
 }
 
 // BackoffInterval specifies randomization interval for backoff func
-func BackoffInterval(minTime time.Duration, maxTime time.Duration) BackoffFunc {
+func BackoffInterval(min time.Duration, max time.Duration) BackoffFunc {
 	return func(_ context.Context, _ Request, attempts int) (time.Duration, error) {
 		td := time.Duration(math.Pow(float64(attempts), math.E)) * time.Millisecond * 100
-		if td < minTime {
-			return minTime, nil
-		} else if td > maxTime {
-			return maxTime, nil
+		if td < min {
+			return min, nil
+		} else if td > max {
+			return max, nil
 		}
 		return td, nil
 	}

client/backoff_test.go

@@ -34,23 +34,23 @@ func TestBackoffExp(t *testing.T) {
 }
 
 func TestBackoffInterval(t *testing.T) {
-	minTime := 100 * time.Millisecond
-	maxTime := 300 * time.Millisecond
+	min := 100 * time.Millisecond
+	max := 300 * time.Millisecond
 
 	r := &testRequest{
 		service: "test",
 		method:  "test",
 	}
 
-	fn := BackoffInterval(minTime, maxTime)
+	fn := BackoffInterval(min, max)
 	for i := 0; i < 5; i++ {
 		d, err := fn(context.TODO(), r, i)
 		if err != nil {
 			t.Fatal(err)
 		}
 
-		if d < minTime || d > maxTime {
-			t.Fatalf("Expected %v < %v < %v", minTime, d, maxTime)
+		if d < min || d > max {
+			t.Fatalf("Expected %v < %v < %v", min, d, max)
 		}
 	}
 }

client/client.go

@@ -1,12 +1,12 @@
 // Package client is an interface for an RPC client
-package client
+package client // import "go.unistack.org/micro/v4/client"
 
 import (
 	"context"
 	"time"
 
 	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/options"
 )
 
 var (
@@ -22,6 +22,8 @@ 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
@@ -29,24 +31,18 @@ var (
 )
 
 // Client is the interface used to make requests to services.
+// It supports Request/Response via Transport and Publishing via the Broker.
 // It also supports bidirectional streaming of requests.
 type Client interface {
 	Name() string
-	Init(opts ...Option) error
+	Init(opts ...options.Option) error
 	Options() Options
-	NewRequest(service string, endpoint string, req interface{}, opts ...RequestOption) Request
-	Call(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error
-	Stream(ctx context.Context, req Request, opts ...CallOption) (Stream, error)
+	NewRequest(service string, endpoint string, req interface{}, opts ...options.Option) Request
+	Call(ctx context.Context, req Request, rsp interface{}, opts ...options.Option) error
+	Stream(ctx context.Context, req Request, opts ...options.Option) (Stream, error)
 	String() string
 }
 
-type (
-	FuncCall   func(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error
-	HookCall   func(next FuncCall) FuncCall
-	FuncStream func(ctx context.Context, req Request, opts ...CallOption) (Stream, error)
-	HookStream func(next FuncStream) FuncStream
-)
-
 // Request is the interface for a synchronous request used by Call or Stream
 type Request interface {
 	// The service to call
@@ -63,16 +59,22 @@ 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
@@ -98,12 +100,3 @@ 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)
-
-// RequestOption used by NewRequest
-type RequestOption func(*RequestOptions)

client/client_call_options.go

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

client/client_call_options_test.go

@@ -0,0 +1,28 @@
+package client
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"go.unistack.org/micro/v4/options"
+)
+
+func TestNewClientCallOptions(t *testing.T) {
+	var flag bool
+	w := func(fn CallFunc) CallFunc {
+		flag = true
+		return fn
+	}
+	c := NewClientCallOptions(NewClient(),
+		options.Address("127.0.0.1"),
+		WithCallWrapper(w),
+		RequestTimeout(1*time.Millisecond),
+		Retries(0),
+		Backoff(BackoffInterval(10*time.Millisecond, 100*time.Millisecond)),
+	)
+	_ = c.Call(context.TODO(), c.NewRequest("service", "endpoint", nil), nil)
+	if !flag {
+		t.Fatalf("NewClientCallOptions not works")
+	}
+}

client/context.go

@@ -15,15 +15,6 @@ func FromContext(ctx context.Context) (Client, bool) {
 	return c, ok
 }
 
-// MustContext get client from context
-func MustContext(ctx context.Context) Client {
-	c, ok := FromContext(ctx)
-	if !ok {
-		panic("missing client")
-	}
-	return c
-}
-
 // NewContext put client in context
 func NewContext(ctx context.Context, c Client) context.Context {
 	if ctx == nil {
@@ -31,23 +22,3 @@ func NewContext(ctx context.Context, c Client) context.Context {
 	}
 	return context.WithValue(ctx, clientKey{}, c)
 }
-
-// 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,25 +38,3 @@ func TestNewNilContext(t *testing.T) {
 		t.Fatal("NewContext 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

@@ -3,7 +3,6 @@ package client
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"time"
 
 	"go.unistack.org/micro/v4/codec"
@@ -12,7 +11,6 @@ import (
 	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/selector"
 	"go.unistack.org/micro/v4/semconv"
-	"go.unistack.org/micro/v4/tracer"
 )
 
 // DefaultCodecs will be used to encode/decode data
@@ -21,9 +19,7 @@ var DefaultCodecs = map[string]codec.Codec{
 }
 
 type noopClient struct {
-	funcCall   FuncCall
-	funcStream FuncStream
-	opts       Options
+	opts Options
 }
 
 type noopRequest struct {
@@ -37,13 +33,13 @@ type noopRequest struct {
 }
 
 // NewClient returns new noop client
-func NewClient(opts ...Option) Client {
-	n := &noopClient{opts: NewOptions(opts...)}
+func NewClient(opts ...options.Option) Client {
+	nc := &noopClient{opts: NewOptions(opts...)}
+	// wrap in reverse
 
-	n.funcCall = n.fnCall
-	n.funcStream = n.fnStream
+	c := Client(nc)
 
-	return n
+	return c
 }
 
 func (n *noopClient) Name() string {
@@ -95,13 +91,10 @@ func (n *noopResponse) Read() ([]byte, error) {
 	return nil, nil
 }
 
-type noopStream struct {
-	err error
-	ctx context.Context
-}
+type noopStream struct{}
 
 func (n *noopStream) Context() context.Context {
-	return n.ctx
+	return context.Background()
 }
 
 func (n *noopStream) Request() Request {
@@ -129,40 +122,31 @@ func (n *noopStream) RecvMsg(interface{}) error {
 }
 
 func (n *noopStream) Error() error {
-	return n.err
+	return nil
 }
 
 func (n *noopStream) Close() error {
-	if sp, ok := tracer.SpanFromContext(n.ctx); ok && sp != nil {
-		if n.err != nil {
-			sp.SetStatus(tracer.SpanStatusError, n.err.Error())
-		}
-		sp.Finish()
-	}
-	return n.err
+	return nil
 }
 
 func (n *noopStream) CloseSend() error {
-	return n.err
+	return nil
 }
 
-func (n *noopClient) Init(opts ...Option) error {
+func (n *noopClient) newCodec(contentType string) (codec.Codec, error) {
+	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 *noopClient) Init(opts ...options.Option) error {
 	for _, o := range opts {
 		o(&n.opts)
 	}
-
-	n.funcCall = n.fnCall
-	n.funcStream = n.fnStream
-
-	n.opts.Hooks.EachPrev(func(hook options.Hook) {
-		switch h := hook.(type) {
-		case HookCall:
-			n.funcCall = h(n.funcCall)
-		case HookStream:
-			n.funcStream = h(n.funcStream)
-		}
-	})
-
 	return nil
 }
 
@@ -174,32 +158,7 @@ func (n *noopClient) String() string {
 	return "noop"
 }
 
-func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error {
-	ts := time.Now()
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
-	var sp tracer.Span
-	ctx, sp = n.opts.Tracer.Start(ctx, "rpc-client",
-		tracer.WithSpanKind(tracer.SpanKindClient),
-		tracer.WithSpanLabels("endpoint", req.Endpoint()),
-	)
-	err := n.funcCall(ctx, req, rsp, opts...)
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
-	te := time.Since(ts)
-	n.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-	n.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-
-	if me := errors.FromError(err); me == nil {
-		sp.Finish()
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(200))).Inc()
-	} else {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code))).Inc()
-	}
-
-	return err
-}
-
-func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error {
+func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opts ...options.Option) error {
 	// make a copy of call opts
 	callOpts := n.opts.CallOptions
 	for _, opt := range opts {
@@ -216,7 +175,7 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		opt := WithRequestTimeout(time.Until(d))
+		opt := RequestTimeout(time.Until(d))
 		opt(&callOpts)
 	}
 
@@ -228,8 +187,11 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 	}
 
 	// make copy of call method
-	hcall := func(ctx context.Context, addr string, req Request, rsp interface{}, opts CallOptions) error {
-		return nil
+	hcall := n.call
+
+	// wrap the call in reverse
+	for i := len(callOpts.CallWrappers); i > 0; i-- {
+		hcall = callOpts.CallWrappers[i-1](hcall)
 	}
 
 	// use the router passed as a call option, or fallback to the rpc clients router
@@ -254,7 +216,7 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 		// call backoff first. Someone may want an initial start delay
 		t, err := callOpts.Backoff(ctx, req, i)
 		if err != nil {
-			return errors.InternalServerError("go.micro.client", "%s", err)
+			return errors.InternalServerError("go.micro.client", err.Error())
 		}
 
 		// only sleep if greater than 0
@@ -268,7 +230,7 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 			// TODO apply any filtering here
 			routes, err = n.opts.Lookup(ctx, req, callOpts)
 			if err != nil {
-				return errors.InternalServerError("go.micro.client", "%s", err)
+				return errors.InternalServerError("go.micro.client", err.Error())
 			}
 
 			// balance the list of nodes
@@ -298,6 +260,9 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 	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)
@@ -325,39 +290,28 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 		}
 	}
 
+	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
 }
 
-func (n *noopClient) NewRequest(service, endpoint string, _ interface{}, _ ...RequestOption) Request {
+func (n *noopClient) call(ctx context.Context, addr string, req Request, rsp interface{}, opts CallOptions) error {
+	return nil
+}
+
+func (n *noopClient) NewRequest(service, endpoint string, req interface{}, opts ...options.Option) Request {
 	return &noopRequest{service: service, endpoint: endpoint}
 }
 
-func (n *noopClient) Stream(ctx context.Context, req Request, opts ...CallOption) (Stream, error) {
-	ts := time.Now()
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
-	var sp tracer.Span
-	ctx, sp = n.opts.Tracer.Start(ctx, "rpc-client",
-		tracer.WithSpanKind(tracer.SpanKindClient),
-		tracer.WithSpanLabels("endpoint", req.Endpoint()),
-	)
-	stream, err := n.funcStream(ctx, req, opts...)
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
-	te := time.Since(ts)
-	n.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-	n.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-
-	if me := errors.FromError(err); me == nil {
-		sp.Finish()
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(200))).Inc()
-	} else {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code))).Inc()
-	}
-
-	return stream, err
-}
-
-func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOption) (Stream, error) {
+func (n *noopClient) Stream(ctx context.Context, req Request, opts ...options.Option) (Stream, error) {
 	var err error
 
 	// make a copy of call opts
@@ -376,7 +330,7 @@ func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOpti
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		o := WithStreamTimeout(time.Until(d))
+		o := StreamTimeout(time.Until(d))
 		o(&callOpts)
 	}
 
@@ -417,7 +371,7 @@ func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOpti
 		// call backoff first. Someone may want an initial start delay
 		t, cerr := callOpts.Backoff(ctx, req, i)
 		if cerr != nil {
-			return nil, errors.InternalServerError("go.micro.client", "%s", cerr)
+			return nil, errors.InternalServerError("go.micro.client", cerr.Error())
 		}
 
 		// only sleep if greater than 0
@@ -431,7 +385,7 @@ func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOpti
 			// TODO apply any filtering here
 			routes, err = n.opts.Lookup(ctx, req, callOpts)
 			if err != nil {
-				return nil, errors.InternalServerError("go.micro.client", "%s", err)
+				return nil, errors.InternalServerError("go.micro.client", err.Error())
 			}
 
 			// balance the list of nodes
@@ -443,7 +397,15 @@ func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOpti
 
 		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 {
@@ -497,6 +459,6 @@ func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOpti
 	return nil, grr
 }
 
-func (n *noopClient) stream(ctx context.Context, _ string, _ Request, _ CallOptions) (Stream, error) {
-	return &noopStream{ctx: ctx}, nil
+func (n *noopClient) stream(ctx context.Context, addr string, req Request, opts CallOptions) (*noopStream, error) {
+	return &noopStream{}, nil
 }

client/options.go

@@ -6,13 +6,11 @@ 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/register"
 	"go.unistack.org/micro/v4/router"
 	"go.unistack.org/micro/v4/selector"
 	"go.unistack.org/micro/v4/selector/random"
@@ -21,56 +19,44 @@ import (
 
 // Options holds client options
 type Options struct {
-	// Codecs map
-	Codecs map[string]codec.Codec
-
-	// Proxy is used for proxy requests
-	Proxy string
-	// ContentType is used to select codec
-	ContentType string
-	// Name is the client name
-	Name string
-
 	// 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
 	Context context.Context
 	// Router used to get route
 	Router router.Router
-
 	// TLSConfig specifies tls.Config for secure connection
 	TLSConfig *tls.Config
-
+	// Codecs map
+	Codecs map[string]codec.Codec
 	// Lookup func used to get destination addr
 	Lookup LookupFunc
-	// ContextDialer used to connect
-	ContextDialer func(context.Context, string) (net.Conn, error)
-
-	// Wrappers contains wrappers
-	Wrappers []Wrapper
-	// Hooks can be run before broker Publish/BatchPublish and
-	// Subscribe/BatchSubscribe methods
-	Hooks options.Hooks
-
+	// Proxy is used for proxy requests
+	Proxy string
+	// ContentType is used to select codec
+	ContentType string
+	// Name is the client name
+	Name string
 	// CallOptions contains default CallOptions
 	CallOptions CallOptions
-
 	// PoolSize connection pool size
 	PoolSize int
 	// PoolTTL connection pool ttl
 	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 ...CallOption) CallOptions {
+func NewCallOptions(opts ...options.Option) CallOptions {
 	options := CallOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -80,16 +66,6 @@ func NewCallOptions(opts ...CallOption) CallOptions {
 
 // CallOptions holds client call options
 type CallOptions struct {
-	// RequestMetadata holds additional metadata for call
-	RequestMetadata metadata.Metadata
-
-	// Network name
-	Network string
-	// Content-Type
-	ContentType string
-	// AuthToken string
-	AuthToken string
-
 	// Selector selects addr
 	Selector selector.Selector
 	// Context used for deadline
@@ -97,48 +73,46 @@ type CallOptions struct {
 	// Router used for route
 	Router router.Router
 	// Retry func used for retries
-
-	// ResponseMetadata holds additional metadata from call
-	ResponseMetadata *metadata.Metadata
-
 	Retry RetryFunc
 	// Backoff func used for backoff when retry
 	Backoff BackoffFunc
-	// ContextDialer used to connect
-	ContextDialer func(context.Context, string) (net.Conn, error)
-
+	// Network name
+	Network string
+	// Content-Type
+	ContentType string
+	// AuthToken string
+	AuthToken string
 	// Address specifies static addr list
 	Address []string
 	// SelectOptions selector options
 	SelectOptions []selector.SelectOption
-
+	// CallWrappers call wrappers
+	CallWrappers []CallWrapper
 	// StreamTimeout stream timeout
 	StreamTimeout time.Duration
 	// RequestTimeout request timeout
 	RequestTimeout time.Duration
-
+	// RequestMetadata holds additional metadata for call
+	RequestMetadata metadata.Metadata
+	// ResponseMetadata holds additional metadata from call
+	ResponseMetadata *metadata.Metadata
 	// DialTimeout dial timeout
 	DialTimeout time.Duration
 	// Retries specifies retries num
 	Retries int
+	// ContextDialer used to connect
+	ContextDialer func(context.Context, string) (net.Conn, error)
 }
 
 // ContextDialer pass ContextDialer to client
-func ContextDialer(fn func(context.Context, string) (net.Conn, error)) Option {
-	return func(o *Options) {
-		o.ContextDialer = fn
-	}
-}
-
-// Context pass context to client
-func Context(ctx context.Context) Option {
-	return func(o *Options) {
-		o.Context = ctx
+func ContextDialer(fn func(context.Context, string) (net.Conn, error)) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".ContextDialer")
 	}
 }
 
 // NewRequestOptions creates new RequestOptions struct
-func NewRequestOptions(opts ...RequestOption) RequestOptions {
+func NewRequestOptions(opts ...options.Option) RequestOptions {
 	options := RequestOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -157,24 +131,24 @@ type RequestOptions struct {
 }
 
 // NewOptions creates new options struct
-func NewOptions(opts ...Option) Options {
+func NewOptions(opts ...options.Option) Options {
 	options := Options{
 		Context:     context.Background(),
 		ContentType: DefaultContentType,
-		Codecs:      DefaultCodecs,
+		Codecs:      make(map[string]codec.Codec),
 		CallOptions: CallOptions{
 			Context:        context.Background(),
 			Backoff:        DefaultBackoff,
 			Retry:          DefaultRetry,
 			Retries:        DefaultRetries,
 			RequestTimeout: DefaultRequestTimeout,
+			DialTimeout:    DefaultDialTimeout,
 		},
 		Lookup:   LookupRoute,
 		PoolSize: DefaultPoolSize,
 		PoolTTL:  DefaultPoolTTL,
 		Selector: random.NewSelector(),
 		Logger:   logger.DefaultLogger,
-		Broker:   broker.DefaultBroker,
 		Meter:    meter.DefaultMeter,
 		Tracer:   tracer.DefaultTracer,
 		Router:   router.DefaultRouter,
@@ -187,284 +161,131 @@ func NewOptions(opts ...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) Option {
-	return func(o *Options) {
-		o.Proxy = addr
+func Proxy(addr string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, addr, ".Proxy")
 	}
 }
 
 // PoolSize sets the connection pool size
-func PoolSize(d int) Option {
-	return func(o *Options) {
-		o.PoolSize = d
+func PoolSize(d int) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, d, ".PoolSize")
 	}
 }
 
 // PoolTTL sets the connection pool ttl
-func PoolTTL(d time.Duration) Option {
-	return func(o *Options) {
-		o.PoolTTL = d
-	}
-}
-
-// 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
+func PoolTTL(td time.Duration) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, td, ".PoolTTL")
 	}
 }
 
 // Selector is used to select a route
-func Selector(s selector.Selector) Option {
-	return func(o *Options) {
-		o.Selector = s
+func Selector(s selector.Selector) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, s, ".Selector")
 	}
 }
 
 // Backoff is used to set the backoff function used when retrying Calls
-func Backoff(fn BackoffFunc) Option {
-	return func(o *Options) {
-		o.CallOptions.Backoff = fn
-	}
-}
-
-// Name sets the client name
-func Name(n string) Option {
-	return func(o *Options) {
-		o.Name = n
+func Backoff(fn BackoffFunc) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".Backoff")
 	}
 }
 
 // Lookup sets the lookup function to use for resolving service names
-func Lookup(l LookupFunc) Option {
-	return func(o *Options) {
-		o.Lookup = l
+func Lookup(fn LookupFunc) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".Lookup")
 	}
 }
 
-// TLSConfig specifies a *tls.Config
-func TLSConfig(t *tls.Config) Option {
-	return func(o *Options) {
-		// set the internal tls
-		o.TLSConfig = t
+// WithCallWrapper sets the retry function to be used when re-trying.
+func WithCallWrapper(fn CallWrapper) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".CallWrappers")
 	}
 }
 
 // Retries sets the retry count when making the request.
-func Retries(i int) Option {
-	return func(o *Options) {
-		o.CallOptions.Retries = i
+func Retries(n int) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, n, ".Retries")
 	}
 }
 
 // Retry sets the retry function to be used when re-trying.
-func Retry(fn RetryFunc) Option {
-	return func(o *Options) {
-		o.CallOptions.Retry = fn
+func Retry(fn RetryFunc) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".Retry")
 	}
 }
 
 // RequestTimeout is the request timeout.
-func RequestTimeout(d time.Duration) Option {
-	return func(o *Options) {
-		o.CallOptions.RequestTimeout = d
+func RequestTimeout(td time.Duration) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, td, ".RequestTimeout")
 	}
 }
 
 // StreamTimeout sets the stream timeout
-func StreamTimeout(d time.Duration) Option {
-	return func(o *Options) {
-		o.CallOptions.StreamTimeout = d
+func StreamTimeout(td time.Duration) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, td, ".StreamTimeout")
 	}
 }
 
 // DialTimeout sets the dial timeout
-func DialTimeout(d time.Duration) Option {
-	return func(o *Options) {
-		o.CallOptions.DialTimeout = d
-	}
-}
-
-// 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
-	}
-}
-
-// 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
+func DialTimeout(td time.Duration) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, td, ".DialTimeout")
 	}
 }
 
 // WithResponseMetadata is a CallOption which adds metadata.Metadata to Options.CallOptions
-func WithResponseMetadata(md *metadata.Metadata) CallOption {
-	return func(o *CallOptions) {
-		o.ResponseMetadata = md
+func ResponseMetadata(md *metadata.Metadata) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, md, ".ResponseMetadata")
 	}
 }
 
 // WithRequestMetadata is a CallOption which adds metadata.Metadata to Options.CallOptions
-func WithRequestMetadata(md metadata.Metadata) CallOption {
-	return func(o *CallOptions) {
-		o.RequestMetadata = md
+func RequestMetadata(md metadata.Metadata) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, metadata.Copy(md), ".RequestMetadata")
 	}
 }
 
-// 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
+// AuthToken is a CallOption which overrides the
 // authorization header with the services own auth token
-func WithAuthToken(t string) CallOption {
-	return func(o *CallOptions) {
-		o.AuthToken = t
+func AuthToken(t string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, t, ".AuthToken")
 	}
 }
 
-// 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
+// Network is a CallOption which sets the network attribute
+func Network(n string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, n, ".Network")
 	}
 }
 
+/*
 // WithSelectOptions sets the options to pass to the selector for this call
-func WithSelectOptions(sops ...selector.SelectOption) CallOption {
+func WithSelectOptions(sops ...selector.SelectOption) options.Option {
 	return func(o *CallOptions) {
 		o.SelectOptions = sops
 	}
 }
+*/
 
 // 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
-	}
-}
-
-// Hooks sets hook runs before action
-func Hooks(h ...options.Hook) Option {
-	return func(o *Options) {
-		o.Hooks = append(o.Hooks, h...)
+func StreamingRequest(b bool) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, b, ".Stream")
 	}
 }

cluster/cluster.go

@@ -1,47 +0,0 @@
-package cluster
-
-import (
-	"context"
-
-	"go.unistack.org/micro/v4/metadata"
-)
-
-// Message sent to member in cluster
-type Message interface {
-	// Header returns message headers
-	Header() metadata.Metadata
-	// Body returns broker message may be []byte slice or some go struct or interface
-	Body() interface{}
-}
-
-type Node interface {
-	// Name returns node name
-	Name() string
-	// Address returns node address
-	Address() string
-	// Metadata returns node metadata
-	Metadata() metadata.Metadata
-}
-
-// Cluster interface used for cluster communication across nodes
-type Cluster interface {
-	// Join is used to take an existing members and performing state sync
-	Join(ctx context.Context, addr ...string) error
-	// Leave broadcast a leave message and stop listeners
-	Leave(ctx context.Context) error
-	// Ping is used to probe live status of the node
-	Ping(ctx context.Context, node Node, payload []byte) error
-	// Members returns the cluster members
-	Members() ([]Node, error)
-	// Broadcast send message for all members in cluster, if filter is not nil, nodes may be filtered
-	// by key/value pairs
-	Broadcast(ctx context.Context, msg Message, filter ...string) error
-	// Unicast send message to single member in cluster
-	Unicast(ctx context.Context, node Node, msg Message) error
-	// Live returns cluster liveness
-	Live() bool
-	// Ready returns cluster readiness
-	Ready() bool
-	// Health returns cluster health
-	Health() bool
-}

codec/codec.go

@@ -1,10 +1,19 @@
 // Package codec is an interface for encoding messages
-package codec
+package codec // import "go.unistack.org/micro/v4/codec"
 
 import (
 	"errors"
+	"io"
 
-	"gopkg.in/yaml.v3"
+	"go.unistack.org/micro/v4/metadata"
+)
+
+// Message types
+const (
+	Error MessageType = iota
+	Request
+	Response
+	Event
 )
 
 var (
@@ -15,23 +24,65 @@ var (
 )
 
 var (
+	// DefaultMaxMsgSize specifies how much data codec can handle
+	DefaultMaxMsgSize = 1024 * 1024 * 4 // 4Mb
 	// DefaultCodec is the global default codec
 	DefaultCodec = NewCodec()
 	// DefaultTagName specifies struct tag name to control codec Marshal/Unmarshal
 	DefaultTagName = "codec"
 )
 
-// Codec encodes/decodes various types of messages.
+// MessageType specifies message type for codec
+type MessageType int
+
+// Codec encodes/decodes various types of messages used within micro.
+// ReadHeader and ReadBody are called in pairs to read requests/responses
+// from the connection. Close is called when finished with the
+// connection. ReadBody may be called with a nil argument to force the
+// body to be read and discarded.
 type Codec interface {
+	ReadHeader(r io.Reader, m *Message, mt MessageType) error
+	ReadBody(r io.Reader, v interface{}) error
+	Write(w io.Writer, m *Message, v interface{}) error
 	Marshal(v interface{}, opts ...Option) ([]byte, error)
 	Unmarshal(b []byte, v interface{}, opts ...Option) error
 	String() string
 }
 
-type CodecV2 interface {
-	Marshal(buf []byte, v interface{}, opts ...Option) ([]byte, error)
-	Unmarshal(buf []byte, v interface{}, opts ...Option) error
-	String() string
+// Message represents detailed information about
+// the communication, likely followed by the body.
+// In the case of an error, body may be nil.
+type Message struct {
+	Header   metadata.Metadata
+	Target   string
+	Method   string
+	Endpoint string
+	Error    string
+	ID       string
+	Body     []byte
+	Type     MessageType
+}
+
+// NewMessage creates new codec message
+func NewMessage(t MessageType) *Message {
+	return &Message{Type: t, Header: metadata.New(0)}
+}
+
+// MarshalAppend calls codec.Marshal(v) and returns the data appended to buf.
+// If codec implements MarshalAppend, that is called instead.
+func MarshalAppend(buf []byte, c Codec, v interface{}, opts ...Option) ([]byte, error) {
+	if nc, ok := c.(interface {
+		MarshalAppend([]byte, interface{}, ...Option) ([]byte, error)
+	}); ok {
+		return nc.MarshalAppend(buf, v, opts...)
+	}
+
+	mbuf, err := c.Marshal(v, opts...)
+	if err != nil {
+		return nil, err
+	}
+
+	return append(buf, mbuf...), nil
 }
 
 // RawMessage is a raw encoded JSON value.
@@ -42,8 +93,6 @@ type RawMessage []byte
 func (m *RawMessage) MarshalJSON() ([]byte, error) {
 	if m == nil {
 		return []byte("null"), nil
-	} else if len(*m) == 0 {
-		return []byte("null"), nil
 	}
 	return *m, nil
 }
@@ -56,22 +105,3 @@ func (m *RawMessage) UnmarshalJSON(data []byte) error {
 	*m = append((*m)[0:0], data...)
 	return nil
 }
-
-// MarshalYAML returns m as the JSON encoding of m.
-func (m *RawMessage) MarshalYAML() ([]byte, error) {
-	if m == nil {
-		return []byte("null"), nil
-	} else if len(*m) == 0 {
-		return []byte("null"), nil
-	}
-	return *m, nil
-}
-
-// UnmarshalYAML sets *m to a copy of data.
-func (m *RawMessage) UnmarshalYAML(n *yaml.Node) error {
-	if m == nil {
-		return errors.New("RawMessage UnmarshalYAML on nil pointer")
-	}
-	*m = append((*m)[0:0], []byte(n.Value)...)
-	return nil
-}

codec/context.go

@@ -15,15 +15,6 @@ func FromContext(ctx context.Context) (Codec, bool) {
 	return c, ok
 }
 
-// MustContext returns codec from context
-func MustContext(ctx context.Context) Codec {
-	c, ok := FromContext(ctx)
-	if !ok {
-		panic("missing codec")
-	}
-	return c
-}
-
 // NewContext put codec in context
 func NewContext(ctx context.Context, c Codec) context.Context {
 	if ctx == nil {

codec/frame.go

@@ -1,7 +1,5 @@
 package codec
 
-import "gopkg.in/yaml.v3"
-
 // Frame gives us the ability to define raw data to send over the pipes
 type Frame struct {
 	Data []byte
@@ -22,17 +20,6 @@ func (m *Frame) UnmarshalJSON(data []byte) error {
 	return m.Unmarshal(data)
 }
 
-// MarshalYAML returns frame data
-func (m *Frame) MarshalYAML() ([]byte, error) {
-	return m.Marshal()
-}
-
-// UnmarshalYAML set frame data
-func (m *Frame) UnmarshalYAML(n *yaml.Node) error {
-	m.Data = []byte(n.Value)
-	return nil
-}
-
 // ProtoMessage noop func
 func (m *Frame) ProtoMessage() {}
 

codec/frame.proto

@@ -1,4 +1,4 @@
-// Copyright 2021 Unistack LLC
+// Copyright 2021-2023 Unistack LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

codec/noop.go

@@ -2,14 +2,70 @@ package codec
 
 import (
 	"encoding/json"
-
-	codecpb "go.unistack.org/micro-proto/v4/codec"
+	"io"
 )
 
 type noopCodec struct {
 	opts Options
 }
 
+func (c *noopCodec) ReadHeader(conn io.Reader, m *Message, t MessageType) error {
+	return nil
+}
+
+func (c *noopCodec) ReadBody(conn io.Reader, b interface{}) error {
+	// read bytes
+	buf, err := io.ReadAll(conn)
+	if err != nil {
+		return err
+	}
+
+	if b == nil {
+		return nil
+	}
+
+	switch v := b.(type) {
+	case *string:
+		*v = string(buf)
+	case *[]byte:
+		*v = buf
+	case *Frame:
+		v.Data = buf
+	default:
+		return json.Unmarshal(buf, v)
+	}
+
+	return nil
+}
+
+func (c *noopCodec) Write(conn io.Writer, m *Message, b interface{}) error {
+	if b == nil {
+		return nil
+	}
+
+	var v []byte
+	switch vb := b.(type) {
+	case *Frame:
+		v = vb.Data
+	case string:
+		v = []byte(vb)
+	case *string:
+		v = []byte(*vb)
+	case *[]byte:
+		v = *vb
+	case []byte:
+		v = vb
+	default:
+		var err error
+		v, err = json.Marshal(vb)
+		if err != nil {
+			return err
+		}
+	}
+	_, err := conn.Write(v)
+	return err
+}
+
 func (c *noopCodec) String() string {
 	return "noop"
 }
@@ -35,8 +91,8 @@ func (c *noopCodec) Marshal(v interface{}, opts ...Option) ([]byte, error) {
 		return ve, nil
 	case *Frame:
 		return ve.Data, nil
-	case *codecpb.Frame:
-		return ve.Data, nil
+	case *Message:
+		return ve.Body, nil
 	}
 
 	return json.Marshal(v)
@@ -59,8 +115,8 @@ func (c *noopCodec) Unmarshal(d []byte, v interface{}, opts ...Option) error {
 	case *Frame:
 		ve.Data = d
 		return nil
-	case *codecpb.Frame:
-		ve.Data = d
+	case *Message:
+		ve.Body = d
 		return nil
 	}
 

codec/options.go

@@ -23,8 +23,15 @@ type Options struct {
 	Context context.Context
 	// TagName specifies tag name in struct to control codec
 	TagName string
-	// Flatten specifies that struct must be analyzed for flatten tag
-	Flatten bool
+	// MaxMsgSize specifies max messages size that reads by codec
+	MaxMsgSize int
+}
+
+// MaxMsgSize sets the max message size
+func MaxMsgSize(n int) Option {
+	return func(o *Options) {
+		o.MaxMsgSize = n
+	}
 }
 
 // TagName sets the codec tag name in struct
@@ -34,13 +41,6 @@ func TagName(n string) Option {
 	}
 }
 
-// Flatten enables checking for flatten tag name
-func Flatten(b bool) Option {
-	return func(o *Options) {
-		o.Flatten = b
-	}
-}
-
 // Logger sets the logger
 func Logger(l logger.Logger) Option {
 	return func(o *Options) {
@@ -65,12 +65,12 @@ func Meter(m meter.Meter) Option {
 // NewOptions returns new options
 func NewOptions(opts ...Option) Options {
 	options := Options{
-		Context: context.Background(),
-		Logger:  logger.DefaultLogger,
-		Meter:   meter.DefaultMeter,
-		Tracer:  tracer.DefaultTracer,
-		TagName: DefaultTagName,
-		Flatten: false,
+		Context:    context.Background(),
+		Logger:     logger.DefaultLogger,
+		Meter:      meter.DefaultMeter,
+		Tracer:     tracer.DefaultTracer,
+		MaxMsgSize: DefaultMaxMsgSize,
+		TagName:    DefaultTagName,
 	}
 
 	for _, o := range opts {

config/config.go

@@ -1,11 +1,13 @@
 // Package config is an interface for dynamic configuration.
-package config
+package config // import "go.unistack.org/micro/v4/config"
 
 import (
 	"context"
 	"errors"
 	"reflect"
 	"time"
+
+	"go.unistack.org/micro/v4/options"
 )
 
 type Validator interface {
@@ -37,26 +39,19 @@ type Config interface {
 	// Name returns name of config
 	Name() string
 	// Init the config
-	Init(opts ...Option) error
+	Init(opts ...options.Option) error
 	// Options in the config
 	Options() Options
 	// Load config from sources
-	Load(context.Context, ...LoadOption) error
+	Load(context.Context, ...options.Option) error
 	// Save config to sources
-	Save(context.Context, ...SaveOption) error
+	Save(context.Context, ...options.Option) error
 	// Watch a config for changes
-	Watch(context.Context, ...WatchOption) (Watcher, error)
+	Watch(context.Context, ...options.Option) (Watcher, error)
 	// String returns config type name
 	String() string
 }
 
-type (
-	FuncLoad func(ctx context.Context, opts ...LoadOption) error
-	HookLoad func(next FuncLoad) FuncLoad
-	FuncSave func(ctx context.Context, opts ...SaveOption) error
-	HookSave func(next FuncSave) FuncSave
-)
-
 // Watcher is the config watcher
 type Watcher interface {
 	// Next blocks until update happens or error returned
@@ -66,7 +61,7 @@ type Watcher interface {
 }
 
 // Load loads config from config sources
-func Load(ctx context.Context, cs []Config, opts ...LoadOption) error {
+func Load(ctx context.Context, cs []Config, opts ...options.Option) error {
 	var err error
 	for _, c := range cs {
 		if err = c.Init(); err != nil {
@@ -138,7 +133,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" BeforeLoad error", err)
+				c.Options().Logger.Error(ctx, c.String()+" BeforeLoad error "+err.Error())
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -153,7 +148,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" AfterLoad error", err)
+				c.Options().Logger.Error(ctx, c.String()+" AfterLoad error "+err.Error())
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -168,7 +163,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" BeforeSave error", err)
+				c.Options().Logger.Error(ctx, c.String()+" BeforeSave error "+err.Error())
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -183,7 +178,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" AfterSave error", err)
+				c.Options().Logger.Error(ctx, c.String()+" AfterSave error "+err.Error())
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -198,7 +193,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" BeforeInit error", err)
+				c.Options().Logger.Error(ctx, c.String()+" BeforeInit error "+err.Error())
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -213,7 +208,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" AfterInit error", err)
+				c.Options().Logger.Error(ctx, c.String()+" AfterInit error "+err.Error())
 				if !c.Options().AllowFail {
 					return err
 				}

config/context.go

@@ -15,15 +15,6 @@ func FromContext(ctx context.Context) (Config, bool) {
 	return c, ok
 }
 
-// MustContext returns store from context
-func MustContext(ctx context.Context) Config {
-	c, ok := FromContext(ctx)
-	if !ok {
-		panic("missing config")
-	}
-	return c
-}
-
 // NewContext put store in context
 func NewContext(ctx context.Context, c Config) context.Context {
 	if ctx == nil {
@@ -31,43 +22,3 @@ 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,47 +40,3 @@ func TestNewContext(t *testing.T) {
 		t.Fatal("NewContext not works")
 	}
 }
-
-func TestSetOption(t *testing.T) {
-	type key struct{}
-	o := SetOption(key{}, "test")
-	opts := &Options{}
-	o(opts)
-
-	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
-		t.Fatal("SetOption not works")
-	}
-}
-
-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

@@ -16,16 +16,14 @@ import (
 )
 
 type defaultConfig struct {
-	funcLoad FuncLoad
-	funcSave FuncSave
-	opts     Options
+	opts Options
 }
 
 func (c *defaultConfig) Options() Options {
 	return c.opts
 }
 
-func (c *defaultConfig) Init(opts ...Option) error {
+func (c *defaultConfig) Init(opts ...options.Option) error {
 	for _, o := range opts {
 		o(&c.opts)
 	}
@@ -34,18 +32,6 @@ func (c *defaultConfig) Init(opts ...Option) error {
 		return err
 	}
 
-	c.funcLoad = c.fnLoad
-	c.funcSave = c.fnSave
-
-	c.opts.Hooks.EachPrev(func(hook options.Hook) {
-		switch h := hook.(type) {
-		case HookLoad:
-			c.funcLoad = h(c.funcLoad)
-		case HookSave:
-			c.funcSave = h(c.funcSave)
-		}
-	})
-
 	if err := DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
@@ -53,18 +39,12 @@ func (c *defaultConfig) Init(opts ...Option) error {
 	return nil
 }
 
-func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error {
-	return c.funcLoad(ctx, opts...)
-}
-
-func (c *defaultConfig) fnLoad(ctx context.Context, opts ...LoadOption) error {
-	var err error
-
+func (c *defaultConfig) Load(ctx context.Context, opts ...options.Option) error {
 	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
 		return nil
 	}
 
-	if err = DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
+	if err := DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
@@ -254,7 +234,6 @@ func fillValue(value reflect.Value, val string) error {
 		}
 		value.Set(reflect.ValueOf(v))
 	}
-
 	return nil
 }
 
@@ -317,11 +296,7 @@ func fillValues(valueOf reflect.Value, tname string) error {
 	return nil
 }
 
-func (c *defaultConfig) Save(ctx context.Context, opts ...SaveOption) error {
-	return c.funcSave(ctx, opts...)
-}
-
-func (c *defaultConfig) fnSave(ctx context.Context, opts ...SaveOption) error {
+func (c *defaultConfig) Save(ctx context.Context, _ ...options.Option) error {
 	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
 		return nil
 	}
@@ -345,19 +320,15 @@ func (c *defaultConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *defaultConfig) Watch(_ context.Context, _ ...WatchOption) (Watcher, error) {
+func (c *defaultConfig) Watch(ctx context.Context, opts ...options.Option) (Watcher, error) {
 	return nil, ErrWatcherNotImplemented
 }
 
 // NewConfig returns new default config source
-func NewConfig(opts ...Option) Config {
+func NewConfig(opts ...options.Option) Config {
 	options := NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = "default"
 	}
-	c := &defaultConfig{opts: options}
-	c.funcLoad = c.fnLoad
-	c.funcSave = c.fnSave
-
-	return c
+	return &defaultConfig{opts: options}
 }

config/default_test.go

@@ -3,26 +3,24 @@ package config_test
 import (
 	"context"
 	"fmt"
-	"reflect"
 	"testing"
 	"time"
 
 	"go.unistack.org/micro/v4/config"
+	mid "go.unistack.org/micro/v4/util/id"
 	mtime "go.unistack.org/micro/v4/util/time"
 )
 
 type cfg struct {
-	MapValue    map[string]bool `default:"key1=true,key2=false"`
-	StructValue *cfgStructValue
-
-	StringValue string `default:"string_value"`
-	IgnoreValue string `json:"-"`
-	UUIDValue   string `default:"micro:generate uuid"`
-	IDValue     string `default:"micro:generate id"`
-
-	DurationValue  time.Duration  `default:"10s"`
-	MDurationValue mtime.Duration `default:"10s"`
-	IntValue       int            `default:"99"`
+	StringValue    string `default:"string_value"`
+	IgnoreValue    string `json:"-"`
+	StructValue    *cfgStructValue
+	IntValue       int             `default:"99"`
+	DurationValue  time.Duration   `default:"10s"`
+	MDurationValue mtime.Duration  `default:"10s"`
+	MapValue       map[string]bool `default:"key1=true,key2=false"`
+	UUIDValue      string          `default:"micro:generate uuid"`
+	IDValue        string          `default:"micro:generate id"`
 }
 
 type cfgStructValue struct {
@@ -43,35 +41,6 @@ func (c *cfgStructValue) Validate() error {
 	return nil
 }
 
-type testHook struct {
-	f bool
-}
-
-func (t *testHook) Load(fn config.FuncLoad) config.FuncLoad {
-	return func(ctx context.Context, opts ...config.LoadOption) error {
-		t.f = true
-		return fn(ctx, opts...)
-	}
-}
-
-func TestHook(t *testing.T) {
-	h := &testHook{}
-
-	c := config.NewConfig(config.Struct(h), config.Hooks(config.HookLoad(h.Load)))
-
-	if err := c.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := c.Load(context.TODO()); err != nil {
-		t.Fatal(err)
-	}
-
-	if !h.f {
-		t.Fatal("hook not works")
-	}
-}
-
 func TestDefault(t *testing.T) {
 	ctx := context.Background()
 	conf := &cfg{IntValue: 10}
@@ -114,6 +83,8 @@ func TestDefault(t *testing.T) {
 
 	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)
@@ -134,13 +105,3 @@ func TestValidate(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
-func Test_SizeOf(t *testing.T) {
-	st := cfg{}
-
-	tVal := reflect.TypeOf(st)
-	for i := 0; i < tVal.NumField(); i++ {
-		field := tVal.Field(i)
-		fmt.Printf("Field: %s, Offset: %d, Size: %d\n", field.Name, field.Offset, field.Type.Size())
-	}
-}

config/options.go

@@ -41,23 +41,16 @@ type Options struct {
 	BeforeInit []func(context.Context, Config) error
 	// AfterInit contains slice of funcs that runs after Init
 	AfterInit []func(context.Context, Config) error
-
+	// AllowFail flag to allow fail in config source
+	AllowFail bool
 	// SkipLoad runs only if condition returns true
 	SkipLoad func(context.Context, Config) bool
 	// SkipSave runs only if condition returns true
 	SkipSave func(context.Context, Config) bool
-	// Hooks can be run before/after config Save/Load
-	Hooks options.Hooks
-
-	// AllowFail flag to allow fail in config source
-	AllowFail bool
 }
 
-// Option function signature
-type Option func(o *Options)
-
 // NewOptions new options struct with filed values
-func NewOptions(opts ...Option) Options {
+func NewOptions(opts ...options.Option) Options {
 	options := Options{
 		Logger:  logger.DefaultLogger,
 		Meter:   meter.DefaultMeter,
@@ -71,9 +64,6 @@ func NewOptions(opts ...Option) Options {
 	return options
 }
 
-// LoadOption function signature
-type LoadOption func(o *LoadOptions)
-
 // LoadOptions struct
 type LoadOptions struct {
 	Struct   interface{}
@@ -83,7 +73,7 @@ type LoadOptions struct {
 }
 
 // NewLoadOptions create LoadOptions struct with provided opts
-func NewLoadOptions(opts ...LoadOption) LoadOptions {
+func NewLoadOptions(opts ...options.Option) LoadOptions {
 	options := LoadOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -92,44 +82,27 @@ func NewLoadOptions(opts ...LoadOption) LoadOptions {
 }
 
 // LoadOverride override values when load
-func LoadOverride(b bool) LoadOption {
-	return func(o *LoadOptions) {
-		o.Override = b
+func LoadOverride(b bool) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, b, ".Override")
 	}
 }
 
 // LoadAppend override values when load
-func LoadAppend(b bool) LoadOption {
-	return func(o *LoadOptions) {
-		o.Append = b
+func LoadAppend(b bool) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, b, ".Append")
 	}
 }
 
-// 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 ...SaveOption) SaveOptions {
+func NewSaveOptions(opts ...options.Option) SaveOptions {
 	options := SaveOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -138,100 +111,65 @@ func NewSaveOptions(opts ...SaveOption) SaveOptions {
 }
 
 // AllowFail allows config source to fail
-func AllowFail(b bool) Option {
-	return func(o *Options) {
-		o.AllowFail = b
+func AllowFail(b bool) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, b, ".AllowFail")
 	}
 }
 
 // BeforeInit run funcs before config Init
-func BeforeInit(fn ...func(context.Context, Config) error) Option {
-	return func(o *Options) {
-		o.BeforeInit = fn
+func BeforeInit(fn ...func(context.Context, Config) error) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".BeforeInit")
 	}
 }
 
 // AfterInit run funcs after config Init
-func AfterInit(fn ...func(context.Context, Config) error) Option {
-	return func(o *Options) {
-		o.AfterInit = fn
+func AfterInit(fn ...func(context.Context, Config) error) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".AfterInit")
 	}
 }
 
 // BeforeLoad run funcs before config load
-func BeforeLoad(fn ...func(context.Context, Config) error) Option {
-	return func(o *Options) {
-		o.BeforeLoad = fn
+func BeforeLoad(fn ...func(context.Context, Config) error) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".BeforeLoad")
 	}
 }
 
 // AfterLoad run funcs after config load
-func AfterLoad(fn ...func(context.Context, Config) error) Option {
-	return func(o *Options) {
-		o.AfterLoad = fn
+func AfterLoad(fn ...func(context.Context, Config) error) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".AfterLoad")
 	}
 }
 
 // BeforeSave run funcs before save
-func BeforeSave(fn ...func(context.Context, Config) error) Option {
-	return func(o *Options) {
-		o.BeforeSave = fn
+func BeforeSave(fn ...func(context.Context, Config) error) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".BeforeSave")
 	}
 }
 
 // AfterSave run fncs after save
-func AfterSave(fn ...func(context.Context, Config) error) Option {
-	return func(o *Options) {
-		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
+func AfterSave(fn ...func(context.Context, Config) error) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".AfterSave")
 	}
 }
 
 // Struct used as config
-func Struct(v interface{}) Option {
-	return func(o *Options) {
-		o.Struct = v
+func Struct(v interface{}) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, v, ".Struct")
 	}
 }
 
 // StructTag sets the struct tag that used for filling
-func StructTag(name string) Option {
-	return func(o *Options) {
-		o.StructTag = name
-	}
-}
-
-// Name sets the name
-func Name(n string) Option {
-	return func(o *Options) {
-		o.Name = n
+func StructTag(name string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, name, ".StructTag")
 	}
 }
 
@@ -249,11 +187,8 @@ type WatchOptions struct {
 	Coalesce bool
 }
 
-// WatchOption func signature
-type WatchOption func(*WatchOptions)
-
 // NewWatchOptions create WatchOptions struct with provided opts
-func NewWatchOptions(opts ...WatchOption) WatchOptions {
+func NewWatchOptions(opts ...options.Option) WatchOptions {
 	options := WatchOptions{
 		Context:     context.Background(),
 		MinInterval: DefaultWatcherMinInterval,
@@ -265,38 +200,20 @@ func NewWatchOptions(opts ...WatchOption) WatchOptions {
 	return options
 }
 
-// WatchContext pass context
-func WatchContext(ctx context.Context) WatchOption {
-	return func(o *WatchOptions) {
-		o.Context = ctx
-	}
-}
-
-// WatchCoalesce controls watch event combining
-func WatchCoalesce(b bool) WatchOption {
-	return func(o *WatchOptions) {
-		o.Coalesce = b
+// Coalesce controls watch event combining
+func WatchCoalesce(b bool) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, b, ".Coalesce")
 	}
 }
 
 // WatchInterval specifies min and max time.Duration for pulling changes
-func WatchInterval(minTime, maxTime time.Duration) WatchOption {
-	return func(o *WatchOptions) {
-		o.MinInterval = minTime
-		o.MaxInterval = maxTime
-	}
-}
-
-// WatchStruct overrides struct for fill
-func WatchStruct(src interface{}) WatchOption {
-	return func(o *WatchOptions) {
-		o.Struct = src
-	}
-}
-
-// Hooks sets hook runs before action
-func Hooks(h ...options.Hook) Option {
-	return func(o *Options) {
-		o.Hooks = append(o.Hooks, h...)
+func WatchInterval(min, max time.Duration) options.Option {
+	return func(src interface{}) error {
+		var err error
+		if err = options.Set(src, min, ".MinInterval"); err == nil {
+			err = options.Set(src, max, ".MaxInterval")
+		}
+		return err
 	}
 }

database/dsn.go

@@ -75,78 +75,80 @@ func ParseDSN(dsn string) (*Config, error) {
 	// Find last '/' that goes before dbname
 	foundSlash := false
 	for i := len(dsn) - 1; i >= 0; i-- {
-		if dsn[i] == '/' {
-			foundSlash = true
-			var j, k int
+		if dsn[i] != '/' {
+			continue
+		}
 
-			// left part is empty if i <= 0
-			if i > 0 {
-				// Find the first ':' in dsn
-				for j = i; j >= 0; j-- {
-					if dsn[j] == ':' {
-						cfg.Scheme = dsn[0:j]
-					}
+		foundSlash = true
+		var j, k int
+
+		// left part is empty if i <= 0
+		if i > 0 {
+			// Find the first ':' in dsn
+			for j = i; j >= 0; j-- {
+				if dsn[j] == ':' {
+					cfg.Scheme = dsn[0:j]
 				}
-
-				// [username[:password]@][host]
-				// Find the last '@' in dsn[:i]
-				for j = i; j >= 0; j-- {
-					if dsn[j] == '@' {
-						// username[:password]
-						// Find the second ':' in dsn[:j]
-						for k = 0; k < j; k++ {
-							if dsn[k] == ':' {
-								if cfg.Scheme == dsn[:k] {
-									continue
-								}
-								var err error
-								cfg.Password, err = url.PathUnescape(dsn[k+1 : j])
-								if err != nil {
-									return nil, err
-								}
-								break
-							}
-						}
-						cfg.Username = dsn[len(cfg.Scheme)+3 : k]
-						break
-					}
-				}
-
-				for k = j + 1; k < i; k++ {
-					if dsn[k] == ':' {
-						cfg.Host = dsn[j+1 : k]
-						cfg.Port = dsn[k+1 : i]
-						break
-					}
-				}
-
 			}
 
-			// dbname[?param1=value1&...&paramN=valueN]
-			// Find the first '?' in dsn[i+1:]
-			for j = i + 1; j < len(dsn); j++ {
-				if dsn[j] == '?' {
-					parts := strings.Split(dsn[j+1:], "&")
-					cfg.Params = make([]string, 0, len(parts)*2)
-					for _, p := range parts {
-						k, v, found := strings.Cut(p, "=")
-						if !found {
-							continue
+			// [username[:password]@][host]
+			// Find the last '@' in dsn[:i]
+			for j = i; j >= 0; j-- {
+				if dsn[j] == '@' {
+					// username[:password]
+					// Find the second ':' in dsn[:j]
+					for k = 0; k < j; k++ {
+						if dsn[k] == ':' {
+							if cfg.Scheme == dsn[:k] {
+								continue
+							}
+							var err error
+							cfg.Password, err = url.PathUnescape(dsn[k+1 : j])
+							if err != nil {
+								return nil, err
+							}
+							break
 						}
-						cfg.Params = append(cfg.Params, k, v)
 					}
-
+					cfg.Username = dsn[len(cfg.Scheme)+3 : k]
 					break
 				}
 			}
-			var err error
-			dbname := dsn[i+1 : j]
-			if cfg.Database, err = url.PathUnescape(dbname); err != nil {
-				return nil, fmt.Errorf("invalid dbname %q: %w", dbname, err)
+
+			for k = j + 1; k < i; k++ {
+				if dsn[k] == ':' {
+					cfg.Host = dsn[j+1 : k]
+					cfg.Port = dsn[k+1 : i]
+					break
+				}
 			}
 
-			break
 		}
+
+		// dbname[?param1=value1&...&paramN=valueN]
+		// Find the first '?' in dsn[i+1:]
+		for j = i + 1; j < len(dsn); j++ {
+			if dsn[j] == '?' {
+				parts := strings.Split(dsn[j+1:], "&")
+				cfg.Params = make([]string, 0, len(parts)*2)
+				for _, p := range parts {
+					k, v, found := strings.Cut(p, "=")
+					if !found {
+						continue
+					}
+					cfg.Params = append(cfg.Params, k, v)
+				}
+
+				break
+			}
+		}
+		var err error
+		dbname := dsn[i+1 : j]
+		if cfg.Database, err = url.PathUnescape(dbname); err != nil {
+			return nil, fmt.Errorf("invalid dbname %q: %w", dbname, err)
+		}
+
+		break
 	}
 
 	if !foundSlash && len(dsn) > 0 {

errors/errors.go

@@ -1,20 +1,14 @@
 // Package errors provides a way to return detailed information
 // for an RPC request error. The error is normally JSON encoded.
-package errors
+package errors // import "go.unistack.org/micro/v4/errors"
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"io"
 	"net/http"
 	"strconv"
 	"strings"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 var (
@@ -44,20 +38,6 @@ var (
 	ErrGatewayTimeout = &Error{Code: 504}
 )
 
-const ProblemContentType = "application/problem+json"
-
-type Problem struct {
-	Type     string `json:"type,omitempty"`
-	Title    string `json:"title,omitempty"`
-	Detail   string `json:"detail,omitempty"`
-	Instance string `json:"instance,omitempty"`
-	Errors   []struct {
-		Title  string `json:"title,omitempty"`
-		Detail string `json:"detail,omitempty"`
-	} `json:"errors,omitempty"`
-	Status int `json:"status,omitempty"`
-}
-
 // Error type
 type Error struct {
 	// ID holds error id or service, usually someting like my_service or id
@@ -276,10 +256,6 @@ func CodeIn(err interface{}, codes ...int32) bool {
 
 // FromError try to convert go error to *Error
 func FromError(err error) *Error {
-	if err == nil {
-		return nil
-	}
-
 	if verr, ok := err.(*Error); ok && verr != nil {
 		return verr
 	}
@@ -364,135 +340,3 @@ func addslashes(str string) string {
 	}
 	return buf.String()
 }
-
-type retryableError struct {
-	err error
-}
-
-// Retryable returns error that can be retried later
-func Retryable(err error) error {
-	return &retryableError{err: err}
-}
-
-type IsRetryableFunc func(error) bool
-
-var (
-	RetrayableOracleErrors = []IsRetryableFunc{
-		func(err error) bool {
-			errmsg := err.Error()
-			switch {
-			case strings.Contains(errmsg, `ORA-`):
-				return true
-			case strings.Contains(errmsg, `can not assign`):
-				return true
-			case strings.Contains(errmsg, `can't assign`):
-				return true
-			}
-			return false
-		},
-	}
-	RetrayablePostgresErrors = []IsRetryableFunc{
-		func(err error) bool {
-			errmsg := err.Error()
-			switch {
-			case strings.Contains(errmsg, `number of field descriptions must equal number of`):
-				return true
-			case strings.Contains(errmsg, `not a pointer`):
-				return true
-			case strings.Contains(errmsg, `values, but dst struct has only`):
-				return true
-			case strings.Contains(errmsg, `struct doesn't have corresponding row field`):
-				return true
-			case strings.Contains(errmsg, `cannot find field`):
-				return true
-			case strings.Contains(errmsg, `cannot scan`) || strings.Contains(errmsg, `cannot convert`):
-				return true
-			case strings.Contains(errmsg, `failed to connect to`):
-				return true
-			}
-			return false
-		},
-	}
-	RetryableMicroErrors = []IsRetryableFunc{
-		func(err error) bool {
-			switch verr := err.(type) {
-			case *Error:
-				switch verr.Code {
-				case 401, 403, 408, 500, 501, 502, 503, 504:
-					return true
-				default:
-					return false
-				}
-			case *retryableError:
-				return true
-			}
-			return false
-		},
-	}
-	RetryableGoErrors = []IsRetryableFunc{
-		func(err error) bool {
-			switch verr := err.(type) {
-			case interface{ SafeToRetry() bool }:
-				return verr.SafeToRetry()
-			case interface{ Timeout() bool }:
-				return verr.Timeout()
-			}
-			switch {
-			case errors.Is(err, io.EOF), errors.Is(err, io.ErrUnexpectedEOF):
-				return true
-			case errors.Is(err, context.DeadlineExceeded):
-				return true
-			case errors.Is(err, io.ErrClosedPipe), errors.Is(err, io.ErrShortBuffer), errors.Is(err, io.ErrShortWrite):
-				return true
-			}
-			return false
-		},
-	}
-	RetryableGrpcErrors = []IsRetryableFunc{
-		func(err error) bool {
-			st, ok := status.FromError(err)
-			if !ok {
-				return false
-			}
-			switch st.Code() {
-			case codes.Unavailable, codes.ResourceExhausted:
-				return true
-			case codes.DeadlineExceeded:
-				return true
-			case codes.Internal:
-				switch {
-				case strings.Contains(st.Message(), `transport: received the unexpected content-type "text/html; charset=UTF-8"`):
-					return true
-				case strings.Contains(st.Message(), io.ErrUnexpectedEOF.Error()):
-					return true
-				case strings.Contains(st.Message(), `stream terminated by RST_STREAM with error code: INTERNAL_ERROR`):
-					return true
-				}
-			}
-			return false
-		},
-	}
-)
-
-// Unwrap provides error wrapping
-func (e *retryableError) Unwrap() error {
-	return e.err
-}
-
-// Error returns the error string
-func (e *retryableError) Error() string {
-	if e.err == nil {
-		return ""
-	}
-	return e.err.Error()
-}
-
-// IsRetryable checks error for ability to retry later
-func IsRetryable(err error, fns ...IsRetryableFunc) bool {
-	for _, fn := range fns {
-		if ok := fn(err); ok {
-			return true
-		}
-	}
-	return false
-}

errors/errors.proto

@@ -1,4 +1,4 @@
-// Copyright 2021 Unistack LLC
+// Copyright 2021-2023 Unistack LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

errors/errors_test.go

@@ -2,19 +2,12 @@ package errors
 
 import (
 	"encoding/json"
-	"errors"
+	er "errors"
 	"fmt"
 	"net/http"
 	"testing"
 )
 
-func TestIsRetrayable(t *testing.T) {
-	err := fmt.Errorf("ORA-")
-	if !IsRetryable(err, RetrayableOracleErrors...) {
-		t.Fatalf("IsRetrayable not works")
-	}
-}
-
 func TestMarshalJSON(t *testing.T) {
 	e := InternalServerError("id", "err: %v", fmt.Errorf("err: %v", `xxx: "UNIX_TIMESTAMP": invalid identifier`))
 	_, err := json.Marshal(e)
@@ -26,7 +19,7 @@ func TestMarshalJSON(t *testing.T) {
 func TestEmpty(t *testing.T) {
 	msg := "test"
 	var err *Error
-	err = FromError(errors.New(msg))
+	err = FromError(fmt.Errorf(msg))
 	if err.Detail != msg {
 		t.Fatalf("invalid error %v", err)
 	}
@@ -42,7 +35,7 @@ func TestFromError(t *testing.T) {
 	if merr.ID != "go.micro.test" || merr.Code != 404 {
 		t.Fatalf("invalid conversation %v != %v", err, merr)
 	}
-	err = errors.New(err.Error())
+	err = er.New(err.Error())
 	merr = FromError(err)
 	if merr.ID != "go.micro.test" || merr.Code != 404 {
 		t.Fatalf("invalid conversation %v != %v", err, merr)
@@ -57,7 +50,7 @@ func TestEqual(t *testing.T) {
 		t.Fatal("errors must be equal")
 	}
 
-	err3 := errors.New("my test err")
+	err3 := er.New("my test err")
 	if Equal(err1, err3) {
 		t.Fatal("errors must be not equal")
 	}

flow/context.go

@@ -22,13 +22,3 @@ 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

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

flow/default.go

@@ -1,17 +1,17 @@
-//go:build ignore
-
 package flow
 
 import (
 	"context"
 	"fmt"
-	"path/filepath"
 	"sync"
 
-	"github.com/heimdalr/dag"
+	"github.com/silas/dag"
 	"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/options"
+	moptions "go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/store"
 	"go.unistack.org/micro/v4/util/id"
 )
@@ -22,7 +22,7 @@ type microFlow struct {
 
 type microWorkflow struct {
 	opts   Options
-	g      *dag.DAG
+	g      *dag.AcyclicGraph
 	steps  map[string]Step
 	id     string
 	status Status
@@ -34,20 +34,20 @@ func (w *microWorkflow) ID() string {
 	return w.id
 }
 
+func (w *microWorkflow) Steps() ([][]Step, error) {
+	return w.getSteps("", false)
+}
+
 func (w *microWorkflow) Status() Status {
 	return w.status
 }
 
 func (w *microWorkflow) AppendSteps(steps ...Step) error {
-	var err error
 	w.Lock()
-	defer w.Unlock()
 
 	for _, s := range steps {
 		w.steps[s.String()] = s
-		if _, err = w.g.AddVertex(s); err != nil {
-			return err
-		}
+		w.g.Add(s)
 	}
 
 	for _, dst := range steps {
@@ -56,13 +56,18 @@ func (w *microWorkflow) AppendSteps(steps ...Step) error {
 			if !ok {
 				return ErrStepNotExists
 			}
-			if err = w.g.AddEdge(src.String(), dst.String()); err != nil {
-				return err
-			}
+			w.g.Connect(dag.BasicEdge(src, dst))
 		}
 	}
 
-	w.g.ReduceTransitively()
+	if err := w.g.Validate(); err != nil {
+		w.Unlock()
+		return err
+	}
+
+	w.g.TransitiveReduction()
+
+	w.Unlock()
 
 	return nil
 }
@@ -71,11 +76,10 @@ func (w *microWorkflow) RemoveSteps(steps ...Step) error {
 	// TODO: handle case when some step requires or required by removed step
 
 	w.Lock()
-	defer w.Unlock()
 
 	for _, s := range steps {
 		delete(w.steps, s.String())
-		w.g.DeleteVertex(s.String())
+		w.g.Remove(s)
 	}
 
 	for _, dst := range steps {
@@ -84,34 +88,91 @@ func (w *microWorkflow) RemoveSteps(steps ...Step) error {
 			if !ok {
 				return ErrStepNotExists
 			}
-			w.g.AddEdge(src.String(), dst.String())
+			w.g.Connect(dag.BasicEdge(src, dst))
 		}
 	}
 
-	w.g.ReduceTransitively()
+	if err := w.g.Validate(); err != nil {
+		w.Unlock()
+		return err
+	}
+
+	w.g.TransitiveReduction()
+
+	w.Unlock()
 
 	return nil
 }
 
+func (w *microWorkflow) getSteps(start string, reverse bool) ([][]Step, error) {
+	var steps [][]Step
+	var root dag.Vertex
+	var err error
+
+	fn := func(n dag.Vertex, idx int) error {
+		if idx == 0 {
+			steps = make([][]Step, 1)
+			steps[0] = make([]Step, 0, 1)
+		} else if idx >= len(steps) {
+			tsteps := make([][]Step, idx+1)
+			copy(tsteps, steps)
+			steps = tsteps
+			steps[idx] = make([]Step, 0, 1)
+		}
+		steps[idx] = append(steps[idx], n.(Step))
+		return nil
+	}
+
+	if start != "" {
+		var ok bool
+		w.RLock()
+		root, ok = w.steps[start]
+		w.RUnlock()
+		if !ok {
+			return nil, ErrStepNotExists
+		}
+	} else {
+		root, err = w.g.Root()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if reverse {
+		err = w.g.SortedReverseDepthFirstWalk([]dag.Vertex{root}, fn)
+	} else {
+		err = w.g.SortedDepthFirstWalk([]dag.Vertex{root}, fn)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return steps, nil
+}
+
 func (w *microWorkflow) Abort(ctx context.Context, id string) error {
-	workflowStore := store.NewNamespaceStore(w.opts.Store, filepath.Join("workflows", id))
+	workflowStore := store.NewNamespaceStore(w.opts.Store, "workflows"+w.opts.Store.Options().Separator+id)
 	return workflowStore.Write(ctx, "status", &codec.Frame{Data: []byte(StatusAborted.String())})
 }
 
 func (w *microWorkflow) Suspend(ctx context.Context, id string) error {
-	workflowStore := store.NewNamespaceStore(w.opts.Store, filepath.Join("workflows", id))
+	workflowStore := store.NewNamespaceStore(w.opts.Store, "workflows"+w.opts.Store.Options().Separator+id)
 	return workflowStore.Write(ctx, "status", &codec.Frame{Data: []byte(StatusSuspend.String())})
 }
 
 func (w *microWorkflow) Resume(ctx context.Context, id string) error {
-	workflowStore := store.NewNamespaceStore(w.opts.Store, filepath.Join("workflows", id))
+	workflowStore := store.NewNamespaceStore(w.opts.Store, "workflows"+w.opts.Store.Options().Separator+id)
 	return workflowStore.Write(ctx, "status", &codec.Frame{Data: []byte(StatusRunning.String())})
 }
 
-func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...ExecuteOption) (string, error) {
+func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...options.Option) (string, error) {
 	w.Lock()
 	if !w.init {
-		w.g.ReduceTransitively()
+		if err := w.g.Validate(); err != nil {
+			w.Unlock()
+			return "", err
+		}
+		w.g.TransitiveReduction()
 		w.init = true
 	}
 	w.Unlock()
@@ -121,292 +182,176 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu
 		return "", err
 	}
 
-	//	stepStore := store.NewNamespaceStore(w.opts.Store, filepath.Join("steps", eid))
-	workflowStore := store.NewNamespaceStore(w.opts.Store, filepath.Join("workflows", eid))
+	stepStore := store.NewNamespaceStore(w.opts.Store, "steps"+w.opts.Store.Options().Separator+eid)
+	workflowStore := store.NewNamespaceStore(w.opts.Store, "workflows"+w.opts.Store.Options().Separator+eid)
 
 	options := NewExecuteOptions(opts...)
 
-	nopts := make([]ExecuteOption, 0, len(opts)+5)
+	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())
+		}
+		return "", err
+	}
+
+	var wg sync.WaitGroup
+	cherr := make(chan error, 1)
+	chstatus := make(chan Status, 1)
+
+	nctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	nopts := make([]moptions.Option, 0, len(opts)+5)
 
 	nopts = append(nopts,
-		ExecuteClient(w.opts.Client),
-		ExecuteTracer(w.opts.Tracer),
-		ExecuteLogger(w.opts.Logger),
-		ExecuteMeter(w.opts.Meter),
+		moptions.Client(w.opts.Client),
+		moptions.Tracer(w.opts.Tracer),
+		moptions.Logger(w.opts.Logger),
+		moptions.Meter(w.opts.Meter),
 	)
 	nopts = append(nopts, opts...)
+	done := make(chan struct{})
 
-	if werr := workflowStore.Write(ctx, "status", &codec.Frame{Data: []byte(StatusRunning.String())}); werr != nil {
-		w.opts.Logger.Error(ctx, "store error: %v", werr)
+	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())
 		return eid, werr
 	}
-
-	var startID string
-	if options.Start == "" {
-		mp := w.g.GetRoots()
-		if len(mp) != 1 {
-			return eid, ErrStepNotExists
-		}
-		for k := range mp {
-			startID = k
-		}
-	} else {
-		for k, v := range w.g.GetVertices() {
-			if v == options.Start {
-				startID = k
+	for idx := range steps {
+		for nidx := range steps[idx] {
+			cstep := steps[idx][nidx]
+			if werr := stepStore.Write(ctx, cstep.ID()+w.opts.Store.Options().Separator+"status", &codec.Frame{Data: []byte(StatusPending.String())}); werr != nil {
+				return eid, werr
 			}
 		}
 	}
 
-	if startID == "" {
-		return eid, ErrStepNotExists
-	}
-
-	if options.Async {
-		go w.handleWorkflow(startID, nopts...)
-		return eid, nil
-	}
-
-	return eid, w.handleWorkflow(startID, nopts...)
-}
-
-func (w *microWorkflow) handleWorkflow(startID string, opts ...ExecuteOption) error {
-	w.RLock()
-	defer w.RUnlock()
-
-	//	stepStore := store.NewNamespaceStore(w.opts.Store, filepath.Join("steps", eid))
-	// workflowStore := store.NewNamespaceStore(w.opts.Store, filepath.Join("workflows", eid))
-
-	// Get IDs of all descendant vertices.
-	flowIDs, errDes := w.g.GetDescendants(startID)
-	if errDes != nil {
-		return errDes
-	}
-
-	// inputChannels provides for input channels for each of the descendant vertices (+ the start-vertex).
-	inputChannels := make(map[string]chan FlowResult, len(flowIDs)+1)
-
-	// Iterate vertex IDs and create an input channel for each of them and a single
-	// output channel for leaves. Note, this "pre-flight" is needed to ensure we
-	// really have an input channel regardless of how we traverse the tree and spawn
-	// workers.
-	leafCount := 0
-
-	for id := range flowIDs {
-
-		// Get all parents of this vertex.
-		parents, errPar := w.g.GetParents(id)
-		if errPar != nil {
-			return errPar
-		}
-
-		// Create a buffered input channel that has capacity for all parent results.
-		inputChannels[id] = make(chan FlowResult, len(parents))
-
-		if ok, err := w.g.IsLeaf(id); ok && err == nil {
-			leafCount += 1
-		}
-	}
-
-	// outputChannel caries the results of leaf vertices.
-	outputChannel := make(chan FlowResult, leafCount)
-
-	// To also process the start vertex and to have its results being passed to its
-	// children, add it to the vertex IDs. Also add an input channel for the start
-	// vertex and feed the inputs to this channel.
-	flowIDs[startID] = struct{}{}
-	inputChannels[startID] = make(chan FlowResult, len(inputs))
-	for _, i := range inputs {
-		inputChannels[startID] <- i
-	}
-
-	wg := sync.WaitGroup{}
-
-	// Iterate all vertex IDs (now incl. start vertex) and handle each worker (incl.
-	// inputs and outputs) in a separate goroutine.
-	for id := range flowIDs {
-
-		// Get all children of this vertex that later need to be notified. Note, we
-		// collect all children before the goroutine to be able to release the read
-		// lock as early as possible.
-		children, errChildren := w.g.GetChildren(id)
-		if errChildren != nil {
-			return errChildren
-		}
-
-		// Remember to wait for this goroutine.
-		wg.Add(1)
-
-		go func(id string) {
-			// Get this vertex's input channel.
-			// Note, only concurrent read here, which is fine.
-			c := inputChannels[id]
-
-			// Await all parent inputs and stuff them into a slice.
-			parentCount := cap(c)
-			parentResults := make([]FlowResult, parentCount)
-			for i := 0; i < parentCount; i++ {
-				parentResults[i] = <-c
-			}
-
-			// Execute the worker.
-			errWorker := callback(w.g, id, parentResults)
-			if errWorker != nil {
-				return errWorker
-			}
-
-			// Send this worker's FlowResult onto all children's input channels or, if it is
-			// a leaf (i.e. no children), send the result onto the output channel.
-			if len(children) > 0 {
-				for child := range children {
-					inputChannels[child] <- flowResult
+	go func() {
+		for idx := range steps {
+			for nidx := range steps[idx] {
+				wStatus := &codec.Frame{}
+				if werr := workflowStore.Read(w.opts.Context, "status", wStatus); werr != nil {
+					cherr <- werr
+					return
 				}
-			} else {
-				outputChannel <- flowResult
-			}
-
-			// "Sign off".
-			wg.Done()
-		}(id)
-	}
-
-	// Wait for all go routines to finish.
-	wg.Wait()
-
-	// Await all leaf vertex results and stuff them into a slice.
-	resultCount := cap(outputChannel)
-	results := make([]FlowResult, resultCount)
-	for i := 0; i < resultCount; i++ {
-		results[i] = <-outputChannel
-	}
-
-	/*
-		go func() {
-			for idx := range steps {
-				for nidx := range steps[idx] {
-					wStatus := &codec.Frame{}
-					if werr := workflowStore.Read(w.opts.Context, "status", wStatus); werr != nil {
-						cherr <- werr
-						return
-					}
-					if status := StringStatus[string(wStatus.Data)]; status != StatusRunning {
-						chstatus <- status
-						return
-					}
-					if w.opts.Logger.V(logger.TraceLevel) {
-						w.opts.Logger.Tracef(nctx, "will be executed %v", steps[idx][nidx])
-					}
-					cstep := steps[idx][nidx]
-					// nolint: nestif
-					if len(cstep.Requires()) == 0 {
-						wg.Add(1)
-						go func(step Step) {
-							defer wg.Done()
-							if werr := stepStore.Write(ctx, filepath.Join(step.ID(), "req"), req); werr != nil {
-								cherr <- werr
-								return
-							}
-							if werr := stepStore.Write(ctx, filepath.Join(step.ID(), "status"), &codec.Frame{Data: []byte(StatusRunning.String())}); werr != nil {
-								cherr <- werr
-								return
-							}
-							rsp, serr := step.Execute(nctx, req, nopts...)
-							if serr != nil {
-								step.SetStatus(StatusFailure)
-								if werr := stepStore.Write(ctx, filepath.Join(step.ID(), "rsp"), serr); werr != nil && w.opts.Logger.V(logger.ErrorLevel) {
-									w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
-								}
-								if werr := stepStore.Write(ctx, filepath.Join(step.ID(), "status"), &codec.Frame{Data: []byte(StatusFailure.String())}); werr != nil && w.opts.Logger.V(logger.ErrorLevel) {
-									w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
-								}
-								cherr <- serr
-								return
-							}
-							if werr := stepStore.Write(ctx, filepath.Join(step.ID(), "rsp"), rsp); werr != nil {
-								w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
-								cherr <- werr
-								return
-							}
-							if werr := stepStore.Write(ctx, filepath.Join(step.ID(), "status"), &codec.Frame{Data: []byte(StatusSuccess.String())}); werr != nil {
-								w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
-								cherr <- werr
-								return
-							}
-						}(cstep)
-						wg.Wait()
-					} else {
-						if werr := stepStore.Write(ctx, filepath.Join(cstep.ID(), "req"), req); werr != nil {
+				if status := StringStatus[string(wStatus.Data)]; status != StatusRunning {
+					chstatus <- status
+					return
+				}
+				if w.opts.Logger.V(logger.TraceLevel) {
+					w.opts.Logger.Trace(nctx, fmt.Sprintf("step will be executed %v", steps[idx][nidx]))
+				}
+				cstep := steps[idx][nidx]
+				// nolint: nestif
+				if len(cstep.Requires()) == 0 {
+					wg.Add(1)
+					go func(step Step) {
+						defer wg.Done()
+						if werr := stepStore.Write(ctx, step.ID()+w.opts.Store.Options().Separator+"req", req); werr != nil {
 							cherr <- werr
 							return
 						}
-						if werr := stepStore.Write(ctx, filepath.Join(cstep.ID(), "status"), &codec.Frame{Data: []byte(StatusRunning.String())}); werr != nil {
+						if werr := stepStore.Write(ctx, step.ID()+w.opts.Store.Options().Separator+"status", &codec.Frame{Data: []byte(StatusRunning.String())}); werr != nil {
 							cherr <- werr
 							return
 						}
-						rsp, serr := cstep.Execute(nctx, req, nopts...)
+						rsp, serr := step.Execute(nctx, req, nopts...)
 						if serr != nil {
-							cstep.SetStatus(StatusFailure)
-							if werr := stepStore.Write(ctx, filepath.Join(cstep.ID(), "rsp"), serr); werr != nil && w.opts.Logger.V(logger.ErrorLevel) {
-								w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
+							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())
 							}
-							if werr := stepStore.Write(ctx, filepath.Join(cstep.ID(), "status"), &codec.Frame{Data: []byte(StatusFailure.String())}); werr != nil && w.opts.Logger.V(logger.ErrorLevel) {
-								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())
 							}
 							cherr <- serr
 							return
 						}
-						if werr := stepStore.Write(ctx, filepath.Join(cstep.ID(), "rsp"), rsp); werr != nil {
-							w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
+						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())
 							cherr <- werr
 							return
 						}
-						if werr := stepStore.Write(ctx, filepath.Join(cstep.ID(), "status"), &codec.Frame{Data: []byte(StatusSuccess.String())}); werr != nil {
+						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())
 							cherr <- werr
 							return
 						}
+					}(cstep)
+					wg.Wait()
+				} else {
+					if werr := stepStore.Write(ctx, cstep.ID()+w.opts.Store.Options().Separator+"req", req); werr != nil {
+						cherr <- werr
+						return
+					}
+					if werr := stepStore.Write(ctx, cstep.ID()+w.opts.Store.Options().Separator+"status", &codec.Frame{Data: []byte(StatusRunning.String())}); werr != nil {
+						cherr <- werr
+						return
+					}
+					rsp, serr := cstep.Execute(nctx, req, nopts...)
+					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())
+						}
+						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())
+						}
+						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())
+						cherr <- werr
+						return
+					}
+					if werr := stepStore.Write(ctx, cstep.ID()+w.opts.Store.Options().Separator+"status", &codec.Frame{Data: []byte(StatusSuccess.String())}); werr != nil {
+						cherr <- werr
+						return
 					}
 				}
 			}
-			close(done)
-		}()
-
-		if options.Async {
-			return eid, nil
 		}
+		close(done)
+	}()
 
-		logger.Tracef(ctx, "wait for finish or error")
-		select {
-		case <-nctx.Done():
-			err = nctx.Err()
-		case cerr := <-cherr:
-			err = cerr
-		case <-done:
-			close(cherr)
-		case <-chstatus:
-			close(chstatus)
-			return eid, nil
-		}
+	if options.Async {
+		return eid, nil
+	}
 
-		switch {
-		case nctx.Err() != nil:
-			if werr := workflowStore.Write(w.opts.Context, "status", &codec.Frame{Data: []byte(StatusAborted.String())}); werr != nil {
-				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.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.Errorf(w.opts.Context, "store error: %v", werr)
-			}
+	w.opts.Logger.Trace(ctx, "wait for finish or error")
+	select {
+	case <-nctx.Done():
+		err = nctx.Err()
+	case cerr := <-cherr:
+		err = cerr
+	case <-done:
+		close(cherr)
+	case <-chstatus:
+		close(chstatus)
+		return eid, nil
+	}
+
+	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())
 		}
-	*/
-	return err
+	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())
+		}
+	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())
+		}
+	}
+
+	return eid, err
 }
 
 // NewFlow create new flow
-func NewFlow(opts ...Option) Flow {
+func NewFlow(opts ...options.Option) Flow {
 	options := NewOptions(opts...)
 	return &microFlow{opts: options}
 }
@@ -415,7 +360,7 @@ func (f *microFlow) Options() Options {
 	return f.opts
 }
 
-func (f *microFlow) Init(opts ...Option) error {
+func (f *microFlow) Init(opts ...options.Option) error {
 	for _, o := range opts {
 		o(&f.opts)
 	}
@@ -442,11 +387,11 @@ func (f *microFlow) WorkflowList(ctx context.Context) ([]Workflow, error) {
 }
 
 func (f *microFlow) WorkflowCreate(ctx context.Context, id string, steps ...Step) (Workflow, error) {
-	w := &microWorkflow{opts: f.opts, id: id, g: &dag.DAG{}, steps: make(map[string]Step, len(steps))}
+	w := &microWorkflow{opts: f.opts, id: id, g: &dag.AcyclicGraph{}, steps: make(map[string]Step, len(steps))}
 
 	for _, s := range steps {
 		w.steps[s.String()] = s
-		w.g.AddVertex(s)
+		w.g.Add(s)
 	}
 
 	for _, dst := range steps {
@@ -455,11 +400,14 @@ func (f *microFlow) WorkflowCreate(ctx context.Context, id string, steps ...Step
 			if !ok {
 				return nil, ErrStepNotExists
 			}
-			w.g.AddEdge(src.String(), dst.String())
+			w.g.Connect(dag.BasicEdge(src, dst))
 		}
 	}
 
-	w.g.ReduceTransitively()
+	if err := w.g.Validate(); err != nil {
+		return nil, err
+	}
+	w.g.TransitiveReduction()
 
 	w.init = true
 
@@ -541,17 +489,17 @@ func (s *microCallStep) SetStatus(status Status) {
 	s.status = status
 }
 
-func (s *microCallStep) Execute(ctx context.Context, req *Message, opts ...ExecuteOption) (*Message, error) {
+func (s *microCallStep) Execute(ctx context.Context, req *Message, opts ...options.Option) (*Message, error) {
 	options := NewExecuteOptions(opts...)
 	if options.Client == nil {
 		return nil, ErrMissingClient
 	}
 	rsp := &codec.Frame{}
-	copts := []client.CallOption{client.WithRetries(0)}
+	copts := []moptions.Option{client.Retries(0)}
 	if options.Timeout > 0 {
 		copts = append(copts,
-			client.WithRequestTimeout(options.Timeout),
-			client.WithDialTimeout(options.Timeout))
+			client.RequestTimeout(options.Timeout),
+			client.DialTimeout(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...)
@@ -624,18 +572,18 @@ func (s *microPublishStep) SetStatus(status Status) {
 	s.status = status
 }
 
-func (s *microPublishStep) Execute(ctx context.Context, req *Message, opts ...ExecuteOption) (*Message, error) {
+func (s *microPublishStep) Execute(ctx context.Context, req *Message, opts ...options.Option) (*Message, error) {
 	return nil, nil
 }
 
 // NewCallStep create new step with client.Call
-func NewCallStep(service string, name string, method string, opts ...StepOption) Step {
+func NewCallStep(service string, name string, method string, opts ...options.Option) 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 ...StepOption) Step {
+func NewPublishStep(topic string, opts ...options.Option) Step {
 	options := NewStepOptions(opts...)
 	return &microPublishStep{topic: topic, opts: options}
 }

flow/flow.go

@@ -8,6 +8,7 @@ import (
 	"sync/atomic"
 
 	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/options"
 )
 
 var (
@@ -51,7 +52,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 ...ExecuteOption) (*Message, error)
+	Execute(ctx context.Context, req *Message, opts ...options.Option) (*Message, error)
 	// Requires returns dependent steps
 	Requires() []string
 	// Options returns step options
@@ -118,13 +119,15 @@ 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 ...ExecuteOption) (string, error)
+	Execute(ctx context.Context, req *Message, opts ...options.Option) (string, error)
 	// RemoveSteps remove steps from workflow
 	RemoveSteps(steps ...Step) error
 	// AppendSteps append steps to workflow
 	AppendSteps(steps ...Step) error
 	// Status returns workflow status
 	Status() Status
+	// Steps returns steps slice where parallel steps returned on the same level
+	Steps() ([][]Step, error)
 	// Suspend suspends execution
 	Suspend(ctx context.Context, id string) error
 	// Resume resumes execution
@@ -138,7 +141,7 @@ type Flow interface {
 	// Options returns options
 	Options() Options
 	// Init initialize
-	Init(...Option) error
+	Init(...options.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,13 +7,11 @@ 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
@@ -31,7 +29,7 @@ type Options struct {
 }
 
 // NewOptions returns new options struct with default or passed values
-func NewOptions(opts ...Option) Options {
+func NewOptions(opts ...options.Option) Options {
 	options := Options{
 		Context: context.Background(),
 		Logger:  logger.DefaultLogger,
@@ -47,66 +45,12 @@ func NewOptions(opts ...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
@@ -123,64 +67,28 @@ type ExecuteOptions struct {
 	Start string
 	// Timeout for execution
 	Timeout time.Duration
+	// Reverse execution
+	Reverse bool
 	// Async enables async execution
 	Async bool
 }
 
-// ExecuteOption func signature
-type ExecuteOption func(*ExecuteOptions)
-
-// ExecuteClient pass client.Client to ExecuteOption
-func ExecuteClient(c client.Client) ExecuteOption {
-	return func(o *ExecuteOptions) {
-		o.Client = c
+// Reverse says that dag must be run in reverse order
+func Reverse(b bool) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, b, ".Reverse")
 	}
 }
 
-// ExecuteTracer pass tracer.Tracer to ExecuteOption
-func ExecuteTracer(t tracer.Tracer) ExecuteOption {
-	return func(o *ExecuteOptions) {
-		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
-	}
-}
-
-// 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
+// Async says that caller does not wait for execution complete
+func Async(b bool) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, b, ".Async")
 	}
 }
 
 // NewExecuteOptions create new ExecuteOptions struct
-func NewExecuteOptions(opts ...ExecuteOption) ExecuteOptions {
+func NewExecuteOptions(opts ...options.Option) ExecuteOptions {
 	options := ExecuteOptions{
 		Client:  client.DefaultClient,
 		Logger:  logger.DefaultLogger,
@@ -202,11 +110,8 @@ type StepOptions struct {
 	Requires []string
 }
 
-// StepOption func signature
-type StepOption func(*StepOptions)
-
 // NewStepOptions create new StepOptions struct
-func NewStepOptions(opts ...StepOption) StepOptions {
+func NewStepOptions(opts ...options.Option) StepOptions {
 	options := StepOptions{
 		Context: context.Background(),
 	}
@@ -216,23 +121,23 @@ func NewStepOptions(opts ...StepOption) StepOptions {
 	return options
 }
 
-// StepID sets the step id for dag
-func StepID(id string) StepOption {
-	return func(o *StepOptions) {
-		o.ID = id
+// Requires specifies required steps
+func Requires(steps ...string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, steps, ".Requires")
 	}
 }
 
-// StepRequires specifies required steps
-func StepRequires(steps ...string) StepOption {
-	return func(o *StepOptions) {
-		o.Requires = steps
+// Fallback set the step to run on error
+func Fallback(step string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, step, ".Fallback")
 	}
 }
 
-// StepFallback set the step to run on error
-func StepFallback(step string) StepOption {
-	return func(o *StepOptions) {
-		o.Fallback = step
+// ID sets the step ID
+func StepID(id string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, id, ".ID")
 	}
 }

fsm/default.go

@@ -32,7 +32,7 @@ type fsm struct {
 
 // NewFSM creates a new finite state machine having the specified initial state
 // with specified options
-func NewFSM(opts ...Option) FSM {
+func NewFSM(opts ...Option) *fsm {
 	return &fsm{
 		statesMap: map[string]StateFunc{},
 		opts:      NewOptions(opts...),

fsm/fsm.go

@@ -1,4 +1,4 @@
-package fsm
+package fsm // import "go.unistack.org/micro/v4/fsm"
 
 import (
 	"context"

fsm/fsm_test.go

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

go.mod

@@ -1,36 +1,20 @@
 module go.unistack.org/micro/v4
 
-go 1.22.0
+go 1.20
 
 require (
-	dario.cat/mergo v1.0.1
-	github.com/DATA-DOG/go-sqlmock v1.5.2
-	github.com/KimMachineGun/automemlimit v0.7.0
-	github.com/ash3in/uuidv8 v1.2.0
+	dario.cat/mergo v1.0.0
+	github.com/DATA-DOG/go-sqlmock v1.5.0
 	github.com/google/uuid v1.6.0
-	github.com/heimdalr/dag v1.5.0
-	github.com/matoous/go-nanoid v1.5.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5
-	go.uber.org/atomic v1.11.0
-	go.uber.org/automaxprocs v1.6.0
-	go.unistack.org/micro-proto/v4 v4.1.0
-	golang.org/x/sync v0.10.0
-	google.golang.org/grpc v1.69.4
-	google.golang.org/protobuf v1.36.3
-	gopkg.in/yaml.v3 v3.0.1
+	golang.org/x/sync v0.6.0
+	golang.org/x/sys v0.16.0
+	google.golang.org/grpc v1.62.1
+	google.golang.org/protobuf v1.32.0
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
-	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
-	github.com/stretchr/testify v1.10.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
 )

go.sum

@@ -1,75 +1,33 @@
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
-github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
-github.com/KimMachineGun/automemlimit v0.7.0 h1:7G06p/dMSf7G8E6oq+f2uOPuVncFyIlDI/pBWK49u88=
-github.com/KimMachineGun/automemlimit v0.7.0/go.mod h1:QZxpHaGOQoYvFhv/r4u3U0JTC2ZcOwbSr11UZF46UBM=
-github.com/ash3in/uuidv8 v1.2.0 h1:2oogGdtCPwaVtyvPPGin4TfZLtOGE5F+W++E880G6SI=
-github.com/ash3in/uuidv8 v1.2.0/go.mod h1:BnU0wJBxnzdEKmVg4xckBkD+VZuecTFTUP3M0dWgyY4=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
-github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
-github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
+github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/heimdalr/dag v1.5.0 h1:hqVtijvY776P5OKP3QbdVBRt3Xxq6BYopz3XgklsGvo=
-github.com/heimdalr/dag v1.5.0/go.mod h1:lthekrHl01dddmzqyBQ1YZbi7XcVGGzjFo0jIky5knc=
-github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIct4=
-github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
 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/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
-github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 h1:G/FZtUu7a6NTWl3KUHMV9jkLAh/Rvtf03NWMHaEDl+E=
 github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
-go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
-go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk=
-go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 h1:Z7FRVJPSMaHQxD0uXU8WdgFh8PseLM8Q8NzhnpMrBhQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
-google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
-google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
-google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
-google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
+google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
+google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 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

@@ -13,15 +13,6 @@ func FromContext(ctx context.Context) (Logger, bool) {
 	return l, ok
 }
 
-// MustContext returns logger from passed context or DefaultLogger if empty
-func MustContext(ctx context.Context) Logger {
-	l, ok := FromContext(ctx)
-	if !ok {
-		panic("missing logger")
-	}
-	return l
-}
-
 // NewContext stores logger into passed context
 func NewContext(ctx context.Context, l Logger) context.Context {
 	if ctx == nil {
@@ -29,13 +20,3 @@ func NewContext(ctx context.Context, l Logger) context.Context {
 	}
 	return context.WithValue(ctx, loggerKey{}, l)
 }
-
-// SetOption returns a function to setup a context with given value
-func SetOption(k, v interface{}) Option {
-	return func(o *Options) {
-		if o.Context == nil {
-			o.Context = context.Background()
-		}
-		o.Context = context.WithValue(o.Context, k, v)
-	}
-}

logger/context_test.go

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

logger/logger.go

@@ -3,6 +3,8 @@ package logger
 
 import (
 	"context"
+
+	"go.unistack.org/micro/v4/options"
 )
 
 type ContextAttrFunc func(ctx context.Context) []interface{}
@@ -14,41 +16,85 @@ var (
 	DefaultLogger = NewLogger()
 	// DefaultLevel used by logger
 	DefaultLevel = InfoLevel
+	// DefaultCallerSkipCount used by logger
+	DefaultCallerSkipCount = 2
 )
 
 // Logger is a generic logging interface
 type Logger interface {
 	// Init initialises options
-	Init(opts ...Option) error
+	Init(opts ...options.Option) error
 	// Clone create logger copy with new options
-	Clone(opts ...Option) Logger
+	Clone(opts ...options.Option) Logger
 	// V compare provided verbosity level with current log level
 	V(level Level) bool
 	// Level sets the log level for logger
 	Level(level Level)
 	// The Logger options
 	Options() Options
-	// Fields set fields to always be logged with keyval pairs
-	Fields(fields ...interface{}) Logger
+	// Attrs set attrs to always be logged with keyval pairs
+	Attrs(attrs ...interface{}) Logger
 	// Info level message
-	Info(ctx context.Context, msg string, args ...interface{})
-	// Trace level message
-	Trace(ctx context.Context, msg string, args ...interface{})
+	Info(ctx context.Context, msg string, attrs ...interface{})
+	// Tracef level message
+	Trace(ctx context.Context, msg string, attrs ...interface{})
 	// Debug level message
-	Debug(ctx context.Context, msg string, args ...interface{})
+	Debug(ctx context.Context, msg string, attrs ...interface{})
 	// Warn level message
-	Warn(ctx context.Context, msg string, args ...interface{})
+	Warn(ctx context.Context, msg string, attrs ...interface{})
 	// Error level message
-	Error(ctx context.Context, msg string, args ...interface{})
+	Error(ctx context.Context, msg string, attrs ...interface{})
 	// Fatal level message
-	Fatal(ctx context.Context, msg string, args ...interface{})
+	Fatal(ctx context.Context, msg string, attrs ...interface{})
 	// Log logs message with needed level
-	Log(ctx context.Context, level Level, msg string, args ...interface{})
-	// Name returns broker instance name
-	Name() string
-	// String returns the type of logger
+	Log(ctx context.Context, level Level, msg string, attrs ...interface{})
+	// String returns the type name of logger
 	String() string
+	// String returns the name of logger
+	Name() string
 }
 
-// Field contains keyval pair
-type Field interface{}
+// Info writes formatted msg to default logger on info level
+func Info(ctx context.Context, msg string, attrs ...interface{}) {
+	DefaultLogger.Info(ctx, msg, attrs...)
+}
+
+// Error writes formatted msg to default logger on error level
+func Error(ctx context.Context, msg string, attrs ...interface{}) {
+	DefaultLogger.Error(ctx, msg, attrs...)
+}
+
+// Debug writes formatted msg to default logger on debug level
+func Debug(ctx context.Context, msg string, attrs ...interface{}) {
+	DefaultLogger.Debug(ctx, msg, attrs...)
+}
+
+// Warn writes formatted msg to default logger on warn level
+func Warn(ctx context.Context, msg string, attrs ...interface{}) {
+	DefaultLogger.Warn(ctx, msg, attrs...)
+}
+
+// Trace writes formatted msg to default logger on trace level
+func Trace(ctx context.Context, msg string, attrs ...interface{}) {
+	DefaultLogger.Trace(ctx, msg, attrs...)
+}
+
+// Fatal writes formatted msg to default logger on fatal level
+func Fatal(ctx context.Context, msg string, attrs ...interface{}) {
+	DefaultLogger.Fatal(ctx, msg, attrs...)
+}
+
+// V returns true if passed level enabled in default logger
+func V(level Level) bool {
+	return DefaultLogger.V(level)
+}
+
+// Init initialize default logger
+func Init(opts ...options.Option) error {
+	return DefaultLogger.Init(opts...)
+}
+
+// Attrs create default logger with specific attrs
+func Attrs(attrs ...interface{}) Logger {
+	return DefaultLogger.Attrs(attrs...)
+}

logger/noop.go

@@ -2,41 +2,34 @@ package logger
 
 import (
 	"context"
-)
 
-const (
-	defaultCallerSkipCount = 2
+	"go.unistack.org/micro/v4/options"
 )
 
 type noopLogger struct {
 	opts Options
 }
 
-func NewLogger(opts ...Option) Logger {
+func NewLogger(opts ...options.Option) Logger {
 	options := NewOptions(opts...)
-	options.CallerSkipCount = defaultCallerSkipCount
 	return &noopLogger{opts: options}
 }
 
-func (l *noopLogger) V(_ Level) bool {
+func (l *noopLogger) V(lvl Level) bool {
 	return false
 }
 
-func (l *noopLogger) Level(_ Level) {
+func (l *noopLogger) Level(lvl Level) {
 }
 
-func (l *noopLogger) Name() string {
-	return l.opts.Name
-}
-
-func (l *noopLogger) Init(opts ...Option) error {
+func (l *noopLogger) Init(opts ...options.Option) error {
 	for _, o := range opts {
 		o(&l.opts)
 	}
 	return nil
 }
 
-func (l *noopLogger) Clone(opts ...Option) Logger {
+func (l *noopLogger) Clone(opts ...options.Option) Logger {
 	nl := &noopLogger{opts: l.opts}
 	for _, o := range opts {
 		o(&nl.opts)
@@ -44,7 +37,7 @@ func (l *noopLogger) Clone(opts ...Option) Logger {
 	return nl
 }
 
-func (l *noopLogger) Fields(_ ...interface{}) Logger {
+func (l *noopLogger) Attrs(attrs ...interface{}) Logger {
 	return l
 }
 
@@ -52,6 +45,10 @@ func (l *noopLogger) Options() Options {
 	return l.opts
 }
 
+func (l *noopLogger) Name() string {
+	return l.opts.Name
+}
+
 func (l *noopLogger) String() string {
 	return "noop"
 }

logger/options.go

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

logger/slog/slog.go

@@ -2,29 +2,18 @@ package slog
 
 import (
 	"context"
-	"io"
 	"log/slog"
 	"os"
-	"reflect"
 	"regexp"
 	"runtime"
 	"strconv"
 	"sync"
-	"sync/atomic"
-	"time"
 
 	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/semconv"
+	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/tracer"
 )
 
-const (
-	badKey = "!BADKEY"
-	// defaultCallerSkipCount used by logger
-	defaultCallerSkipCount = 3
-	timeFormat             = "2006-01-02T15:04:05.000000000Z07:00"
-)
-
 var reTrace = regexp.MustCompile(`.*/slog/logger\.go.*\n`)
 
 var (
@@ -36,27 +25,6 @@ var (
 	fatalValue = slog.StringValue("fatal")
 )
 
-type wrapper struct {
-	h     slog.Handler
-	level atomic.Int64
-}
-
-func (h *wrapper) Enabled(ctx context.Context, level slog.Level) bool {
-	return level >= slog.Level(int(h.level.Load()))
-}
-
-func (h *wrapper) Handle(ctx context.Context, rec slog.Record) error {
-	return h.h.Handle(ctx, rec)
-}
-
-func (h *wrapper) WithAttrs(attrs []slog.Attr) slog.Handler {
-	return h.h.WithAttrs(attrs)
-}
-
-func (h *wrapper) WithGroup(name string) slog.Handler {
-	return h.h.WithGroup(name)
-}
-
 func (s *slogLogger) renameAttr(_ []string, a slog.Attr) slog.Attr {
 	switch a.Key {
 	case slog.SourceKey:
@@ -65,7 +33,6 @@ func (s *slogLogger) renameAttr(_ []string, a slog.Attr) slog.Attr {
 		a.Key = s.opts.SourceKey
 	case slog.TimeKey:
 		a.Key = s.opts.TimeKey
-		a.Value = slog.StringValue(a.Value.Time().Format(timeFormat))
 	case slog.MessageKey:
 		a.Key = s.opts.MessageKey
 	case slog.LevelKey:
@@ -94,149 +61,271 @@ func (s *slogLogger) renameAttr(_ []string, a slog.Attr) slog.Attr {
 }
 
 type slogLogger struct {
-	handler *wrapper
+	leveler *slog.LevelVar
+	handler slog.Handler
 	opts    logger.Options
 	mu      sync.RWMutex
 }
 
-func (s *slogLogger) Clone(opts ...logger.Option) logger.Logger {
+func (s *slogLogger) Clone(opts ...options.Option) logger.Logger {
 	s.mu.RLock()
 	options := s.opts
 	s.mu.RUnlock()
 
 	for _, o := range opts {
-		o(&options)
+		_ = o(&options)
 	}
 
-	if len(options.ContextAttrFuncs) == 0 {
-		options.ContextAttrFuncs = logger.DefaultContextAttrFuncs
-	}
-
-	attrs, _ := s.argsAttrs(options.Fields)
 	l := &slogLogger{
-		handler: &wrapper{h: s.handler.h.WithAttrs(attrs)},
-		opts:    options,
+		opts: options,
 	}
-	l.handler.level.Store(int64(loggerToSlogLevel(options.Level)))
+
+	l.leveler = new(slog.LevelVar)
+	handleOpt := &slog.HandlerOptions{
+		ReplaceAttr: l.renameAttr,
+		Level:       l.leveler,
+		AddSource:   l.opts.AddSource,
+	}
+	l.leveler.Set(loggerToSlogLevel(l.opts.Level))
+	l.handler = slog.New(slog.NewJSONHandler(options.Out, handleOpt)).With(options.Attrs...).Handler()
 
 	return l
 }
 
 func (s *slogLogger) V(level logger.Level) bool {
-	s.mu.Lock()
-	v := s.opts.Level.Enabled(level)
-	s.mu.Unlock()
-	return v
+	return s.opts.Level.Enabled(level)
 }
 
 func (s *slogLogger) Level(level logger.Level) {
-	s.mu.Lock()
-	s.opts.Level = level
-	s.handler.level.Store(int64(loggerToSlogLevel(level)))
-	s.mu.Unlock()
+	s.leveler.Set(loggerToSlogLevel(level))
 }
 
 func (s *slogLogger) Options() logger.Options {
 	return s.opts
 }
 
-func (s *slogLogger) Fields(fields ...interface{}) logger.Logger {
+func (s *slogLogger) Attrs(attrs ...interface{}) logger.Logger {
 	s.mu.RLock()
+	level := s.leveler.Level()
 	options := s.opts
 	s.mu.RUnlock()
 
 	l := &slogLogger{opts: options}
-	logger.WithAddFields(fields...)(&l.opts)
+	l.leveler = new(slog.LevelVar)
+	l.leveler.Set(level)
 
-	if len(options.ContextAttrFuncs) == 0 {
-		options.ContextAttrFuncs = logger.DefaultContextAttrFuncs
+	handleOpt := &slog.HandlerOptions{
+		ReplaceAttr: l.renameAttr,
+		Level:       l.leveler,
+		AddSource:   l.opts.AddSource,
 	}
 
-	attrs, _ := s.argsAttrs(fields)
-	l.handler = &wrapper{h: s.handler.h.WithAttrs(attrs)}
-	l.handler.level.Store(int64(loggerToSlogLevel(l.opts.Level)))
+	l.handler = slog.New(slog.NewJSONHandler(s.opts.Out, handleOpt)).With(attrs...).Handler()
 
 	return l
 }
 
-func (s *slogLogger) Init(opts ...logger.Option) error {
+func (s *slogLogger) Init(opts ...options.Option) error {
 	s.mu.Lock()
 
-	for _, o := range opts {
-		o(&s.opts)
-	}
-
 	if len(s.opts.ContextAttrFuncs) == 0 {
 		s.opts.ContextAttrFuncs = logger.DefaultContextAttrFuncs
 	}
 
+	for _, o := range opts {
+		if err := o(&s.opts); err != nil {
+			return err
+		}
+	}
+
+	s.leveler = new(slog.LevelVar)
 	handleOpt := &slog.HandlerOptions{
 		ReplaceAttr: s.renameAttr,
-		Level:       loggerToSlogLevel(logger.TraceLevel),
+		Level:       s.leveler,
 		AddSource:   s.opts.AddSource,
 	}
-
-	attrs, _ := s.argsAttrs(s.opts.Fields)
-
-	var h slog.Handler
-	if s.opts.Context != nil {
-		if v, ok := s.opts.Context.Value(handlerKey{}).(slog.Handler); ok && v != nil {
-			h = v
-		}
-
-		if fn := s.opts.Context.Value(handlerFnKey{}); fn != nil {
-			if rfn := reflect.ValueOf(fn); rfn.Kind() == reflect.Func {
-				if ret := rfn.Call([]reflect.Value{reflect.ValueOf(s.opts.Out), reflect.ValueOf(handleOpt)}); len(ret) == 1 {
-					if iface, ok := ret[0].Interface().(slog.Handler); ok && iface != nil {
-						h = iface
-					}
-				}
-			}
-		}
-	}
-
-	if h == nil {
-		h = slog.NewJSONHandler(s.opts.Out, handleOpt)
-	}
-
-	s.handler = &wrapper{h: h.WithAttrs(attrs)}
-	s.handler.level.Store(int64(loggerToSlogLevel(s.opts.Level)))
+	s.leveler.Set(loggerToSlogLevel(s.opts.Level))
+	s.handler = slog.New(slog.NewJSONHandler(s.opts.Out, handleOpt)).With(s.opts.Attrs...).Handler()
 	s.mu.Unlock()
 
 	return nil
 }
 
 func (s *slogLogger) Log(ctx context.Context, lvl logger.Level, msg string, attrs ...interface{}) {
-	s.printLog(ctx, lvl, msg, attrs...)
+	if !s.V(lvl) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(s.opts.TimeFunc(), loggerToSlogLevel(lvl), msg, pcs[0])
+	for _, fn := range s.opts.ContextAttrFuncs {
+		attrs = append(attrs, fn(ctx)...)
+	}
+	for idx, attr := range attrs {
+		if ve, ok := attr.(error); ok && ve != nil {
+			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
+			break
+		}
+	}
+	if s.opts.AddStacktrace && lvl == logger.ErrorLevel {
+		stackInfo := make([]byte, 1024*1024)
+		if stackSize := runtime.Stack(stackInfo, false); stackSize > 0 {
+			traceLines := reTrace.Split(string(stackInfo[:stackSize]), -1)
+			if len(traceLines) != 0 {
+				attrs = append(attrs, slog.String(s.opts.StacktraceKey, traceLines[len(traceLines)-1]))
+			}
+		}
+	}
+	r.Add(attrs...)
+	r.Attrs(func(a slog.Attr) bool {
+		if a.Key == s.opts.ErrorKey {
+			if span, ok := tracer.SpanFromContext(ctx); ok {
+				span.SetStatus(tracer.SpanStatusError, a.Value.String())
+				return false
+			}
+		}
+		return true
+	})
+	_ = s.handler.Handle(ctx, r)
 }
 
 func (s *slogLogger) Info(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.InfoLevel, msg, attrs...)
+	if !s.V(logger.InfoLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelInfo, msg, pcs[0])
+	for _, fn := range s.opts.ContextAttrFuncs {
+		attrs = append(attrs, fn(ctx)...)
+	}
+	for idx, attr := range attrs {
+		if ve, ok := attr.(error); ok && ve != nil {
+			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
+			break
+		}
+	}
+	r.Add(attrs...)
+	_ = s.handler.Handle(ctx, r)
 }
 
 func (s *slogLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.DebugLevel, msg, attrs...)
+	if !s.V(logger.DebugLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelDebug, msg, pcs[0])
+	for _, fn := range s.opts.ContextAttrFuncs {
+		attrs = append(attrs, fn(ctx)...)
+	}
+	for idx, attr := range attrs {
+		if ve, ok := attr.(error); ok && ve != nil {
+			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
+			break
+		}
+	}
+	r.Add(attrs...)
+	_ = s.handler.Handle(ctx, r)
 }
 
 func (s *slogLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.TraceLevel, msg, attrs...)
+	if !s.V(logger.TraceLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelDebug-1, msg, pcs[0])
+	for _, fn := range s.opts.ContextAttrFuncs {
+		attrs = append(attrs, fn(ctx)...)
+	}
+	for idx, attr := range attrs {
+		if ve, ok := attr.(error); ok && ve != nil {
+			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
+			break
+		}
+	}
+	r.Add(attrs...)
+	_ = s.handler.Handle(ctx, r)
 }
 
 func (s *slogLogger) Error(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.ErrorLevel, msg, attrs...)
+	if !s.V(logger.ErrorLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelError, msg, pcs[0])
+	for _, fn := range s.opts.ContextAttrFuncs {
+		attrs = append(attrs, fn(ctx)...)
+	}
+	for idx, attr := range attrs {
+		if ve, ok := attr.(error); ok && ve != nil {
+			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
+			break
+		}
+	}
+	if s.opts.AddStacktrace {
+		stackInfo := make([]byte, 1024*1024)
+		if stackSize := runtime.Stack(stackInfo, false); stackSize > 0 {
+			traceLines := reTrace.Split(string(stackInfo[:stackSize]), -1)
+			if len(traceLines) != 0 {
+				attrs = append(attrs, slog.String(s.opts.StacktraceKey, traceLines[len(traceLines)-1]))
+			}
+		}
+	}
+	r.Add(attrs...)
+	r.Attrs(func(a slog.Attr) bool {
+		if a.Key == s.opts.ErrorKey {
+			if span, ok := tracer.SpanFromContext(ctx); ok {
+				span.SetStatus(tracer.SpanStatusError, a.Value.String())
+				return false
+			}
+		}
+		return true
+	})
+	_ = s.handler.Handle(ctx, r)
 }
 
 func (s *slogLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.FatalLevel, msg, attrs...)
-	if closer, ok := s.opts.Out.(io.Closer); ok {
-		closer.Close()
+	if !s.V(logger.FatalLevel) {
+		return
 	}
-	time.Sleep(1 * time.Second)
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelError+1, msg, pcs[0])
+	for _, fn := range s.opts.ContextAttrFuncs {
+		attrs = append(attrs, fn(ctx)...)
+	}
+	for idx, attr := range attrs {
+		if ve, ok := attr.(error); ok && ve != nil {
+			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
+			break
+		}
+	}
+	r.Add(attrs...)
+	_ = s.handler.Handle(ctx, r)
 	os.Exit(1)
 }
 
 func (s *slogLogger) Warn(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.WarnLevel, msg, attrs...)
+	if !s.V(logger.WarnLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(s.opts.TimeFunc(), slog.LevelWarn, msg, pcs[0])
+	for _, fn := range s.opts.ContextAttrFuncs {
+		attrs = append(attrs, fn(ctx)...)
+	}
+	for idx, attr := range attrs {
+		if ve, ok := attr.(error); ok && ve != nil {
+			attrs[idx] = slog.String(s.opts.ErrorKey, ve.Error())
+			break
+		}
+	}
+	r.Add(attrs...)
+	_ = s.handler.Handle(ctx, r)
 }
 
 func (s *slogLogger) Name() string {
@@ -247,61 +336,11 @@ func (s *slogLogger) String() string {
 	return "slog"
 }
 
-func (s *slogLogger) printLog(ctx context.Context, lvl logger.Level, msg string, args ...interface{}) {
-	if !s.V(lvl) {
-		return
-	}
-	var argError error
-
-	s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", lvl.String()).Inc()
-
-	attrs, err := s.argsAttrs(args)
-	if err != nil {
-		argError = err
-	}
-	if argError != nil {
-		if span, ok := tracer.SpanFromContext(ctx); ok {
-			span.SetStatus(tracer.SpanStatusError, argError.Error())
-		}
-	}
-
-	for _, fn := range s.opts.ContextAttrFuncs {
-		ctxAttrs, err := s.argsAttrs(fn(ctx))
-		if err != nil {
-			argError = err
-		}
-		attrs = append(attrs, ctxAttrs...)
-	}
-	if argError != nil {
-		if span, ok := tracer.SpanFromContext(ctx); ok {
-			span.SetStatus(tracer.SpanStatusError, argError.Error())
-		}
-	}
-
-	if s.opts.AddStacktrace && (lvl == logger.FatalLevel || lvl == logger.ErrorLevel) {
-		stackInfo := make([]byte, 1024*1024)
-		if stackSize := runtime.Stack(stackInfo, false); stackSize > 0 {
-			traceLines := reTrace.Split(string(stackInfo[:stackSize]), -1)
-			if len(traceLines) != 0 {
-				attrs = append(attrs, slog.String(s.opts.StacktraceKey, traceLines[len(traceLines)-1]))
-			}
-		}
-	}
-
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, printLog, LogLvlMethod]
-	r := slog.NewRecord(s.opts.TimeFunc(), loggerToSlogLevel(lvl), msg, pcs[0])
-	r.AddAttrs(attrs...)
-	_ = s.handler.Handle(ctx, r)
-}
-
-func NewLogger(opts ...logger.Option) logger.Logger {
-	s := &slogLogger{
+func NewLogger(opts ...options.Option) logger.Logger {
+	l := &slogLogger{
 		opts: logger.NewOptions(opts...),
 	}
-	s.opts.CallerSkipCount = defaultCallerSkipCount
-
-	return s
+	return l
 }
 
 func loggerToSlogLevel(level logger.Level) slog.Level {
@@ -337,39 +376,3 @@ func slogToLoggerLevel(level slog.Level) logger.Level {
 		return logger.InfoLevel
 	}
 }
-
-func (s *slogLogger) argsAttrs(args []interface{}) ([]slog.Attr, error) {
-	attrs := make([]slog.Attr, 0, len(args))
-	var err error
-
-	for idx := 0; idx < len(args); idx++ {
-		switch arg := args[idx].(type) {
-		case slog.Attr:
-			attrs = append(attrs, arg)
-		case string:
-			if idx+1 < len(args) {
-				attrs = append(attrs, slog.Any(arg, args[idx+1]))
-				idx++
-			} else {
-				attrs = append(attrs, slog.String(badKey, arg))
-			}
-		case error:
-			attrs = append(attrs, slog.String(s.opts.ErrorKey, arg.Error()))
-			err = arg
-		}
-	}
-
-	return attrs, err
-}
-
-type handlerKey struct{}
-
-func WithHandler(h slog.Handler) logger.Option {
-	return logger.SetOption(handlerKey{}, h)
-}
-
-type handlerFnKey struct{}
-
-func WithHandlerFunc(fn any) logger.Option {
-	return logger.SetOption(handlerFnKey{}, fn)
-}

logger/slog/slog_test.go

@@ -3,227 +3,13 @@ package slog
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"log"
-	"log/slog"
-	"strings"
 	"testing"
-	"time"
 
-	"github.com/google/uuid"
 	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/util/buffer"
 )
 
-// always first to have proper check
-func TestStacktrace(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.DebugLevel), logger.WithOutput(buf),
-		WithHandlerFunc(slog.NewTextHandler),
-		logger.WithAddStacktrace(true),
-	)
-	if err := l.Init(logger.WithFields("key1", "val1")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Error(ctx, "msg1", errors.New("err"))
-
-	if !bytes.Contains(buf.Bytes(), []byte(`slog_test.go:32`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestDelayedBuffer(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	dbuf := buffer.NewDelayedBuffer(100, 100*time.Millisecond, buf)
-	l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(dbuf),
-		WithHandlerFunc(slog.NewTextHandler),
-		logger.WithAddStacktrace(true),
-	)
-	if err := l.Init(logger.WithFields("key1", "val1")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Error(ctx, "msg1", errors.New("err"))
-	time.Sleep(120 * time.Millisecond)
-	if !bytes.Contains(buf.Bytes(), []byte(`key1=val1`)) {
-		t.Fatalf("logger delayed buffer not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestTime(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(buf),
-		WithHandlerFunc(slog.NewTextHandler),
-		logger.WithAddStacktrace(true),
-		logger.WithTimeFunc(func() time.Time {
-			return time.Unix(0, 0)
-		}),
-	)
-	if err := l.Init(logger.WithFields("key1", "val1")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Error(ctx, "msg1", errors.New("err"))
-
-	if !bytes.Contains(buf.Bytes(), []byte(`timestamp=1970-01-01T03:00:00.000000000+03:00`)) &&
-		!bytes.Contains(buf.Bytes(), []byte(`timestamp=1970-01-01T00:00:00.000000000Z`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestWithFields(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf),
-		WithHandlerFunc(slog.NewTextHandler),
-		logger.WithDedupKeys(true),
-	)
-	if err := l.Init(logger.WithFields("key1", "val1")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg1")
-
-	l = l.Fields("key1", "val2")
-
-	l.Info(ctx, "msg2")
-
-	if !bytes.Contains(buf.Bytes(), []byte(`msg=msg2 key1=val1`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestWithDedupKeysWithAddFields(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf),
-		WithHandlerFunc(slog.NewTextHandler),
-		logger.WithDedupKeys(true),
-	)
-	if err := l.Init(logger.WithFields("key1", "val1")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg1")
-
-	if err := l.Init(logger.WithAddFields("key2", "val2")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg2")
-
-	if err := l.Init(logger.WithAddFields("key2", "val3", "key1", "val4")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg3")
-
-	if !bytes.Contains(buf.Bytes(), []byte(`msg=msg3 key1=val1 key2=val2`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestWithHandlerFunc(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf),
-		WithHandlerFunc(slog.NewTextHandler),
-	)
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg1")
-
-	if !bytes.Contains(buf.Bytes(), []byte(`msg=msg1`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestWithAddFields(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg1")
-
-	if err := l.Init(logger.WithAddFields("key1", "val1")); err != nil {
-		t.Fatal(err)
-	}
-	l.Info(ctx, "msg2")
-
-	if err := l.Init(logger.WithAddFields("key2", "val2")); err != nil {
-		t.Fatal(err)
-	}
-	l.Info(ctx, "msg3")
-
-	if !bytes.Contains(buf.Bytes(), []byte(`"key1"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"key2"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestMultipleFieldsWithLevel(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l = l.Fields("key", "val")
-
-	l.Info(ctx, "msg1")
-	nl := l.Clone(logger.WithLevel(logger.DebugLevel))
-	nl.Debug(ctx, "msg2")
-	l.Debug(ctx, "msg3")
-	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"msg1"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"msg2"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-	if bytes.Contains(buf.Bytes(), []byte(`"msg3"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestMultipleFields(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l = l.Fields("key", "val")
-
-	l = l.Fields("key1", "val1")
-
-	l.Info(ctx, "msg")
-
-	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"key1":"val1"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
 func TestError(t *testing.T) {
 	ctx := context.TODO()
 	buf := bytes.NewBuffer(nil)
@@ -231,40 +17,10 @@ func TestError(t *testing.T) {
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}
-
-	l.Error(ctx, "message", fmt.Errorf("error message"))
+	l.Error(ctx, "msg", fmt.Errorf("message"))
 	if !bytes.Contains(buf.Bytes(), []byte(`"stacktrace":"`)) {
 		t.Fatalf("logger stacktrace not works, buf contains: %s", buf.Bytes())
 	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"error":"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestErrorf(t *testing.T) {
-	ctx := context.TODO()
-
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(buf), logger.WithAddStacktrace(true))
-	if err := l.Init(logger.WithContextAttrFuncs(func(_ context.Context) []interface{} {
-		return nil
-	})); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Log(ctx, logger.ErrorLevel, "message", errors.New("error msg"))
-
-	l.Log(ctx, logger.ErrorLevel, "", errors.New("error msg"))
-	if !bytes.Contains(buf.Bytes(), []byte(`"error":"error msg"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-
-	if !bytes.Contains(buf.Bytes(), []byte(`"stacktrace":"`)) {
-		t.Fatalf("logger stacktrace not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"error":"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
 }
 
 func TestContext(t *testing.T) {
@@ -275,7 +31,7 @@ func TestContext(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	nl, ok := logger.FromContext(logger.NewContext(ctx, l.Fields("key", "val")))
+	nl, ok := logger.FromContext(logger.NewContext(ctx, l.Attrs("key", "val")))
 	if !ok {
 		t.Fatal("context without logger")
 	}
@@ -285,7 +41,7 @@ func TestContext(t *testing.T) {
 	}
 }
 
-func TestFields(t *testing.T) {
+func TestAttrs(t *testing.T) {
 	ctx := context.TODO()
 	buf := bytes.NewBuffer(nil)
 	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
@@ -293,7 +49,7 @@ func TestFields(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	nl := l.Fields("key", "val")
+	nl := l.Attrs("key", "val")
 
 	nl.Info(ctx, "message")
 	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
@@ -309,7 +65,7 @@ func TestFromContextWithFields(t *testing.T) {
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}
-	nl := l.Fields("key", "val")
+	nl := l.Attrs("key", "val")
 
 	ctx = logger.NewContext(ctx, nl)
 
@@ -322,11 +78,6 @@ func TestFromContextWithFields(t *testing.T) {
 	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
 		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
 	}
-
-	l.Info(ctx, "test", "uncorrected number attributes")
-	if !bytes.Contains(buf.Bytes(), []byte(`"!BADKEY":"uncorrected number attributes"`)) {
-		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
-	}
 }
 
 func TestClone(t *testing.T) {
@@ -386,7 +137,7 @@ func TestLogger(t *testing.T) {
 	}
 	l.Trace(ctx, "trace_msg1")
 	l.Warn(ctx, "warn_msg1")
-	l.Fields("error", "test").Info(ctx, "error message")
+	l.Attrs("error", "test").Info(ctx, "error message")
 	l.Warn(ctx, "first second")
 
 	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"trace"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"trace_msg1"`))) {
@@ -402,53 +153,3 @@ func TestLogger(t *testing.T) {
 		t.Fatalf("logger warn, buf %s", buf.Bytes())
 	}
 }
-
-func Test_WithContextAttrFunc(t *testing.T) {
-	loggerContextAttrFuncs := []logger.ContextAttrFunc{
-		func(ctx context.Context) []interface{} {
-			md, ok := metadata.FromIncomingContext(ctx)
-			if !ok {
-				return nil
-			}
-			attrs := make([]interface{}, 0, 10)
-			for k, v := range md {
-				key := strings.ToLower(k)
-				switch key {
-				case "x-request-id", "phone", "external-Id", "source-service", "x-app-install-id", "client-id", "client-ip":
-					attrs = append(attrs, key, v[0])
-				}
-			}
-			return attrs
-		},
-	}
-
-	logger.DefaultContextAttrFuncs = append(logger.DefaultContextAttrFuncs, loggerContextAttrFuncs...)
-
-	ctx := context.TODO()
-	ctx = metadata.AppendIncomingContext(ctx, "X-Request-Id", uuid.New().String(),
-		"Source-Service", "Test-System")
-
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "test message")
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"info"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"test message"`))) {
-		t.Fatalf("logger info, buf %s", buf.Bytes())
-	}
-	if !(bytes.Contains(buf.Bytes(), []byte(`"x-request-id":"`))) {
-		t.Fatalf("logger info, buf %s", buf.Bytes())
-	}
-	if !(bytes.Contains(buf.Bytes(), []byte(`"source-service":"Test-System"`))) {
-		t.Fatalf("logger info, buf %s", buf.Bytes())
-	}
-	buf.Reset()
-	imd, _ := metadata.FromIncomingContext(ctx)
-	l.Info(ctx, "test message1")
-	imd.Set("Source-Service", "Test-System2")
-	l.Info(ctx, "test message2")
-
-	// t.Logf("xxx %s", buf.Bytes())
-}

logger/stdlogger.go

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

logger/unwrap/unwrap.go

@@ -36,14 +36,14 @@ var (
 	circularShortBytes = []byte("<shown>")
 	invalidAngleBytes  = []byte("<invalid>")
 	filteredBytes      = []byte("<filtered>")
-	// openBracketBytes   = []byte("[")
-	// closeBracketBytes  = []byte("]")
-	percentBytes    = []byte("%")
-	precisionBytes  = []byte(".")
-	openAngleBytes  = []byte("<")
-	closeAngleBytes = []byte(">")
-	openMapBytes    = []byte("{")
-	closeMapBytes   = []byte("}")
+	openBracketBytes   = []byte("[")
+	closeBracketBytes  = []byte("]")
+	percentBytes       = []byte("%")
+	precisionBytes     = []byte(".")
+	openAngleBytes     = []byte("<")
+	closeAngleBytes    = []byte(">")
+	openMapBytes       = []byte("{")
+	closeMapBytes      = []byte("}")
 )
 
 type protoMessage interface {
@@ -52,13 +52,11 @@ type protoMessage interface {
 }
 
 type Wrapper struct {
-	pointers map[uintptr]int
-	takeMap  map[int]bool
-
-	val  interface{}
-	s    fmt.State
-	opts *Options
-
+	val              interface{}
+	s                fmt.State
+	pointers         map[uintptr]int
+	opts             *Options
+	takeMap          map[int]bool
 	depth            int
 	ignoreNextType   bool
 	protoWrapperType bool

logger/unwrap/unwrap_test.go

@@ -82,12 +82,12 @@ func TestTagged(t *testing.T) {
 func TestTaggedNested(t *testing.T) {
 	type val struct {
 		key string `logger:"take"`
-		// val string `logger:"omit"`
+		val string `logger:"omit"`
 		unk string
 	}
 	type str struct {
-		// key string `logger:"omit"`
-		val *val `logger:"take"`
+		key string `logger:"omit"`
+		val *val   `logger:"take"`
 	}
 
 	var iface interface{}

metadata/context.go

@@ -0,0 +1,100 @@
+// Package metadata is a way of defining message headers
+package metadata
+
+import (
+	"context"
+)
+
+type (
+	mdIncomingKey struct{}
+	mdOutgoingKey struct{}
+	mdKey         struct{}
+)
+
+// FromIncomingContext returns metadata from incoming ctx
+// returned metadata shoud not be modified or race condition happens
+func FromIncomingContext(ctx context.Context) (Metadata, bool) {
+	if ctx == nil {
+		return nil, false
+	}
+	md, ok := ctx.Value(mdIncomingKey{}).(Metadata)
+	if !ok || md == nil {
+		return nil, false
+	}
+	return md, ok
+}
+
+// FromOutgoingContext returns metadata from outgoing ctx
+// returned metadata shoud not be modified or race condition happens
+func FromOutgoingContext(ctx context.Context) (Metadata, bool) {
+	if ctx == nil {
+		return nil, false
+	}
+	md, ok := ctx.Value(mdOutgoingKey{}).(Metadata)
+	if !ok || md == nil {
+		return nil, false
+	}
+	return md, ok
+}
+
+// FromContext returns metadata from the given context
+// returned metadata shoud not be modified or race condition happens
+func FromContext(ctx context.Context) (Metadata, bool) {
+	if ctx == nil {
+		return nil, false
+	}
+	md, ok := ctx.Value(mdKey{}).(Metadata)
+	if !ok || md == nil {
+		return nil, false
+	}
+	return md, ok
+}
+
+// NewContext creates a new context with the given metadata
+func NewContext(ctx context.Context, md Metadata) context.Context {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	ctx = context.WithValue(ctx, mdKey{}, md)
+	return ctx
+}
+
+// NewIncomingContext creates a new context with incoming metadata attached
+func NewIncomingContext(ctx context.Context, md Metadata) context.Context {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	ctx = context.WithValue(ctx, mdIncomingKey{}, md)
+	return ctx
+}
+
+// NewOutgoingContext creates a new context with outcoming metadata attached
+func NewOutgoingContext(ctx context.Context, md Metadata) context.Context {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	ctx = context.WithValue(ctx, mdOutgoingKey{}, md)
+	return ctx
+}
+
+// AppendOutgoingContext apends new md to context
+func AppendOutgoingContext(ctx context.Context, kv ...string) context.Context {
+	md := Pairs(kv...)
+	omd, ok := FromOutgoingContext(ctx)
+	if !ok {
+		return NewOutgoingContext(ctx, md)
+	}
+	nmd := Merge(omd, md, true)
+	return NewOutgoingContext(ctx, nmd)
+}
+
+// AppendIncomingContext apends new md to context
+func AppendIncomingContext(ctx context.Context, kv ...string) context.Context {
+	md := Pairs(kv...)
+	omd, ok := FromIncomingContext(ctx)
+	if !ok {
+		return NewIncomingContext(ctx, md)
+	}
+	nmd := Merge(omd, md, true)
+	return NewIncomingContext(ctx, nmd)
+}

metadata/context_test.go

@@ -0,0 +1,110 @@
+package metadata
+
+import (
+	"context"
+	"testing"
+)
+
+func TestFromNilContext(t *testing.T) {
+	// nolint: staticcheck
+	c, ok := FromContext(nil)
+	if ok || c != nil {
+		t.Fatal("FromContext not works")
+	}
+}
+
+func TestNewNilContext(t *testing.T) {
+	// nolint: staticcheck
+	ctx := NewContext(nil, New(0))
+
+	c, ok := FromContext(ctx)
+	if c == nil || !ok {
+		t.Fatal("NewContext not works")
+	}
+}
+
+func TestFromContext(t *testing.T) {
+	ctx := context.WithValue(context.TODO(), mdKey{}, New(0))
+
+	c, ok := FromContext(ctx)
+	if c == nil || !ok {
+		t.Fatal("FromContext not works")
+	}
+}
+
+func TestNewContext(t *testing.T) {
+	ctx := NewContext(context.TODO(), New(0))
+
+	c, ok := FromContext(ctx)
+	if c == nil || !ok {
+		t.Fatal("NewContext not works")
+	}
+}
+
+func TestFromIncomingContext(t *testing.T) {
+	ctx := context.WithValue(context.TODO(), mdIncomingKey{}, New(0))
+
+	c, ok := FromIncomingContext(ctx)
+	if c == nil || !ok {
+		t.Fatal("FromIncomingContext not works")
+	}
+}
+
+func TestFromOutgoingContext(t *testing.T) {
+	ctx := context.WithValue(context.TODO(), mdOutgoingKey{}, New(0))
+
+	c, ok := FromOutgoingContext(ctx)
+	if c == nil || !ok {
+		t.Fatal("FromOutgoingContext not works")
+	}
+}
+
+func TestNewIncomingContext(t *testing.T) {
+	md := New(1)
+	md.Set("key", "val")
+	ctx := NewIncomingContext(context.TODO(), md)
+
+	c, ok := FromIncomingContext(ctx)
+	if c == nil || !ok {
+		t.Fatal("NewIncomingContext not works")
+	}
+}
+
+func TestNewOutgoingContext(t *testing.T) {
+	md := New(1)
+	md.Set("key", "val")
+	ctx := NewOutgoingContext(context.TODO(), md)
+
+	c, ok := FromOutgoingContext(ctx)
+	if c == nil || !ok {
+		t.Fatal("NewOutgoingContext not works")
+	}
+}
+
+func TestAppendIncomingContext(t *testing.T) {
+	md := New(1)
+	md.Set("key1", "val1")
+	ctx := AppendIncomingContext(context.TODO(), "key2", "val2")
+
+	nmd, ok := FromIncomingContext(ctx)
+	if nmd == nil || !ok {
+		t.Fatal("AppendIncomingContext not works")
+	}
+	if v, ok := nmd.Get("key2"); !ok || v != "val2" {
+		t.Fatal("AppendIncomingContext not works")
+	}
+}
+
+func TestAppendOutgoingContext(t *testing.T) {
+	md := New(1)
+	md.Set("key1", "val1")
+	ctx := AppendOutgoingContext(context.TODO(), "key2", "val2")
+
+	nmd, ok := FromOutgoingContext(ctx)
+	if nmd == nil || !ok {
+		t.Fatal("AppendOutgoingContext not works")
+	}
+	if v, ok := nmd.Get("key2"); !ok || v != "val2" {
+		t.Fatal("AppendOutgoingContext not works")
+	}
+}

metadata/headers.go

@@ -1,19 +0,0 @@
-// Package metadata is a way of defining message headers
-package metadata
-
-var (
-	// HeaderTopic is the header name that contains topic name
-	HeaderTopic = "Micro-Topic"
-	// HeaderContentType specifies content type of message
-	HeaderContentType = "Content-Type"
-	// HeaderEndpoint specifies endpoint in service
-	HeaderEndpoint = "Micro-Endpoint"
-	// HeaderService specifies service
-	HeaderService = "Micro-Service"
-	// HeaderTimeout specifies timeout of operation
-	HeaderTimeout = "Micro-Timeout"
-	// HeaderAuthorization specifies Authorization header
-	HeaderAuthorization = "Authorization"
-	// HeaderXRequestID specifies request id
-	HeaderXRequestID = "X-Request-Id"
-)

metadata/metadata.go

@@ -1,493 +1,118 @@
+// Package metadata is a way of defining message headers
 package metadata
 
 import (
-	"context"
-	"fmt"
 	"net/textproto"
-	"sort"
 	"strings"
 )
 
-// defaultMetadataSize used when need to init new Metadata
-var defaultMetadataSize = 2
-
-// Metadata is a mapping from metadata keys to values. Users should use the following
-// two convenience functions New and Pairs to generate Metadata.
-type Metadata map[string][]string
-
-// New creates an zero Metadata.
-func New(l int) Metadata {
-	if l == 0 {
-		l = defaultMetadataSize
-	}
-	md := make(Metadata, l)
-	return md
-}
-
-// NewWithMetadata creates an Metadata from a given key-value map.
-func NewWithMetadata(m map[string]string) Metadata {
-	md := make(Metadata, len(m))
-	for key, val := range m {
-		md[key] = append(md[key], val)
-	}
-	return md
-}
-
-// Pairs returns an Metadata formed by the mapping of key, value ...
-// Pairs panics if len(kv) is odd.
-func Pairs(kv ...string) Metadata {
-	if len(kv)%2 == 1 {
-		panic(fmt.Sprintf("metadata: Pairs got the odd number of input pairs for metadata: %d", len(kv)))
-	}
-	md := make(Metadata, len(kv)/2)
-	for i := 0; i < len(kv); i += 2 {
-		md[kv[i]] = append(md[kv[i]], kv[i+1])
-	}
-	return md
-}
-
-// Len returns the number of items in Metadata.
-func (md Metadata) Len() int {
-	return len(md)
-}
-
-// Copy returns a copy of Metadata.
-func Copy(src Metadata) Metadata {
-	out := make(Metadata, len(src))
-	for k, v := range src {
-		out[k] = copyOf(v)
-	}
-	return out
-}
-
-// Copy returns a copy of Metadata.
-func (md Metadata) Copy() Metadata {
-	out := make(Metadata, len(md))
-	for k, v := range md {
-		out[k] = copyOf(v)
-	}
-	return out
-}
-
-// AsHTTP1 returns a copy of Metadata
-// with CanonicalMIMEHeaderKey.
-func (md Metadata) AsHTTP1() map[string][]string {
-	out := make(map[string][]string, len(md))
-	for k, v := range md {
-		out[textproto.CanonicalMIMEHeaderKey(k)] = copyOf(v)
-	}
-	return out
-}
-
-// AsHTTP1 returns a copy of Metadata
-// with strings.ToLower.
-func (md Metadata) AsHTTP2() map[string][]string {
-	out := make(map[string][]string, len(md))
-	for k, v := range md {
-		out[strings.ToLower(k)] = copyOf(v)
-	}
-	return out
-}
-
-// CopyTo copies Metadata to out.
-func (md Metadata) CopyTo(out Metadata) {
-	for k, v := range md {
-		out[k] = copyOf(v)
-	}
-}
-
-// Get obtains the values for a given key.
-func (md Metadata) MustGet(k string) []string {
-	v, ok := md.Get(k)
-	if !ok {
-		panic("missing metadata key")
-	}
-	return v
-}
-
-// Get obtains the values for a given key.
-func (md Metadata) Get(k string) ([]string, bool) {
-	v, ok := md[k]
-	if !ok {
-		v, ok = md[strings.ToLower(k)]
-	}
-	if !ok {
-		v, ok = md[textproto.CanonicalMIMEHeaderKey(k)]
-	}
-	return v, ok
-}
-
-// MustGetJoined obtains the values for a given key
-// with joined values with "," symbol
-func (md Metadata) MustGetJoined(k string) string {
-	v, ok := md.GetJoined(k)
-	if !ok {
-		panic("missing metadata key")
-	}
-	return v
-}
-
-// GetJoined obtains the values for a given key
-// with joined values with "," symbol
-func (md Metadata) GetJoined(k string) (string, bool) {
-	v, ok := md.Get(k)
-	if !ok {
-		return "", ok
-	}
-	return strings.Join(v, ","), true
-}
-
-// Set sets the value of a given key with a slice of values.
-func (md Metadata) Add(key string, vals ...string) {
-	if len(vals) == 0 {
-		return
-	}
-	md[key] = vals
-}
-
-// Set sets the value of a given key with a slice of values.
-func (md Metadata) Set(kvs ...string) {
-	if len(kvs)%2 == 1 {
-		panic(fmt.Sprintf("metadata: Set got an odd number of input pairs for metadata: %d", len(kvs)))
-	}
-
-	for i := 0; i < len(kvs); i += 2 {
-		md[kvs[i]] = append(md[kvs[i]], kvs[i+1])
-	}
-}
-
-// Append adds the values to key k, not overwriting what was already stored at
-// that key.
-func (md Metadata) Append(key string, vals ...string) {
-	if len(vals) == 0 {
-		return
-	}
-	md[key] = append(md[key], vals...)
-}
-
-// Del removes the values for a given keys k.
-func (md Metadata) Del(k ...string) {
-	for i := range k {
-		delete(md, k[i])
-		delete(md, strings.ToLower(k[i]))
-		delete(md, textproto.CanonicalMIMEHeaderKey(k[i]))
-	}
-}
-
-// Join joins any number of Metadatas into a single Metadata.
-//
-// The order of values for each key is determined by the order in which the Metadatas
-// containing those values are presented to Join.
-func Join(mds ...Metadata) Metadata {
-	out := Metadata{}
-	for _, Metadata := range mds {
-		for k, v := range Metadata {
-			out[k] = append(out[k], v...)
-		}
-	}
-	return out
-}
-
-type (
-	metadataIncomingKey struct{}
-	metadataOutgoingKey struct{}
-	metadataCurrentKey  struct{}
+var (
+	// HeaderTopic is the header name that contains topic name
+	HeaderTopic = "Micro-Topic"
+	// HeaderContentType specifies content type of message
+	HeaderContentType = "Content-Type"
+	// HeaderEndpoint specifies endpoint in service
+	HeaderEndpoint = "Micro-Endpoint"
+	// HeaderService specifies service
+	HeaderService = "Micro-Service"
+	// HeaderTimeout specifies timeout of operation
+	HeaderTimeout = "Micro-Timeout"
+	// HeaderAuthorization specifies Authorization header
+	HeaderAuthorization = "Authorization"
+	// HeaderXRequestID specifies request id
+	HeaderXRequestID = "X-Request-Id"
 )
 
-// NewContext creates a new context with Metadata attached. Metadata must
-// not be modified after calling this function.
-func NewContext(ctx context.Context, md Metadata) context.Context {
-	return context.WithValue(ctx, metadataCurrentKey{}, rawMetadata{md: md})
-}
+// Metadata is our way of representing request headers internally.
+type Metadata map[string][]string
 
-// NewIncomingContext creates a new context with incoming Metadata attached. Metadata must
-// not be modified after calling this function.
-func NewIncomingContext(ctx context.Context, md Metadata) context.Context {
-	return context.WithValue(ctx, metadataIncomingKey{}, rawMetadata{md: md})
-}
-
-// NewOutgoingContext creates a new context with outgoing Metadata attached. If used
-// in conjunction with AppendOutgoingContext, NewOutgoingContext will
-// overwrite any previously-appended metadata. Metadata must not be modified after
-// calling this function.
-func NewOutgoingContext(ctx context.Context, md Metadata) context.Context {
-	return context.WithValue(ctx, metadataOutgoingKey{}, rawMetadata{md: md})
-}
-
-// AppendContext returns a new context with the provided kv merged
-// with any existing metadata in the context. Please refer to the documentation
-// of Pairs for a description of kv.
-func AppendContext(ctx context.Context, kv ...string) context.Context {
-	if len(kv)%2 == 1 {
-		panic(fmt.Sprintf("metadata: AppendContext got an odd number of input pairs for metadata: %d", len(kv)))
-	}
-	md, _ := ctx.Value(metadataCurrentKey{}).(rawMetadata)
-	added := make([][]string, len(md.added)+1)
-	copy(added, md.added)
-	kvCopy := make([]string, 0, len(kv))
-	for i := 0; i < len(kv); i += 2 {
-		kvCopy = append(kvCopy, strings.ToLower(kv[i]), kv[i+1])
-	}
-	added[len(added)-1] = kvCopy
-	return context.WithValue(ctx, metadataCurrentKey{}, rawMetadata{md: md.md, added: added})
-}
-
-// AppendIncomingContext returns a new context with the provided kv merged
-// with any existing metadata in the context. Please refer to the documentation
-// of Pairs for a description of kv.
-func AppendIncomingContext(ctx context.Context, kv ...string) context.Context {
-	if len(kv)%2 == 1 {
-		panic(fmt.Sprintf("metadata: AppendIncomingContext got an odd number of input pairs for metadata: %d", len(kv)))
-	}
-	md, _ := ctx.Value(metadataIncomingKey{}).(rawMetadata)
-	added := make([][]string, len(md.added)+1)
-	copy(added, md.added)
-	kvCopy := make([]string, 0, len(kv))
-	for i := 0; i < len(kv); i += 2 {
-		kvCopy = append(kvCopy, strings.ToLower(kv[i]), kv[i+1])
-	}
-	added[len(added)-1] = kvCopy
-	return context.WithValue(ctx, metadataIncomingKey{}, rawMetadata{md: md.md, added: added})
-}
-
-// AppendOutgoingContext returns a new context with the provided kv merged
-// with any existing metadata in the context. Please refer to the documentation
-// of Pairs for a description of kv.
-func AppendOutgoingContext(ctx context.Context, kv ...string) context.Context {
-	if len(kv)%2 == 1 {
-		panic(fmt.Sprintf("metadata: AppendOutgoingContext got an odd number of input pairs for metadata: %d", len(kv)))
-	}
-	md, _ := ctx.Value(metadataOutgoingKey{}).(rawMetadata)
-	added := make([][]string, len(md.added)+1)
-	copy(added, md.added)
-	kvCopy := make([]string, 0, len(kv))
-	for i := 0; i < len(kv); i += 2 {
-		kvCopy = append(kvCopy, strings.ToLower(kv[i]), kv[i+1])
-	}
-	added[len(added)-1] = kvCopy
-	return context.WithValue(ctx, metadataOutgoingKey{}, rawMetadata{md: md.md, added: added})
-}
-
-// FromContext returns the metadata in ctx if it exists.
-func FromContext(ctx context.Context) (Metadata, bool) {
-	raw, ok := ctx.Value(metadataCurrentKey{}).(rawMetadata)
+// Get returns value from metadata by key
+func (md Metadata) Get(key string) (string, bool) {
+	// fast path
+	val, ok := md[key]
 	if !ok {
-		return nil, false
-	}
-	metadataSize := len(raw.md)
-	for i := range raw.added {
-		metadataSize += len(raw.added[i]) / 2
+		// slow path
+		val, ok = md[textproto.CanonicalMIMEHeaderKey(key)]
 	}
+	return strings.Join(val, ","), ok
+}
 
-	out := make(Metadata, metadataSize)
-	for k, v := range raw.md {
-		out[k] = copyOf(v)
+// Set is used to store value in metadata
+func (md Metadata) Set(kv ...string) {
+	if len(kv)%2 == 1 {
+		kv = kv[:len(kv)-1]
 	}
-	for _, added := range raw.added {
-		if len(added)%2 == 1 {
-			panic(fmt.Sprintf("metadata: FromContext got an odd number of input pairs for metadata: %d", len(added)))
-		}
+	for idx := 0; idx < len(kv); idx += 2 {
+		md[textproto.CanonicalMIMEHeaderKey(kv[idx])] = []string{kv[idx+1]}
+	}
+}
 
-		for i := 0; i < len(added); i += 2 {
-			out[added[i]] = append(out[added[i]], added[i+1])
+// Append is used to append value in metadata
+func (md Metadata) Append(k string, v ...string) {
+	if len(v) == 0 {
+		return
+	}
+	k = textproto.CanonicalMIMEHeaderKey(k)
+	md[k] = append(md[k], v...)
+}
+
+// Del is used to remove value from metadata
+func (md Metadata) Del(keys ...string) {
+	for _, key := range keys {
+		// fast path
+		delete(md, key)
+		// slow path
+		delete(md, textproto.CanonicalMIMEHeaderKey(key))
+	}
+}
+
+// Copy makes a copy of the metadata
+func Copy(md Metadata, exclude ...string) Metadata {
+	nmd := make(Metadata, len(md))
+	for k, v := range md {
+		nmd[k] = v
+	}
+	nmd.Del(exclude...)
+	return nmd
+}
+
+// New return new sized metadata
+func New(size int) Metadata {
+	if size == 0 {
+		size = 2
+	}
+	return make(Metadata, size)
+}
+
+// Merge merges metadata to existing metadata, overwriting if specified
+func Merge(omd Metadata, mmd Metadata, overwrite bool) Metadata {
+	nmd := Copy(omd)
+	for key, val := range mmd {
+		nval, ok := nmd[key]
+		switch {
+		case ok && overwrite:
+			nmd[key] = nval
+			continue
+		case ok && !overwrite:
+			continue
+		case !ok:
+			for _, v := range val {
+				if v != "" {
+					nval = append(nval, v)
+				}
+			}
+			nmd[key] = nval
 		}
 	}
-	return out, true
+	return nmd
 }
 
-// MustContext returns the metadata in ctx.
-func MustContext(ctx context.Context) Metadata {
-	md, ok := FromContext(ctx)
-	if !ok {
-		panic("missing metadata")
+// Pairs from which metadata created
+func Pairs(kv ...string) Metadata {
+	if len(kv)%2 == 1 {
+		kv = kv[:len(kv)-1]
 	}
+	md := make(Metadata, len(kv)/2)
+	md.Set(kv...)
 	return md
 }
-
-// FromIncomingContext returns the incoming metadata in ctx if it exists.
-func FromIncomingContext(ctx context.Context) (Metadata, bool) {
-	raw, ok := ctx.Value(metadataIncomingKey{}).(rawMetadata)
-	if !ok {
-		return nil, false
-	}
-	metadataSize := len(raw.md)
-	for i := range raw.added {
-		metadataSize += len(raw.added[i]) / 2
-	}
-
-	out := make(Metadata, metadataSize)
-	for k, v := range raw.md {
-		out[k] = copyOf(v)
-	}
-	for _, added := range raw.added {
-		if len(added)%2 == 1 {
-			panic(fmt.Sprintf("metadata: FromIncomingContext got an odd number of input pairs for metadata: %d", len(added)))
-		}
-
-		for i := 0; i < len(added); i += 2 {
-			out[added[i]] = append(out[added[i]], added[i+1])
-		}
-	}
-	return out, true
-}
-
-// MustIncomingContext returns the incoming metadata in ctx.
-func MustIncomingContext(ctx context.Context) Metadata {
-	md, ok := FromIncomingContext(ctx)
-	if !ok {
-		panic("missing metadata")
-	}
-	return md
-}
-
-// ValueFromIncomingContext returns the metadata value corresponding to the metadata
-// key from the incoming metadata if it exists. Keys are matched in a case insensitive
-// manner.
-func ValueFromIncomingContext(ctx context.Context, key string) []string {
-	raw, ok := ctx.Value(metadataIncomingKey{}).(rawMetadata)
-	if !ok {
-		return nil
-	}
-
-	if v, ok := raw.md[key]; ok {
-		return copyOf(v)
-	}
-	for k, v := range raw.md {
-		// Case insensitive comparison: Metadata is a map, and there's no guarantee
-		// that the Metadata attached to the context is created using our helper
-		// functions.
-		if strings.EqualFold(k, key) {
-			return copyOf(v)
-		}
-	}
-	return nil
-}
-
-// ValueFromCurrentContext returns the metadata value corresponding to the metadata
-// key from the incoming metadata if it exists. Keys are matched in a case insensitive
-// manner.
-func ValueFromCurrentContext(ctx context.Context, key string) []string {
-	md, ok := ctx.Value(metadataCurrentKey{}).(rawMetadata)
-	if !ok {
-		return nil
-	}
-
-	if v, ok := md.md[key]; ok {
-		return copyOf(v)
-	}
-	for k, v := range md.md {
-		// Case insensitive comparison: Metadata is a map, and there's no guarantee
-		// that the Metadata attached to the context is created using our helper
-		// functions.
-		if strings.EqualFold(k, key) {
-			return copyOf(v)
-		}
-	}
-	return nil
-}
-
-// MustOutgoingContext returns the outgoing metadata in ctx.
-func MustOutgoingContext(ctx context.Context) Metadata {
-	md, ok := FromOutgoingContext(ctx)
-	if !ok {
-		panic("missing metadata")
-	}
-	return md
-}
-
-// ValueFromOutgoingContext returns the metadata value corresponding to the metadata
-// key from the incoming metadata if it exists. Keys are matched in a case insensitive
-// manner.
-func ValueFromOutgoingContext(ctx context.Context, key string) []string {
-	md, ok := ctx.Value(metadataOutgoingKey{}).(rawMetadata)
-	if !ok {
-		return nil
-	}
-
-	if v, ok := md.md[key]; ok {
-		return copyOf(v)
-	}
-	for k, v := range md.md {
-		// Case insensitive comparison: Metadata is a map, and there's no guarantee
-		// that the Metadata attached to the context is created using our helper
-		// functions.
-		if strings.EqualFold(k, key) {
-			return copyOf(v)
-		}
-	}
-	return nil
-}
-
-func copyOf(v []string) []string {
-	vals := make([]string, len(v))
-	copy(vals, v)
-	return vals
-}
-
-// FromOutgoingContext returns the outgoing metadata in ctx if it exists.
-func FromOutgoingContext(ctx context.Context) (Metadata, bool) {
-	raw, ok := ctx.Value(metadataOutgoingKey{}).(rawMetadata)
-	if !ok {
-		return nil, false
-	}
-
-	metadataSize := len(raw.md)
-	for i := range raw.added {
-		metadataSize += len(raw.added[i]) / 2
-	}
-
-	out := make(Metadata, metadataSize)
-	for k, v := range raw.md {
-		out[k] = copyOf(v)
-	}
-	for _, added := range raw.added {
-		if len(added)%2 == 1 {
-			panic(fmt.Sprintf("metadata: FromOutgoingContext got an odd number of input pairs for metadata: %d", len(added)))
-		}
-
-		for i := 0; i < len(added); i += 2 {
-			out[added[i]] = append(out[added[i]], added[i+1])
-		}
-	}
-	return out, ok
-}
-
-type rawMetadata struct {
-	md    Metadata
-	added [][]string
-}
-
-// Iterator used to iterate over metadata with order
-type Iterator struct {
-	md   Metadata
-	keys []string
-	cur  int
-	cnt  int
-}
-
-// Next advance iterator to next element
-func (iter *Iterator) Next(k *string, v *[]string) bool {
-	if iter.cur+1 > iter.cnt {
-		return false
-	}
-
-	if k != nil && v != nil {
-		*k = iter.keys[iter.cur]
-		vv := iter.md[*k]
-		*v = make([]string, len(vv))
-		copy(*v, vv)
-		iter.cur++
-	}
-	return true
-}
-
-// Iterator returns the itarator for metadata in sorted order
-func (md Metadata) Iterator() *Iterator {
-	iter := &Iterator{md: md, cnt: len(md)}
-	iter.keys = make([]string, 0, iter.cnt)
-	for k := range md {
-		iter.keys = append(iter.keys, k)
-	}
-	sort.Strings(iter.keys)
-	return iter
-}

metadata/metadata_test.go

@@ -5,56 +5,17 @@ import (
 	"testing"
 )
 
-/*
-func TestAppendOutgoingContextModify(t *testing.T) {
-	md := Pairs("key1", "val1")
-	ctx := NewOutgoingContext(context.TODO(), md)
-	nctx := AppendOutgoingContext(ctx, "key1", "val3", "key2", "val2")
-	_ = nctx
-	omd := MustOutgoingContext(nctx)
-	fmt.Printf("%#+v\n", omd)
-}
-*/
-
-func TestLowercase(t *testing.T) {
-	md := New(1)
-	md["x-request-id"] = []string{"12345"}
-	v, ok := md.GetJoined("X-Request-Id")
-	if !ok || v == "" {
-		t.Fatalf("metadata invalid %#+v", md)
-	}
-}
-
-func TestMultipleUsage(t *testing.T) {
-	ctx := context.TODO()
-	md := New(0)
-	md.Set("key1_1", "val1_1", "key1_2", "val1_2", "key1_3", "val1_3")
-	ctx = NewIncomingContext(ctx, Copy(md))
-	ctx = NewOutgoingContext(ctx, Copy(md))
-	imd, _ := FromIncomingContext(ctx)
-	omd, _ := FromOutgoingContext(ctx)
-	_ = func(x context.Context) context.Context {
-		m, _ := FromIncomingContext(x)
-		m.Del("key1_2")
-		return ctx
-	}(ctx)
-	_ = func(x context.Context) context.Context {
-		m, _ := FromIncomingContext(x)
-		m.Del("key1_3")
-		return ctx
-	}(ctx)
-	_ = imd
-	_ = omd
-}
-
 func TestMetadataSetMultiple(t *testing.T) {
 	md := New(4)
-	md.Set("key1", "val1", "key2", "val2")
+	md.Set("key1", "val1", "key2", "val2", "key3")
 
-	if v, ok := md.GetJoined("key1"); !ok || v != "val1" {
+	if v, ok := md.Get("key1"); !ok || v != "val1" {
 		t.Fatalf("invalid kv %#+v", md)
 	}
-	if v, ok := md.GetJoined("key2"); !ok || v != "val2" {
+	if v, ok := md.Get("key2"); !ok || v != "val2" {
+		t.Fatalf("invalid kv %#+v", md)
+	}
+	if _, ok := md.Get("key3"); ok {
 		t.Fatalf("invalid kv %#+v", md)
 	}
 }
@@ -73,74 +34,91 @@ func TestAppend(t *testing.T) {
 
 func TestPairs(t *testing.T) {
 	md := Pairs("key1", "val1", "key2", "val2")
+
 	if _, ok := md.Get("key1"); !ok {
 		t.Fatal("key1 not found")
 	}
 }
 
-func TestPassing(t *testing.T) {
+func testIncomingCtx(ctx context.Context) {
+	if md, ok := FromIncomingContext(ctx); ok && md != nil {
+		md.Set("Key1", "Val1_new")
+		md.Set("Key3", "Val3")
+	}
+}
+
+func testOutgoingCtx(ctx context.Context) {
+	if md, ok := FromOutgoingContext(ctx); ok && md != nil {
+		md.Set("Key1", "Val1_new")
+		md.Set("Key3", "Val3")
+	}
+}
+
+func TestIncoming(t *testing.T) {
 	ctx := context.TODO()
 	md1 := New(2)
 	md1.Set("Key1", "Val1")
 	md1.Set("Key2", "Val2")
 
 	ctx = NewIncomingContext(ctx, md1)
-
-	_, ok := FromOutgoingContext(ctx)
-	if ok {
-		t.Fatalf("create outgoing context")
-	}
-
-	ctx = NewOutgoingContext(ctx, md1)
-
-	md, ok := FromOutgoingContext(ctx)
+	testIncomingCtx(ctx)
+	md, ok := FromIncomingContext(ctx)
 	if !ok {
-		t.Fatalf("missing metadata from outgoing context")
+		t.Fatalf("missing metadata from incoming context")
 	}
-	if v, ok := md.Get("Key1"); !ok || v[0] != "Val1" {
+	if v, ok := md.Get("Key1"); !ok || v != "Val1_new" {
 		t.Fatalf("invalid metadata value %#+v", md)
 	}
 }
 
-func TestIterator(t *testing.T) {
-	md := Pairs(
-		"1Last", "last",
-		"2First", "first",
-		"3Second", "second",
-	)
+func TestOutgoing(t *testing.T) {
+	ctx := context.TODO()
+	md1 := New(2)
+	md1.Set("Key1", "Val1")
+	md1.Set("Key2", "Val2")
 
-	iter := md.Iterator()
-	var k string
-	var v []string
-	chk := New(3)
-	for iter.Next(&k, &v) {
-		chk[k] = v
+	ctx = NewOutgoingContext(ctx, md1)
+	testOutgoingCtx(ctx)
+	md, ok := FromOutgoingContext(ctx)
+	if !ok {
+		t.Fatalf("missing metadata from outgoing context")
+	}
+	if v, ok := md.Get("Key1"); !ok || v != "Val1_new" {
+		t.Fatalf("invalid metadata value %#+v", md)
+	}
+}
+
+func TestMerge(t *testing.T) {
+	omd := Metadata{
+		"key1": []string{"val1"},
+	}
+	mmd := Metadata{
+		"key2": []string{"val2"},
 	}
 
-	for k, v := range chk {
-		if cv, ok := md[k]; !ok || len(cv) != len(v) || cv[0] != v[0] {
-			t.Fatalf("XXXX %#+v %#+v", chk, md)
-		}
+	nmd := Merge(omd, mmd, true)
+	if len(nmd) != 2 {
+		t.Fatalf("merge failed: %v", nmd)
 	}
 }
 
 func TestMedataCanonicalKey(t *testing.T) {
 	md := New(1)
 	md.Set("x-request-id", "12345")
-	v, ok := md.GetJoined("x-request-id")
+	v, ok := md.Get("x-request-id")
 	if !ok {
 		t.Fatalf("failed to get x-request-id")
 	} else if v != "12345" {
 		t.Fatalf("invalid metadata value: %s != %s", "12345", v)
 	}
 
-	v, ok = md.GetJoined("X-Request-Id")
+	v, ok = md.Get("X-Request-Id")
 	if !ok {
 		t.Fatalf("failed to get x-request-id")
 	} else if v != "12345" {
 		t.Fatalf("invalid metadata value: %s != %s", "12345", v)
 	}
-	v, ok = md.GetJoined("X-Request-ID")
+	v, ok = md.Get("X-Request-ID")
 	if !ok {
 		t.Fatalf("failed to get x-request-id")
 	} else if v != "12345" {
@@ -153,7 +131,7 @@ func TestMetadataSet(t *testing.T) {
 
 	md.Set("Key", "val")
 
-	val, ok := md.GetJoined("Key")
+	val, ok := md.Get("Key")
 	if !ok {
 		t.Fatal("key Key not found")
 	}
@@ -163,10 +141,7 @@ func TestMetadataSet(t *testing.T) {
 }
 
 func TestMetadataDelete(t *testing.T) {
-	md := Metadata{
-		"Foo": []string{"bar"},
-		"Baz": []string{"empty"},
-	}
+	md := Pairs("Foo", "bar", "Baz", "empty")
 
 	md.Del("Baz")
 	_, ok := md.Get("Baz")
@@ -175,25 +150,29 @@ func TestMetadataDelete(t *testing.T) {
 	}
 }
 
-func TestMetadataCopy(t *testing.T) {
-	md := Metadata{
-		"Foo": []string{"bar"},
-		"Bar": []string{"baz"},
+func TestNilContext(t *testing.T) {
+	var ctx context.Context
+
+	_, ok := FromContext(ctx)
+	if ok {
+		t.Fatal("nil context")
 	}
+}
+
+func TestMetadataCopy(t *testing.T) {
+	md := Pairs("Foo", "bar", "Bar", "baz")
 
 	cp := Copy(md)
 
 	for k, v := range md {
-		if cv := cp[k]; cv[0] != v[0] {
+		if cv := cp[k]; len(cv) != len(v) {
 			t.Fatalf("Got %s:%s for %s:%s", k, cv, k, v)
 		}
 	}
 }
 
 func TestMetadataContext(t *testing.T) {
-	md := Metadata{
-		"Foo": []string{"bar"},
-	}
+	md := Pairs("Foo", "bar")
 
 	ctx := NewContext(context.TODO(), md)
 
@@ -202,7 +181,7 @@ func TestMetadataContext(t *testing.T) {
 		t.Errorf("Unexpected error retrieving metadata, got %t", ok)
 	}
 
-	if emd["Foo"][0] != md["Foo"][0] {
+	if len(emd["Foo"]) != len(md["Foo"]) {
 		t.Errorf("Expected key: %s val: %s, got key: %s val: %s", "Foo", md["Foo"], "Foo", emd["Foo"])
 	}
 
@@ -211,88 +190,13 @@ func TestMetadataContext(t *testing.T) {
 	}
 }
 
-func TestFromContext(t *testing.T) {
-	ctx := context.WithValue(context.TODO(), metadataCurrentKey{}, rawMetadata{md: New(0)})
-
-	c, ok := FromContext(ctx)
-	if c == nil || !ok {
-		t.Fatal("FromContext not works")
-	}
-}
-
-func TestNewContext(t *testing.T) {
-	ctx := NewContext(context.TODO(), New(0))
-
-	c, ok := FromContext(ctx)
-	if c == nil || !ok {
-		t.Fatal("NewContext not works")
-	}
-}
-
-func TestFromIncomingContext(t *testing.T) {
-	ctx := context.WithValue(context.TODO(), metadataIncomingKey{}, rawMetadata{md: New(0)})
-
-	c, ok := FromIncomingContext(ctx)
-	if c == nil || !ok {
-		t.Fatal("FromIncomingContext not works")
-	}
-}
-
-func TestFromOutgoingContext(t *testing.T) {
-	ctx := context.WithValue(context.TODO(), metadataOutgoingKey{}, rawMetadata{md: New(0)})
-
-	c, ok := FromOutgoingContext(ctx)
-	if c == nil || !ok {
-		t.Fatal("FromOutgoingContext not works")
-	}
-}
-
-func TestNewIncomingContext(t *testing.T) {
-	md := New(1)
-	md.Set("key", "val")
-	ctx := NewIncomingContext(context.TODO(), md)
-
-	c, ok := FromIncomingContext(ctx)
-	if c == nil || !ok {
-		t.Fatal("NewIncomingContext not works")
-	}
-}
-
-func TestNewOutgoingContext(t *testing.T) {
-	md := New(1)
-	md.Set("key", "val")
-	ctx := NewOutgoingContext(context.TODO(), md)
-
-	c, ok := FromOutgoingContext(ctx)
-	if c == nil || !ok {
-		t.Fatal("NewOutgoingContext not works")
-	}
-}
-
-func TestAppendIncomingContext(t *testing.T) {
-	md := New(1)
-	md.Set("key1", "val1")
-	ctx := AppendIncomingContext(context.TODO(), "key2", "val2")
-
-	nmd, ok := FromIncomingContext(ctx)
-	if nmd == nil || !ok {
-		t.Fatal("AppendIncomingContext not works")
-	}
-	if v, ok := nmd.GetJoined("key2"); !ok || v != "val2" {
-		t.Fatal("AppendIncomingContext not works")
-	}
-}
-
-func TestAppendOutgoingContext(t *testing.T) {
-	md := New(1)
-	md.Set("key1", "val1")
-	ctx := AppendOutgoingContext(context.TODO(), "key2", "val2")
-
-	nmd, ok := FromOutgoingContext(ctx)
-	if nmd == nil || !ok {
-		t.Fatal("AppendOutgoingContext not works")
-	}
-	if v, ok := nmd.GetJoined("key2"); !ok || v != "val2" {
-		t.Fatal("AppendOutgoingContext not works")
+func TestCopy(t *testing.T) {
+	md := New(2)
+	md.Set("key1", "val1", "key2", "val2")
+	nmd := Copy(md, "key2")
+	if len(nmd) != 1 {
+		t.Fatal("Copy exclude not works")
+	} else if nmd["Key1"][0] != "val1" {
+		t.Fatal("Copy exclude not works")
 	}
 }

meter/context.go

@@ -15,15 +15,6 @@ func FromContext(ctx context.Context) (Meter, bool) {
 	return c, ok
 }
 
-// MustContext get meter from context
-func MustContext(ctx context.Context) Meter {
-	m, ok := FromContext(ctx)
-	if !ok {
-		panic("missing meter")
-	}
-	return m
-}
-
 // NewContext put meter in context
 func NewContext(ctx context.Context, c Meter) context.Context {
 	if ctx == nil {
@@ -31,13 +22,3 @@ 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,14 +40,3 @@ func TestNewContext(t *testing.T) {
 		t.Fatal("NewContext not works")
 	}
 }
-
-func TestSetOption(t *testing.T) {
-	type key struct{}
-	o := SetOption(key{}, "test")
-	opts := &Options{}
-	o(opts)
-
-	if v, ok := opts.Context.Value(key{}).(string); !ok || v == "" {
-		t.Fatal("SetOption not works")
-	}
-}

meter/meter.go

@@ -1,5 +1,5 @@
 // Package meter is for instrumentation
-package meter
+package meter // import "go.unistack.org/micro/v4/meter"
 
 import (
 	"io"
@@ -7,6 +7,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"go.unistack.org/micro/v4/options"
 )
 
 var (
@@ -16,19 +18,14 @@ var (
 	DefaultAddress = ":9090"
 	// DefaultPath the meter endpoint where the Meter data will be made available
 	DefaultPath = "/metrics"
-	// DefaultMeterStatsInterval specifies interval for meter updating
-	DefaultMeterStatsInterval = 5 * time.Second
+	// DefaultMetricPrefix holds the string that prepends to all metrics
+	DefaultMetricPrefix = "micro_"
+	// DefaultLabelPrefix holds the string that prepends to all labels
+	DefaultLabelPrefix = "micro_"
 	// DefaultSummaryQuantiles is the default spread of stats for summary
 	DefaultSummaryQuantiles = []float64{0.5, 0.9, 0.97, 0.99, 1}
 	// DefaultSummaryWindow is the default window for summary
 	DefaultSummaryWindow = 5 * time.Minute
-	// DefaultSkipEndpoints is the slice of endpoint that must not be metered
-	DefaultSkipEndpoints = []string{
-		"MeterService.Metrics",
-		"HealthService.Live",
-		"HealthService.Ready",
-		"HealthService.Version",
-	}
 )
 
 // Meter is an interface for collecting and instrumenting metrics
@@ -36,9 +33,9 @@ type Meter interface {
 	// Name returns meter name
 	Name() string
 	// Init initialize meter
-	Init(opts ...Option) error
+	Init(opts ...options.Option) error
 	// Clone create meter copy with new options
-	Clone(opts ...Option) Meter
+	Clone(opts ...options.Option) Meter
 	// Counter get or create counter
 	Counter(name string, labels ...string) Counter
 	// FloatCounter get or create float counter
@@ -46,7 +43,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 ...Option) Meter
+	Set(opts ...options.Option) Meter
 	// Histogram get or create histogram
 	Histogram(name string, labels ...string) Histogram
 	// Summary get or create summary
@@ -54,7 +51,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 ...Option) error
+	Write(w io.Writer, opts ...options.Option) error
 	// Options returns meter options
 	Options() Options
 	// String return meter type

meter/noop.go

@@ -3,6 +3,8 @@ package meter
 import (
 	"io"
 	"time"
+
+	"go.unistack.org/micro/v4/options"
 )
 
 // NoopMeter is an noop implementation of Meter
@@ -11,12 +13,12 @@ type noopMeter struct {
 }
 
 // NewMeter returns a configured noop reporter:
-func NewMeter(opts ...Option) Meter {
+func NewMeter(opts ...options.Option) Meter {
 	return &noopMeter{opts: NewOptions(opts...)}
 }
 
 // Clone return old meter with new options
-func (r *noopMeter) Clone(opts ...Option) Meter {
+func (r *noopMeter) Clone(opts ...options.Option) Meter {
 	options := r.opts
 	for _, o := range opts {
 		o(&options)
@@ -29,7 +31,7 @@ func (r *noopMeter) Name() string {
 }
 
 // Init initialize options
-func (r *noopMeter) Init(opts ...Option) error {
+func (r *noopMeter) Init(opts ...options.Option) error {
 	for _, o := range opts {
 		o(&r.opts)
 	}
@@ -37,37 +39,37 @@ func (r *noopMeter) Init(opts ...Option) error {
 }
 
 // Counter implements the Meter interface
-func (r *noopMeter) Counter(_ string, labels ...string) Counter {
+func (r *noopMeter) Counter(name string, labels ...string) Counter {
 	return &noopCounter{labels: labels}
 }
 
 // FloatCounter implements the Meter interface
-func (r *noopMeter) FloatCounter(_ string, labels ...string) FloatCounter {
+func (r *noopMeter) FloatCounter(name string, labels ...string) FloatCounter {
 	return &noopFloatCounter{labels: labels}
 }
 
 // Gauge implements the Meter interface
-func (r *noopMeter) Gauge(_ string, _ func() float64, labels ...string) Gauge {
+func (r *noopMeter) Gauge(name string, f func() float64, labels ...string) Gauge {
 	return &noopGauge{labels: labels}
 }
 
 // Summary implements the Meter interface
-func (r *noopMeter) Summary(_ string, labels ...string) Summary {
+func (r *noopMeter) Summary(name string, labels ...string) Summary {
 	return &noopSummary{labels: labels}
 }
 
 // SummaryExt implements the Meter interface
-func (r *noopMeter) SummaryExt(_ string, _ time.Duration, _ []float64, labels ...string) Summary {
+func (r *noopMeter) SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) Summary {
 	return &noopSummary{labels: labels}
 }
 
 // Histogram implements the Meter interface
-func (r *noopMeter) Histogram(_ string, labels ...string) Histogram {
+func (r *noopMeter) Histogram(name string, labels ...string) Histogram {
 	return &noopHistogram{labels: labels}
 }
 
 // Set implements the Meter interface
-func (r *noopMeter) Set(opts ...Option) Meter {
+func (r *noopMeter) Set(opts ...options.Option) Meter {
 	m := &noopMeter{opts: r.opts}
 
 	for _, o := range opts {
@@ -77,7 +79,7 @@ func (r *noopMeter) Set(opts ...Option) Meter {
 	return m
 }
 
-func (r *noopMeter) Write(_ io.Writer, _ ...Option) error {
+func (r *noopMeter) Write(_ io.Writer, _ ...options.Option) error {
 	return nil
 }
 

meter/options.go

@@ -2,13 +2,17 @@ package meter
 
 import (
 	"context"
-)
+	"reflect"
 
-// Option powers the configuration for metrics implementations:
-type Option func(*Options)
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/options"
+	rutil "go.unistack.org/micro/v4/util/reflect"
+)
 
 // Options for metrics implementations
 type Options struct {
+	// Logger used for logging
+	Logger logger.Logger
 	// Context holds external options
 	Context context.Context
 	// Name holds the meter name
@@ -17,6 +21,10 @@ type Options struct {
 	Address string
 	// Path holds the path for metrics
 	Path string
+	// MetricPrefix holds the prefix for all metrics
+	MetricPrefix string
+	// LabelPrefix holds the prefix for all labels
+	LabelPrefix string
 	// Labels holds the default labels
 	Labels []string
 	// WriteProcessMetrics flag to write process metrics
@@ -26,11 +34,14 @@ type Options struct {
 }
 
 // NewOptions prepares a set of options:
-func NewOptions(opt ...Option) Options {
+func NewOptions(opt ...options.Option) Options {
 	opts := Options{
-		Address: DefaultAddress,
-		Path:    DefaultPath,
-		Context: context.Background(),
+		Address:      DefaultAddress,
+		Path:         DefaultPath,
+		Context:      context.Background(),
+		Logger:       logger.DefaultLogger,
+		MetricPrefix: DefaultMetricPrefix,
+		LabelPrefix:  DefaultLabelPrefix,
 	}
 
 	for _, o := range opt {
@@ -40,24 +51,24 @@ func NewOptions(opt ...Option) Options {
 	return opts
 }
 
-// Context sets the metrics context
-func Context(ctx context.Context) Option {
-	return func(o *Options) {
-		o.Context = ctx
+// LabelPrefix sets the labels prefix
+func LabelPrefix(pref string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, pref, ".LabelPrefix")
+	}
+}
+
+// MetricPrefix sets the metric prefix
+func MetricPrefix(pref string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, pref, ".MetricPrefix")
 	}
 }
 
 // Path used to serve metrics over HTTP
-func Path(value string) Option {
-	return func(o *Options) {
-		o.Path = value
-	}
-}
-
-// Address is the listen address to serve metrics
-func Address(value string) Option {
-	return func(o *Options) {
-		o.Address = value
+func Path(path string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, path, ".Path")
 	}
 }
 
@@ -70,30 +81,34 @@ func TimingObjectives(value map[float64]float64) Option {
 }
 */
 
-// Labels add the meter labels
-func Labels(ls ...string) Option {
-	return func(o *Options) {
-		o.Labels = append(o.Labels, ls...)
-	}
-}
-
-// Name sets the name
-func Name(n string) Option {
-	return func(o *Options) {
-		o.Name = n
+// Labels sets the meter labels
+func Labels(ls ...string) options.Option {
+	return func(src interface{}) error {
+		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
 	}
 }
 
 // WriteProcessMetrics enable process metrics output for write
-func WriteProcessMetrics(b bool) Option {
-	return func(o *Options) {
-		o.WriteProcessMetrics = b
+func WriteProcessMetrics(b bool) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, b, ".WriteProcessMetrics")
 	}
 }
 
 // WriteFDMetrics enable fd metrics output for write
-func WriteFDMetrics(b bool) Option {
-	return func(o *Options) {
-		o.WriteFDMetrics = b
+func WriteFDMetrics(b bool) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, b, ".WriteFDMetrics")
 	}
 }

meter/wrapper/wrapper.go

@@ -0,0 +1,239 @@
+package wrapper
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"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 (
+	labelSuccess  = "success"
+	labelFailure  = "failure"
+	labelStatus   = "status"
+	labelEndpoint = "endpoint"
+
+	// DefaultSkipEndpoints contains list of endpoints that not evaluted by wrapper
+	DefaultSkipEndpoints = []string{"Meter.Metrics", "Health.Live", "Health.Ready", "Health.Version"}
+)
+
+// Options struct
+type Options struct {
+	Meter         meter.Meter
+	lopts         []options.Option
+	SkipEndpoints []string
+}
+
+// Option func signature
+type Option func(*Options)
+
+// NewOptions creates new Options struct
+func NewOptions(opts ...Option) Options {
+	options := Options{
+		Meter:         meter.DefaultMeter,
+		lopts:         make([]options.Option, 0, 5),
+		SkipEndpoints: DefaultSkipEndpoints,
+	}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
+// ServiceName passes service name to meter label
+func ServiceName(name string) Option {
+	return func(o *Options) {
+		o.lopts = append(o.lopts, meter.Labels("name", name))
+	}
+}
+
+// ServiceVersion passes service version to meter label
+func ServiceVersion(version string) Option {
+	return func(o *Options) {
+		o.lopts = append(o.lopts, meter.Labels("version", version))
+	}
+}
+
+// ServiceID passes service id to meter label
+func ServiceID(id string) Option {
+	return func(o *Options) {
+		o.lopts = append(o.lopts, meter.Labels("id", id))
+	}
+}
+
+// Meter passes meter
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// SkipEndoints add endpoint to skip
+func SkipEndoints(eps ...string) Option {
+	return func(o *Options) {
+		o.SkipEndpoints = append(o.SkipEndpoints, eps...)
+	}
+}
+
+type wrapper struct {
+	client.Client
+	callFunc client.CallFunc
+	opts     Options
+}
+
+// NewClientWrapper create new client wrapper
+func NewClientWrapper(opts ...Option) client.Wrapper {
+	return func(c client.Client) client.Client {
+		handler := &wrapper{
+			opts:   NewOptions(opts...),
+			Client: c,
+		}
+		return handler
+	}
+}
+
+// NewCallWrapper create new call wrapper
+func NewCallWrapper(opts ...Option) client.CallWrapper {
+	return func(fn client.CallFunc) client.CallFunc {
+		handler := &wrapper{
+			opts:     NewOptions(opts...),
+			callFunc: fn,
+		}
+		return handler.CallFunc
+	}
+}
+
+func (w *wrapper) CallFunc(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
+	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
+	for _, ep := range w.opts.SkipEndpoints {
+		if ep == endpoint {
+			return w.callFunc(ctx, addr, req, rsp, opts)
+		}
+	}
+
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(semconv.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.Summary(semconv.ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(semconv.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()
+
+	return err
+}
+
+func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...options.Option) error {
+	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
+	for _, ep := range w.opts.SkipEndpoints {
+		if ep == endpoint {
+			return w.Client.Call(ctx, req, rsp, opts...)
+		}
+	}
+
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(semconv.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.Summary(semconv.ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(semconv.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()
+
+	return err
+}
+
+func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...options.Option) (client.Stream, error) {
+	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
+	for _, ep := range w.opts.SkipEndpoints {
+		if ep == endpoint {
+			return w.Client.Stream(ctx, req, opts...)
+		}
+	}
+
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(semconv.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.Summary(semconv.ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(semconv.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()
+
+	return stream, err
+}
+
+// NewServerHandlerWrapper create new server handler wrapper
+func NewServerHandlerWrapper(opts ...Option) server.HandlerWrapper {
+	handler := &wrapper{
+		opts: NewOptions(opts...),
+	}
+	return handler.HandlerFunc
+}
+
+func (w *wrapper) HandlerFunc(fn server.HandlerFunc) server.HandlerFunc {
+	return func(ctx context.Context, req server.Request, rsp interface{}) error {
+		endpoint := req.Service() + "." + req.Endpoint()
+		for _, ep := range w.opts.SkipEndpoints {
+			if ep == endpoint {
+				return fn(ctx, req, rsp)
+			}
+		}
+
+		labels := make([]string, 0, 4)
+		labels = append(labels, labelEndpoint, endpoint)
+
+		w.opts.Meter.Counter(semconv.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.Summary(semconv.ServerRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+		w.opts.Meter.Histogram(semconv.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()
+
+		return err
+	}
+}

micro_test.go

@@ -8,7 +8,7 @@ import (
 
 	"go.unistack.org/micro/v4/broker"
 	"go.unistack.org/micro/v4/fsm"
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/options"
 )
 
 func TestAs(t *testing.T) {
@@ -19,27 +19,26 @@ func TestAs(t *testing.T) {
 	testCases := []struct {
 		b      any
 		target any
+		match  bool
 		want   any
-
-		match bool
 	}{
 		{
-			b:      broTarget,
-			target: &b,
-			match:  true,
-			want:   broTarget,
+			broTarget,
+			&b,
+			true,
+			broTarget,
 		},
 		{
-			b:      nil,
-			target: &b,
-			match:  false,
-			want:   nil,
+			nil,
+			&b,
+			false,
+			nil,
 		},
 		{
-			b:      fsmTarget,
-			target: &b,
-			match:  false,
-			want:   nil,
+			fsmTarget,
+			&b,
+			false,
+			nil,
 		},
 	}
 	for i, tc := range testCases {
@@ -62,21 +61,12 @@ func TestAs(t *testing.T) {
 	}
 }
 
-var _ broker.Broker = (*bro)(nil)
-
 type bro struct {
 	name string
 }
 
-func (p *bro) Name() string { return p.name }
-
-func (p *bro) Live() bool { return true }
-
-func (p *bro) Ready() bool { return true }
-
-func (p *bro) Health() bool { return true }
-
-func (p *bro) Init(_ ...broker.Option) error { return nil }
+func (p *bro) Name() string                      { return p.name }
+func (p *bro) Init(opts ...options.Option) error { return nil }
 
 // Options returns broker options
 func (p *bro) Options() broker.Options { return broker.Options{} }
@@ -85,23 +75,16 @@ func (p *bro) Options() broker.Options { return broker.Options{} }
 func (p *bro) Address() string { return "" }
 
 // Connect connects to broker
-func (p *bro) Connect(_ context.Context) error { return nil }
+func (p *bro) Connect(ctx context.Context) error { return nil }
 
 // Disconnect disconnect from broker
-func (p *bro) Disconnect(_ context.Context) error { return nil }
-
-// NewMessage creates new message
-func (p *bro) NewMessage(_ context.Context, _ metadata.Metadata, _ interface{}, _ ...broker.PublishOption) (broker.Message, error) {
-	return nil, nil
-}
+func (p *bro) Disconnect(ctx context.Context) error { return nil }
 
 // Publish message, msg can be single broker.Message or []broker.Message
-func (p *bro) Publish(_ context.Context, _ string, _ ...broker.Message) error {
-	return nil
-}
+func (p *bro) Publish(ctx context.Context, msg interface{}, opts ...options.Option) error { return nil }
 
 // Subscribe subscribes to topic message via handler
-func (p *bro) Subscribe(_ context.Context, _ string, _ interface{}, _ ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (p *bro) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...options.Option) (broker.Subscriber, error) {
 	return nil, nil
 }
 
@@ -112,9 +95,9 @@ type fsmT struct {
 	name string
 }
 
-func (f *fsmT) Start(_ context.Context, _ interface{}, _ ...Option) (interface{}, error) {
+func (f *fsmT) Start(ctx context.Context, a interface{}, o ...Option) (interface{}, error) {
 	return nil, nil
 }
-func (f *fsmT) Current() string                 { return f.name }
-func (f *fsmT) Reset()                          {}
-func (f *fsmT) State(_ string, _ fsm.StateFunc) {}
+func (f *fsmT) Current() string                  { return f.name }
+func (f *fsmT) Reset()                           {}
+func (f *fsmT) State(s string, sf fsm.StateFunc) {}

mtls/mtls.go

@@ -1,4 +1,4 @@
-package mtls
+package mtls // import "go.unistack.org/micro/v4/mtls"
 
 import (
 	"bytes"

mtls/options.go

@@ -8,20 +8,19 @@ import (
 
 // CertificateOptions holds options for x509.CreateCertificate
 type CertificateOptions struct {
+	Organization          []string
+	OrganizationalUnit    []string
+	CommonName            string
+	OCSPServer            []string
+	IssuingCertificateURL []string
 	SerialNumber          *big.Int
 	NotAfter              time.Time
 	NotBefore             time.Time
-	CommonName            string
-	Organization          []string
-	OrganizationalUnit    []string
-	OCSPServer            []string
-	IssuingCertificateURL []string
+	SignatureAlgorithm    x509.SignatureAlgorithm
+	PublicKeyAlgorithm    x509.PublicKeyAlgorithm
 	ExtKeyUsage           []x509.ExtKeyUsage
-
-	SignatureAlgorithm x509.SignatureAlgorithm
-	PublicKeyAlgorithm x509.PublicKeyAlgorithm
-	KeyUsage           x509.KeyUsage
-	IsCA               bool
+	KeyUsage              x509.KeyUsage
+	IsCA                  bool
 }
 
 // CertificateOrganizationalUnit set OrganizationalUnit in certificate subject

options.go

@@ -11,6 +11,7 @@ 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"
@@ -90,33 +91,7 @@ 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 {
-		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
-					}
-				}
-			}
-		}
+		o.Brokers = []broker.Broker{b}
 		return nil
 	}
 }
@@ -227,7 +202,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(server.Logger(l)); err != nil {
+					if err = srv.Init(options.Logger(l)); err != nil {
 						return err
 					}
 				}
@@ -236,7 +211,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(client.Logger(l)); err != nil {
+					if err = cli.Init(options.Logger(l)); err != nil {
 						return err
 					}
 				}
@@ -245,7 +220,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(broker.Logger(l)); err != nil {
+					if err = brk.Init(options.Logger(l)); err != nil {
 						return err
 					}
 				}
@@ -263,17 +238,25 @@ 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(store.Logger(l)); err != nil {
+					if err = str.Init(options.Logger(l)); err != nil {
+						return err
+					}
+				}
+			}
+		}
+		for _, mtr := range o.Meters {
+			for _, or := range lopts.meters {
+				if mtr.Name() == or || all {
+					if err = mtr.Init(options.Logger(l)); err != nil {
 						return err
 					}
 				}
 			}
 		}
-
 		for _, trc := range o.Tracers {
 			for _, ot := range lopts.tracers {
 				if trc.Name() == ot || all {
-					if err = trc.Init(tracer.Logger(l)); err != nil {
+					if err = trc.Init(options.Logger(l)); err != nil {
 						return err
 					}
 				}
@@ -294,8 +277,8 @@ type loggerOptions struct {
 	brokers   []string
 	registers []string
 	stores    []string
-	// meters    []string
-	tracers []string
+	meters    []string
+	tracers   []string
 }
 
 /*
@@ -347,7 +330,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(server.Register(r)); err != nil {
+					if err = srv.Init(options.Register(r)); err != nil {
 						return err
 					}
 				}
@@ -356,7 +339,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(broker.Register(r)); err != nil {
+					if err = brk.Init(options.Register(r)); err != nil {
 						return err
 					}
 				}
@@ -413,7 +396,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(server.Tracer(t)); err != nil {
+					if err = srv.Init(options.Tracer(t)); err != nil {
 						return err
 					}
 				}
@@ -422,7 +405,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(client.Tracer(t)); err != nil {
+					if err = cli.Init(options.Tracer(t)); err != nil {
 						return err
 					}
 				}
@@ -431,7 +414,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(store.Tracer(t)); err != nil {
+					if err = str.Init(options.Tracer(t)); err != nil {
 						return err
 					}
 				}
@@ -440,7 +423,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(broker.Tracer(t)); err != nil {
+					if err = brk.Init(options.Tracer(t)); err != nil {
 						return err
 					}
 				}
@@ -539,7 +522,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(client.Router(r)); err != nil {
+					if err = cli.Init(options.Router(r)); err != nil {
 						return err
 					}
 				}
@@ -574,7 +557,7 @@ func Address(addr string) Option {
 		default:
 			return fmt.Errorf("cant set same address for multiple servers")
 		}
-		return o.Servers[0].Init(server.Address(addr))
+		return o.Servers[0].Init(options.Address(addr))
 	}
 }
 

options/hooks.go

@@ -1,4 +1,4 @@
-package options
+package options // import "go.unistack.org/micro/v4/options"
 
 // Hook func interface
 type Hook interface{}

options/options.go

@@ -1,222 +1,221 @@
 package options
 
 import (
+	"context"
+	"crypto/tls"
 	"reflect"
-	"strings"
 	"time"
 
-	"github.com/spf13/cast"
-	mreflect "go.unistack.org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/metadata"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
-// Options interface must be used by all options
-type Validator interface {
-	// Validate returns nil, if all options are correct,
-	// otherwise returns an error explaining the mistake
-	Validate() error
-}
-
 // Option func signature
 type Option func(interface{}) error
 
-// Apply assign options to struct src
-func Apply(src interface{}, opts ...Option) error {
-	for _, opt := range opts {
-		if err := opt(src); err != nil {
+// 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
 		}
-	}
-	return nil
-}
-
-// SetValueByPath set src struct field to val dst via path
-func SetValueByPath(src interface{}, dst interface{}, path string) error {
-	var err error
-
-	switch v := dst.(type) {
-	case []interface{}:
-		if len(v) == 1 {
-			dst = v[0]
-		}
-	}
-
-	var sv reflect.Value
-	switch t := src.(type) {
-	case reflect.Value:
-		sv = t
-	default:
-		sv = reflect.ValueOf(src)
-	}
-
-	parts := strings.Split(path, ".")
-
-	for _, p := range parts {
-
-		if sv.Kind() == reflect.Ptr {
-			sv = sv.Elem()
-		}
-		if sv.Kind() != reflect.Struct {
-			return mreflect.ErrInvalidStruct
-		}
-
-		typ := sv.Type()
-		for idx := 0; idx < typ.NumField(); idx++ {
-			fld := typ.Field(idx)
-			val := sv.Field(idx)
-
-			/*
-				if len(fld.PkgPath) != 0 {
-					continue
-				}
-			*/
-
-			if fld.Anonymous {
-				if len(parts) == 1 && val.Kind() == reflect.Struct {
-					if err = SetValueByPath(val, dst, p); err != nil {
-						return err
-					}
-				}
-			}
-
-			if fld.Name != p && !strings.EqualFold(strings.ToLower(fld.Name), strings.ToLower(p)) {
-				continue
-			}
-
-			switch val.Interface().(type) {
-			case []time.Duration:
-				dst, err = cast.ToDurationSliceE(dst)
-				if err != nil {
-					return err
-				}
-				reflect.Copy(val, reflect.ValueOf(dst))
-				return nil
-			case time.Duration:
-				dst, err = cast.ToDurationE(dst)
-				if err != nil {
-					return err
-				}
-				val.Set(reflect.ValueOf(dst))
-				return nil
-			case time.Time:
-				dst, err = cast.ToTimeE(dst)
-				if err != nil {
-					return err
-				}
-				val.Set(reflect.ValueOf(dst))
-				return nil
-			}
-
-			switch val.Kind() {
-			case reflect.Map:
-				if val.IsZero() {
-					val.Set(reflect.MakeMap(val.Type()))
-				}
-
-				return setMap(val.Interface(), dst)
-			case reflect.Array, reflect.Slice:
-				switch val.Type().Elem().Kind() {
-				case reflect.Bool:
-					dst, err = cast.ToBoolSliceE(dst)
-				case reflect.String:
-					dst, err = cast.ToStringSliceE(dst)
-				case reflect.Float32:
-					dst, err = toFloat32SliceE(dst)
-				case reflect.Float64:
-					dst, err = toFloat64SliceE(dst)
-				case reflect.Int8:
-					dst, err = toInt8SliceE(dst)
-				case reflect.Int:
-					dst, err = cast.ToIntSliceE(dst)
-				case reflect.Int16:
-					dst, err = toInt16SliceE(dst)
-				case reflect.Int32:
-					dst, err = toInt32SliceE(dst)
-				case reflect.Int64:
-					dst, err = toInt64SliceE(dst)
-				case reflect.Uint8:
-					dst, err = toUint8SliceE(dst)
-				case reflect.Uint:
-					dst, err = toUintSliceE(dst)
-				case reflect.Uint16:
-					dst, err = toUint16SliceE(dst)
-				case reflect.Uint32:
-					dst, err = toUint32SliceE(dst)
-				case reflect.Uint64:
-					dst, err = toUint64SliceE(dst)
-				}
-				if err != nil {
-					return err
-				}
-				if val.Kind() == reflect.Slice {
-					val.Set(reflect.ValueOf(dst))
-				} else {
-					reflect.Copy(val, reflect.ValueOf(dst))
-				}
-				return nil
-			case reflect.Float32:
-				dst, err = toFloat32SliceE(dst)
-			case reflect.Float64:
-				dst, err = toFloat64SliceE(dst)
-			case reflect.Bool:
-				dst, err = cast.ToBoolE(dst)
-			case reflect.String:
-				dst, err = cast.ToStringE(dst)
-			case reflect.Int8:
-				dst, err = cast.ToInt8E(dst)
-			case reflect.Int:
-				dst, err = cast.ToIntE(dst)
-			case reflect.Int16:
-				dst, err = cast.ToInt16E(dst)
-			case reflect.Int32:
-				dst, err = cast.ToInt32E(dst)
-			case reflect.Int64:
-				dst, err = cast.ToInt64E(dst)
-			case reflect.Uint8:
-				dst, err = cast.ToUint8E(dst)
-			case reflect.Uint:
-				dst, err = cast.ToUintE(dst)
-			case reflect.Uint16:
-				dst, err = cast.ToUint16E(dst)
-			case reflect.Uint32:
-				dst, err = cast.ToUint32E(dst)
-			case reflect.Uint64:
-				dst, err = cast.ToUint64E(dst)
-			default:
-			}
-			if err != nil {
-				return err
-			}
-			val.Set(reflect.ValueOf(dst))
-		}
-	}
-
-	return nil
-}
-
-// NewOption create new option with name
-func NewOption(name string) func(...interface{}) Option {
-	return func(dst ...interface{}) Option {
-		return func(src interface{}) error {
-			return SetValueByPath(src, dst, name)
+		if ctx == nil {
+			ctx = context.Background()
 		}
+		err = Set(src, context.WithValue(ctx.(context.Context), k, v), ".Context")
+		return err
 	}
 }
 
-var (
-	Address   = NewOption("Address")
-	Name      = NewOption("Name")
-	Broker    = NewOption("Broker")
-	Logger    = NewOption("Logger")
-	Meter     = NewOption("Meter")
-	Tracer    = NewOption("Tracer")
-	Store     = NewOption("Store")
-	Register  = NewOption("Register")
-	Router    = NewOption("Router")
-	Codec     = NewOption("Codec")
-	Codecs    = NewOption("Codecs")
-	Client    = NewOption("Client")
-	Context   = NewOption("Context")
-	TLSConfig = NewOption("TLSConfig")
-	Metadata  = NewOption("Metadata")
-	Timeout   = NewOption("Timeout")
-)
+// ContentType pass ContentType for message data
+func ContentType(ct string) Option {
+	return func(src interface{}) error {
+		return Set(src, ct, ".ContentType")
+	}
+}
+
+// Metadata pass additional metadata
+func Metadata(md ...any) Option {
+	var result metadata.Metadata
+	if len(md) == 1 {
+		switch vt := md[0].(type) {
+		case metadata.Metadata:
+			result = metadata.Copy(vt)
+		case map[string]string:
+			result = make(metadata.Metadata, len(vt))
+			for k, v := range vt {
+				result.Set(k, v)
+			}
+		case map[string][]string:
+			result = metadata.Copy(vt)
+		default:
+			result = metadata.New(0)
+		}
+	} else {
+		result = metadata.New(len(md) / 2)
+		for idx := 0; idx <= len(md)/2; idx += 2 {
+			k, ok := md[idx].(string)
+			switch vt := md[idx+1].(type) {
+			case string:
+				if ok {
+					result.Set(k, vt)
+				}
+			case []string:
+				if ok {
+					result.Append(k, vt...)
+				}
+			}
+		}
+	}
+
+	return func(src interface{}) error {
+		return Set(src, result, ".Metadata")
+	}
+}
+
+// Namespace to use
+func Namespace(ns string) Option {
+	return func(src interface{}) error {
+		return Set(src, ns, ".Namespace")
+	}
+}
+
+// Labels sets the labels
+func Labels(ls ...interface{}) Option {
+	return func(src interface{}) error {
+		v, err := Get(src, ".Labels")
+		if err != nil {
+			return err
+		} else if rutil.IsZero(v) {
+			v = reflect.MakeSlice(reflect.TypeOf(v), 0, len(ls)).Interface()
+		}
+		cv := reflect.ValueOf(v)
+		for _, l := range ls {
+			cv = reflect.Append(cv, reflect.ValueOf(l))
+		}
+		return Set(src, cv.Interface(), ".Labels")
+	}
+}
+
+// Timeout pass timeout time.Duration
+func Timeout(td time.Duration) Option {
+	return func(src interface{}) error {
+		return Set(src, td, ".Timeout")
+	}
+}

options/options_test.go

@@ -1,181 +1,149 @@
 package options_test
 
 import (
-	"crypto/tls"
-	"sync"
 	"testing"
 
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/metadata"
 	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/util/reflect"
 )
 
-type codec interface {
-	Marshal(v interface{}, opts ...options.Option) ([]byte, error)
-	Unmarshal(b []byte, v interface{}, opts ...options.Option) error
-	String() string
+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) {
-	type s struct {
-		Codecs map[string]codec
-	}
+	var err error
 
-	wg := &sync.WaitGroup{}
-	tc := &tls.Config{InsecureSkipVerify: true}
-	opts := []options.Option{
-		options.NewOption("Codecs")(wg),
-		options.NewOption("TLSConfig")(tc),
+	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))
 
-	if err := options.Apply(src, opts...); err != nil {
+	for _, o := range opts {
+		if err = o(src); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	for k, v := range src.Codecs {
+		if k != "text/html" || v != c {
+			continue
+		}
+		return
+	}
+
+	t.Fatalf("failed to set Codecs")
+}
+
+func TestLabels(t *testing.T) {
+	type str1 struct {
+		Labels []string
+	}
+	type str2 struct {
+		Labels []interface{}
+	}
+
+	x1 := &str1{}
+
+	if err := options.Labels("one", "two")(x1); err != nil {
 		t.Fatal(err)
 	}
+	if len(x1.Labels) != 2 {
+		t.Fatal("failed to set labels")
+	}
+	x2 := &str2{}
+	if err := options.Labels("key", "val")(x2); err != nil {
+		t.Fatal(err)
+	}
+	if len(x2.Labels) != 2 {
+		t.Fatal("failed to set labels")
+	}
+	if x2.Labels[0] != "key" {
+		t.Fatal("failed to set labels")
+	}
 }
 
-func TestSpecial(t *testing.T) {
+func TestMetadataAny(t *testing.T) {
 	type s struct {
-		Wait      *sync.WaitGroup
-		TLSConfig *tls.Config
+		Metadata metadata.Metadata
 	}
 
-	wg := &sync.WaitGroup{}
-	tc := &tls.Config{InsecureSkipVerify: true}
-	opts := []options.Option{
-		options.NewOption("Wait")(wg),
-		options.NewOption("TLSConfig")(tc),
+	testCases := []struct {
+		Name     string
+		Data     any
+		Expected metadata.Metadata
+	}{
+		{
+			"strings_even",
+			[]any{"Strkey1", []string{"val1"}, "Strkey2", []string{"val2"}},
+			metadata.Pairs("Strkey1", "val1", "Strkey2", "val2"),
+		},
+		{
+			"strings_odd",
+			[]any{"key1", "val1", "key2"},
+			metadata.Pairs("Key1", "val1"),
+		},
+		{
+			Name: "map",
+			Data: map[string][]string{
+				"Mapkey1": {"val1"},
+				"Mapkey2": {"val2"},
+			},
+			Expected: metadata.Metadata{
+				"Mapkey1": []string{"val1"},
+				"Mapkey2": []string{"val2"},
+			},
+		},
+		{
+			"metadata.Metadata",
+			metadata.Pairs("key1", "val1", "key2", "val2"),
+			metadata.Pairs("Key1", "val1", "Key2", "val2"),
+		},
 	}
 
-	src := &s{}
+	for _, tt := range testCases {
+		t.Run(tt.Name, func(t *testing.T) {
+			src := &s{}
+			var opts []options.Option
+			switch valData := tt.Data.(type) {
+			case []any:
+				opts = append(opts, options.Metadata(valData...))
+			case map[string]string, map[string][]string, metadata.Metadata:
+				opts = append(opts, options.Metadata(valData))
+			}
 
-	if err := options.Apply(src, opts...); err != nil {
-		t.Fatal(err)
-	}
-
-	if src.Wait == nil {
-		t.Fatalf("failed to set Wait %#+v", src)
-	}
-
-	if src.TLSConfig == nil {
-		t.Fatalf("failed to set TLSConfig %#+v", src)
-	}
-
-	if src.TLSConfig.InsecureSkipVerify != true {
-		t.Fatalf("failed to set TLSConfig %#+v", src)
-	}
-}
-
-func TestNested(t *testing.T) {
-	type server struct {
-		Address []string
-	}
-	type ownserver struct {
-		server
-		OwnField string
-	}
-
-	opts := []options.Option{
-		options.Address("host:port"),
-		options.NewOption("OwnField")("fieldval"),
-	}
-
-	src := &ownserver{}
-
-	if err := options.Apply(src, opts...); err != nil {
-		t.Fatal(err)
-	}
-
-	if src.Address[0] != "host:port" {
-		t.Fatalf("failed to set Address %#+v", src)
-	}
-
-	if src.OwnField != "fieldval" {
-		t.Fatalf("failed to set OwnField %#+v", src)
-	}
-}
-
-func TestAddress(t *testing.T) {
-	type s struct {
-		Address []string
-	}
-
-	opts := []options.Option{options.Address("host:port")}
-
-	src := &s{}
-
-	if err := options.Apply(src, opts...); err != nil {
-		t.Fatal(err)
-	}
-
-	if src.Address[0] != "host:port" {
-		t.Fatalf("failed to set Address %#+v", src)
-	}
-}
-
-func TestNewOption(t *testing.T) {
-	type s struct {
-		Address []string
-	}
-
-	opts := []options.Option{options.NewOption("Address")("host1:port1", "host2:port2")}
-
-	src := &s{}
-
-	if err := options.Apply(src, opts...); err != nil {
-		t.Fatal(err)
-	}
-
-	if src.Address[0] != "host1:port1" {
-		t.Fatalf("failed to set Address %#+v", src)
-	}
-	if src.Address[1] != "host2:port2" {
-		t.Fatalf("failed to set Address %#+v", src)
-	}
-}
-
-func TestArray(t *testing.T) {
-	type s struct {
-		Address [1]string
-	}
-
-	opts := []options.Option{options.NewOption("Address")("host:port", "host1:port1")}
-
-	src := &s{}
-
-	if err := options.Apply(src, opts...); err != nil {
-		t.Fatal(err)
-	}
-
-	if src.Address[0] != "host:port" {
-		t.Fatalf("failed to set Address %#+v", src)
-	}
-}
-
-func TestMap(t *testing.T) {
-	type s struct {
-		Metadata map[string]string
-	}
-
-	opts := []options.Option{
-		options.NewOption("Metadata")("key1", "val1"),
-		options.NewOption("Metadata")(map[string]string{"key2": "val2"}),
-	}
-
-	src := &s{}
-
-	if err := options.Apply(src, opts...); err != nil {
-		t.Fatal(err)
-	}
-
-	if len(src.Metadata) != 2 {
-		t.Fatalf("failed to set Metadata %#+v", src)
-	}
-
-	if src.Metadata["key1"] != "val1" {
-		t.Fatalf("failed to set Metadata %#+v", src)
-	}
-
-	if src.Metadata["key2"] != "val2" {
-		t.Fatalf("failed to set Metadata %#+v", src)
+			for _, o := range opts {
+				if err := o(src); err != nil {
+					t.Fatal(err)
+				}
+				if !reflect.Equal(tt.Expected, src.Metadata) {
+					t.Fatalf("expected: %v, actual: %v", tt.Expected, src.Metadata)
+				}
+			}
+		})
 	}
 }

options/util.go

@@ -1,577 +0,0 @@
-package options
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/spf13/cast"
-)
-
-func toInt8SliceE(i interface{}) ([]int8, error) {
-	if i == nil {
-		return []int8{}, fmt.Errorf("unable to cast %#v of type %T to []int8", i, i)
-	}
-
-	switch v := i.(type) {
-	case []int8:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]int8, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToInt8E(s.Index(j).Interface())
-			if err != nil {
-				return []int8{}, fmt.Errorf("unable to cast %#v of type %T to []int8", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []int8{}, fmt.Errorf("unable to cast %#v of type %T to []int8", i, i)
-	}
-}
-
-func toInt16SliceE(i interface{}) ([]int16, error) {
-	if i == nil {
-		return []int16{}, fmt.Errorf("unable to cast %#v of type %T to []int16", i, i)
-	}
-
-	switch v := i.(type) {
-	case []int16:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]int16, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToInt16E(s.Index(j).Interface())
-			if err != nil {
-				return []int16{}, fmt.Errorf("unable to cast %#v of type %T to []int16", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []int16{}, fmt.Errorf("unable to cast %#v of type %T to []int16", i, i)
-	}
-}
-
-func toInt32SliceE(i interface{}) ([]int32, error) {
-	if i == nil {
-		return []int32{}, fmt.Errorf("unable to cast %#v of type %T to []int32", i, i)
-	}
-
-	switch v := i.(type) {
-	case []int32:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]int32, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToInt32E(s.Index(j).Interface())
-			if err != nil {
-				return []int32{}, fmt.Errorf("unable to cast %#v of type %T to []int32", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []int32{}, fmt.Errorf("unable to cast %#v of type %T to []int32", i, i)
-	}
-}
-
-func toInt64SliceE(i interface{}) ([]int64, error) {
-	if i == nil {
-		return []int64{}, fmt.Errorf("unable to cast %#v of type %T to []int64", i, i)
-	}
-
-	switch v := i.(type) {
-	case []int64:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]int64, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToInt64E(s.Index(j).Interface())
-			if err != nil {
-				return []int64{}, fmt.Errorf("unable to cast %#v of type %T to []int64", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []int64{}, fmt.Errorf("unable to cast %#v of type %T to []int64", i, i)
-	}
-}
-
-func toUintSliceE(i interface{}) ([]uint, error) {
-	if i == nil {
-		return []uint{}, fmt.Errorf("unable to cast %#v of type %T to []uint", i, i)
-	}
-
-	switch v := i.(type) {
-	case []uint:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]uint, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToUintE(s.Index(j).Interface())
-			if err != nil {
-				return []uint{}, fmt.Errorf("unable to cast %#v of type %T to []uint", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []uint{}, fmt.Errorf("unable to cast %#v of type %T to []uint", i, i)
-	}
-}
-
-func toUint8SliceE(i interface{}) ([]uint8, error) {
-	if i == nil {
-		return []uint8{}, fmt.Errorf("unable to cast %#v of type %T to []uint8", i, i)
-	}
-
-	switch v := i.(type) {
-	case []uint8:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]uint8, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToUint8E(s.Index(j).Interface())
-			if err != nil {
-				return []uint8{}, fmt.Errorf("unable to cast %#v of type %T to []uint8", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []uint8{}, fmt.Errorf("unable to cast %#v of type %T to []uint8", i, i)
-	}
-}
-
-func toUint16SliceE(i interface{}) ([]uint16, error) {
-	if i == nil {
-		return []uint16{}, fmt.Errorf("unable to cast %#v of type %T to []uint16", i, i)
-	}
-
-	switch v := i.(type) {
-	case []uint16:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]uint16, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToUint16E(s.Index(j).Interface())
-			if err != nil {
-				return []uint16{}, fmt.Errorf("unable to cast %#v of type %T to []uint16", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []uint16{}, fmt.Errorf("unable to cast %#v of type %T to []uint16", i, i)
-	}
-}
-
-func toUint32SliceE(i interface{}) ([]uint32, error) {
-	if i == nil {
-		return []uint32{}, fmt.Errorf("unable to cast %#v of type %T to []uint32", i, i)
-	}
-
-	switch v := i.(type) {
-	case []uint32:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]uint32, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToUint32E(s.Index(j).Interface())
-			if err != nil {
-				return []uint32{}, fmt.Errorf("unable to cast %#v of type %T to []uint32", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []uint32{}, fmt.Errorf("unable to cast %#v of type %T to []uint32", i, i)
-	}
-}
-
-func toUint64SliceE(i interface{}) ([]uint64, error) {
-	if i == nil {
-		return []uint64{}, fmt.Errorf("unable to cast %#v of type %T to []uint64", i, i)
-	}
-
-	switch v := i.(type) {
-	case []uint64:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]uint64, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToUint64E(s.Index(j).Interface())
-			if err != nil {
-				return []uint64{}, fmt.Errorf("unable to cast %#v of type %T to []uint64", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []uint64{}, fmt.Errorf("unable to cast %#v of type %T to []uint64", i, i)
-	}
-}
-
-func toFloat32SliceE(i interface{}) ([]float32, error) {
-	if i == nil {
-		return []float32{}, fmt.Errorf("unable to cast %#v of type %T to []float32", i, i)
-	}
-
-	switch v := i.(type) {
-	case []float32:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]float32, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToFloat32E(s.Index(j).Interface())
-			if err != nil {
-				return []float32{}, fmt.Errorf("unable to cast %#v of type %T to []float32", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []float32{}, fmt.Errorf("unable to cast %#v of type %T to []float32", i, i)
-	}
-}
-
-func toFloat64SliceE(i interface{}) ([]float64, error) {
-	if i == nil {
-		return []float64{}, fmt.Errorf("unable to cast %#v of type %T to []float64", i, i)
-	}
-
-	switch v := i.(type) {
-	case []float64:
-		return v, nil
-	}
-
-	kind := reflect.TypeOf(i).Kind()
-	switch kind {
-	case reflect.Slice, reflect.Array:
-		s := reflect.ValueOf(i)
-		a := make([]float64, s.Len())
-		for j := 0; j < s.Len(); j++ {
-			val, err := cast.ToFloat64E(s.Index(j).Interface())
-			if err != nil {
-				return []float64{}, fmt.Errorf("unable to cast %#v of type %T to []float64", i, i)
-			}
-			a[j] = val
-		}
-		return a, nil
-	default:
-		return []float64{}, fmt.Errorf("unable to cast %#v of type %T to []float32", i, i)
-	}
-}
-
-func setMap(src interface{}, dst interface{}) error {
-	var err error
-
-	if src == nil {
-		return fmt.Errorf("unable to cast %#v of type %T", src, src)
-	}
-	if dst == nil {
-		return fmt.Errorf("unable to cast %#v of type %T", dst, dst)
-	}
-
-	val := reflect.ValueOf(src)
-
-	keyKind := val.Type().Key().Kind()
-	valKind := val.Type().Elem().Kind()
-
-	switch v := dst.(type) {
-	case []interface{}:
-		if len(v) == 1 {
-			dstVal := reflect.ValueOf(v[0])
-			if dstVal.Kind() != reflect.Map {
-				return nil
-			}
-			mapIter := dstVal.MapRange()
-			for mapIter.Next() {
-				var (
-					keyVal interface{}
-					valVal interface{}
-				)
-				switch keyKind {
-				case reflect.Bool:
-					keyVal, err = cast.ToBoolE(mapIter.Key())
-				case reflect.String:
-					keyVal, err = cast.ToStringE(mapIter.Key())
-				case reflect.Float32:
-					keyVal, err = cast.ToFloat32E(mapIter.Key())
-				case reflect.Float64:
-					keyVal, err = cast.ToFloat64E(mapIter.Key())
-				case reflect.Int8:
-					keyVal, err = cast.ToInt8E(mapIter.Key())
-				case reflect.Int:
-					keyVal, err = cast.ToIntE(mapIter.Key())
-				case reflect.Int16:
-					keyVal, err = cast.ToInt16E(mapIter.Key())
-				case reflect.Int32:
-					keyVal, err = cast.ToInt32E(mapIter.Key())
-				case reflect.Int64:
-					keyVal, err = cast.ToInt64E(mapIter.Key())
-				case reflect.Uint8:
-					keyVal, err = cast.ToUint8E(mapIter.Key())
-				case reflect.Uint:
-					keyVal, err = cast.ToUintE(mapIter.Key())
-				case reflect.Uint16:
-					keyVal, err = cast.ToUint16E(mapIter.Key())
-				case reflect.Uint32:
-					keyVal, err = cast.ToUint32E(mapIter.Key())
-				case reflect.Uint64:
-					keyVal, err = cast.ToUint64E(mapIter.Key())
-				}
-				if err != nil {
-					return err
-				}
-				switch valKind {
-				case reflect.Bool:
-					valVal, err = cast.ToBoolE(mapIter.Value())
-				case reflect.String:
-					valVal, err = cast.ToStringE(mapIter.Value())
-				case reflect.Float32:
-					valVal, err = cast.ToFloat32E(mapIter.Value())
-				case reflect.Float64:
-					valVal, err = cast.ToFloat64E(mapIter.Value())
-				case reflect.Int8:
-					valVal, err = cast.ToInt8E(mapIter.Value())
-				case reflect.Int:
-					valVal, err = cast.ToIntE(mapIter.Value())
-				case reflect.Int16:
-					valVal, err = cast.ToInt16E(mapIter.Value())
-				case reflect.Int32:
-					valVal, err = cast.ToInt32E(mapIter.Value())
-				case reflect.Int64:
-					valVal, err = cast.ToInt64E(mapIter.Value())
-				case reflect.Uint8:
-					valVal, err = cast.ToUint8E(mapIter.Value())
-				case reflect.Uint:
-					valVal, err = cast.ToUintE(mapIter.Value())
-				case reflect.Uint16:
-					valVal, err = cast.ToUint16E(mapIter.Value())
-				case reflect.Uint32:
-					valVal, err = cast.ToUint32E(mapIter.Value())
-				case reflect.Uint64:
-					valVal, err = cast.ToUint64E(mapIter.Value())
-				}
-				if err != nil {
-					return err
-				}
-
-				val.SetMapIndex(reflect.ValueOf(keyVal), reflect.ValueOf(valVal))
-			}
-			return nil
-		}
-		if l := len(v) % 2; l == 1 {
-			v = v[:len(v)-1]
-		}
-		var (
-			keyVal interface{}
-			valVal interface{}
-		)
-		for i := 0; i < len(v); i += 2 {
-			switch keyKind {
-			case reflect.Bool:
-				keyVal, err = cast.ToBoolE(v[i])
-			case reflect.String:
-				keyVal, err = cast.ToStringE(v[i])
-			case reflect.Float32:
-				keyVal, err = cast.ToFloat32E(v[i])
-			case reflect.Float64:
-				keyVal, err = cast.ToFloat64E(v[i])
-			case reflect.Int8:
-				keyVal, err = cast.ToInt8E(v[i])
-			case reflect.Int:
-				keyVal, err = cast.ToIntE(v[i])
-			case reflect.Int16:
-				keyVal, err = cast.ToInt16E(v[i])
-			case reflect.Int32:
-				keyVal, err = cast.ToInt32E(v[i])
-			case reflect.Int64:
-				keyVal, err = cast.ToInt64E(v[i])
-			case reflect.Uint8:
-				keyVal, err = cast.ToUint8E(v[i])
-			case reflect.Uint:
-				keyVal, err = cast.ToUintE(v[i])
-			case reflect.Uint16:
-				keyVal, err = cast.ToUint16E(v[i])
-			case reflect.Uint32:
-				keyVal, err = cast.ToUint32E(v[i])
-			case reflect.Uint64:
-				keyVal, err = cast.ToUint64E(v[i])
-			}
-			if err != nil {
-				return err
-			}
-			switch valKind {
-			case reflect.Bool:
-				valVal, err = cast.ToBoolE(v[i+1])
-			case reflect.String:
-				valVal, err = cast.ToStringE(v[i+1])
-			case reflect.Float32:
-				valVal, err = cast.ToFloat32E(v[i+1])
-			case reflect.Float64:
-				valVal, err = cast.ToFloat64E(v[i+1])
-			case reflect.Int8:
-				valVal, err = cast.ToInt8E(v[i+1])
-			case reflect.Int:
-				valVal, err = cast.ToIntE(v[i+1])
-			case reflect.Int16:
-				valVal, err = cast.ToInt16E(v[i+1])
-			case reflect.Int32:
-				valVal, err = cast.ToInt32E(v[i+1])
-			case reflect.Int64:
-				valVal, err = cast.ToInt64E(v[i+1])
-			case reflect.Uint8:
-				valVal, err = cast.ToUint8E(v[i+1])
-			case reflect.Uint:
-				valVal, err = cast.ToUintE(v[i+1])
-			case reflect.Uint16:
-				valVal, err = cast.ToUint16E(v[i+1])
-			case reflect.Uint32:
-				valVal, err = cast.ToUint32E(v[i+1])
-			case reflect.Uint64:
-				valVal, err = cast.ToUint64E(v[i+1])
-			}
-			if err != nil {
-				return err
-			}
-
-			val.SetMapIndex(reflect.ValueOf(keyVal), reflect.ValueOf(valVal))
-		}
-	default:
-		dstVal := reflect.ValueOf(dst)
-		if dstVal.Kind() != reflect.Map {
-			return nil
-		}
-		mapIter := dstVal.MapRange()
-		for mapIter.Next() {
-			var (
-				keyVal interface{}
-				valVal interface{}
-			)
-			switch keyKind {
-			case reflect.Bool:
-				keyVal, err = cast.ToBoolE(mapIter.Key())
-			case reflect.String:
-				keyVal, err = cast.ToStringE(mapIter.Key())
-			case reflect.Float32:
-				keyVal, err = cast.ToFloat32E(mapIter.Key())
-			case reflect.Float64:
-				keyVal, err = cast.ToFloat64E(mapIter.Key())
-			case reflect.Int8:
-				keyVal, err = cast.ToInt8E(mapIter.Key())
-			case reflect.Int:
-				keyVal, err = cast.ToIntE(mapIter.Key())
-			case reflect.Int16:
-				keyVal, err = cast.ToInt16E(mapIter.Key())
-			case reflect.Int32:
-				keyVal, err = cast.ToInt32E(mapIter.Key())
-			case reflect.Int64:
-				keyVal, err = cast.ToInt64E(mapIter.Key())
-			case reflect.Uint8:
-				keyVal, err = cast.ToUint8E(mapIter.Key())
-			case reflect.Uint:
-				keyVal, err = cast.ToUintE(mapIter.Key())
-			case reflect.Uint16:
-				keyVal, err = cast.ToUint16E(mapIter.Key())
-			case reflect.Uint32:
-				keyVal, err = cast.ToUint32E(mapIter.Key())
-			case reflect.Uint64:
-				keyVal, err = cast.ToUint64E(mapIter.Key())
-			}
-			if err != nil {
-				return err
-			}
-			switch valKind {
-			case reflect.Bool:
-				valVal, err = cast.ToBoolE(mapIter.Value())
-			case reflect.String:
-				valVal, err = cast.ToStringE(mapIter.Value())
-			case reflect.Float32:
-				valVal, err = cast.ToFloat32E(mapIter.Value())
-			case reflect.Float64:
-				valVal, err = cast.ToFloat64E(mapIter.Value())
-			case reflect.Int8:
-				valVal, err = cast.ToInt8E(mapIter.Value())
-			case reflect.Int:
-				valVal, err = cast.ToIntE(mapIter.Value())
-			case reflect.Int16:
-				valVal, err = cast.ToInt16E(mapIter.Value())
-			case reflect.Int32:
-				valVal, err = cast.ToInt32E(mapIter.Value())
-			case reflect.Int64:
-				valVal, err = cast.ToInt64E(mapIter.Value())
-			case reflect.Uint8:
-				valVal, err = cast.ToUint8E(mapIter.Value())
-			case reflect.Uint:
-				valVal, err = cast.ToUintE(mapIter.Value())
-			case reflect.Uint16:
-				valVal, err = cast.ToUint16E(mapIter.Value())
-			case reflect.Uint32:
-				valVal, err = cast.ToUint32E(mapIter.Value())
-			case reflect.Uint64:
-				valVal, err = cast.ToUint64E(mapIter.Value())
-			}
-			if err != nil {
-				return err
-			}
-
-			val.SetMapIndex(reflect.ValueOf(keyVal), reflect.ValueOf(valVal))
-		}
-		return nil
-	}
-	return nil
-}

profiler/http/http.go

@@ -1,5 +1,5 @@
 // Package http enables the http profiler
-package http
+package http // import "go.unistack.org/micro/v4/profiler/http"
 
 import (
 	"context"

profiler/noop.go

@@ -15,6 +15,6 @@ func (p *noopProfiler) String() string {
 }
 
 // NewProfiler returns new noop profiler
-func NewProfiler(_ ...Option) Profiler {
+func NewProfiler(opts ...Option) Profiler {
 	return &noopProfiler{}
 }

profiler/pprof/pprof.go

@@ -1,5 +1,5 @@
 // Package pprof provides a pprof profiler which writes output to /tmp/[name].{cpu,mem}.pprof
-package pprof
+package pprof // import "go.unistack.org/micro/v4/profiler/pprof"
 
 import (
 	"os"

profiler/profile.go

@@ -1,5 +1,5 @@
 // Package profiler is for profilers
-package profiler
+package profiler // import "go.unistack.org/micro/v4/profiler"
 
 // Profiler interface
 type Profiler interface {
@@ -12,7 +12,7 @@ type Profiler interface {
 }
 
 // DefaultProfiler holds the default profiler
-var DefaultProfiler = NewProfiler()
+var DefaultProfiler Profiler = NewProfiler()
 
 // Options holds the options for profiler
 type Options struct {

register/context.go

@@ -15,15 +15,6 @@ func FromContext(ctx context.Context) (Register, bool) {
 	return c, ok
 }
 
-// MustContext get register from context
-func MustContext(ctx context.Context) Register {
-	r, ok := FromContext(ctx)
-	if !ok {
-		panic("missing register")
-	}
-	return r
-}
-
 // NewContext put register in context
 func NewContext(ctx context.Context, c Register) context.Context {
 	if ctx == nil {

register/extractor.go

@@ -1,9 +1,12 @@
 package register
 
 import (
+	"fmt"
 	"reflect"
 	"unicode"
 	"unicode/utf8"
+
+	"go.unistack.org/micro/v4/metadata"
 )
 
 // ExtractValue from reflect.Type from specified depth
@@ -35,6 +38,53 @@ func ExtractValue(v reflect.Type, d int) string {
 	return v.Name()
 }
 
+// ExtractEndpoint extract *Endpoint from reflect.Method
+func ExtractEndpoint(method reflect.Method) *Endpoint {
+	if method.PkgPath != "" {
+		return nil
+	}
+
+	var rspType, reqType reflect.Type
+	var stream bool
+	mt := method.Type
+
+	switch mt.NumIn() {
+	case 3:
+		reqType = mt.In(1)
+		rspType = mt.In(2)
+	case 4:
+		reqType = mt.In(2)
+		rspType = mt.In(3)
+	default:
+		return nil
+	}
+
+	// are we dealing with a stream?
+	switch rspType.Kind() {
+	case reflect.Func, reflect.Interface:
+		stream = true
+	}
+
+	request := ExtractValue(reqType, 0)
+	response := ExtractValue(rspType, 0)
+	if request == "" || response == "" {
+		return nil
+	}
+
+	ep := &Endpoint{
+		Name:     method.Name,
+		Request:  request,
+		Response: response,
+		Metadata: metadata.New(0),
+	}
+
+	if stream {
+		ep.Metadata.Set("stream", fmt.Sprintf("%v", stream))
+	}
+
+	return ep
+}
+
 // ExtractSubValue exctact *Value from reflect.Type
 func ExtractSubValue(typ reflect.Type) string {
 	var reqType reflect.Type

register/extractor_test.go

@@ -2,6 +2,8 @@ package register
 
 import (
 	"context"
+	"reflect"
+	"testing"
 )
 
 type TestHandler struct{}
@@ -13,3 +15,40 @@ type TestResponse struct{}
 func (t *TestHandler) Test(ctx context.Context, req *TestRequest, rsp *TestResponse) error {
 	return nil
 }
+
+func TestExtractEndpoint(t *testing.T) {
+	handler := &TestHandler{}
+	typ := reflect.TypeOf(handler)
+
+	var endpoints []*Endpoint
+
+	for m := 0; m < typ.NumMethod(); m++ {
+		if e := ExtractEndpoint(typ.Method(m)); e != nil {
+			endpoints = append(endpoints, e)
+		}
+	}
+
+	if i := len(endpoints); i != 1 {
+		t.Fatalf("Expected 1 endpoint, have %d", i)
+	}
+
+	if endpoints[0].Name != "Test" {
+		t.Fatalf("Expected handler Test, got %s", endpoints[0].Name)
+	}
+
+	if endpoints[0].Request == "" {
+		t.Fatal("Expected non nil Request")
+	}
+
+	if endpoints[0].Response == "" {
+		t.Fatal("Expected non nil Request")
+	}
+
+	if endpoints[0].Request != "TestRequest" {
+		t.Fatalf("Expected TestRequest got %s", endpoints[0].Request)
+	}
+
+	if endpoints[0].Response != "TestResponse" {
+		t.Fatalf("Expected TestResponse got %s", endpoints[0].Response)
+	}
+}

register/memory/memory.go

@@ -1,14 +1,14 @@
-package register
+package memory
 
 import (
 	"context"
-	"fmt"
 	"sync"
 	"time"
 
-	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/metadata"
 	"go.unistack.org/micro/v4/register"
+
+	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/util/id"
 )
 
@@ -24,9 +24,11 @@ type node struct {
 }
 
 type record struct {
-	Name    string
-	Version string
-	Nodes   map[string]*node
+	Name      string
+	Version   string
+	Metadata  metadata.Metadata
+	Nodes     map[string]*node
+	Endpoints []*register.Endpoint
 }
 
 type memory struct {
@@ -58,15 +60,15 @@ func (m *memory) ttlPrune() {
 
 	for range prune.C {
 		m.Lock()
-		for namespace, services := range m.records {
+		for domain, services := range m.records {
 			for service, versions := range services {
 				for version, record := range versions {
 					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, fmt.Sprintf("Register TTL expired for node %s of service %s", n.ID, service))
+								m.opts.Logger.Debug(m.opts.Context, "RegisterTTL expired for node "+n.ID+" of service "+service)
 							}
-							delete(m.records[namespace][service][version].Nodes, id)
+							delete(m.records[domain][service][version].Nodes, id)
 						}
 					}
 				}
@@ -99,11 +101,21 @@ func (m *memory) sendEvent(r *register.Result) {
 	}
 }
 
-func (m *memory) Connect(_ context.Context) error {
+func (m *memory) Connect(ctx context.Context) error {
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	default:
+	}
 	return nil
 }
 
-func (m *memory) Disconnect(_ context.Context) error {
+func (m *memory) Disconnect(ctx context.Context) error {
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	default:
+	}
 	return nil
 }
 
@@ -123,19 +135,29 @@ func (m *memory) Options() register.Options {
 	return m.opts
 }
 
-func (m *memory) Register(_ context.Context, s *register.Service, opts ...register.RegisterOption) error {
+func (m *memory) Register(ctx context.Context, s *register.Service, opts ...register.RegisterOption) error {
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	default:
+	}
 	m.Lock()
 	defer m.Unlock()
 
 	options := register.NewRegisterOptions(opts...)
 
 	// get the services for this domain from the register
-	srvs, ok := m.records[options.Namespace]
+	srvs, ok := m.records[options.Domain]
 	if !ok {
 		srvs = make(services)
 	}
 
-	s.Namespace = options.Namespace
+	// domain is set in metadata so it can be passed to watchers
+	if s.Metadata == nil {
+		s.Metadata = metadata.New(0)
+	}
+
+	s.Metadata.Set("domain", options.Domain)
 
 	// ensure the service name exists
 	r := serviceToRecord(s, options.TTL)
@@ -146,10 +168,10 @@ func (m *memory) Register(_ context.Context, s *register.Service, opts ...regist
 	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, fmt.Sprintf("Register added new service: %s, version: %s", s.Name, s.Version))
+			m.opts.Logger.Debug(m.opts.Context, "register added new service: "+s.Name+", version "+s.Version)
 		}
-		m.records[options.Namespace] = srvs
-		go m.sendEvent(&register.Result{Action: register.EventCreate, Service: s})
+		m.records[options.Domain] = srvs
+		go m.sendEvent(&register.Result{Action: "create", Service: s})
 	}
 
 	var addedNodes bool
@@ -160,14 +182,15 @@ func (m *memory) Register(_ context.Context, s *register.Service, opts ...regist
 			continue
 		}
 
-		md := metadata.Copy(n.Metadata)
+		metadata := metadata.Copy(n.Metadata)
+		metadata.Set("domain", options.Domain)
 
 		// add the node
 		srvs[s.Name][s.Version].Nodes[n.ID] = &node{
 			Node: &register.Node{
 				ID:       n.ID,
 				Address:  n.Address,
-				Metadata: md,
+				Metadata: metadata,
 			},
 			TTL:      options.TTL,
 			LastSeen: time.Now(),
@@ -178,21 +201,21 @@ func (m *memory) Register(_ context.Context, s *register.Service, opts ...regist
 
 	if addedNodes {
 		if m.opts.Logger.V(logger.DebugLevel) {
-			m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register added new node to service: %s, version: %s", s.Name, s.Version))
+			m.opts.Logger.Debug(m.opts.Context, "register added new node to service: "+s.Name+", version "+s.Version)
 		}
-		go m.sendEvent(&register.Result{Action: register.EventUpdate, Service: s})
+		go m.sendEvent(&register.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, fmt.Sprintf("Updated registration for service: %s, version: %s", s.Name, s.Version))
+				m.opts.Logger.Debug(m.opts.Context, "updated registration for service: "+s.Name+", version "+s.Version)
 			}
 			srvs[s.Name][s.Version].Nodes[n.ID].TTL = options.TTL
 			srvs[s.Name][s.Version].Nodes[n.ID].LastSeen = time.Now()
 		}
 	}
 
-	m.records[options.Namespace] = srvs
+	m.records[options.Domain] = srvs
 	return nil
 }
 
@@ -202,8 +225,14 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
 
 	options := register.NewDeregisterOptions(opts...)
 
+	// domain is set in metadata so it can be passed to watchers
+	if s.Metadata == nil {
+		s.Metadata = metadata.New(0)
+	}
+	s.Metadata.Set("domain", options.Domain)
+
 	// if the domain doesn't exist, there is nothing to deregister
-	services, ok := m.records[options.Namespace]
+	services, ok := m.records[options.Domain]
 	if !ok {
 		return nil
 	}
@@ -223,7 +252,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
 	for _, n := range s.Nodes {
 		if _, ok := version.Nodes[n.ID]; ok {
 			if m.opts.Logger.V(logger.DebugLevel) {
-				m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register removed node from service: %s, version: %s", s.Name, s.Version))
+				m.opts.Logger.Debug(m.opts.Context, "register removed node from service: "+s.Name+", version "+s.Version)
 			}
 			delete(version.Nodes, n.ID)
 		}
@@ -232,28 +261,28 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
 	// if the nodes not empty, we replace the version in the store and exist, the rest of the logic
 	// is cleanup
 	if len(version.Nodes) > 0 {
-		m.records[options.Namespace][s.Name][s.Version] = version
-		go m.sendEvent(&register.Result{Action: register.EventUpdate, Service: s})
+		m.records[options.Domain][s.Name][s.Version] = version
+		go m.sendEvent(&register.Result{Action: "update", Service: s})
 		return nil
 	}
 
 	// if this version was the only version of the service, we can remove the whole service from the
 	// register and exit
 	if len(versions) == 1 {
-		delete(m.records[options.Namespace], s.Name)
-		go m.sendEvent(&register.Result{Action: register.EventDelete, Service: s})
+		delete(m.records[options.Domain], s.Name)
+		go m.sendEvent(&register.Result{Action: "delete", Service: s})
 
 		if m.opts.Logger.V(logger.DebugLevel) {
-			m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register removed service: %s", s.Name))
+			m.opts.Logger.Debug(m.opts.Context, "register removed service: "+s.Name)
 		}
 		return nil
 	}
 
 	// there are other versions of the service running, so only remove this version of it
-	delete(m.records[options.Namespace][s.Name], s.Version)
-	go m.sendEvent(&register.Result{Action: register.EventDelete, Service: s})
+	delete(m.records[options.Domain][s.Name], s.Version)
+	go m.sendEvent(&register.Result{Action: "delete", Service: s})
 	if m.opts.Logger.V(logger.DebugLevel) {
-		m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register removed service: %s, version: %s", s.Name, s.Version))
+		m.opts.Logger.Debug(m.opts.Context, "register removed service: "+s.Name+", version "+s.Version)
 	}
 
 	return nil
@@ -263,15 +292,15 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
 	options := register.NewLookupOptions(opts...)
 
 	// if it's a wildcard domain, return from all domains
-	if options.Namespace == register.WildcardNamespace {
+	if options.Domain == register.WildcardDomain {
 		m.RLock()
 		recs := m.records
 		m.RUnlock()
 
 		var services []*register.Service
 
-		for namespace := range recs {
-			srvs, err := m.LookupService(ctx, name, append(opts, register.LookupNamespace(namespace))...)
+		for domain := range recs {
+			srvs, err := m.LookupService(ctx, name, append(opts, register.LookupDomain(domain))...)
 			if err == register.ErrNotFound {
 				continue
 			} else if err != nil {
@@ -290,7 +319,7 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
 	defer m.RUnlock()
 
 	// check the domain exists
-	services, ok := m.records[options.Namespace]
+	services, ok := m.records[options.Domain]
 	if !ok {
 		return nil, register.ErrNotFound
 	}
@@ -307,7 +336,7 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
 	var i int
 
 	for _, r := range versions {
-		result[i] = recordToService(r, options.Namespace)
+		result[i] = recordToService(r, options.Domain)
 		i++
 	}
 
@@ -318,15 +347,15 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
 	options := register.NewListOptions(opts...)
 
 	// if it's a wildcard domain, list from all domains
-	if options.Namespace == register.WildcardNamespace {
+	if options.Domain == register.WildcardDomain {
 		m.RLock()
 		recs := m.records
 		m.RUnlock()
 
 		var services []*register.Service
 
-		for namespace := range recs {
-			srvs, err := m.ListServices(ctx, append(opts, register.ListNamespace(namespace))...)
+		for domain := range recs {
+			srvs, err := m.ListServices(ctx, append(opts, register.ListDomain(domain))...)
 			if err != nil {
 				return nil, err
 			}
@@ -340,7 +369,7 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
 	defer m.RUnlock()
 
 	// ensure the domain exists
-	services, ok := m.records[options.Namespace]
+	services, ok := m.records[options.Domain]
 	if !ok {
 		return make([]*register.Service, 0), nil
 	}
@@ -350,7 +379,7 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
 
 	for _, service := range services {
 		for _, version := range service {
-			result = append(result, recordToService(version, options.Namespace))
+			result = append(result, recordToService(version, options.Domain))
 		}
 	}
 
@@ -405,13 +434,24 @@ func (m *watcher) Next() (*register.Result, error) {
 				continue
 			}
 
-			namespace := register.DefaultNamespace
-			if r.Service.Namespace != "" {
-				namespace = r.Service.Namespace
+			if m.wo.Domain == register.WildcardDomain {
+				return r, nil
+			}
+
+			if r.Service.Metadata == nil {
+				continue
+			}
+
+			// extract domain from service metadata
+			var domain string
+			if v, ok := r.Service.Metadata.Get("domain"); ok && v != "" {
+				domain = v
+			} else {
+				domain = register.DefaultDomain
 			}
 
 			// only send the event if watching the wildcard or this specific domain
-			if m.wo.Namespace == register.WildcardNamespace || m.wo.Namespace == namespace {
+			if m.wo.Domain == domain {
 				return r, nil
 			}
 		case <-m.exit:
@@ -430,6 +470,8 @@ func (m *watcher) Stop() {
 }
 
 func serviceToRecord(s *register.Service, ttl time.Duration) *record {
+	metadata := metadata.Copy(s.Metadata)
+
 	nodes := make(map[string]*node, len(s.Nodes))
 	for _, n := range s.Nodes {
 		nodes[n.ID] = &node{
@@ -439,23 +481,40 @@ func serviceToRecord(s *register.Service, ttl time.Duration) *record {
 		}
 	}
 
+	endpoints := make([]*register.Endpoint, len(s.Endpoints))
+	copy(endpoints, s.Endpoints)
+
 	return &record{
-		Name:    s.Name,
-		Version: s.Version,
-		Nodes:   nodes,
+		Name:      s.Name,
+		Version:   s.Version,
+		Metadata:  metadata,
+		Nodes:     nodes,
+		Endpoints: endpoints,
 	}
 }
 
-func recordToService(r *record, namespace string) *register.Service {
+func recordToService(r *record, domain string) *register.Service {
+	endpoints := make([]*register.Endpoint, len(r.Endpoints))
+	for i, e := range r.Endpoints {
+		md := metadata.Copy(e.Metadata)
+		// set the domain in metadata so it can be determined when a wildcard query is performed
+		md.Set("domain", domain)
+
+		endpoints[i] = &register.Endpoint{
+			Name:     e.Name,
+			Request:  e.Request,
+			Response: e.Response,
+			Metadata: md,
+		}
+	}
+
 	nodes := make([]*register.Node, len(r.Nodes))
 	i := 0
 	for _, n := range r.Nodes {
-		nmd := metadata.Copy(n.Metadata)
-
 		nodes[i] = &register.Node{
 			ID:       n.ID,
 			Address:  n.Address,
-			Metadata: nmd,
+			Metadata: metadata.Copy(n.Metadata),
 		}
 		i++
 	}
@@ -463,7 +522,8 @@ func recordToService(r *record, namespace string) *register.Service {
 	return &register.Service{
 		Name:      r.Name,
 		Version:   r.Version,
+		Metadata:  metadata.Copy(r.Metadata),
+		Endpoints: endpoints,
 		Nodes:     nodes,
-		Namespace: namespace,
 	}
 }

register/memory/memory_test.go

@@ -1,12 +1,14 @@
-package register
+package memory
 
 import (
 	"context"
 	"fmt"
+	"reflect"
 	"sync"
 	"testing"
 	"time"
 
+	"go.unistack.org/micro/v4"
 	"go.unistack.org/micro/v4/register"
 )
 
@@ -251,34 +253,41 @@ func TestMemoryWildcard(t *testing.T) {
 	m := NewRegister()
 	ctx := context.TODO()
 
+	if err := m.Init(); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := m.Connect(ctx); err != nil {
+		t.Fatal(err)
+	}
 	testSrv := &register.Service{Name: "foo", Version: "1.0.0"}
 
-	if err := m.Register(ctx, testSrv, register.RegisterNamespace("one")); err != nil {
+	if err := m.Register(ctx, testSrv, register.RegisterDomain("one")); err != nil {
 		t.Fatalf("Register err: %v", err)
 	}
-	if err := m.Register(ctx, testSrv, register.RegisterNamespace("two")); err != nil {
+	if err := m.Register(ctx, testSrv, register.RegisterDomain("two")); err != nil {
 		t.Fatalf("Register err: %v", err)
 	}
 
-	if recs, err := m.ListServices(ctx, register.ListNamespace("one")); err != nil {
+	if recs, err := m.ListServices(ctx, register.ListDomain("one")); err != nil {
 		t.Errorf("List err: %v", err)
 	} else if len(recs) != 1 {
 		t.Errorf("Expected 1 record, got %v", len(recs))
 	}
 
-	if recs, err := m.ListServices(ctx, register.ListNamespace("*")); err != nil {
+	if recs, err := m.ListServices(ctx, register.ListDomain("*")); err != nil {
 		t.Errorf("List err: %v", err)
 	} else if len(recs) != 2 {
 		t.Errorf("Expected 2 records, got %v", len(recs))
 	}
 
-	if recs, err := m.LookupService(ctx, testSrv.Name, register.LookupNamespace("one")); err != nil {
+	if recs, err := m.LookupService(ctx, testSrv.Name, register.LookupDomain("one")); err != nil {
 		t.Errorf("Lookup err: %v", err)
 	} else if len(recs) != 1 {
 		t.Errorf("Expected 1 record, got %v", len(recs))
 	}
 
-	if recs, err := m.LookupService(ctx, testSrv.Name, register.LookupNamespace("*")); err != nil {
+	if recs, err := m.LookupService(ctx, testSrv.Name, register.LookupDomain("*")); err != nil {
 		t.Errorf("Lookup err: %v", err)
 	} else if len(recs) != 2 {
 		t.Errorf("Expected 2 records, got %v", len(recs))
@@ -302,17 +311,19 @@ func TestWatcher(t *testing.T) {
 	}
 	defer wc.Stop()
 
-	cherr := make(chan error, 10)
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
-		_, err := wc.Next()
-		if err != nil {
-			cherr <- fmt.Errorf("unexpected err %v", err)
+		for {
+			_, err := wc.Next()
+			if err != nil {
+				t.Fatal("unexpected err", err)
+			}
+			// t.Logf("changes %#+v", ch.Service)
+			wc.Stop()
+			wg.Done()
+			return
 		}
-		// t.Logf("changes %#+v", ch.Service)
-		wc.Stop()
-		wg.Done()
 	}()
 
 	if err := m.Register(ctx, testSrv); err != nil {
@@ -324,3 +335,37 @@ func TestWatcher(t *testing.T) {
 		t.Fatal("expected error on Next()")
 	}
 }
+
+func Test_service_Register(t *testing.T) {
+	t.Skip()
+	r := NewRegister()
+
+	type args struct {
+		names []string
+	}
+	tests := []struct {
+		name string
+		opts []micro.Option
+		args args
+		want register.Register
+	}{
+		{
+			name: "service.Register",
+			opts: []micro.Option{micro.Register(r)},
+			args: args{
+				names: []string{"memory"},
+			},
+			want: r,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := micro.NewService(tt.opts...)
+
+			if got := s.Register(tt.args.names...); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("service.Register() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

register/options.go

@@ -5,7 +5,6 @@ import (
 	"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"
@@ -27,8 +26,6 @@ type Options struct {
 	Name string
 	// Addrs specifies register addrs
 	Addrs []string
-	// Codec used to marshal/unmarshal data in register
-	Codec codec.Codec
 	// Timeout specifies timeout
 	Timeout time.Duration
 }
@@ -40,7 +37,6 @@ func NewOptions(opts ...Option) Options {
 		Meter:   meter.DefaultMeter,
 		Tracer:  tracer.DefaultTracer,
 		Context: context.Background(),
-		Codec:   codec.NewCodec(),
 	}
 	for _, o := range opts {
 		o(&options)
@@ -50,17 +46,17 @@ func NewOptions(opts ...Option) Options {
 
 // RegisterOptions holds options for register method
 type RegisterOptions struct { // nolint: golint,revive
-	Context   context.Context
-	Namespace string
-	TTL       time.Duration
-	Attempts  int
+	Context  context.Context
+	Domain   string
+	TTL      time.Duration
+	Attempts int
 }
 
 // NewRegisterOptions returns register options struct filled by opts
 func NewRegisterOptions(opts ...RegisterOption) RegisterOptions {
 	options := RegisterOptions{
-		Namespace: DefaultNamespace,
-		Context:   context.Background(),
+		Domain:  DefaultDomain,
+		Context: context.Background(),
 	}
 	for _, o := range opts {
 		o(&options)
@@ -76,15 +72,15 @@ type WatchOptions struct {
 	// Other options for implementations of the interface
 	// can be stored in a context
 	Context context.Context
-	// Namespace to watch
-	Namespace string
+	// Domain to watch
+	Domain string
 }
 
 // NewWatchOptions returns watch options filled by opts
 func NewWatchOptions(opts ...WatchOption) WatchOptions {
 	options := WatchOptions{
-		Namespace: DefaultNamespace,
-		Context:   context.Background(),
+		Domain:  DefaultDomain,
+		Context: context.Background(),
 	}
 	for _, o := range opts {
 		o(&options)
@@ -95,8 +91,8 @@ func NewWatchOptions(opts ...WatchOption) WatchOptions {
 // DeregisterOptions holds options for deregister method
 type DeregisterOptions struct {
 	Context context.Context
-	// Namespace the service was registered in
-	Namespace string
+	// Domain the service was registered in
+	Domain string
 	// Atempts specify max attempts for deregister
 	Attempts int
 }
@@ -104,8 +100,8 @@ type DeregisterOptions struct {
 // NewDeregisterOptions returns options for deregister filled by opts
 func NewDeregisterOptions(opts ...DeregisterOption) DeregisterOptions {
 	options := DeregisterOptions{
-		Namespace: DefaultNamespace,
-		Context:   context.Background(),
+		Domain:  DefaultDomain,
+		Context: context.Background(),
 	}
 	for _, o := range opts {
 		o(&options)
@@ -116,15 +112,15 @@ func NewDeregisterOptions(opts ...DeregisterOption) DeregisterOptions {
 // LookupOptions holds lookup options
 type LookupOptions struct {
 	Context context.Context
-	// Namespace to scope the request to
-	Namespace string
+	// Domain to scope the request to
+	Domain string
 }
 
 // NewLookupOptions returns lookup options filled by opts
 func NewLookupOptions(opts ...LookupOption) LookupOptions {
 	options := LookupOptions{
-		Namespace: DefaultNamespace,
-		Context:   context.Background(),
+		Domain:  DefaultDomain,
+		Context: context.Background(),
 	}
 	for _, o := range opts {
 		o(&options)
@@ -134,17 +130,16 @@ func NewLookupOptions(opts ...LookupOption) LookupOptions {
 
 // ListOptions holds the list options for list method
 type ListOptions struct {
-	// Context used to store additional options
 	Context context.Context
-	// Namespace to scope the request to
-	Namespace string
+	// Domain to scope the request to
+	Domain string
 }
 
 // NewListOptions returns list options filled by opts
 func NewListOptions(opts ...ListOption) ListOptions {
 	options := ListOptions{
-		Namespace: DefaultNamespace,
-		Context:   context.Background(),
+		Domain:  DefaultDomain,
+		Context: context.Background(),
 	}
 	for _, o := range opts {
 		o(&options)
@@ -222,10 +217,10 @@ func RegisterContext(ctx context.Context) RegisterOption { // nolint: golint,rev
 	}
 }
 
-// RegisterNamespace secifies register Namespace
-func RegisterNamespace(d string) RegisterOption { // nolint: golint,revive
+// RegisterDomain secifies register domain
+func RegisterDomain(d string) RegisterOption { // nolint: golint,revive
 	return func(o *RegisterOptions) {
-		o.Namespace = d
+		o.Domain = d
 	}
 }
 
@@ -243,10 +238,10 @@ func WatchContext(ctx context.Context) WatchOption {
 	}
 }
 
-// WatchNamespace sets the Namespace for watch
-func WatchNamespace(d string) WatchOption {
+// WatchDomain sets the domain for watch
+func WatchDomain(d string) WatchOption {
 	return func(o *WatchOptions) {
-		o.Namespace = d
+		o.Domain = d
 	}
 }
 
@@ -264,10 +259,10 @@ func DeregisterContext(ctx context.Context) DeregisterOption {
 	}
 }
 
-// DeregisterNamespace specifies deregister Namespace
-func DeregisterNamespace(d string) DeregisterOption {
+// DeregisterDomain specifies deregister domain
+func DeregisterDomain(d string) DeregisterOption {
 	return func(o *DeregisterOptions) {
-		o.Namespace = d
+		o.Domain = d
 	}
 }
 
@@ -278,10 +273,10 @@ func LookupContext(ctx context.Context) LookupOption {
 	}
 }
 
-// LookupNamespace sets the Namespace for lookup
-func LookupNamespace(d string) LookupOption {
+// LookupDomain sets the domain for lookup
+func LookupDomain(d string) LookupOption {
 	return func(o *LookupOptions) {
-		o.Namespace = d
+		o.Domain = d
 	}
 }
 
@@ -292,10 +287,10 @@ func ListContext(ctx context.Context) ListOption {
 	}
 }
 
-// ListNamespace sets the Namespace for list method
-func ListNamespace(d string) ListOption {
+// ListDomain sets the domain for list method
+func ListDomain(d string) ListOption {
 	return func(o *ListOptions) {
-		o.Namespace = d
+		o.Domain = d
 	}
 }
 
@@ -305,9 +300,3 @@ func Name(n string) Option {
 		o.Name = n
 	}
 }
-
-func Codec(c codec.Codec) Option {
-	return func(o *Options) {
-		o.Codec = c
-	}
-}

register/register.go

@@ -1,20 +1,19 @@
 // Package register is an interface for service discovery
-package register
+package register // import "go.unistack.org/micro/v4/register"
 
 import (
 	"context"
 	"errors"
-
 	"go.unistack.org/micro/v4/metadata"
 )
 
 const (
-	// WildcardNamespace indicates any Namespace
-	WildcardNamespace = "*"
+	// WildcardDomain indicates any domain
+	WildcardDomain = "*"
 )
 
-// DefaultNamespace to use if none was provided in options
-var DefaultNamespace = "micro"
+// DefaultDomain to use if none was provided in options
+var DefaultDomain = "micro"
 
 var (
 	// DefaultRegister is the global default register
@@ -29,47 +28,41 @@ var (
 // and an abstraction over varying implementations
 // {consul, etcd, zookeeper, ...}
 type Register interface {
-	// Name returns register name
 	Name() string
-	// Init initialize register
 	Init(...Option) error
-	// Options returns options for register
 	Options() Options
-	// Connect initialize connect to register
 	Connect(context.Context) error
-	// Disconnect initialize discconection from register
 	Disconnect(context.Context) error
-	// Register service in registry
 	Register(context.Context, *Service, ...RegisterOption) error
-	// Deregister service from registry
 	Deregister(context.Context, *Service, ...DeregisterOption) error
-	// LookupService in registry
 	LookupService(context.Context, string, ...LookupOption) ([]*Service, error)
-	// ListServices in registry
 	ListServices(context.Context, ...ListOption) ([]*Service, error)
-	// Watch registry events
 	Watch(context.Context, ...WatchOption) (Watcher, error)
-	// String returns registry string representation
 	String() string
-	// Live returns register liveness
-	// Live() bool
-	// Ready returns register readiness
-	// Ready() bool
 }
 
 // Service holds service register info
 type Service struct {
-	Name      string  `json:"name,omitempty"`
-	Version   string  `json:"version,omitempty"`
-	Nodes     []*Node `json:"nodes,omitempty"`
-	Namespace string  `json:"namespace,omitempty"`
+	Name      string            `json:"name"`
+	Version   string            `json:"version"`
+	Metadata  metadata.Metadata `json:"metadata"`
+	Endpoints []*Endpoint       `json:"endpoints"`
+	Nodes     []*Node           `json:"nodes"`
 }
 
 // Node holds node register info
 type Node struct {
-	Metadata metadata.Metadata `json:"metadata,omitempty"`
-	ID       string            `json:"id,omitempty"`
-	Address  string            `json:"address,omitempty"`
+	Metadata metadata.Metadata `json:"metadata"`
+	ID       string            `json:"id"`
+	Address  string            `json:"address"`
+}
+
+// Endpoint holds endpoint register info
+type Endpoint struct {
+	Request  string            `json:"request"`
+	Response string            `json:"response"`
+	Metadata metadata.Metadata `json:"metadata"`
+	Name     string            `json:"name"`
 }
 
 // Option func signature

register/watcher.go

@@ -15,31 +15,31 @@ type Watcher interface {
 // the watcher. Actions can be create, update, delete
 type Result struct {
 	// Service holds register service
-	Service *Service `json:"service,omitempty"`
+	Service *Service
 	// Action holds the action
-	Action EventType `json:"action,omitempty"`
+	Action string
 }
 
 // EventType defines register event type
 type EventType int
 
 const (
-	// EventCreate is emitted when a new service is registered
-	EventCreate EventType = iota
-	// EventDelete is emitted when an existing service is deregistered
-	EventDelete
-	// EventUpdate is emitted when an existing service is updated
-	EventUpdate
+	// Create is emitted when a new service is registered
+	Create EventType = iota
+	// Delete is emitted when an existing service is deregistered
+	Delete
+	// Update is emitted when an existing service is updated
+	Update
 )
 
 // String returns human readable event type
 func (t EventType) String() string {
 	switch t {
-	case EventCreate:
+	case Create:
 		return "create"
-	case EventDelete:
+	case Delete:
 		return "delete"
-	case EventUpdate:
+	case Update:
 		return "update"
 	default:
 		return "unknown"
@@ -49,11 +49,11 @@ func (t EventType) String() string {
 // Event is register event
 type Event struct {
 	// Timestamp is event timestamp
-	Timestamp time.Time `json:"timestamp,omitempty"`
+	Timestamp time.Time
 	// Service is register service
-	Service *Service `json:"service,omitempty"`
+	Service *Service
 	// ID is register id
-	ID string `json:"id,omitempty"`
+	ID string
 	// Type defines type of event
-	Type EventType `json:"type,omitempty"`
+	Type EventType
 }

resolver/dns/dns.go

@@ -1,5 +1,5 @@
 // Package dns resolves names to dns records
-package dns
+package dns // import "go.unistack.org/micro/v4/resolver/dns"
 
 import (
 	"context"
@@ -12,9 +12,9 @@ import (
 
 // Resolver is a DNS network resolve
 type Resolver struct {
+	sync.RWMutex
 	goresolver *net.Resolver
 	Address    string
-	mu         sync.RWMutex
 }
 
 // Resolve tries to resolve endpoint address
@@ -39,12 +39,12 @@ func (r *Resolver) Resolve(name string) ([]*resolver.Record, error) {
 		return []*resolver.Record{rec}, nil
 	}
 
-	r.mu.RLock()
+	r.RLock()
 	goresolver := r.goresolver
-	r.mu.RUnlock()
+	r.RUnlock()
 
 	if goresolver == nil {
-		r.mu.Lock()
+		r.Lock()
 		r.goresolver = &net.Resolver{
 			Dial: func(ctx context.Context, _ string, _ string) (net.Conn, error) {
 				d := net.Dialer{
@@ -53,7 +53,7 @@ func (r *Resolver) Resolve(name string) ([]*resolver.Record, error) {
 				return d.DialContext(ctx, "udp", r.Address)
 			},
 		}
-		r.mu.Unlock()
+		r.Unlock()
 	}
 
 	addrs, err := goresolver.LookupIP(context.TODO(), "ip", host)