tracer: add missing UniqLabels function

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

.gitea/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,18 @@
+---
+name: Bug report
+about: For reporting bugs in micro
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+
+1. What are you trying to do?
+2. What did you expect to happen?
+3. What happens instead?
+
+**How to reproduce the bug:**
+
+If possible, please include a minimal code snippet here.

.gitea/ISSUE_TEMPLATE/feature-request---enhancement.md

@@ -0,0 +1,17 @@
+---
+name: Feature request / Enhancement
+about: If you have a need not served by micro
+title: "[FEATURE]"
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitea/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,8 @@
+---
+name: Question
+about: Ask a question about micro
+title: ''
+labels: ''
+assignees: ''
+
+---

.gitea/autoapprove.yml

@@ -0,0 +1,28 @@
+name: "autoapprove"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  autoapprove:
+    runs-on: ubuntu-latest
+    steps:
+      - name: approve
+        run: [ "curl -o tea https://dl.gitea.com/tea/main/tea-main-linux-amd64",
+               "chmod +x ./tea",
+               "./tea login add --name unistack --token ${{ secrets.GITHUB_TOKEN }} --url https://git.unistack.org",
+               "./tea pr --repo ${{ github.event.repository.name }}"
+        ]
+        if: github.actor == 'vtolstov'
+        id: approve
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.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.18
+    - 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.18
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...

.github.old/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+## Pull Request template
+Please, go through these steps before clicking submit on this PR.
+
+1. Give a descriptive title to your PR.
+2. Provide a description of your changes.
+3. Make sure you have some relevant tests.
+4. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if applicable).
+
+**PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING**

.github.old/workflows/autoapprove.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: approve
-        uses: hmarr/auto-approve-action@v2
+        uses: hmarr/auto-approve-action@v3
         if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
         id: approve
         with:

.github.old/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v3.3.1
+        uses: golangci/golangci-lint-action@v3.4.0
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

.github.old/workflows/dependabot-automerge.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.5
+        uses: dependabot/fetch-metadata@v1.3.6
         with:
           github-token: "${{ secrets.TOKEN }}"
       - name: merge

.github.old/workflows/pr.yml

@@ -34,14 +34,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v3.3.1
+        uses: golangci/golangci-lint-action@v3.4.0
         continue-on-error: true
         with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
+          version: v1.30

README.md

@@ -1,4 +1,4 @@
-# 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/github.com/unistack-org/micro/v3?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/v3)](https://goreportcard.com/report/go.unistack.org/micro/v3) [![Coverage](https://codecov.io/gh/unistack-org/micro/branch/v3/graph/badge.svg?token=OZPO2LP7VS)](https://codecov.io/gh/unistack-org/micro)
+# 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.
 

api/api.go

@@ -1,182 +0,0 @@
-package api // import "go.unistack.org/micro/v3/api"
-
-import (
-	"errors"
-	"regexp"
-	"strings"
-
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/register"
-	"go.unistack.org/micro/v3/server"
-)
-
-// nolint: revive
-// Api interface
-type Api interface {
-	// Initialise options
-	Init(...Option) error
-	// Get the options
-	Options() Options
-	// Register a http handler
-	Register(*Endpoint) error
-	// Register a route
-	Deregister(*Endpoint) error
-	// Implementation of api
-	String() string
-}
-
-// Options holds the options
-type Options struct{}
-
-// Option func signature
-type Option func(*Options) error
-
-// Endpoint is a mapping between an RPC method and HTTP endpoint
-type Endpoint struct {
-	// Name Greeter.Hello
-	Name string
-	// Desciption for endpoint
-	Description string
-	// Handler e.g rpc, proxy
-	Handler string
-	// Body destination
-	// "*" or "" - top level message value
-	// "string" - inner message value
-	Body string
-	// Host e.g example.com
-	Host []string
-	// Method e.g GET, POST
-	Method []string
-	// Path e.g /greeter. Expect POSIX regex
-	Path []string
-	// Stream flag
-	Stream bool
-}
-
-// Service represents an API service
-type Service struct {
-	// Name of service
-	Name string
-	// Endpoint for this service
-	Endpoint *Endpoint
-	// Services that provides service
-	Services []*register.Service
-}
-
-// Encode encodes an endpoint to endpoint metadata
-func Encode(e *Endpoint) map[string]string {
-	if e == nil {
-		return nil
-	}
-
-	// endpoint map
-	ep := make(map[string]string)
-
-	// set vals only if they exist
-	set := func(k, v string) {
-		if len(v) == 0 {
-			return
-		}
-		ep[k] = v
-	}
-
-	set("endpoint", e.Name)
-	set("description", e.Description)
-	set("handler", e.Handler)
-	set("method", strings.Join(e.Method, ","))
-	set("path", strings.Join(e.Path, ","))
-	set("host", strings.Join(e.Host, ","))
-	set("body", e.Body)
-
-	return ep
-}
-
-// Decode decodes endpoint metadata into an endpoint
-func Decode(e metadata.Metadata) *Endpoint {
-	if e == nil {
-		return nil
-	}
-
-	ep := &Endpoint{}
-	ep.Name, _ = e.Get("endpoint")
-	ep.Description, _ = e.Get("description")
-	epmethod, _ := e.Get("method")
-	ep.Method = []string{epmethod}
-	eppath, _ := e.Get("path")
-	ep.Path = []string{eppath}
-	ephost, _ := e.Get("host")
-	ep.Host = []string{ephost}
-	ep.Handler, _ = e.Get("handler")
-	ep.Body, _ = e.Get("body")
-
-	return ep
-}
-
-// Validate validates an endpoint to guarantee it won't blow up when being served
-func Validate(e *Endpoint) error {
-	if e == nil {
-		return errors.New("endpoint is nil")
-	}
-
-	if len(e.Name) == 0 {
-		return errors.New("name required")
-	}
-
-	for _, p := range e.Path {
-		ps := p[0]
-		pe := p[len(p)-1]
-
-		switch {
-		case ps == '^' && pe == '$':
-			if _, err := regexp.CompilePOSIX(p); err != nil {
-				return err
-			}
-		case ps == '^' && pe != '$':
-			return errors.New("invalid path")
-		case ps != '^' && pe == '$':
-			return errors.New("invalid path")
-		}
-	}
-
-	if len(e.Handler) == 0 {
-		return errors.New("invalid handler")
-	}
-
-	return nil
-}
-
-/*
-Design ideas
-
-// Gateway is an api gateway interface
-type Gateway interface {
-	// Register a http handler
-	Handle(pattern string, http.Handler)
-	// Register a route
-	RegisterRoute(r Route)
-	// Init initialises the command line.
-	// It also parses further options.
-	Init(...Option) error
-	// Run the gateway
-	Run() error
-}
-
-// NewGateway returns a new api gateway
-func NewGateway() Gateway {
-	return newGateway()
-}
-*/
-
-// WithEndpoint returns a server.HandlerOption with endpoint metadata set
-//
-// Usage:
-//
-// 	proto.RegisterHandler(service.Server(), new(Handler), api.WithEndpoint(
-//		&api.Endpoint{
-//			Name: "Greeter.Hello",
-//			Path: []string{"/greeter"},
-//		},
-//	))
-func WithEndpoint(e *Endpoint) server.HandlerOption {
-	return server.EndpointMetadata(e.Name, Encode(e))
-}

api/api_test.go

@@ -1,245 +0,0 @@
-package api
-
-import (
-	"strings"
-	"testing"
-
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/server"
-)
-
-func TestDecode(t *testing.T) {
-	md := metadata.New(0)
-	md.Set("host", "localhost", "method", "GET", "path", "/")
-	ep := Decode(md)
-	if md == nil {
-		t.Fatalf("failed to decode md %#+v", md)
-	} else if len(ep.Host) != 1 || len(ep.Method) != 1 || len(ep.Path) != 1 {
-		t.Fatalf("ep invalid after decode %#+v", ep)
-	}
-	if ep.Host[0] != "localhost" || ep.Method[0] != "GET" || ep.Path[0] != "/" {
-		t.Fatalf("ep invalid after decode %#+v", ep)
-	}
-}
-
-//nolint:gocyclo
-func TestEncode(t *testing.T) {
-	testData := []*Endpoint{
-		nil,
-		{
-			Name:        "Foo.Bar",
-			Description: "A test endpoint",
-			Handler:     "meta",
-			Host:        []string{"foo.com"},
-			Method:      []string{"GET"},
-			Path:        []string{"/test"},
-		},
-	}
-
-	compare := func(expect, got []string) bool {
-		// no data to compare, return true
-		if len(expect) == 0 && len(got) == 0 {
-			return true
-		}
-		// no data expected but got some return false
-		if len(expect) == 0 && len(got) > 0 {
-			return false
-		}
-
-		// compare expected with what we got
-		for _, e := range expect {
-			var seen bool
-			for _, g := range got {
-				if e == g {
-					seen = true
-					break
-				}
-			}
-			if !seen {
-				return false
-			}
-		}
-
-		// we're done, return true
-		return true
-	}
-
-	for _, d := range testData {
-		// encode
-		e := Encode(d)
-		// decode
-		de := Decode(e)
-
-		// nil endpoint returns nil
-		if d == nil {
-			if e != nil {
-				t.Fatalf("expected nil got %v", e)
-			}
-			if de != nil {
-				t.Fatalf("expected nil got %v", de)
-			}
-
-			continue
-		}
-
-		// check encoded map
-		name := e["endpoint"]
-		desc := e["description"]
-		method := strings.Split(e["method"], ",")
-		path := strings.Split(e["path"], ",")
-		host := strings.Split(e["host"], ",")
-		handler := e["handler"]
-
-		if name != d.Name {
-			t.Fatalf("expected %v got %v", d.Name, name)
-		}
-		if desc != d.Description {
-			t.Fatalf("expected %v got %v", d.Description, desc)
-		}
-		if handler != d.Handler {
-			t.Fatalf("expected %v got %v", d.Handler, handler)
-		}
-		if ok := compare(d.Method, method); !ok {
-			t.Fatalf("expected %v got %v", d.Method, method)
-		}
-		if ok := compare(d.Path, path); !ok {
-			t.Fatalf("expected %v got %v", d.Path, path)
-		}
-		if ok := compare(d.Host, host); !ok {
-			t.Fatalf("expected %v got %v", d.Host, host)
-		}
-
-		if de.Name != d.Name {
-			t.Fatalf("expected %v got %v", d.Name, de.Name)
-		}
-		if de.Description != d.Description {
-			t.Fatalf("expected %v got %v", d.Description, de.Description)
-		}
-		if de.Handler != d.Handler {
-			t.Fatalf("expected %v got %v", d.Handler, de.Handler)
-		}
-		if ok := compare(d.Method, de.Method); !ok {
-			t.Fatalf("expected %v got %v", d.Method, de.Method)
-		}
-		if ok := compare(d.Path, de.Path); !ok {
-			t.Fatalf("expected %v got %v", d.Path, de.Path)
-		}
-		if ok := compare(d.Host, de.Host); !ok {
-			t.Fatalf("expected %v got %v", d.Host, de.Host)
-		}
-	}
-}
-
-func TestValidate(t *testing.T) {
-	epPcre := &Endpoint{
-		Name:        "Foo.Bar",
-		Description: "A test endpoint",
-		Handler:     "meta",
-		Host:        []string{"foo.com"},
-		Method:      []string{"GET"},
-		Path:        []string{"^/test/?$"},
-	}
-	if err := Validate(epPcre); err != nil {
-		t.Fatal(err)
-	}
-
-	epGpath := &Endpoint{
-		Name:        "Foo.Bar",
-		Description: "A test endpoint",
-		Handler:     "meta",
-		Host:        []string{"foo.com"},
-		Method:      []string{"GET"},
-		Path:        []string{"/test/{id}"},
-	}
-	if err := Validate(epGpath); err != nil {
-		t.Fatal(err)
-	}
-
-	epPcreInvalid := &Endpoint{
-		Name:        "Foo.Bar",
-		Description: "A test endpoint",
-		Handler:     "meta",
-		Host:        []string{"foo.com"},
-		Method:      []string{"GET"},
-		Path:        []string{"/test/?$"},
-	}
-	if err := Validate(epPcreInvalid); err == nil {
-		t.Fatalf("invalid pcre %v", epPcreInvalid.Path[0])
-	}
-}
-
-func TestWithEndpoint(t *testing.T) {
-	ep := &Endpoint{
-		Name:        "Foo.Bar",
-		Description: "A test endpoint",
-		Handler:     "meta",
-		Host:        []string{"foo.com"},
-		Method:      []string{"GET"},
-		Path:        []string{"/test/{id}"},
-	}
-	o := WithEndpoint(ep)
-	opts := server.NewHandlerOptions(o)
-	if opts.Metadata == nil {
-		t.Fatalf("WithEndpoint not works %#+v", opts)
-	}
-	md, ok := opts.Metadata[ep.Name]
-	if !ok {
-		t.Fatalf("WithEndpoint not works %#+v", opts)
-	}
-	if v, ok := md.Get("Endpoint"); !ok || v != "Foo.Bar" {
-		t.Fatalf("WithEndpoint not works %#+v", md)
-	}
-}
-
-func TestValidateNilErr(t *testing.T) {
-	var ep *Endpoint
-	if err := Validate(ep); err == nil {
-		t.Fatalf("Validate not works")
-	}
-}
-
-func TestValidateMissingNameErr(t *testing.T) {
-	ep := &Endpoint{}
-	if err := Validate(ep); err == nil {
-		t.Fatalf("Validate not works")
-	}
-}
-
-func TestValidateMissingHandlerErr(t *testing.T) {
-	ep := &Endpoint{Name: "test"}
-	if err := Validate(ep); err == nil {
-		t.Fatalf("Validate not works")
-	}
-}
-
-func TestValidateRegexpStartErr(t *testing.T) {
-	ep := &Endpoint{Name: "test", Handler: "test"}
-	ep.Path = []string{"^/"}
-	if err := Validate(ep); err == nil {
-		t.Fatalf("Validate not works")
-	}
-}
-
-func TestValidateRegexpEndErr(t *testing.T) {
-	ep := &Endpoint{Name: "test", Handler: "test", Path: []string{""}}
-	ep.Path[0] = "/$"
-	if err := Validate(ep); err == nil {
-		t.Fatalf("Validate not works")
-	}
-}
-
-func TestValidateRegexpNonErr(t *testing.T) {
-	ep := &Endpoint{Name: "test", Handler: "test", Path: []string{""}}
-	ep.Path[0] = "^/(.*)$"
-	if err := Validate(ep); err != nil {
-		t.Fatalf("Validate not works")
-	}
-}
-
-func TestValidateRegexpErr(t *testing.T) {
-	ep := &Endpoint{Name: "test", Handler: "test", Path: []string{""}}
-	ep.Path[0] = "^/(.$"
-	if err := Validate(ep); err == nil {
-		t.Fatalf("Validate not works")
-	}
-}

broker/broker.go

@@ -1,21 +1,24 @@
 // Package broker is an interface used for asynchronous messaging
-package broker // import "go.unistack.org/micro/v3/broker"
+package broker // import "go.unistack.org/micro/v4/broker"
 
 import (
 	"context"
 	"errors"
 
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/options"
 )
 
 // DefaultBroker default memory broker
-var DefaultBroker = NewBroker()
+var DefaultBroker Broker = NewBroker()
 
 var (
 	// ErrNotConnected returns when broker used but not connected yet
 	ErrNotConnected = errors.New("broker not connected")
 	// ErrDisconnected returns when broker disconnected
 	ErrDisconnected = errors.New("broker disconnected")
+	// ErrInvalidMessage returns when message has nvalid format
+	ErrInvalidMessage = errors.New("broker message has invalid format")
 )
 
 // Broker is an interface used for asynchronous messaging.
@@ -23,7 +26,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
@@ -32,93 +35,29 @@ type Broker interface {
 	Connect(ctx context.Context) error
 	// Disconnect disconnect from broker
 	Disconnect(ctx context.Context) error
-	// Publish message to broker topic
-	Publish(ctx context.Context, topic string, msg *Message, opts ...PublishOption) 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, h Handler, opts ...SubscribeOption) (Subscriber, error)
-	// BatchPublish messages to broker with multiple topics
-	BatchPublish(ctx context.Context, msgs []*Message, opts ...PublishOption) error
-	// BatchSubscribe subscribes to topic messages via handler
-	BatchSubscribe(ctx context.Context, topic string, h BatchHandler, opts ...SubscribeOption) (Subscriber, error)
+	Subscribe(ctx context.Context, topic string, handler interface{}, opts ...options.Option) (Subscriber, error)
 	// String type of broker
 	String() string
 }
 
-// Handler is used to process messages via a subscription of a topic.
-type Handler func(Event) error
-
-// Events contains multiple events
-type Events []Event
-
-// Ack try to ack all events and return
-func (evs Events) Ack() error {
-	var err error
-	for _, ev := range evs {
-		if err = ev.Ack(); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// SetError sets error on event
-func (evs Events) SetError(err error) {
-	for _, ev := range evs {
-		ev.SetError(err)
-	}
-}
-
-// BatchHandler is used to process messages in batches via a subscription of a topic.
-type BatchHandler func(Events) error
-
-// Event is given to a subscription handler for processing
-type Event interface {
-	// Topic returns event topic
+// Message is given to a subscription handler for processing
+type Message interface {
+	// Context for the message
+	Context() context.Context
+	// Topic
 	Topic() string
-	// Message returns broker message
-	Message() *Message
+	// Header returns message headers
+	Header() metadata.Metadata
+	// Body returns broker message may be []byte slice or some go struct
+	Body() interface{}
 	// Ack acknowledge message
 	Ack() error
 	// Error returns message error (like decoding errors or some other)
+	// In this case Body contains raw []byte from broker
 	Error() error
-	// SetError set event processing error
-	SetError(err error)
-}
-
-// RawMessage is a raw encoded JSON value.
-// It implements Marshaler and Unmarshaler and can be used to delay decoding or precompute a encoding.
-type RawMessage []byte
-
-// MarshalJSON returns m as the JSON encoding of m.
-func (m *RawMessage) MarshalJSON() ([]byte, error) {
-	if m == nil {
-		return []byte("null"), nil
-	}
-	return *m, nil
-}
-
-// UnmarshalJSON sets *m to a copy of data.
-func (m *RawMessage) UnmarshalJSON(data []byte) error {
-	if m == nil {
-		return errors.New("RawMessage UnmarshalJSON on nil pointer")
-	}
-	*m = append((*m)[0:0], data...)
-	return nil
-}
-
-// Message is used to transfer data
-type Message struct {
-	// Header contains message metadata
-	Header metadata.Metadata
-	// Body contains message body
-	Body RawMessage
-}
-
-// NewMessage create broker message with topic filled
-func NewMessage(topic string) *Message {
-	m := &Message{Header: metadata.New(2)}
-	m.Header.Set(metadata.HeaderTopic, topic)
-	return m
 }
 
 // Subscriber is a convenience return type for the Subscribe method
@@ -130,3 +69,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

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

broker/context_test.go

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

broker/memory.go

@@ -2,17 +2,22 @@ package broker
 
 import (
 	"context"
+	"fmt"
 	"sync"
+	"time"
 
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/metadata"
-	maddr "go.unistack.org/micro/v3/util/addr"
-	"go.unistack.org/micro/v3/util/id"
-	mnet "go.unistack.org/micro/v3/util/net"
-	"go.unistack.org/micro/v3/util/rand"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/semconv"
+	maddr "go.unistack.org/micro/v4/util/addr"
+	"go.unistack.org/micro/v4/util/id"
+	mnet "go.unistack.org/micro/v4/util/net"
+	"go.unistack.org/micro/v4/util/rand"
 )
 
-type memoryBroker struct {
+type MemoryBroker struct {
 	subscribers map[string][]*memorySubscriber
 	addr        string
 	opts        Options
@@ -20,32 +25,15 @@ type memoryBroker struct {
 	connected bool
 }
 
-type memoryEvent struct {
-	err     error
-	message interface{}
-	topic   string
-	opts    Options
-}
-
-type memorySubscriber struct {
-	ctx          context.Context
-	exit         chan bool
-	handler      Handler
-	batchhandler BatchHandler
-	id           string
-	topic        string
-	opts         SubscribeOptions
-}
-
-func (m *memoryBroker) Options() Options {
+func (m *MemoryBroker) Options() Options {
 	return m.opts
 }
 
-func (m *memoryBroker) Address() string {
+func (m *MemoryBroker) Address() string {
 	return m.addr
 }
 
-func (m *memoryBroker) Connect(ctx context.Context) error {
+func (m *MemoryBroker) Connect(ctx context.Context) error {
 	m.Lock()
 	defer m.Unlock()
 
@@ -69,35 +57,33 @@ func (m *memoryBroker) Connect(ctx context.Context) error {
 	return nil
 }
 
-func (m *memoryBroker) Disconnect(ctx context.Context) error {
+func (m *MemoryBroker) Disconnect(ctx context.Context) error {
 	m.Lock()
 	defer m.Unlock()
 
-	if !m.connected {
-		return nil
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	default:
+		if m.connected {
+			m.connected = false
+		}
 	}
 
-	m.connected = false
 	return nil
 }
 
-func (m *memoryBroker) Init(opts ...Option) error {
+func (m *MemoryBroker) Init(opts ...options.Option) error {
+	var err error
 	for _, o := range opts {
-		o(&m.opts)
+		if err = o(&m.opts); err != nil {
+			return err
+		}
 	}
 	return nil
 }
 
-func (m *memoryBroker) Publish(ctx context.Context, topic string, msg *Message, opts ...PublishOption) error {
-	msg.Header.Set(metadata.HeaderTopic, topic)
-	return m.publish(ctx, []*Message{msg}, opts...)
-}
-
-func (m *memoryBroker) BatchPublish(ctx context.Context, msgs []*Message, opts ...PublishOption) error {
-	return m.publish(ctx, msgs, opts...)
-}
-
-func (m *memoryBroker) publish(ctx context.Context, msgs []*Message, opts ...PublishOption) error {
+func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ...options.Option) error {
 	m.RLock()
 	if !m.connected {
 		m.RUnlock()
@@ -112,17 +98,29 @@ func (m *memoryBroker) publish(ctx context.Context, msgs []*Message, opts ...Pub
 		return ctx.Err()
 	default:
 		options := NewPublishOptions(opts...)
-
-		msgTopicMap := make(map[string]Events)
-		for _, v := range msgs {
-			p := &memoryEvent{opts: m.opts}
-
-			if m.opts.Codec == nil || options.BodyOnly {
-				p.topic, _ = v.Header.Get(metadata.HeaderTopic)
-				p.message = v.Body
+		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 {
-				p.topic, _ = v.Header.Get(metadata.HeaderTopic)
-				p.message, err = m.opts.Codec.Marshal(v)
+				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
 				}
@@ -130,110 +128,96 @@ func (m *memoryBroker) publish(ctx context.Context, msgs []*Message, opts ...Pub
 			msgTopicMap[p.topic] = append(msgTopicMap[p.topic], p)
 		}
 
-		beh := m.opts.BatchErrorHandler
 		eh := m.opts.ErrorHandler
 
 		for t, ms := range msgTopicMap {
+			ts := time.Now()
+
+			m.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", t).Add(len(ms))
+			m.opts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", t).Add(len(ms))
+
 			m.RLock()
 			subs, ok := m.subscribers[t]
 			m.RUnlock()
 			if !ok {
+				m.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", t, "status", "failure").Add(len(ms))
+				m.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", t).Add(-len(ms))
+				m.opts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", t).Add(-len(ms))
 				continue
 			}
 
+			m.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", t, "status", "success").Add(len(ms))
 			for _, sub := range subs {
-				if sub.opts.BatchErrorHandler != nil {
-					beh = sub.opts.BatchErrorHandler
-				}
 				if sub.opts.ErrorHandler != nil {
 					eh = sub.opts.ErrorHandler
 				}
 
-				switch {
-				// batch processing
-				case sub.batchhandler != nil:
-					if err = sub.batchhandler(ms); err != nil {
-						ms.SetError(err)
-						if beh != nil {
-							_ = beh(ms)
+				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())
 						}
-					} else if sub.opts.AutoAck {
-						if err = ms.Ack(); err != nil {
-							m.opts.Logger.Errorf(m.opts.Context, "ack failed: %v", err)
-						}
 					}
-					// single processing
-				case sub.handler != nil:
+				case MessageHandler:
 					for _, p := range ms {
-						if err = sub.handler(p); err != nil {
-							p.SetError(err)
+						if err = mh(p); err != nil {
+							m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "failure").Inc()
 							if eh != nil {
-								_ = eh(p)
+								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.Errorf(m.opts.Context, "ack failed: %v", err)
+						} else {
+							if sub.opts.AutoAck {
+								if err = p.Ack(); err != nil {
+									m.opts.Logger.Errorf(m.opts.Context, "ack failed: %v", err)
+									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) BatchSubscribe(ctx context.Context, topic string, handler BatchHandler, opts ...SubscribeOption) (Subscriber, error) {
-	m.RLock()
-	if !m.connected {
-		m.RUnlock()
-		return nil, ErrNotConnected
-	}
-	m.RUnlock()
-
-	sid, err := id.New()
-	if err != nil {
-		return nil, err
-	}
-
-	options := NewSubscribeOptions(opts...)
-
-	sub := &memorySubscriber{
-		exit:         make(chan bool, 1),
-		id:           sid,
-		topic:        topic,
-		batchhandler: handler,
-		opts:         options,
-		ctx:          ctx,
-	}
-
-	m.Lock()
-	m.subscribers[topic] = append(m.subscribers[topic], sub)
-	m.Unlock()
-
-	go func() {
-		<-sub.exit
-		m.Lock()
-		newSubscribers := make([]*memorySubscriber, 0, len(m.subscribers)-1)
-		for _, sb := range m.subscribers[topic] {
-			if sb.id == sub.id {
-				continue
-			}
-			newSubscribers = append(newSubscribers, sb)
-		}
-		m.subscribers[topic] = newSubscribers
-		m.Unlock()
-	}()
-
-	return sub, nil
-}
-
-func (m *memoryBroker) Subscribe(ctx context.Context, topic string, handler Handler, opts ...SubscribeOption) (Subscriber, error) {
+func (m *MemoryBroker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...options.Option) (Subscriber, error) {
 	m.RLock()
 	if !m.connected {
 		m.RUnlock()
@@ -278,46 +262,54 @@ func (m *memoryBroker) Subscribe(ctx context.Context, topic string, handler Hand
 	return sub, nil
 }
 
-func (m *memoryBroker) String() string {
+func (m *MemoryBroker) String() string {
 	return "memory"
 }
 
-func (m *memoryBroker) Name() string {
+func (m *MemoryBroker) Name() string {
 	return m.opts.Name
 }
 
-func (m *memoryEvent) Topic() string {
+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 *memoryEvent) Message() *Message {
-	switch v := m.message.(type) {
-	case *Message:
-		return v
-	case []byte:
-		msg := &Message{}
-		if err := m.opts.Codec.Unmarshal(v, msg); err != nil {
-			if m.opts.Logger.V(logger.ErrorLevel) {
-				m.opts.Logger.Error(m.opts.Context, "[memory]: failed to unmarshal: %v", err)
-			}
-			return nil
-		}
-		return msg
-	}
+func (m *memoryMessage) Header() metadata.Metadata {
+	return m.header
+}
 
+func (m *memoryMessage) Body() interface{} {
+	return m.body
+}
+
+func (m *memoryMessage) Ack() error {
 	return nil
 }
 
-func (m *memoryEvent) Ack() error {
-	return nil
-}
-
-func (m *memoryEvent) Error() error {
+func (m *memoryMessage) Error() error {
 	return m.err
 }
 
-func (m *memoryEvent) SetError(err error) {
-	m.err = 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 {
@@ -334,8 +326,8 @@ func (m *memorySubscriber) Unsubscribe(ctx context.Context) error {
 }
 
 // NewBroker return new memory broker
-func NewBroker(opts ...Option) Broker {
-	return &memoryBroker{
+func NewBroker(opts ...options.Option) *MemoryBroker {
+	return &MemoryBroker{
 		opts:        NewOptions(opts...),
 		subscribers: make(map[string][]*memorySubscriber),
 	}

broker/memory_test.go

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

broker/options.go

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

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

client/backoff.go

@@ -5,7 +5,7 @@ import (
 	"math"
 	"time"
 
-	"go.unistack.org/micro/v3/util/backoff"
+	"go.unistack.org/micro/v4/util/backoff"
 )
 
 // BackoffFunc is the backoff call func

client/client.go

@@ -1,19 +1,19 @@
 // Package client is an interface for an RPC client
-package client // import "go.unistack.org/micro/v3/client"
+package client // import "go.unistack.org/micro/v4/client"
 
 import (
 	"context"
 	"time"
 
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/options"
 )
 
 var (
 	// DefaultClient is the global default client
 	DefaultClient = NewClient()
 	// DefaultContentType is the default content-type if not specified
-	DefaultContentType = "application/json"
+	DefaultContentType = ""
 	// DefaultBackoff is the default backoff function for retries (minimum 10 millisecond and maximum 5 second)
 	DefaultBackoff = BackoffInterval(10*time.Millisecond, 5*time.Second)
 	// DefaultRetry is the default check-for-retry function for retries
@@ -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
@@ -33,25 +35,14 @@ var (
 // It also supports bidirectional streaming of requests.
 type Client interface {
 	Name() string
-	Init(opts ...Option) error
+	Init(opts ...options.Option) error
 	Options() Options
-	NewMessage(topic string, msg interface{}, opts ...MessageOption) Message
-	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)
-	Publish(ctx context.Context, msg Message, opts ...PublishOption) error
-	BatchPublish(ctx context.Context, msg []Message, opts ...PublishOption) 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
 }
 
-// Message is the interface for publishing asynchronously
-type Message interface {
-	Topic() string
-	Payload() interface{}
-	ContentType() string
-	Metadata() metadata.Metadata
-}
-
 // Request is the interface for a synchronous request used by Call or Stream
 type Request interface {
 	// The service to call
@@ -68,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
-	// read the header
-	Header() metadata.Metadata
+	// The content type
+	// ContentType() string
+	// Header data
+	// 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
@@ -103,18 +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)
-
-// PublishOption used by Publish
-type PublishOption func(*PublishOptions)
-
-// MessageOption used by NewMessage
-type MessageOption func(*MessageOptions)
-
-// RequestOption used by NewRequest
-type RequestOption func(*RequestOptions)

client/client_call_options.go

@@ -2,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

@@ -4,6 +4,8 @@ import (
 	"context"
 	"testing"
 	"time"
+
+	"go.unistack.org/micro/v4/options"
 )
 
 func TestNewClientCallOptions(t *testing.T) {
@@ -13,11 +15,11 @@ func TestNewClientCallOptions(t *testing.T) {
 		return fn
 	}
 	c := NewClientCallOptions(NewClient(),
-		WithAddress("127.0.0.1"),
+		options.Address("127.0.0.1"),
 		WithCallWrapper(w),
-		WithRequestTimeout(1*time.Millisecond),
-		WithRetries(0),
-		WithBackoff(BackoffInterval(10*time.Millisecond, 100*time.Millisecond)),
+		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 {

client/context.go

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

client/context_test.go

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

client/lookup.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"sort"
 
-	"go.unistack.org/micro/v3/errors"
-	"go.unistack.org/micro/v3/router"
+	"go.unistack.org/micro/v4/errors"
+	"go.unistack.org/micro/v4/router"
 )
 
 // LookupFunc is used to lookup routes for a service

client/noop.go

@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"time"
 
-	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/errors"
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/selector"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/errors"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/selector"
+	"go.unistack.org/micro/v4/semconv"
 )
 
 // DefaultCodecs will be used to encode/decode data
@@ -21,12 +22,6 @@ type noopClient struct {
 	opts Options
 }
 
-type noopMessage struct {
-	topic   string
-	payload interface{}
-	opts    MessageOptions
-}
-
 type noopRequest struct {
 	body        interface{}
 	codec       codec.Codec
@@ -38,16 +33,12 @@ type noopRequest struct {
 }
 
 // NewClient returns new noop client
-func NewClient(opts ...Option) Client {
+func NewClient(opts ...options.Option) Client {
 	nc := &noopClient{opts: NewOptions(opts...)}
 	// wrap in reverse
 
 	c := Client(nc)
 
-	for i := len(nc.opts.Wrappers); i > 0; i-- {
-		c = nc.opts.Wrappers[i-1](c)
-	}
-
 	return c
 }
 
@@ -142,22 +133,6 @@ func (n *noopStream) CloseSend() error {
 	return nil
 }
 
-func (n *noopMessage) Topic() string {
-	return n.topic
-}
-
-func (n *noopMessage) Payload() interface{} {
-	return n.payload
-}
-
-func (n *noopMessage) ContentType() string {
-	return n.opts.ContentType
-}
-
-func (n *noopMessage) Metadata() metadata.Metadata {
-	return n.opts.Metadata
-}
-
 func (n *noopClient) newCodec(contentType string) (codec.Codec, error) {
 	if cf, ok := n.opts.Codecs[contentType]; ok {
 		return cf, nil
@@ -168,7 +143,7 @@ func (n *noopClient) newCodec(contentType string) (codec.Codec, error) {
 	return nil, codec.ErrUnknownContentType
 }
 
-func (n *noopClient) Init(opts ...Option) error {
+func (n *noopClient) Init(opts ...options.Option) error {
 	for _, o := range opts {
 		o(&n.opts)
 	}
@@ -183,7 +158,7 @@ func (n *noopClient) String() string {
 	return "noop"
 }
 
-func (n *noopClient) Call(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 {
@@ -200,7 +175,7 @@ func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opt
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		opt := WithRequestTimeout(time.Until(d))
+		opt := RequestTimeout(time.Until(d))
 		opt(&callOpts)
 	}
 
@@ -285,6 +260,9 @@ func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opt
 	ch := make(chan error, callOpts.Retries)
 	var gerr error
 
+	ts := time.Now()
+	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
+	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", endpoint).Inc()
 	for i := 0; i <= callOpts.Retries; i++ {
 		go func() {
 			ch <- call(i)
@@ -312,6 +290,16 @@ func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opt
 		}
 	}
 
+	if gerr != nil {
+		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", endpoint, "status", "failure").Inc()
+	} else {
+		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", endpoint, "status", "success").Inc()
+	}
+	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", endpoint).Dec()
+	te := time.Since(ts)
+	n.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", endpoint).Update(te.Seconds())
+	n.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", endpoint).Update(te.Seconds())
+
 	return gerr
 }
 
@@ -319,16 +307,11 @@ func (n *noopClient) call(ctx context.Context, addr string, req Request, rsp int
 	return nil
 }
 
-func (n *noopClient) NewRequest(service, endpoint string, req interface{}, opts ...RequestOption) Request {
+func (n *noopClient) NewRequest(service, endpoint string, req interface{}, opts ...options.Option) Request {
 	return &noopRequest{service: service, endpoint: endpoint}
 }
 
-func (n *noopClient) NewMessage(topic string, msg interface{}, opts ...MessageOption) Message {
-	options := NewMessageOptions(append([]MessageOption{MessageContentType(n.opts.ContentType)}, opts...)...)
-	return &noopMessage{topic: topic, payload: msg, opts: options}
-}
-
-func (n *noopClient) Stream(ctx context.Context, req Request, opts ...CallOption) (Stream, error) {
+func (n *noopClient) Stream(ctx context.Context, req Request, opts ...options.Option) (Stream, error) {
 	var err error
 
 	// make a copy of call opts
@@ -347,7 +330,7 @@ func (n *noopClient) Stream(ctx context.Context, req Request, opts ...CallOption
 	} 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)
 	}
 
@@ -414,7 +397,15 @@ func (n *noopClient) Stream(ctx context.Context, req Request, opts ...CallOption
 
 		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 {
@@ -468,64 +459,6 @@ func (n *noopClient) Stream(ctx context.Context, req Request, opts ...CallOption
 	return nil, grr
 }
 
-func (n *noopClient) stream(ctx context.Context, addr string, req Request, opts CallOptions) (Stream, error) {
+func (n *noopClient) stream(ctx context.Context, addr string, req Request, opts CallOptions) (*noopStream, error) {
 	return &noopStream{}, nil
 }
-
-func (n *noopClient) BatchPublish(ctx context.Context, ps []Message, opts ...PublishOption) error {
-	return n.publish(ctx, ps, opts...)
-}
-
-func (n *noopClient) Publish(ctx context.Context, p Message, opts ...PublishOption) error {
-	return n.publish(ctx, []Message{p}, opts...)
-}
-
-func (n *noopClient) publish(ctx context.Context, ps []Message, opts ...PublishOption) error {
-	options := NewPublishOptions(opts...)
-
-	msgs := make([]*broker.Message, 0, len(ps))
-
-	for _, p := range ps {
-		md, ok := metadata.FromOutgoingContext(ctx)
-		if !ok {
-			md = metadata.New(0)
-		}
-		md[metadata.HeaderContentType] = p.ContentType()
-
-		topic := p.Topic()
-
-		// get the exchange
-		if len(options.Exchange) > 0 {
-			topic = options.Exchange
-		}
-
-		md[metadata.HeaderTopic] = topic
-
-		var body []byte
-
-		// passed in raw data
-		if d, ok := p.Payload().(*codec.Frame); ok {
-			body = d.Data
-		} else {
-			// use codec for payload
-			cf, err := n.newCodec(p.ContentType())
-			if err != nil {
-				return errors.InternalServerError("go.micro.client", err.Error())
-			}
-
-			// set the body
-			b, err := cf.Marshal(p.Payload())
-			if err != nil {
-				return errors.InternalServerError("go.micro.client", err.Error())
-			}
-			body = b
-		}
-
-		msgs = append(msgs, &broker.Message{Header: md, Body: body})
-	}
-
-	return n.opts.Broker.BatchPublish(ctx, msgs,
-		broker.PublishContext(options.Context),
-		broker.PublishBodyOnly(options.BodyOnly),
-	)
-}

client/options.go

@@ -6,31 +6,25 @@ import (
 	"net"
 	"time"
 
-	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/network/transport"
-	"go.unistack.org/micro/v3/register"
-	"go.unistack.org/micro/v3/router"
-	"go.unistack.org/micro/v3/selector"
-	"go.unistack.org/micro/v3/selector/random"
-	"go.unistack.org/micro/v3/tracer"
+	"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/router"
+	"go.unistack.org/micro/v4/selector"
+	"go.unistack.org/micro/v4/selector/random"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 // Options holds client options
 type Options struct {
-	// Transport used for transfer messages
-	Transport transport.Transport
 	// Selector used to select needed address
 	Selector selector.Selector
 	// Logger used to log messages
 	Logger logger.Logger
 	// Tracer used for tracing
 	Tracer tracer.Tracer
-	// Broker used to publish messages
-	Broker broker.Broker
 	// Meter used for metrics
 	Meter meter.Meter
 	// Context is used for external options
@@ -49,8 +43,6 @@ type Options struct {
 	ContentType string
 	// Name is the client name
 	Name string
-	// Wrappers contains wrappers
-	Wrappers []Wrapper
 	// CallOptions contains default CallOptions
 	CallOptions CallOptions
 	// PoolSize connection pool size
@@ -59,10 +51,12 @@ type Options struct {
 	PoolTTL time.Duration
 	// ContextDialer used to connect
 	ContextDialer func(context.Context, string) (net.Conn, error)
+	// Hooks may contains Client func wrapper
+	Hooks options.Hooks
 }
 
 // NewCallOptions creates new call options struct
-func NewCallOptions(opts ...CallOption) CallOptions {
+func NewCallOptions(opts ...options.Option) CallOptions {
 	options := CallOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -111,58 +105,14 @@ type CallOptions struct {
 }
 
 // ContextDialer pass ContextDialer to client
-func ContextDialer(fn func(context.Context, string) (net.Conn, error)) Option {
-	return func(o *Options) {
-		o.ContextDialer = fn
+func ContextDialer(fn func(context.Context, string) (net.Conn, error)) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fn, ".ContextDialer")
 	}
 }
 
-// Context pass context to client
-func Context(ctx context.Context) Option {
-	return func(o *Options) {
-		o.Context = ctx
-	}
-}
-
-// NewPublishOptions create new PublishOptions struct from option
-func NewPublishOptions(opts ...PublishOption) PublishOptions {
-	options := PublishOptions{}
-	for _, o := range opts {
-		o(&options)
-	}
-	return options
-}
-
-// PublishOptions holds publish options
-type PublishOptions struct {
-	// Context used for external options
-	Context context.Context
-	// Exchange topic exchange name
-	Exchange string
-	// BodyOnly will publish only message body
-	BodyOnly bool
-}
-
-// NewMessageOptions creates message options struct
-func NewMessageOptions(opts ...MessageOption) MessageOptions {
-	options := MessageOptions{Metadata: metadata.New(1)}
-	for _, o := range opts {
-		o(&options)
-	}
-	return options
-}
-
-// MessageOptions holds client message options
-type MessageOptions struct {
-	// Metadata additional metadata
-	Metadata metadata.Metadata
-	// ContentType specify content-type of message
-	// deprecated
-	ContentType string
-}
-
 // NewRequestOptions creates new RequestOptions struct
-func NewRequestOptions(opts ...RequestOption) RequestOptions {
+func NewRequestOptions(opts ...options.Option) RequestOptions {
 	options := RequestOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -181,7 +131,7 @@ 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,
@@ -192,18 +142,16 @@ func NewOptions(opts ...Option) Options {
 			Retry:          DefaultRetry,
 			Retries:        DefaultRetries,
 			RequestTimeout: DefaultRequestTimeout,
-			DialTimeout:    transport.DefaultDialTimeout,
+			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,
-		Transport: transport.DefaultTransport,
+		Lookup:   LookupRoute,
+		PoolSize: DefaultPoolSize,
+		PoolTTL:  DefaultPoolTTL,
+		Selector: random.NewSelector(),
+		Logger:   logger.DefaultLogger,
+		Meter:    meter.DefaultMeter,
+		Tracer:   tracer.DefaultTracer,
+		Router:   router.DefaultRouter,
 	}
 
 	for _, o := range opts {
@@ -213,381 +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
-	}
-}
-
-// Transport to use for communication e.g http, rabbitmq, etc
-func Transport(t transport.Transport) Option {
-	return func(o *Options) {
-		o.Transport = t
-	}
-}
-
-// Register sets the routers register
-func Register(r register.Register) Option {
-	return func(o *Options) {
-		if o.Router != nil {
-			_ = o.Router.Init(router.Register(r))
-		}
-	}
-}
-
-// Router is used to lookup routes for a service
-func Router(r router.Router) Option {
-	return func(o *Options) {
-		o.Router = r
+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
-	}
-}
-
-// Wrap adds a wrapper to the list of options passed into the client
-func Wrap(w Wrapper) Option {
-	return func(o *Options) {
-		o.Wrappers = append(o.Wrappers, w)
-	}
-}
-
-// WrapCall adds a wrapper to the list of CallFunc wrappers
-func WrapCall(cw ...CallWrapper) Option {
-	return func(o *Options) {
-		o.CallOptions.CallWrappers = append(o.CallOptions.CallWrappers, cw...)
+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
-
-		// set the default transport if one is not
-		// already set. Required for Init call below.
-
-		// set the transport tls
-		_ = o.Transport.Init(
-			transport.TLSConfig(t),
-		)
+// 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
-	}
-}
-
-// WithExchange sets the exchange to route a message through
-// Deprecated
-func WithExchange(e string) PublishOption {
-	return func(o *PublishOptions) {
-		o.Exchange = e
-	}
-}
-
-// PublishExchange sets the exchange to route a message through
-func PublishExchange(e string) PublishOption {
-	return func(o *PublishOptions) {
-		o.Exchange = e
-	}
-}
-
-// WithBodyOnly publish only message body
-// DERECATED
-func WithBodyOnly(b bool) PublishOption {
-	return func(o *PublishOptions) {
-		o.BodyOnly = b
-	}
-}
-
-// PublishBodyOnly publish only message body
-func PublishBodyOnly(b bool) PublishOption {
-	return func(o *PublishOptions) {
-		o.BodyOnly = b
-	}
-}
-
-// PublishContext sets the context in publish options
-func PublishContext(ctx context.Context) PublishOption {
-	return func(o *PublishOptions) {
-		o.Context = ctx
-	}
-}
-
-// WithContextDialer pass ContextDialer to client call
-func WithContextDialer(fn func(context.Context, string) (net.Conn, error)) CallOption {
-	return func(o *CallOptions) {
-		o.ContextDialer = fn
-	}
-}
-
-// WithContentType specifies call content type
-func WithContentType(ct string) CallOption {
-	return func(o *CallOptions) {
-		o.ContentType = ct
-	}
-}
-
-// WithAddress sets the remote addresses to use rather than using service discovery
-func WithAddress(a ...string) CallOption {
-	return func(o *CallOptions) {
-		o.Address = a
-	}
-}
-
-// WithCallWrapper is a CallOption which adds to the existing CallFunc wrappers
-func WithCallWrapper(cw ...CallWrapper) CallOption {
-	return func(o *CallOptions) {
-		o.CallWrappers = append(o.CallWrappers, cw...)
-	}
-}
-
-// WithBackoff is a CallOption which overrides that which
-// set in Options.CallOptions
-func WithBackoff(fn BackoffFunc) CallOption {
-	return func(o *CallOptions) {
-		o.Backoff = fn
-	}
-}
-
-// WithRetry is a CallOption which overrides that which
-// set in Options.CallOptions
-func WithRetry(fn RetryFunc) CallOption {
-	return func(o *CallOptions) {
-		o.Retry = fn
-	}
-}
-
-// WithRetries is a CallOption which overrides that which
-// set in Options.CallOptions
-func WithRetries(i int) CallOption {
-	return func(o *CallOptions) {
-		o.Retries = i
+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")
 	}
 }
 
-// WithNetwork is a CallOption which sets the network attribute
-func WithNetwork(n string) CallOption {
-	return func(o *CallOptions) {
-		o.Network = n
-	}
-}
-
-// WithRouter sets the router to use for this call
-func WithRouter(r router.Router) CallOption {
-	return func(o *CallOptions) {
-		o.Router = r
-	}
-}
-
-// WithSelector sets the selector to use for this call
-func WithSelector(s selector.Selector) CallOption {
-	return func(o *CallOptions) {
-		o.Selector = s
+// 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
 	}
 }
-
-// WithMessageContentType sets the message content type
-// Deprecated
-func WithMessageContentType(ct string) MessageOption {
-	return func(o *MessageOptions) {
-		o.Metadata.Set(metadata.HeaderContentType, ct)
-		o.ContentType = ct
-	}
-}
-
-// MessageContentType sets the message content type
-func MessageContentType(ct string) MessageOption {
-	return func(o *MessageOptions) {
-		o.Metadata.Set(metadata.HeaderContentType, ct)
-		o.ContentType = ct
-	}
-}
-
-// MessageMetadata sets the message metadata
-func MessageMetadata(k, v string) MessageOption {
-	return func(o *MessageOptions) {
-		o.Metadata.Set(k, v)
-	}
-}
+*/
 
 // StreamingRequest specifies that request is streaming
-func StreamingRequest(b bool) RequestOption {
-	return func(o *RequestOptions) {
-		o.Stream = b
-	}
-}
-
-// RequestContentType specifies request content type
-func RequestContentType(ct string) RequestOption {
-	return func(o *RequestOptions) {
-		o.ContentType = ct
+func StreamingRequest(b bool) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, b, ".Stream")
 	}
 }

client/retry.go

@@ -3,7 +3,7 @@ package client
 import (
 	"context"
 
-	"go.unistack.org/micro/v3/errors"
+	"go.unistack.org/micro/v4/errors"
 )
 
 // RetryFunc that returning either false or a non-nil error will result in the call not being retried

client/retry_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"go.unistack.org/micro/v3/errors"
+	"go.unistack.org/micro/v4/errors"
 )
 
 func TestRetryAlways(t *testing.T) {

client/test_request.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
 )
 
 type testRequest struct {

codec/codec.go

@@ -1,11 +1,11 @@
 // Package codec is an interface for encoding messages
-package codec // import "go.unistack.org/micro/v3/codec"
+package codec // import "go.unistack.org/micro/v4/codec"
 
 import (
 	"errors"
 	"io"
 
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
 )
 
 // Message types
@@ -84,3 +84,24 @@ func MarshalAppend(buf []byte, c Codec, v interface{}, opts ...Option) ([]byte,
 
 	return append(buf, mbuf...), nil
 }
+
+// RawMessage is a raw encoded JSON value.
+// It implements Marshaler and Unmarshaler and can be used to delay decoding or precompute a encoding.
+type RawMessage []byte
+
+// MarshalJSON returns m as the JSON encoding of m.
+func (m *RawMessage) MarshalJSON() ([]byte, error) {
+	if m == nil {
+		return []byte("null"), nil
+	}
+	return *m, nil
+}
+
+// UnmarshalJSON sets *m to a copy of data.
+func (m *RawMessage) UnmarshalJSON(data []byte) error {
+	if m == nil {
+		return errors.New("RawMessage UnmarshalJSON on nil pointer")
+	}
+	*m = append((*m)[0:0], data...)
+	return nil
+}

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.
@@ -17,7 +17,7 @@ syntax = "proto3";
 package micro.codec;
 
 option cc_enable_arenas = true;
-option go_package = "go.unistack.org/micro/v3/codec;codec";
+option go_package = "go.unistack.org/micro/v4/codec;codec";
 option java_multiple_files = true;
 option java_outer_classname = "MicroCodec";
 option java_package = "micro.codec";

codec/options.go

@@ -3,9 +3,9 @@ package codec
 import (
 	"context"
 
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 // Option func

config/config.go

@@ -1,11 +1,13 @@
 // Package config is an interface for dynamic configuration.
-package config // import "go.unistack.org/micro/v3/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,15 +39,15 @@ 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
 }
@@ -59,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 {
@@ -124,33 +126,12 @@ func Validate(ctx context.Context, cfg interface{}) error {
 }
 
 var (
-	// DefaultAfterLoad default func that runs after config load
-	DefaultAfterLoad = func(ctx context.Context, c Config) error {
-		for _, fn := range c.Options().AfterLoad {
-			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Errorf(ctx, "%s AfterLoad err: %v", c.String(), err)
-				if !c.Options().AllowFail {
-					return err
-				}
-			}
-		}
-		return nil
-	}
-	// DefaultAfterSave default func that runs after config save
-	DefaultAfterSave = func(ctx context.Context, c Config) error {
-		for _, fn := range c.Options().AfterSave {
-			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Errorf(ctx, "%s AfterSave err: %v", c.String(), err)
-				if !c.Options().AllowFail {
-					return err
-				}
-			}
-		}
-		return nil
-	}
-	// DefaultBeforeLoad default func that runs before config load
+	// DefaultBeforeLoad default func that runs before config Load
 	DefaultBeforeLoad = func(ctx context.Context, c Config) error {
 		for _, fn := range c.Options().BeforeLoad {
+			if fn == nil {
+				return nil
+			}
 			if err := fn(ctx, c); err != nil {
 				c.Options().Logger.Errorf(ctx, "%s BeforeLoad err: %v", c.String(), err)
 				if !c.Options().AllowFail {
@@ -160,9 +141,27 @@ var (
 		}
 		return nil
 	}
-	// DefaultBeforeSave default func that runs befora config save
+	// DefaultAfterLoad default func that runs after config Load
+	DefaultAfterLoad = func(ctx context.Context, c Config) error {
+		for _, fn := range c.Options().AfterLoad {
+			if fn == nil {
+				return nil
+			}
+			if err := fn(ctx, c); err != nil {
+				c.Options().Logger.Errorf(ctx, "%s AfterLoad err: %v", c.String(), err)
+				if !c.Options().AllowFail {
+					return err
+				}
+			}
+		}
+		return nil
+	}
+	// DefaultBeforeSave default func that runs befora config Save
 	DefaultBeforeSave = func(ctx context.Context, c Config) error {
 		for _, fn := range c.Options().BeforeSave {
+			if fn == nil {
+				return nil
+			}
 			if err := fn(ctx, c); err != nil {
 				c.Options().Logger.Errorf(ctx, "%s BeforeSave err: %v", c.String(), err)
 				if !c.Options().AllowFail {
@@ -172,4 +171,49 @@ var (
 		}
 		return nil
 	}
+	// DefaultAfterSave default func that runs after config Save
+	DefaultAfterSave = func(ctx context.Context, c Config) error {
+		for _, fn := range c.Options().AfterSave {
+			if fn == nil {
+				return nil
+			}
+			if err := fn(ctx, c); err != nil {
+				c.Options().Logger.Errorf(ctx, "%s AfterSave err: %v", c.String(), err)
+				if !c.Options().AllowFail {
+					return err
+				}
+			}
+		}
+		return nil
+	}
+	// DefaultBeforeInit default func that runs befora config Init
+	DefaultBeforeInit = func(ctx context.Context, c Config) error {
+		for _, fn := range c.Options().BeforeInit {
+			if fn == nil {
+				return nil
+			}
+			if err := fn(ctx, c); err != nil {
+				c.Options().Logger.Errorf(ctx, "%s BeforeInit err: %v", c.String(), err)
+				if !c.Options().AllowFail {
+					return err
+				}
+			}
+		}
+		return nil
+	}
+	// DefaultAfterInit default func that runs after config Init
+	DefaultAfterInit = func(ctx context.Context, c Config) error {
+		for _, fn := range c.Options().AfterSave {
+			if fn == nil {
+				return nil
+			}
+			if err := fn(ctx, c); err != nil {
+				c.Options().Logger.Errorf(ctx, "%s AfterInit err: %v", c.String(), err)
+				if !c.Options().AllowFail {
+					return err
+				}
+			}
+		}
+		return nil
+	}
 )

config/context.go

@@ -22,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

@@ -5,9 +5,14 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
+	"time"
 
+	"github.com/google/uuid"
 	"github.com/imdario/mergo"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/options"
+	mid "go.unistack.org/micro/v4/util/id"
+	rutil "go.unistack.org/micro/v4/util/reflect"
+	mtime "go.unistack.org/micro/v4/util/time"
 )
 
 type defaultConfig struct {
@@ -18,15 +23,24 @@ 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)
 	}
+
+	if err := DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
+	if err := DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
 	return nil
 }
 
-func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error {
-	if err := DefaultBeforeLoad(ctx, c); err != nil {
+func (c *defaultConfig) Load(ctx context.Context, opts ...options.Option) error {
+	if err := DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
@@ -49,21 +63,20 @@ func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error {
 		if !c.opts.AllowFail {
 			return err
 		}
-		return DefaultAfterLoad(ctx, c)
+		if err = DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
+			return err
+		}
 	}
 
 	if err = fillValues(reflect.ValueOf(src), c.opts.StructTag); err == nil {
 		err = mergo.Merge(dst, src, mopts...)
 	}
 
-	if err != nil {
-		c.opts.Logger.Errorf(ctx, "default load error: %v", err)
-		if !c.opts.AllowFail {
-			return err
-		}
+	if err != nil && !c.opts.AllowFail {
+		return err
 	}
 
-	if err := DefaultAfterLoad(ctx, c); err != nil {
+	if err := DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
@@ -75,6 +88,7 @@ func fillValue(value reflect.Value, val string) error {
 	if !rutil.IsEmpty(value) {
 		return nil
 	}
+
 	switch value.Kind() {
 	case reflect.Map:
 		t := value.Type()
@@ -113,6 +127,20 @@ func fillValue(value reflect.Value, val string) error {
 		}
 		value.Set(reflect.ValueOf(v))
 	case reflect.String:
+		switch val {
+		case "micro:generate uuid":
+			uid, err := uuid.NewRandom()
+			if err != nil {
+				return err
+			}
+			val = uid.String()
+		case "micro:generate id":
+			uid, err := mid.New()
+			if err != nil {
+				return err
+			}
+			val = uid
+		}
 		value.Set(reflect.ValueOf(val))
 	case reflect.Float32:
 		v, err := strconv.ParseFloat(val, 32)
@@ -151,11 +179,26 @@ func fillValue(value reflect.Value, val string) error {
 		}
 		value.Set(reflect.ValueOf(int32(v)))
 	case reflect.Int64:
-		v, err := strconv.ParseInt(val, 10, 64)
-		if err != nil {
-			return err
+		switch {
+		case value.Type().String() == "time.Duration" && value.Type().PkgPath() == "time":
+			v, err := time.ParseDuration(val)
+			if err != nil {
+				return err
+			}
+			value.Set(reflect.ValueOf(v))
+		case value.Type().String() == "time.Duration" && value.Type().PkgPath() == "go.unistack.org/micro/v4/util/time":
+			v, err := mtime.ParseDuration(val)
+			if err != nil {
+				return err
+			}
+			value.SetInt(int64(v))
+		default:
+			v, err := strconv.ParseInt(val, 10, 64)
+			if err != nil {
+				return err
+			}
+			value.Set(reflect.ValueOf(v))
 		}
-		value.Set(reflect.ValueOf(v))
 	case reflect.Uint:
 		v, err := strconv.ParseUint(val, 10, 0)
 		if err != nil {
@@ -249,7 +292,7 @@ func fillValues(valueOf reflect.Value, tname string) error {
 	return nil
 }
 
-func (c *defaultConfig) Save(ctx context.Context, opts ...SaveOption) error {
+func (c *defaultConfig) Save(ctx context.Context, opts ...options.Option) error {
 	if err := DefaultBeforeSave(ctx, c); err != nil {
 		return err
 	}
@@ -269,12 +312,12 @@ func (c *defaultConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *defaultConfig) Watch(ctx context.Context, opts ...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"

config/default_test.go

@@ -4,15 +4,23 @@ import (
 	"context"
 	"fmt"
 	"testing"
+	"time"
 
-	"go.unistack.org/micro/v3/config"
+	"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 {
-	StringValue string `default:"string_value"`
-	IgnoreValue string `json:"-"`
-	StructValue *cfgStructValue
-	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 {
@@ -63,6 +71,21 @@ func TestDefault(t *testing.T) {
 	if conf.StringValue != "after_load" {
 		t.Fatal("AfterLoad option not working")
 	}
+	if len(conf.MapValue) != 2 {
+		t.Fatalf("map value invalid: %#+v\n", conf.MapValue)
+	}
+
+	if conf.UUIDValue == "" {
+		t.Fatalf("uuid value empty")
+	} else if len(conf.UUIDValue) != 36 {
+		t.Fatalf("uuid value invalid: %s", conf.UUIDValue)
+	}
+
+	if conf.IDValue == "" {
+		t.Fatalf("id value empty")
+	} else if len(conf.IDValue) != mid.DefaultSize {
+		t.Fatalf("id value invalid: %s", conf.IDValue)
+	}
 	_ = conf
 	// t.Logf("%#+v\n", conf)
 }

config/options.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"time"
 
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 // Options hold the config options
@@ -28,23 +29,24 @@ type Options struct {
 	Name string
 	// StructTag name
 	StructTag string
-	// BeforeSave contains slice of funcs that runs before save
+	// BeforeSave contains slice of funcs that runs before Save
 	BeforeSave []func(context.Context, Config) error
-	// AfterLoad contains slice of funcs that runs after load
-	AfterLoad []func(context.Context, Config) error
-	// BeforeLoad contains slice of funcs that runs before load
-	BeforeLoad []func(context.Context, Config) error
-	// AfterSave contains slice of funcs that runs after save
+	// AfterSave contains slice of funcs that runs after Save
 	AfterSave []func(context.Context, Config) error
+	// BeforeLoad contains slice of funcs that runs before Load
+	BeforeLoad []func(context.Context, Config) error
+	// AfterLoad contains slice of funcs that runs after Load
+	AfterLoad []func(context.Context, Config) error
+	// BeforeInit contains slice of funcs that runs before Init
+	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
 }
 
-// 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,
@@ -58,9 +60,6 @@ func NewOptions(opts ...Option) Options {
 	return options
 }
 
-// LoadOption function signature
-type LoadOption func(o *LoadOptions)
-
 // LoadOptions struct
 type LoadOptions struct {
 	Struct   interface{}
@@ -70,7 +69,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)
@@ -79,44 +78,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)
@@ -125,86 +107,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) 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) 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")
 	}
 }
 
@@ -222,11 +183,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,
@@ -238,31 +196,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(min, max time.Duration) WatchOption {
-	return func(o *WatchOptions) {
-		o.MinInterval = min
-		o.MaxInterval = max
-	}
-}
-
-// WatchStruct overrides struct for fill
-func WatchStruct(src interface{}) WatchOption {
-	return func(o *WatchOptions) {
-		o.Struct = src
+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
 	}
 }

errors/errors.go

@@ -1,6 +1,6 @@
 // Package errors provides a way to return detailed information
 // for an RPC request error. The error is normally JSON encoded.
-package errors // import "go.unistack.org/micro/v3/errors"
+package errors // import "go.unistack.org/micro/v4/errors"
 
 import (
 	"bytes"

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.
@@ -17,7 +17,7 @@ syntax = "proto3";
 package micro.errors;
 
 option cc_enable_arenas = true;
-option go_package = "go.unistack.org/micro/v3/errors;errors";
+option go_package = "go.unistack.org/micro/v4/errors;errors";
 option java_multiple_files = true;
 option java_outer_classname = "MicroErrors";
 option java_package = "micro.errors";

event.go

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

flow/context.go

@@ -22,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

@@ -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")
-	}
-}

flow/dag_test.go

@@ -8,6 +8,7 @@ import (
 )
 
 func TestDeps(t *testing.T) {
+	t.Skip()
 	d := &dag.AcyclicGraph{}
 
 	v0 := d.Add(&node{"v0"})

flow/default.go

@@ -6,12 +6,14 @@ import (
 	"sync"
 
 	"github.com/silas/dag"
-	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/store"
-	"go.unistack.org/micro/v3/util/id"
+	"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"
 )
 
 type microFlow struct {
@@ -163,7 +165,7 @@ func (w *microWorkflow) Resume(ctx context.Context, id string) error {
 	return workflowStore.Write(ctx, "status", &codec.Frame{Data: []byte(StatusRunning.String())})
 }
 
-func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...ExecuteOption) (string, error) {
+func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...options.Option) (string, error) {
 	w.Lock()
 	if !w.init {
 		if err := w.g.Validate(); err != nil {
@@ -200,13 +202,13 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu
 	nctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
-	nopts := make([]ExecuteOption, 0, len(opts)+5)
+	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{})
@@ -349,7 +351,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu
 }
 
 // NewFlow create new flow
-func NewFlow(opts ...Option) Flow {
+func NewFlow(opts ...options.Option) Flow {
 	options := NewOptions(opts...)
 	return &microFlow{opts: options}
 }
@@ -358,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)
 	}
@@ -487,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...)
@@ -570,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

@@ -1,5 +1,5 @@
 // Package flow is an interface used for saga pattern microservice workflow
-package flow // import "go.unistack.org/micro/v3/flow"
+package flow // import "go.unistack.org/micro/v4/flow"
 
 import (
 	"context"
@@ -7,7 +7,8 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"go.unistack.org/micro/v3/metadata"
+	"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,7 +119,7 @@ type Workflow interface {
 	// ID returns id of the workflow
 	ID() string
 	// Execute workflow with args, return execution id and error
-	Execute(ctx context.Context, req *Message, opts ...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
@@ -140,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

@@ -4,16 +4,14 @@ import (
 	"context"
 	"time"
 
-	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/store"
-	"go.unistack.org/micro/v3/tracer"
+	"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
@@ -129,67 +73,22 @@ type ExecuteOptions struct {
 	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
-	}
-}
-
-// ExecuteReverse says that dag must be run in reverse order
-func ExecuteReverse(b bool) ExecuteOption {
-	return func(o *ExecuteOptions) {
-		o.Reverse = b
-	}
-}
-
-// ExecuteTimeout pass timeout time.Duration for execution
-func ExecuteTimeout(td time.Duration) ExecuteOption {
-	return func(o *ExecuteOptions) {
-		o.Timeout = td
-	}
-}
-
-// ExecuteAsync says that caller does not wait for execution complete
-func ExecuteAsync(b bool) ExecuteOption {
-	return func(o *ExecuteOptions) {
-		o.Async = b
+// 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,
@@ -211,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(),
 	}
@@ -225,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

@@ -0,0 +1,126 @@
+package fsm
+
+import (
+	"context"
+	"fmt"
+	"sync"
+)
+
+type state struct {
+	body interface{}
+	name string
+}
+
+var _ State = &state{}
+
+func (s *state) Name() string {
+	return s.name
+}
+
+func (s *state) Body() interface{} {
+	return s.body
+}
+
+// fsm is a finite state machine
+type fsm struct {
+	statesMap   map[string]StateFunc
+	current     string
+	statesOrder []string
+	opts        Options
+	mu          sync.Mutex
+}
+
+// NewFSM creates a new finite state machine having the specified initial state
+// with specified options
+func NewFSM(opts ...Option) *fsm {
+	return &fsm{
+		statesMap: map[string]StateFunc{},
+		opts:      NewOptions(opts...),
+	}
+}
+
+// Current returns the current state
+func (f *fsm) Current() string {
+	f.mu.Lock()
+	s := f.current
+	f.mu.Unlock()
+	return s
+}
+
+// Current returns the current state
+func (f *fsm) Reset() {
+	f.mu.Lock()
+	f.current = f.opts.Initial
+	f.mu.Unlock()
+}
+
+// State adds state to fsm
+func (f *fsm) State(state string, fn StateFunc) {
+	f.mu.Lock()
+	f.statesMap[state] = fn
+	f.statesOrder = append(f.statesOrder, state)
+	f.mu.Unlock()
+}
+
+// Start runs state machine with provided data
+func (f *fsm) Start(ctx context.Context, args interface{}, opts ...Option) (interface{}, error) {
+	var err error
+
+	f.mu.Lock()
+	options := f.opts
+
+	for _, opt := range opts {
+		opt(&options)
+	}
+
+	sopts := []StateOption{StateDryRun(options.DryRun)}
+
+	cstate := options.Initial
+	states := make(map[string]StateFunc, len(f.statesMap))
+	for k, v := range f.statesMap {
+		states[k] = v
+	}
+	f.current = cstate
+	f.mu.Unlock()
+
+	var s State
+	s = &state{name: cstate, body: args}
+	nstate := s.Name()
+
+	for {
+		select {
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		default:
+			fn, ok := states[nstate]
+			if !ok {
+				return nil, fmt.Errorf(`state "%s" %w`, nstate, ErrInvalidState)
+			}
+			f.mu.Lock()
+			f.current = nstate
+			f.mu.Unlock()
+
+			// wrap the handler func
+			for i := len(options.Wrappers); i > 0; i-- {
+				fn = options.Wrappers[i-1](fn)
+			}
+
+			s, err = fn(ctx, s, sopts...)
+
+			switch {
+			case err != nil:
+				return s.Body(), err
+			case s.Name() == StateEnd:
+				return s.Body(), nil
+			case s.Name() == "":
+				for idx := range f.statesOrder {
+					if f.statesOrder[idx] == nstate && len(f.statesOrder) > idx+1 {
+						nstate = f.statesOrder[idx+1]
+					}
+				}
+			default:
+				nstate = s.Name()
+			}
+		}
+	}
+}

fsm/fsm.go

@@ -1,10 +1,8 @@
-package fsm // import "go.unistack.org/micro/v3/fsm"
+package fsm // import "go.unistack.org/micro/v4/fsm"
 
 import (
 	"context"
 	"errors"
-	"fmt"
-	"sync"
 )
 
 var (
@@ -12,170 +10,20 @@ var (
 	StateEnd        = "end"
 )
 
-// Options struct holding fsm options
-type Options struct {
-	// DryRun mode
-	DryRun bool
-	// Initial state
-	Initial string
-	// HooksBefore func slice runs in order before state
-	HooksBefore []HookBeforeFunc
-	// HooksAfter func slice runs in order after state
-	HooksAfter []HookAfterFunc
+type State interface {
+	Name() string
+	Body() interface{}
 }
 
-// HookBeforeFunc func signature
-type HookBeforeFunc func(ctx context.Context, state string, args interface{})
-
-// HookAfterFunc func signature
-type HookAfterFunc func(ctx context.Context, state string, args interface{})
-
-// Option func signature
-type Option func(*Options)
-
-// StateOptions holds state options
-type StateOptions struct {
-	DryRun bool
-}
-
-// StateDryRun says that state executes in dry run mode
-func StateDryRun(b bool) StateOption {
-	return func(o *StateOptions) {
-		o.DryRun = b
-	}
-}
-
-// StateOption func signature
-type StateOption func(*StateOptions)
-
-// InitialState sets init state for state machine
-func InitialState(initial string) Option {
-	return func(o *Options) {
-		o.Initial = initial
-	}
-}
-
-// HookBefore provides hook func slice
-func HookBefore(fns ...HookBeforeFunc) Option {
-	return func(o *Options) {
-		o.HooksBefore = fns
-	}
-}
-
-// HookAfter provides hook func slice
-func HookAfter(fns ...HookAfterFunc) Option {
-	return func(o *Options) {
-		o.HooksAfter = fns
-	}
-}
+// StateWrapper wraps the StateFunc and returns the equivalent
+type StateWrapper func(StateFunc) StateFunc
 
 // StateFunc called on state transition and return next step and error
-type StateFunc func(ctx context.Context, args interface{}, opts ...StateOption) (string, interface{}, error)
+type StateFunc func(ctx context.Context, state State, opts ...StateOption) (State, error)
 
-// FSM is a finite state machine
-type FSM struct {
-	mu          sync.Mutex
-	statesMap   map[string]StateFunc
-	statesOrder []string
-	opts        *Options
-	current     string
-}
-
-// New creates a new finite state machine having the specified initial state
-// with specified options
-func New(opts ...Option) *FSM {
-	options := &Options{}
-
-	for _, opt := range opts {
-		opt(options)
-	}
-
-	return &FSM{
-		statesMap: map[string]StateFunc{},
-		opts:      options,
-	}
-}
-
-// Current returns the current state
-func (f *FSM) Current() string {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	return f.current
-}
-
-// Current returns the current state
-func (f *FSM) Reset() {
-	f.mu.Lock()
-	f.current = f.opts.Initial
-	f.mu.Unlock()
-}
-
-// State adds state to fsm
-func (f *FSM) State(state string, fn StateFunc) {
-	f.mu.Lock()
-	f.statesMap[state] = fn
-	f.statesOrder = append(f.statesOrder, state)
-	f.mu.Unlock()
-}
-
-// Init initialize fsm and check states
-
-// Start runs state machine with provided data
-func (f *FSM) Start(ctx context.Context, args interface{}, opts ...Option) (interface{}, error) {
-	var err error
-	var ok bool
-	var fn StateFunc
-	var nstate string
-
-	f.mu.Lock()
-	options := f.opts
-
-	for _, opt := range opts {
-		opt(options)
-	}
-
-	sopts := []StateOption{StateDryRun(options.DryRun)}
-
-	cstate := options.Initial
-	states := make(map[string]StateFunc, len(f.statesMap))
-	for k, v := range f.statesMap {
-		states[k] = v
-	}
-	f.current = cstate
-	f.mu.Unlock()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		default:
-			fn, ok = states[cstate]
-			if !ok {
-				return nil, fmt.Errorf(`state "%s" %w`, cstate, ErrInvalidState)
-			}
-			f.mu.Lock()
-			f.current = cstate
-			f.mu.Unlock()
-			for _, fn := range options.HooksBefore {
-				fn(ctx, cstate, args)
-			}
-			nstate, args, err = fn(ctx, args, sopts...)
-			for _, fn := range options.HooksAfter {
-				fn(ctx, cstate, args)
-			}
-			switch {
-			case err != nil:
-				return args, err
-			case nstate == StateEnd:
-				return args, nil
-			case nstate == "":
-				for idx := range f.statesOrder {
-					if f.statesOrder[idx] == cstate && len(f.statesOrder) > idx+1 {
-						nstate = f.statesOrder[idx+1]
-					}
-				}
-			}
-			cstate = nstate
-		}
-	}
+type FSM interface {
+	Start(context.Context, interface{}, ...Option) (interface{}, error)
+	Current() string
+	Reset()
+	State(string, StateFunc)
 }

fsm/fsm_test.go

@@ -1,63 +1,72 @@
 package fsm
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"testing"
+
+	"go.unistack.org/micro/v4/logger"
 )
 
 func TestFSMStart(t *testing.T) {
 	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	pfb := func(_ context.Context, state string, _ interface{}) {
-		fmt.Fprintf(buf, "before state %s\n", state)
+
+	if err := logger.DefaultLogger.Init(); err != nil {
+		t.Fatal(err)
 	}
-	pfa := func(_ context.Context, state string, _ interface{}) {
-		fmt.Fprintf(buf, "after state %s\n", state)
+
+	wrapper := func(next StateFunc) StateFunc {
+		return func(sctx context.Context, s State, opts ...StateOption) (State, error) {
+			sctx = logger.NewContext(sctx, logger.Fields("state", s.Name()))
+			return next(sctx, s, opts...)
+		}
 	}
-	f := New(InitialState("1"), HookBefore(pfb), HookAfter(pfa))
-	f1 := func(_ context.Context, req interface{}, _ ...StateOption) (string, interface{}, error) {
-		args := req.(map[string]interface{})
+
+	f := NewFSM(InitialState("1"), WrapState(wrapper))
+	f1 := func(sctx context.Context, s State, opts ...StateOption) (State, error) {
+		_, ok := logger.FromContext(sctx)
+		if !ok {
+			t.Fatal("f1 context does not have logger")
+		}
+		args := s.Body().(map[string]interface{})
 		if v, ok := args["request"].(string); !ok || v == "" {
-			return "", nil, fmt.Errorf("empty request")
+			return nil, fmt.Errorf("empty request")
 		}
-		return "2", map[string]interface{}{"response": "test2"}, nil
+		return &state{name: "", body: map[string]interface{}{"response": "state1"}}, nil
 	}
-	f2 := func(_ context.Context, req interface{}, _ ...StateOption) (string, interface{}, error) {
-		args := req.(map[string]interface{})
-		if v, ok := args["response"].(string); !ok || v == "" {
-			return "", nil, fmt.Errorf("empty response")
+	f2 := func(sctx context.Context, s State, opts ...StateOption) (State, error) {
+		_, ok := logger.FromContext(sctx)
+		if !ok {
+			t.Fatal("f2 context does not have logger")
 		}
-		return "", map[string]interface{}{"response": "test"}, nil
+		args := s.Body().(map[string]interface{})
+		if v, ok := args["response"].(string); !ok || v == "" {
+			return nil, fmt.Errorf("empty response")
+		}
+		return &state{name: "", body: map[string]interface{}{"response": "state2"}}, nil
 	}
-	f3 := func(_ context.Context, req interface{}, _ ...StateOption) (string, interface{}, error) {
-		args := req.(map[string]interface{})
-		if v, ok := args["response"].(string); !ok || v == "" {
-			return "", nil, fmt.Errorf("empty response")
+	f3 := func(sctx context.Context, s State, opts ...StateOption) (State, error) {
+		_, ok := logger.FromContext(sctx)
+		if !ok {
+			t.Fatal("f3 context does not have logger")
 		}
-		return StateEnd, map[string]interface{}{"response": "test_last"}, nil
+		args := s.Body().(map[string]interface{})
+		if v, ok := args["response"].(string); !ok || v == "" {
+			return nil, fmt.Errorf("empty response")
+		}
+		return &state{name: StateEnd, body: map[string]interface{}{"response": "state3"}}, nil
 	}
 	f.State("1", f1)
 	f.State("2", f2)
 	f.State("3", f3)
-	rsp, err := f.Start(ctx, map[string]interface{}{"request": "test1"})
+	rsp, err := f.Start(ctx, map[string]interface{}{"request": "state"})
 	if err != nil {
 		t.Fatal(err)
 	}
 	args := rsp.(map[string]interface{})
 	if v, ok := args["response"].(string); !ok || v == "" {
 		t.Fatalf("nil rsp: %#+v", args)
-	} else if v != "test_last" {
+	} else if v != "state3" {
 		t.Fatalf("invalid rsp %#+v", args)
 	}
-
-	if !bytes.Contains(buf.Bytes(), []byte(`before state 1`)) ||
-		!bytes.Contains(buf.Bytes(), []byte(`before state 2`)) ||
-		!bytes.Contains(buf.Bytes(), []byte(`after state 1`)) ||
-		!bytes.Contains(buf.Bytes(), []byte(`after state 2`)) ||
-		!bytes.Contains(buf.Bytes(), []byte(`after state 3`)) ||
-		!bytes.Contains(buf.Bytes(), []byte(`after state 3`)) {
-		t.Fatalf("fsm not works properly or hooks error, buf: %s", buf.Bytes())
-	}
 }

fsm/options.go

@@ -0,0 +1,52 @@
+package fsm
+
+// Options struct holding fsm options
+type Options struct {
+	// Initial state
+	Initial string
+	// Wrappers runs before state
+	Wrappers []StateWrapper
+	// DryRun mode
+	DryRun bool
+}
+
+// Option func signature
+type Option func(*Options)
+
+// StateOptions holds state options
+type StateOptions struct {
+	DryRun bool
+}
+
+// StateDryRun says that state executes in dry run mode
+func StateDryRun(b bool) StateOption {
+	return func(o *StateOptions) {
+		o.DryRun = b
+	}
+}
+
+// StateOption func signature
+type StateOption func(*StateOptions)
+
+// InitialState sets init state for state machine
+func InitialState(initial string) Option {
+	return func(o *Options) {
+		o.Initial = initial
+	}
+}
+
+// WrapState adds a state Wrapper to a list of options passed into the fsm
+func WrapState(w StateWrapper) Option {
+	return func(o *Options) {
+		o.Wrappers = append(o.Wrappers, w)
+	}
+}
+
+// NewOptions returns new Options struct filled by passed Option
+func NewOptions(opts ...Option) Options {
+	options := Options{}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}

go.mod

@@ -1,13 +1,20 @@
-module go.unistack.org/micro/v3
+module go.unistack.org/micro/v4
 
-go 1.16
+go 1.20
 
 require (
-	github.com/google/go-cmp v0.5.7 // indirect
-	github.com/imdario/mergo v0.3.13
-	github.com/kr/pretty v0.2.1 // indirect
-	github.com/kr/text v0.2.0 // indirect
+	github.com/DATA-DOG/go-sqlmock v1.5.0
+	github.com/google/uuid v1.3.0
+	github.com/imdario/mergo v0.3.15
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35
-	go.unistack.org/micro-proto/v3 v3.3.1
+	github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5
+	golang.org/x/sync v0.3.0
+	golang.org/x/sys v0.7.0
+	google.golang.org/grpc v1.57.0
+	google.golang.org/protobuf v1.31.0
+)
+
+require (
+	github.com/golang/protobuf v1.5.3 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
 )

go.sum

@@ -1,160 +1,33 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+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.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
-github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+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.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-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/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
+github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35 h1:4mohWoM/UGg1BvFFiqSPRl5uwJY3rVV0HQX0ETqauqQ=
-github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.unistack.org/micro-proto/v3 v3.3.1 h1:nQ0MtWvP2G3QrpOgawVOPhpZZYkq6umTGDqs8FxJYIo=
-go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 h1:G/FZtUu7a6NTWl3KUHMV9jkLAh/Rvtf03NWMHaEDl+E=
+github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
+google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
 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.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

logger/context.go

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

logger/context_test.go

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

logger/default.go

@@ -9,28 +9,24 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"go.unistack.org/micro/v4/options"
 )
 
 type defaultLogger struct {
-	enc      *json.Encoder
-	logFunc  LogFunc
-	logfFunc LogfFunc
-	opts     Options
+	enc  *json.Encoder
+	opts Options
 	sync.RWMutex
 }
 
 // Init(opts...) should only overwrite provided options
-func (l *defaultLogger) Init(opts ...Option) error {
+func (l *defaultLogger) Init(opts ...options.Option) error {
 	l.Lock()
 	for _, o := range opts {
 		o(&l.opts)
 	}
 	l.enc = json.NewEncoder(l.opts.Out)
 	// wrap the Log func
-	for i := len(l.opts.Wrappers); i > 0; i-- {
-		l.logFunc = l.opts.Wrappers[i-1].Log(l.logFunc)
-		l.logfFunc = l.opts.Wrappers[i-1].Logf(l.logfFunc)
-	}
 	l.Unlock()
 	return nil
 }
@@ -39,7 +35,7 @@ func (l *defaultLogger) String() string {
 	return "micro"
 }
 
-func (l *defaultLogger) Clone(opts ...Option) Logger {
+func (l *defaultLogger) Clone(opts ...options.Option) Logger {
 	newopts := NewOptions(opts...)
 	oldopts := l.opts
 	for _, o := range opts {
@@ -47,17 +43,10 @@ func (l *defaultLogger) Clone(opts ...Option) Logger {
 		o(&oldopts)
 	}
 
-	oldopts.Wrappers = newopts.Wrappers
 	l.Lock()
-	cl := &defaultLogger{opts: oldopts, logFunc: l.logFunc, logfFunc: l.logfFunc}
+	cl := &defaultLogger{opts: oldopts, enc: json.NewEncoder(l.opts.Out)}
 	l.Unlock()
 
-	// wrap the Log func
-	for i := len(newopts.Wrappers); i > 0; i-- {
-		cl.logFunc = newopts.Wrappers[i-1].Log(cl.logFunc)
-		cl.logfFunc = newopts.Wrappers[i-1].Logf(cl.logfFunc)
-	}
-
 	return cl
 }
 
@@ -75,15 +64,17 @@ func (l *defaultLogger) Level(level Level) {
 }
 
 func (l *defaultLogger) Fields(fields ...interface{}) Logger {
+	l.RLock()
 	nl := &defaultLogger{opts: l.opts, enc: l.enc}
 	if len(fields) == 0 {
+		l.RUnlock()
 		return nl
 	} else if len(fields)%2 != 0 {
 		fields = fields[:len(fields)-1]
 	}
-	nl.logFunc = l.logFunc
-	nl.logfFunc = l.logfFunc
+	nl.opts.Fields = copyFields(l.opts.Fields)
 	nl.opts.Fields = append(nl.opts.Fields, fields...)
+	l.RUnlock()
 	return nl
 }
 
@@ -143,27 +134,27 @@ func (l *defaultLogger) Fatal(ctx context.Context, args ...interface{}) {
 }
 
 func (l *defaultLogger) Infof(ctx context.Context, msg string, args ...interface{}) {
-	l.logfFunc(ctx, InfoLevel, msg, args...)
+	l.Logf(ctx, InfoLevel, msg, args...)
 }
 
 func (l *defaultLogger) Errorf(ctx context.Context, msg string, args ...interface{}) {
-	l.logfFunc(ctx, ErrorLevel, msg, args...)
+	l.Logf(ctx, ErrorLevel, msg, args...)
 }
 
 func (l *defaultLogger) Debugf(ctx context.Context, msg string, args ...interface{}) {
-	l.logfFunc(ctx, DebugLevel, msg, args...)
+	l.Logf(ctx, DebugLevel, msg, args...)
 }
 
 func (l *defaultLogger) Warnf(ctx context.Context, msg string, args ...interface{}) {
-	l.logfFunc(ctx, WarnLevel, msg, args...)
+	l.Logf(ctx, WarnLevel, msg, args...)
 }
 
 func (l *defaultLogger) Tracef(ctx context.Context, msg string, args ...interface{}) {
-	l.logfFunc(ctx, TraceLevel, msg, args...)
+	l.Logf(ctx, TraceLevel, msg, args...)
 }
 
 func (l *defaultLogger) Fatalf(ctx context.Context, msg string, args ...interface{}) {
-	l.logfFunc(ctx, FatalLevel, msg, args...)
+	l.Logf(ctx, FatalLevel, msg, args...)
 	os.Exit(1)
 }
 
@@ -232,12 +223,10 @@ func (l *defaultLogger) Options() Options {
 }
 
 // NewLogger builds a new logger based on options
-func NewLogger(opts ...Option) Logger {
+func NewLogger(opts ...options.Option) Logger {
 	l := &defaultLogger{
 		opts: NewOptions(opts...),
 	}
-	l.logFunc = l.Log
-	l.logfFunc = l.Logf
 	l.enc = json.NewEncoder(l.opts.Out)
 	return l
 }

logger/logger.go

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

logger/logger_test.go

@@ -32,7 +32,33 @@ func TestFields(t *testing.T) {
 	if err := l.Init(); err != nil {
 		t.Fatal(err)
 	}
-	l.Fields("key", "val").Info(ctx, "message")
+
+	nl := l.Fields("key", "val")
+
+	nl.Info(ctx, "message")
+	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
+		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
+	}
+}
+
+func TestFromContextWithFields(t *testing.T) {
+	ctx := context.TODO()
+	buf := bytes.NewBuffer(nil)
+	var ok bool
+	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	if err := l.Init(); err != nil {
+		t.Fatal(err)
+	}
+	nl := l.Fields("key", "val")
+
+	ctx = NewContext(ctx, nl)
+
+	l, ok = FromContext(ctx)
+	if !ok {
+		t.Fatalf("context does not have logger")
+	}
+
+	l.Info(ctx, "message")
 	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
 		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
 	}
@@ -110,39 +136,3 @@ func TestLogger(t *testing.T) {
 		t.Fatalf("logger error, buf %s", buf.Bytes())
 	}
 }
-
-func TestLoggerWrapper(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
-	if err := l.Init(WrapLogger(NewOmitWrapper())); err != nil {
-		t.Fatal(err)
-	}
-	type secret struct {
-		Name  string
-		Passw string `logger:"omit"`
-	}
-	s := &secret{Name: "name", Passw: "secret"}
-	l.Errorf(ctx, "test %#+v", s)
-	if !bytes.Contains(buf.Bytes(), []byte(`logger.secret{Name:\"name\", Passw:\"\"}"`)) {
-		t.Fatalf("omit not works, struct: %v, output: %s", s, buf.Bytes())
-	}
-}
-
-func TestOmitLoggerWrapper(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewOmitLogger(NewLogger(WithLevel(TraceLevel), WithOutput(buf)))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-	type secret struct {
-		Name  string
-		Passw string `logger:"omit"`
-	}
-	s := &secret{Name: "name", Passw: "secret"}
-	l.Errorf(ctx, "test %#+v", s)
-	if !bytes.Contains(buf.Bytes(), []byte(`logger.secret{Name:\"name\", Passw:\"\"}"`)) {
-		t.Fatalf("omit not works, struct: %v, output: %s", s, buf.Bytes())
-	}
-}

logger/options.go

@@ -4,10 +4,9 @@ import (
 	"context"
 	"io"
 	"os"
-)
 
-// Option func
-type Option func(*Options)
+	"go.unistack.org/micro/v4/options"
+)
 
 // Options holds logger options
 type Options struct {
@@ -19,8 +18,6 @@ type Options struct {
 	Fields []interface{}
 	// Name holds the logger name
 	Name string
-	// Wrappers logger wrapper that called before actual Log/Logf function
-	Wrappers []Wrapper
 	// The logging level the logger should log
 	Level Level
 	// CallerSkipCount number of frmaes to skip
@@ -28,7 +25,7 @@ type Options struct {
 }
 
 // NewOptions creates new options struct
-func NewOptions(opts ...Option) Options {
+func NewOptions(opts ...options.Option) Options {
 	options := Options{
 		Level:           DefaultLevel,
 		Fields:          make([]interface{}, 0, 6),
@@ -43,50 +40,29 @@ func NewOptions(opts ...Option) Options {
 }
 
 // WithFields set default fields for the logger
-func WithFields(fields ...interface{}) Option {
-	return func(o *Options) {
-		o.Fields = fields
+func WithFields(fields ...interface{}) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, fields, ".Fields")
 	}
 }
 
 // WithLevel set default level for the logger
-func WithLevel(level Level) Option {
-	return func(o *Options) {
-		o.Level = level
+func WithLevel(lvl Level) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, lvl, ".Level")
 	}
 }
 
 // WithOutput set default output writer for the logger
-func WithOutput(out io.Writer) Option {
-	return func(o *Options) {
-		o.Out = out
+func WithOutput(out io.Writer) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, out, ".Out")
 	}
 }
 
 // WithCallerSkipCount set frame count to skip
-func WithCallerSkipCount(c int) Option {
-	return func(o *Options) {
-		o.CallerSkipCount = c
-	}
-}
-
-// WithContext set context
-func WithContext(ctx context.Context) Option {
-	return func(o *Options) {
-		o.Context = ctx
-	}
-}
-
-// WithName sets the name
-func WithName(n string) Option {
-	return func(o *Options) {
-		o.Name = n
-	}
-}
-
-// WrapLogger adds a logger Wrapper to a list of options passed into the logger
-func WrapLogger(w Wrapper) Option {
-	return func(o *Options) {
-		o.Wrappers = append(o.Wrappers, w)
+func WithCallerSkipCount(c int) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, c, ".CallerSkipCount")
 	}
 }

logger/unwrap/unwrap.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
 )
 
 const sf = "0-+# "
@@ -35,6 +35,7 @@ var (
 	nilAngleBytes      = []byte("<nil>")
 	circularShortBytes = []byte("<shown>")
 	invalidAngleBytes  = []byte("<invalid>")
+	filteredBytes      = []byte("<filtered>")
 	openBracketBytes   = []byte("[")
 	closeBracketBytes  = []byte("]")
 	percentBytes       = []byte("%")
@@ -45,25 +46,36 @@ var (
 	closeMapBytes      = []byte("}")
 )
 
-type unwrap struct {
-	val            interface{}
-	s              fmt.State
-	depth          int
-	pointers       map[uintptr]int
-	opts           *Options
-	ignoreNextType bool
+type protoMessage interface {
+	Reset()
+	ProtoMessage()
 }
 
+type Wrapper struct {
+	val              interface{}
+	s                fmt.State
+	pointers         map[uintptr]int
+	opts             *Options
+	depth            int
+	ignoreNextType   bool
+	takeMap          map[int]bool
+	protoWrapperType bool
+	sqlWrapperType   bool
+}
+
+// Options struct
 type Options struct {
-	Codec         codec.Codec
-	Indent        string
-	UnwrapMethods bool
+	Codec   codec.Codec
+	Indent  string
+	Methods bool
+	Tagged  bool
 }
 
+// NewOptions creates new Options struct via provided args
 func NewOptions(opts ...Option) Options {
 	options := Options{
-		Indent:        " ",
-		UnwrapMethods: false,
+		Indent:  " ",
+		Methods: false,
 	}
 	for _, o := range opts {
 		o(&options)
@@ -71,34 +83,45 @@ func NewOptions(opts ...Option) Options {
 	return options
 }
 
+// Option func signature
 type Option func(*Options)
 
-func UnwrapIndent(f string) Option {
+// Indent option specify indent level
+func Indent(f string) Option {
 	return func(o *Options) {
 		o.Indent = f
 	}
 }
 
-func UnwrapMethods(b bool) Option {
+// Methods option toggles fmt.Stringer methods
+func Methods(b bool) Option {
 	return func(o *Options) {
-		o.UnwrapMethods = b
+		o.Methods = b
 	}
 }
 
-func UnwrapCodec(c codec.Codec) Option {
+// Codec option automatic marshal arg via specified codec and write it to log
+func Codec(c codec.Codec) Option {
 	return func(o *Options) {
 		o.Codec = c
 	}
 }
 
-func Unwrap(val interface{}, opts ...Option) *unwrap {
-	options := NewOptions(opts...)
-	return &unwrap{val: val, opts: &options, pointers: make(map[uintptr]int)}
+// Tagged option toggles output only logger:"take" fields
+func Tagged(b bool) Option {
+	return func(o *Options) {
+		o.Tagged = b
+	}
 }
 
-func (f *unwrap) unpackValue(v reflect.Value) reflect.Value {
+func Unwrap(val interface{}, opts ...Option) *Wrapper {
+	options := NewOptions(opts...)
+	return &Wrapper{val: val, opts: &options, pointers: make(map[uintptr]int), takeMap: make(map[int]bool)}
+}
+
+func (w *Wrapper) unpackValue(v reflect.Value) reflect.Value {
 	if v.Kind() == reflect.Interface {
-		f.ignoreNextType = false
+		w.ignoreNextType = false
 		if !v.IsNil() {
 			v = v.Elem()
 		}
@@ -107,19 +130,19 @@ func (f *unwrap) unpackValue(v reflect.Value) reflect.Value {
 }
 
 // formatPtr handles formatting of pointers by indirecting them as necessary.
-func (f *unwrap) formatPtr(v reflect.Value) {
+func (w *Wrapper) formatPtr(v reflect.Value) {
 	// Display nil if top level pointer is nil.
-	showTypes := f.s.Flag('#')
-	if v.IsNil() && (!showTypes || f.ignoreNextType) {
-		_, _ = f.s.Write(nilAngleBytes)
+	showTypes := w.s.Flag('#')
+	if v.IsNil() && (!showTypes || w.ignoreNextType) {
+		_, _ = w.s.Write(nilAngleBytes)
 		return
 	}
 
 	// Remove pointers at or below the current depth from map used to detect
 	// circular refs.
-	for k, depth := range f.pointers {
-		if depth >= f.depth {
-			delete(f.pointers, k)
+	for k, depth := range w.pointers {
+		if depth >= w.depth {
+			delete(w.pointers, k)
 		}
 	}
 
@@ -141,12 +164,12 @@ func (f *unwrap) formatPtr(v reflect.Value) {
 		indirects++
 		addr := ve.Pointer()
 		pointerChain = append(pointerChain, addr)
-		if pd, ok := f.pointers[addr]; ok && pd < f.depth {
+		if pd, ok := w.pointers[addr]; ok && pd < w.depth {
 			cycleFound = true
 			indirects--
 			break
 		}
-		f.pointers[addr] = f.depth
+		w.pointers[addr] = w.depth
 
 		ve = ve.Elem()
 		if ve.Kind() == reflect.Interface {
@@ -159,51 +182,49 @@ func (f *unwrap) formatPtr(v reflect.Value) {
 	}
 
 	// Display type or indirection level depending on flags.
-	if showTypes && !f.ignoreNextType {
-		if f.depth > 0 {
-			_, _ = f.s.Write(openParenBytes)
+	if showTypes && !w.ignoreNextType {
+		if w.depth > 0 {
+			_, _ = w.s.Write(openParenBytes)
 		}
-		if f.depth > 0 {
-			_, _ = f.s.Write(bytes.Repeat(asteriskBytes, indirects))
+		if w.depth > 0 {
+			_, _ = w.s.Write(bytes.Repeat(asteriskBytes, indirects))
 		} else {
-			_, _ = f.s.Write(bytes.Repeat(ampBytes, indirects))
+			_, _ = w.s.Write(bytes.Repeat(ampBytes, indirects))
 		}
-		_, _ = f.s.Write([]byte(ve.Type().String()))
-		if f.depth > 0 {
-			_, _ = f.s.Write(closeParenBytes)
+		_, _ = w.s.Write([]byte(ve.Type().String()))
+		if w.depth > 0 {
+			_, _ = w.s.Write(closeParenBytes)
 		}
 	} else {
 		if nilFound || cycleFound {
 			indirects += strings.Count(ve.Type().String(), "*")
 		}
-		_, _ = f.s.Write(openAngleBytes)
-		_, _ = f.s.Write([]byte(strings.Repeat("*", indirects)))
-		_, _ = f.s.Write(closeAngleBytes)
+		_, _ = w.s.Write(openAngleBytes)
+		_, _ = w.s.Write([]byte(strings.Repeat("*", indirects)))
+		_, _ = w.s.Write(closeAngleBytes)
 	}
 
 	// Display pointer information depending on flags.
-	if f.s.Flag('+') && (len(pointerChain) > 0) {
-		_, _ = f.s.Write(openParenBytes)
+	if w.s.Flag('+') && (len(pointerChain) > 0) {
+		_, _ = w.s.Write(openParenBytes)
 		for i, addr := range pointerChain {
 			if i > 0 {
-				_, _ = f.s.Write(pointerChainBytes)
+				_, _ = w.s.Write(pointerChainBytes)
 			}
-			getHexPtr(f.s, addr)
+			getHexPtr(w.s, addr)
 		}
-		_, _ = f.s.Write(closeParenBytes)
+		_, _ = w.s.Write(closeParenBytes)
 	}
 
 	// Display dereferenced value.
 	switch {
 	case nilFound:
-		_, _ = f.s.Write(nilAngleBytes)
-
+		_, _ = w.s.Write(nilAngleBytes)
 	case cycleFound:
-		_, _ = f.s.Write(circularShortBytes)
-
+		_, _ = w.s.Write(circularShortBytes)
 	default:
-		f.ignoreNextType = true
-		f.format(ve)
+		w.ignoreNextType = true
+		w.format(ve)
 	}
 }
 
@@ -211,54 +232,73 @@ func (f *unwrap) formatPtr(v reflect.Value) {
 // uses the passed reflect value to figure out what kind of object we are
 // dealing with and formats it appropriately.  It is a recursive function,
 // however circular data structures are detected and handled properly.
-func (f *unwrap) format(v reflect.Value) {
-	if f.opts.Codec != nil {
-		buf, err := f.opts.Codec.Marshal(v.Interface())
+func (w *Wrapper) format(v reflect.Value) {
+	if w.opts.Codec != nil {
+		buf, err := w.opts.Codec.Marshal(v.Interface())
 		if err != nil {
-			_, _ = f.s.Write(invalidAngleBytes)
+			_, _ = w.s.Write(invalidAngleBytes)
 			return
 		}
-		_, _ = f.s.Write(buf)
+		_, _ = w.s.Write(buf)
 		return
 	}
+
 	// Handle invalid reflect values immediately.
 	kind := v.Kind()
 	if kind == reflect.Invalid {
-		_, _ = f.s.Write(invalidAngleBytes)
+		_, _ = w.s.Write(invalidAngleBytes)
 		return
 	}
 
 	// Handle pointers specially.
-	if kind == reflect.Ptr {
-		f.formatPtr(v)
+	switch kind {
+	case reflect.Ptr:
+		if !v.IsZero() {
+			if strings.HasPrefix(reflect.Indirect(v).Type().String(), "wrapperspb.") {
+				w.protoWrapperType = true
+			} else if strings.HasPrefix(reflect.Indirect(v).Type().String(), "sql.Null") {
+				w.sqlWrapperType = true
+			} else if v.CanInterface() {
+				if _, ok := v.Interface().(protoMessage); ok {
+					w.protoWrapperType = true
+				}
+			}
+		}
+		w.formatPtr(v)
 		return
+	case reflect.Struct:
+		if !v.IsZero() {
+			if strings.HasPrefix(reflect.Indirect(v).Type().String(), "sql.Null") {
+				w.sqlWrapperType = true
+			}
+		}
 	}
 
 	// get type information unless already handled elsewhere.
-	if !f.ignoreNextType && f.s.Flag('#') {
+	if !w.ignoreNextType && w.s.Flag('#') {
 		if v.Type().Kind() != reflect.Map &&
 			v.Type().Kind() != reflect.String &&
 			v.Type().Kind() != reflect.Array &&
 			v.Type().Kind() != reflect.Slice {
-			_, _ = f.s.Write(openParenBytes)
+			_, _ = w.s.Write(openParenBytes)
 		}
 		if v.Kind() != reflect.String {
-			_, _ = f.s.Write([]byte(v.Type().String()))
+			_, _ = w.s.Write([]byte(v.Type().String()))
 		}
 		if v.Type().Kind() != reflect.Map &&
 			v.Type().Kind() != reflect.String &&
 			v.Type().Kind() != reflect.Array &&
 			v.Type().Kind() != reflect.Slice {
-			_, _ = f.s.Write(closeParenBytes)
+			_, _ = w.s.Write(closeParenBytes)
 		}
 	}
-	f.ignoreNextType = false
+	w.ignoreNextType = false
 
 	// Call Stringer/error interfaces if they exist and the handle methods
 	// flag is enabled.
-	if !f.opts.UnwrapMethods {
+	if w.opts.Methods {
 		if (kind != reflect.Invalid) && (kind != reflect.Interface) {
-			if handled := handleMethods(f.opts, f.s, v); handled {
+			if handled := handleMethods(w.opts, w.s, v); handled {
 				return
 			}
 		}
@@ -266,48 +306,48 @@ func (f *unwrap) format(v reflect.Value) {
 
 	switch kind {
 	case reflect.Invalid:
-		_, _ = f.s.Write(invalidAngleBytes)
+		_, _ = w.s.Write(invalidAngleBytes)
 	case reflect.Bool:
-		getBool(f.s, v.Bool())
+		getBool(w.s, v.Bool())
 	case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int:
-		getInt(f.s, v.Int(), 10)
+		getInt(w.s, v.Int(), 10)
 	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
-		getUint(f.s, v.Uint(), 10)
+		getUint(w.s, v.Uint(), 10)
 	case reflect.Float32:
-		getFloat(f.s, v.Float(), 32)
+		getFloat(w.s, v.Float(), 32)
 	case reflect.Float64:
-		getFloat(f.s, v.Float(), 64)
+		getFloat(w.s, v.Float(), 64)
 	case reflect.Complex64:
-		getComplex(f.s, v.Complex(), 32)
+		getComplex(w.s, v.Complex(), 32)
 	case reflect.Complex128:
-		getComplex(f.s, v.Complex(), 64)
+		getComplex(w.s, v.Complex(), 64)
 	case reflect.Slice:
 		if v.IsNil() {
-			_, _ = f.s.Write(nilAngleBytes)
+			_, _ = w.s.Write(nilAngleBytes)
 			break
 		}
 		fallthrough
 	case reflect.Array:
-		_, _ = f.s.Write(openBraceBytes)
-		f.depth++
+		_, _ = w.s.Write(openBraceBytes)
+		w.depth++
 		numEntries := v.Len()
 		for i := 0; i < numEntries; i++ {
 			if i > 0 {
-				_, _ = f.s.Write(commaBytes)
-				_, _ = f.s.Write(spaceBytes)
+				_, _ = w.s.Write(commaBytes)
+				_, _ = w.s.Write(spaceBytes)
 			}
-			f.ignoreNextType = true
-			f.format(f.unpackValue(v.Index(i)))
+			w.ignoreNextType = true
+			w.format(w.unpackValue(v.Index(i)))
 		}
-		f.depth--
-		_, _ = f.s.Write(closeBraceBytes)
+		w.depth--
+		_, _ = w.s.Write(closeBraceBytes)
 	case reflect.String:
-		_, _ = f.s.Write([]byte(`"` + v.String() + `"`))
+		_, _ = w.s.Write([]byte(`"` + v.String() + `"`))
 	case reflect.Interface:
 		// The only time we should get here is for nil interfaces due to
 		// unpackValue calls.
 		if v.IsNil() {
-			_, _ = f.s.Write(nilAngleBytes)
+			_, _ = w.s.Write(nilAngleBytes)
 		}
 	case reflect.Ptr:
 		// Do nothing.  We should never get here since pointers have already
@@ -315,79 +355,123 @@ func (f *unwrap) format(v reflect.Value) {
 	case reflect.Map:
 		// nil maps should be indicated as different than empty maps
 		if v.IsNil() {
-			_, _ = f.s.Write(nilAngleBytes)
+			_, _ = w.s.Write(nilAngleBytes)
 			break
 		}
-		_, _ = f.s.Write(openMapBytes)
-		f.depth++
+		_, _ = w.s.Write(openMapBytes)
+		w.depth++
 		keys := v.MapKeys()
 		for i, key := range keys {
 			if i > 0 {
-				_, _ = f.s.Write(spaceBytes)
+				_, _ = w.s.Write(spaceBytes)
 			}
-			f.ignoreNextType = true
-			f.format(f.unpackValue(key))
-			_, _ = f.s.Write(colonBytes)
-			f.ignoreNextType = true
-			f.format(f.unpackValue(v.MapIndex(key)))
+			w.ignoreNextType = true
+			w.format(w.unpackValue(key))
+			_, _ = w.s.Write(colonBytes)
+			w.ignoreNextType = true
+			w.format(w.unpackValue(v.MapIndex(key)))
 		}
-		f.depth--
-		_, _ = f.s.Write(closeMapBytes)
+		w.depth--
+		_, _ = w.s.Write(closeMapBytes)
 	case reflect.Struct:
+
 		numFields := v.NumField()
-		_, _ = f.s.Write(openBraceBytes)
-		f.depth++
+		numWritten := 0
+		_, _ = w.s.Write(openBraceBytes)
+		w.depth++
+
 		vt := v.Type()
 		prevSkip := false
+
 		for i := 0; i < numFields; i++ {
-			sv, ok := vt.Field(i).Tag.Lookup("logger")
-			if ok && sv == "omit" {
+			switch vt.Field(i).Type.PkgPath() {
+			case "google.golang.org/protobuf/internal/impl", "google.golang.org/protobuf/internal/pragma":
+				w.protoWrapperType = true
 				prevSkip = true
 				continue
 			}
-			if i > 0 && !prevSkip {
-				_, _ = f.s.Write(commaBytes)
-				_, _ = f.s.Write(spaceBytes)
+			if w.protoWrapperType && !vt.Field(i).IsExported() {
+				prevSkip = true
+				continue
+			} else if w.sqlWrapperType && vt.Field(i).Name == "Valid" {
+				prevSkip = true
+				continue
 			}
+			if _, ok := vt.Field(i).Tag.Lookup("protobuf"); ok && !w.protoWrapperType {
+				w.protoWrapperType = true
+			}
+			sv, ok := vt.Field(i).Tag.Lookup("logger")
+			switch {
+			case ok:
+				switch sv {
+				case "omit":
+					prevSkip = true
+					continue
+				case "take":
+					break
+				}
+			case !ok && w.opts.Tagged:
+				// skip top level untagged
+				if w.depth == 1 {
+					prevSkip = true
+					continue
+				}
+				if tv, ok := w.takeMap[w.depth]; ok && !tv {
+					prevSkip = true
+					continue
+				}
+			}
+
 			if prevSkip {
 				prevSkip = false
 			}
-			vtf := vt.Field(i)
-			if f.s.Flag('+') || f.s.Flag('#') {
-				_, _ = f.s.Write([]byte(vtf.Name))
-				_, _ = f.s.Write(colonBytes)
+
+			if numWritten > 0 {
+				_, _ = w.s.Write(commaBytes)
+				_, _ = w.s.Write(spaceBytes)
 			}
-			f.format(f.unpackValue(v.Field(i)))
+
+			vt := vt.Field(i)
+			if w.s.Flag('+') || w.s.Flag('#') {
+				_, _ = w.s.Write([]byte(vt.Name))
+				_, _ = w.s.Write(colonBytes)
+			}
+			w.format(w.unpackValue(v.Field(i)))
+			numWritten++
 		}
-		f.depth--
-		_, _ = f.s.Write(closeBraceBytes)
+		w.depth--
+
+		if numWritten == 0 && w.depth < 0 {
+			_, _ = w.s.Write(filteredBytes)
+		}
+		_, _ = w.s.Write(closeBraceBytes)
 	case reflect.Uintptr:
-		getHexPtr(f.s, uintptr(v.Uint()))
+		getHexPtr(w.s, uintptr(v.Uint()))
 	case reflect.UnsafePointer, reflect.Chan, reflect.Func:
-		getHexPtr(f.s, v.Pointer())
+		getHexPtr(w.s, v.Pointer())
 	// There were not any other types at the time this code was written, but
 	// fall back to letting the default fmt package handle it if any get added.
 	default:
-		format := f.buildDefaultFormat()
+		format := w.buildDefaultFormat()
 		if v.CanInterface() {
-			_, _ = fmt.Fprintf(f.s, format, v.Interface())
+			_, _ = fmt.Fprintf(w.s, format, v.Interface())
 		} else {
-			_, _ = fmt.Fprintf(f.s, format, v.String())
+			_, _ = fmt.Fprintf(w.s, format, v.String())
 		}
 	}
 }
 
-func (f *unwrap) Format(s fmt.State, verb rune) {
-	f.s = s
+func (w *Wrapper) Format(s fmt.State, verb rune) {
+	w.s = s
 
 	// Use standard formatting for verbs that are not v.
 	if verb != 'v' {
-		format := f.constructOrigFormat(verb)
-		_, _ = fmt.Fprintf(s, format, f.val)
+		format := w.constructOrigFormat(verb)
+		_, _ = fmt.Fprintf(s, format, w.val)
 		return
 	}
 
-	if f.val == nil {
+	if w.val == nil {
 		if s.Flag('#') {
 			_, _ = s.Write(interfaceBytes)
 		}
@@ -395,7 +479,11 @@ func (f *unwrap) Format(s fmt.State, verb rune) {
 		return
 	}
 
-	f.format(reflect.ValueOf(f.val))
+	if w.opts.Tagged {
+		w.buildTakeMap(reflect.ValueOf(w.val), 1)
+	}
+
+	w.format(reflect.ValueOf(w.val))
 }
 
 // handle special methods like error.Error() or fmt.Stringer interface
@@ -511,11 +599,11 @@ func catchPanic(w io.Writer, _ reflect.Value) {
 	}
 }
 
-func (f *unwrap) buildDefaultFormat() (format string) {
+func (w *Wrapper) buildDefaultFormat() (format string) {
 	buf := bytes.NewBuffer(percentBytes)
 
 	for _, flag := range sf {
-		if f.s.Flag(int(flag)) {
+		if w.s.Flag(int(flag)) {
 			_, _ = buf.WriteRune(flag)
 		}
 	}
@@ -526,26 +614,68 @@ func (f *unwrap) buildDefaultFormat() (format string) {
 	return format
 }
 
-func (f *unwrap) constructOrigFormat(verb rune) (format string) {
+func (w *Wrapper) constructOrigFormat(verb rune) string {
 	buf := bytes.NewBuffer(percentBytes)
 
 	for _, flag := range sf {
-		if f.s.Flag(int(flag)) {
+		if w.s.Flag(int(flag)) {
 			_, _ = buf.WriteRune(flag)
 		}
 	}
 
-	if width, ok := f.s.Width(); ok {
+	if width, ok := w.s.Width(); ok {
 		_, _ = buf.WriteString(strconv.Itoa(width))
 	}
 
-	if precision, ok := f.s.Precision(); ok {
+	if precision, ok := w.s.Precision(); ok {
 		_, _ = buf.Write(precisionBytes)
 		_, _ = buf.WriteString(strconv.Itoa(precision))
 	}
 
 	_, _ = buf.WriteRune(verb)
 
-	format = buf.String()
-	return format
+	return buf.String()
+}
+
+func (w *Wrapper) buildTakeMap(v reflect.Value, depth int) {
+	if !v.IsValid() || v.IsZero() {
+		return
+	}
+
+	switch v.Kind() {
+	case reflect.Slice, reflect.Array:
+		for i := 0; i < v.Len(); i++ {
+			w.buildTakeMap(v.Index(i), depth+1)
+		}
+		w.takeMap[depth] = true
+		return
+	case reflect.Struct:
+		break
+	case reflect.Ptr:
+		v = v.Elem()
+		if v.Kind() != reflect.Struct {
+			w.takeMap[depth] = true
+			return
+		}
+	default:
+		w.takeMap[depth] = true
+		return
+	}
+
+	vt := v.Type()
+
+	for i := 0; i < v.NumField(); i++ {
+		sv, ok := vt.Field(i).Tag.Lookup("logger")
+		if ok && sv == "take" {
+			w.takeMap[depth] = false
+		}
+		if v.Kind() == reflect.Struct ||
+			(v.Kind() == reflect.Ptr && v.Elem().Kind() == reflect.Struct) {
+			w.buildTakeMap(v.Field(i), depth+1)
+		}
+	}
+
+	if _, ok := w.takeMap[depth]; !ok {
+		w.takeMap[depth] = true
+	}
 }

logger/unwrap/unwrap_test.go

@@ -1,24 +1,13 @@
 package unwrap
 
 import (
+	"fmt"
+	"strings"
 	"testing"
 
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
 )
 
-func TestUnwrapOmit(t *testing.T) {
-	type val struct {
-		MP  map[string]string `json:"mp" logger:"omit"`
-		STR string            `json:"str"`
-		AR  []string          `json:"ar"`
-	}
-
-	v1 := &val{AR: []string{"string1", "string2"}, STR: "string", MP: map[string]string{"key": "val"}}
-
-	t.Logf("output: %#v", v1)
-	t.Logf("output: %#v", Unwrap(v1))
-}
-
 func TestUnwrap(t *testing.T) {
 	string1 := "string1"
 	string2 := "string2"
@@ -32,7 +21,10 @@ func TestUnwrap(t *testing.T) {
 
 	v1 := &val1{ar: []*string{&string1, &string2}, str: &string1, val: &val1{str: &string2}, mp: map[string]string{"key": "val"}}
 
-	t.Logf("output: %#v", Unwrap(v1))
+	buf := fmt.Sprintf("%#v", Unwrap(v1))
+	if strings.Compare(buf, `&unwrap.val1{mp:map[string]string{"key":"val"}, val:(*unwrap.val1){mp:map[string]string<nil>, val:(*unwrap.val1)<nil>, str:(*string)"string2", ar:[]*string<nil>}, str:(*string)"string1", ar:[]*string{<*><shown>, <*>"string2"}}`) != 0 {
+		t.Fatalf("not proper written %s", buf)
+	}
 
 	type val2 struct {
 		mp  map[string]string
@@ -42,11 +34,11 @@ func TestUnwrap(t *testing.T) {
 	}
 
 	v2 := &val2{ar: []string{string1, string2}, str: string1, val: &val2{str: string2}, mp: map[string]string{"key": "val"}}
-
-	t.Logf("output: %#v", v2)
+	_ = v2
+	// t.Logf("output: %#v", v2)
 }
 
-func TestUnwrapCodec(t *testing.T) {
+func TestCodec(t *testing.T) {
 	type val struct {
 		MP  map[string]string `json:"mp"`
 		STR string            `json:"str"`
@@ -55,5 +47,54 @@ func TestUnwrapCodec(t *testing.T) {
 
 	v1 := &val{AR: []string{"string1", "string2"}, STR: "string", MP: map[string]string{"key": "val"}}
 
-	t.Logf("output: %#v", Unwrap(v1, UnwrapCodec(codec.NewCodec())))
+	buf := fmt.Sprintf("%#v", Unwrap(v1, Codec(codec.NewCodec())))
+	if strings.Compare(buf, `{"mp":{"key":"val"},"str":"string","ar":["string1","string2"]}`) != 0 {
+		t.Fatalf("not proper written %s", buf)
+	}
+}
+
+func TestOmit(t *testing.T) {
+	type val struct {
+		Key1 string `logger:"omit"`
+		Key2 string `logger:"take"`
+		Key3 string
+	}
+	v1 := &val{Key1: "val1", Key2: "val2", Key3: "val3"}
+	buf := fmt.Sprintf("%#v", Unwrap(v1))
+	if strings.Compare(buf, `&unwrap.val{Key2:"val2", Key3:"val3"}`) != 0 {
+		t.Fatalf("not proper written %s", buf)
+	}
+}
+
+func TestTagged(t *testing.T) {
+	type val struct {
+		Key1 string `logger:"take"`
+		Key2 string
+	}
+
+	v1 := &val{Key1: "val1", Key2: "val2"}
+	buf := fmt.Sprintf("%#v", Unwrap(v1, Tagged(true)))
+	if strings.Compare(buf, `&unwrap.val{Key1:"val1"}`) != 0 {
+		t.Fatalf("not proper written %s", buf)
+	}
+}
+
+func TestTaggedNested(t *testing.T) {
+	type val struct {
+		key string `logger:"take"`
+		val string `logger:"omit"`
+		unk string
+	}
+	type str struct {
+		key string `logger:"omit"`
+		val *val   `logger:"take"`
+	}
+
+	var iface interface{}
+	v := &str{val: &val{key: "test", unk: "unk"}}
+	iface = v
+	buf := fmt.Sprintf("%#v", Unwrap(iface, Tagged(true)))
+	if strings.Compare(buf, `&unwrap.str{val:(*unwrap.val){key:"test"}}`) != 0 {
+		t.Fatalf("not proper written %s", buf)
+	}
 }

logger/wrapper.go

@@ -1,166 +0,0 @@
-package logger // import "go.unistack.org/micro/v3/logger/wrapper"
-
-import (
-	"context"
-	"reflect"
-
-	rutil "go.unistack.org/micro/v3/util/reflect"
-)
-
-// LogFunc function used for Log method
-type LogFunc func(ctx context.Context, level Level, args ...interface{})
-
-// LogfFunc function used for Logf method
-type LogfFunc func(ctx context.Context, level Level, msg string, args ...interface{})
-
-type Wrapper interface {
-	// Log logs message with needed level
-	Log(LogFunc) LogFunc
-	// Logf logs message with needed level
-	Logf(LogfFunc) LogfFunc
-}
-
-var _ Logger = &omitLogger{}
-
-type omitLogger struct {
-	l Logger
-}
-
-func NewOmitLogger(l Logger) Logger {
-	return &omitLogger{l: l}
-}
-
-func (w *omitLogger) Init(opts ...Option) error {
-	return w.l.Init(append(opts, WrapLogger(NewOmitWrapper()))...)
-}
-
-func (w *omitLogger) V(level Level) bool {
-	return w.l.V(level)
-}
-
-func (w *omitLogger) Level(level Level) {
-	w.l.Level(level)
-}
-
-func (w *omitLogger) Clone(opts ...Option) Logger {
-	return w.l.Clone(opts...)
-}
-
-func (w *omitLogger) Options() Options {
-	return w.l.Options()
-}
-
-func (w *omitLogger) Fields(fields ...interface{}) Logger {
-	return w.l.Fields(fields...)
-}
-
-func (w *omitLogger) Info(ctx context.Context, args ...interface{}) {
-	w.l.Info(ctx, args...)
-}
-
-func (w *omitLogger) Trace(ctx context.Context, args ...interface{}) {
-	w.l.Trace(ctx, args...)
-}
-
-func (w *omitLogger) Debug(ctx context.Context, args ...interface{}) {
-	w.l.Debug(ctx, args...)
-}
-
-func (w *omitLogger) Warn(ctx context.Context, args ...interface{}) {
-	w.l.Warn(ctx, args...)
-}
-
-func (w *omitLogger) Error(ctx context.Context, args ...interface{}) {
-	w.l.Error(ctx, args...)
-}
-
-func (w *omitLogger) Fatal(ctx context.Context, args ...interface{}) {
-	w.l.Fatal(ctx, args...)
-}
-
-func (w *omitLogger) Infof(ctx context.Context, msg string, args ...interface{}) {
-	w.l.Infof(ctx, msg, args...)
-}
-
-func (w *omitLogger) Tracef(ctx context.Context, msg string, args ...interface{}) {
-	w.l.Tracef(ctx, msg, args...)
-}
-
-func (w *omitLogger) Debugf(ctx context.Context, msg string, args ...interface{}) {
-	w.l.Debugf(ctx, msg, args...)
-}
-
-func (w *omitLogger) Warnf(ctx context.Context, msg string, args ...interface{}) {
-	w.l.Warnf(ctx, msg, args...)
-}
-
-func (w *omitLogger) Errorf(ctx context.Context, msg string, args ...interface{}) {
-	w.l.Errorf(ctx, msg, args...)
-}
-
-func (w *omitLogger) Fatalf(ctx context.Context, msg string, args ...interface{}) {
-	w.l.Fatalf(ctx, msg, args...)
-}
-
-func (w *omitLogger) Log(ctx context.Context, level Level, args ...interface{}) {
-	w.l.Log(ctx, level, args...)
-}
-
-func (w *omitLogger) Logf(ctx context.Context, level Level, msg string, args ...interface{}) {
-	w.l.Logf(ctx, level, msg, args...)
-}
-
-func (w *omitLogger) String() string {
-	return w.l.String()
-}
-
-type omitWrapper struct{}
-
-func NewOmitWrapper() Wrapper {
-	return &omitWrapper{}
-}
-
-func getArgs(args []interface{}) []interface{} {
-	nargs := make([]interface{}, 0, len(args))
-	var err error
-	for _, arg := range args {
-		val := reflect.ValueOf(arg)
-		if val.Kind() == reflect.Ptr {
-			val = val.Elem()
-		}
-		narg := arg
-		if val.Kind() != reflect.Struct {
-			nargs = append(nargs, narg)
-			continue
-		}
-
-		if narg, err = rutil.Zero(arg); err != nil {
-			nargs = append(nargs, narg)
-			continue
-		}
-
-		rutil.CopyDefaults(narg, arg)
-		if flds, ferr := rutil.StructFields(narg); ferr == nil {
-			for _, fld := range flds {
-				if tv, ok := fld.Field.Tag.Lookup("logger"); ok && tv == "omit" {
-					fld.Value.Set(reflect.Zero(fld.Value.Type()))
-				}
-			}
-		}
-
-		nargs = append(nargs, narg)
-	}
-	return nargs
-}
-
-func (w *omitWrapper) Log(fn LogFunc) LogFunc {
-	return func(ctx context.Context, level Level, args ...interface{}) {
-		fn(ctx, level, getArgs(args)...)
-	}
-}
-
-func (w *omitWrapper) Logf(fn LogfFunc) LogfFunc {
-	return func(ctx context.Context, level Level, msg string, args ...interface{}) {
-		fn(ctx, level, msg, getArgs(args)...)
-	}
-}

logger/wrapper/wrapper.go

@@ -5,9 +5,9 @@ import (
 	"context"
 	"fmt"
 
-	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/server"
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/server"
 )
 
 var (
@@ -29,15 +29,6 @@ var (
 		return labels
 	}
 
-	// DefaultClientPublishObserver called by wrapper in client Publish
-	DefaultClientPublishObserver = func(ctx context.Context, msg client.Message, opts []client.PublishOption, err error) []string {
-		labels := []string{"endpoint", msg.Topic()}
-		if err != nil {
-			labels = append(labels, "error", err.Error())
-		}
-		return labels
-	}
-
 	// DefaultServerHandlerObserver called by wrapper in server Handler
 	DefaultServerHandlerObserver = func(ctx context.Context, req server.Request, rsp interface{}, err error) []string {
 		labels := []string{"service", req.Service(), "endpoint", req.Endpoint()}
@@ -47,15 +38,6 @@ var (
 		return labels
 	}
 
-	// DefaultServerSubscriberObserver called by wrapper in server Subscriber
-	DefaultServerSubscriberObserver = func(ctx context.Context, msg server.Message, err error) []string {
-		labels := []string{"endpoint", msg.Topic()}
-		if err != nil {
-			labels = append(labels, "error", err.Error())
-		}
-		return labels
-	}
-
 	// DefaultClientCallFuncObserver called by wrapper in client CallFunc
 	DefaultClientCallFuncObserver = func(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions, err error) []string {
 		labels := []string{"service", req.Service(), "endpoint", req.Endpoint()}
@@ -66,15 +48,14 @@ var (
 	}
 
 	// DefaultSkipEndpoints wrapper not called for this endpoints
-	DefaultSkipEndpoints = []string{"Meter.Metrics"}
+	DefaultSkipEndpoints = []string{"Meter.Metrics", "Health.Live", "Health.Ready", "Health.Version"}
 )
 
 type lWrapper struct {
 	client.Client
-	serverHandler    server.HandlerFunc
-	serverSubscriber server.SubscriberFunc
-	clientCallFunc   client.CallFunc
-	opts             Options
+	serverHandler  server.HandlerFunc
+	clientCallFunc client.CallFunc
+	opts           Options
 }
 
 type (
@@ -82,14 +63,10 @@ type (
 	ClientCallObserver func(context.Context, client.Request, interface{}, []client.CallOption, error) []string
 	// ClientStreamObserver func signature
 	ClientStreamObserver func(context.Context, client.Request, []client.CallOption, client.Stream, error) []string
-	// ClientPublishObserver func signature
-	ClientPublishObserver func(context.Context, client.Message, []client.PublishOption, error) []string
 	// ClientCallFuncObserver func signature
 	ClientCallFuncObserver func(context.Context, string, client.Request, interface{}, client.CallOptions, error) []string
 	// ServerHandlerObserver func signature
 	ServerHandlerObserver func(context.Context, server.Request, interface{}, error) []string
-	// ServerSubscriberObserver func signature
-	ServerSubscriberObserver func(context.Context, server.Message, error) []string
 )
 
 // Options struct for wrapper
@@ -98,14 +75,10 @@ type Options struct {
 	Logger logger.Logger
 	// ServerHandlerObservers funcs
 	ServerHandlerObservers []ServerHandlerObserver
-	// ServerSubscriberObservers funcs
-	ServerSubscriberObservers []ServerSubscriberObserver
 	// ClientCallObservers funcs
 	ClientCallObservers []ClientCallObserver
 	// ClientStreamObservers funcs
 	ClientStreamObservers []ClientStreamObserver
-	// ClientPublishObservers funcs
-	ClientPublishObservers []ClientPublishObserver
 	// ClientCallFuncObservers funcs
 	ClientCallFuncObservers []ClientCallFuncObserver
 	// SkipEndpoints
@@ -122,15 +95,13 @@ type Option func(*Options)
 // NewOptions creates Options from Option slice
 func NewOptions(opts ...Option) Options {
 	options := Options{
-		Logger:                    logger.DefaultLogger,
-		Level:                     logger.TraceLevel,
-		ClientCallObservers:       []ClientCallObserver{DefaultClientCallObserver},
-		ClientStreamObservers:     []ClientStreamObserver{DefaultClientStreamObserver},
-		ClientPublishObservers:    []ClientPublishObserver{DefaultClientPublishObserver},
-		ClientCallFuncObservers:   []ClientCallFuncObserver{DefaultClientCallFuncObserver},
-		ServerHandlerObservers:    []ServerHandlerObserver{DefaultServerHandlerObserver},
-		ServerSubscriberObservers: []ServerSubscriberObserver{DefaultServerSubscriberObserver},
-		SkipEndpoints:             DefaultSkipEndpoints,
+		Logger:                  logger.DefaultLogger,
+		Level:                   logger.TraceLevel,
+		ClientCallObservers:     []ClientCallObserver{DefaultClientCallObserver},
+		ClientStreamObservers:   []ClientStreamObserver{DefaultClientStreamObserver},
+		ClientCallFuncObservers: []ClientCallFuncObserver{DefaultClientCallFuncObserver},
+		ServerHandlerObservers:  []ServerHandlerObserver{DefaultServerHandlerObserver},
+		SkipEndpoints:           DefaultSkipEndpoints,
 	}
 
 	for _, o := range opts {
@@ -175,13 +146,6 @@ func WithClientStreamObservers(ob ...ClientStreamObserver) Option {
 	}
 }
 
-// WithClientPublishObservers funcs
-func WithClientPublishObservers(ob ...ClientPublishObserver) Option {
-	return func(o *Options) {
-		o.ClientPublishObservers = ob
-	}
-}
-
 // WithClientCallFuncObservers funcs
 func WithClientCallFuncObservers(ob ...ClientCallFuncObserver) Option {
 	return func(o *Options) {
@@ -196,13 +160,6 @@ func WithServerHandlerObservers(ob ...ServerHandlerObserver) Option {
 	}
 }
 
-// WithServerSubscriberObservers funcs
-func WithServerSubscriberObservers(ob ...ServerSubscriberObserver) Option {
-	return func(o *Options) {
-		o.ServerSubscriberObservers = ob
-	}
-}
-
 // SkipEndpoins
 func SkipEndpoints(eps ...string) Option {
 	return func(o *Options) {
@@ -228,11 +185,7 @@ func (l *lWrapper) Call(ctx context.Context, req client.Request, rsp interface{}
 	for _, o := range l.opts.ClientCallObservers {
 		labels = append(labels, o(ctx, req, rsp, opts, err)...)
 	}
-	fields := make(map[string]interface{}, len(labels)/2)
-	for i := 0; i < len(labels); i += 2 {
-		fields[labels[i]] = labels[i+1]
-	}
-	l.opts.Logger.Fields(fields).Log(ctx, l.opts.Level)
+	l.opts.Logger.Fields(labels).Log(ctx, l.opts.Level)
 
 	return err
 }
@@ -255,42 +208,11 @@ func (l *lWrapper) Stream(ctx context.Context, req client.Request, opts ...clien
 	for _, o := range l.opts.ClientStreamObservers {
 		labels = append(labels, o(ctx, req, opts, stream, err)...)
 	}
-	fields := make(map[string]interface{}, len(labels)/2)
-	for i := 0; i < len(labels); i += 2 {
-		fields[labels[i]] = labels[i+1]
-	}
-	l.opts.Logger.Fields(fields).Log(ctx, l.opts.Level)
+	l.opts.Logger.Fields(labels).Log(ctx, l.opts.Level)
 
 	return stream, err
 }
 
-func (l *lWrapper) Publish(ctx context.Context, msg client.Message, opts ...client.PublishOption) error {
-	err := l.Client.Publish(ctx, msg, opts...)
-
-	endpoint := msg.Topic()
-	for _, ep := range l.opts.SkipEndpoints {
-		if ep == endpoint {
-			return err
-		}
-	}
-
-	if !l.opts.Enabled {
-		return err
-	}
-
-	var labels []string
-	for _, o := range l.opts.ClientPublishObservers {
-		labels = append(labels, o(ctx, msg, opts, err)...)
-	}
-	fields := make(map[string]interface{}, len(labels)/2)
-	for i := 0; i < len(labels); i += 2 {
-		fields[labels[i]] = labels[i+1]
-	}
-	l.opts.Logger.Fields(fields).Log(ctx, l.opts.Level)
-
-	return err
-}
-
 func (l *lWrapper) ServerHandler(ctx context.Context, req server.Request, rsp interface{}) error {
 	err := l.serverHandler(ctx, req, rsp)
 
@@ -309,38 +231,7 @@ func (l *lWrapper) ServerHandler(ctx context.Context, req server.Request, rsp in
 	for _, o := range l.opts.ServerHandlerObservers {
 		labels = append(labels, o(ctx, req, rsp, err)...)
 	}
-	fields := make(map[string]interface{}, len(labels)/2)
-	for i := 0; i < len(labels); i += 2 {
-		fields[labels[i]] = labels[i+1]
-	}
-	l.opts.Logger.Fields(fields).Log(ctx, l.opts.Level)
-
-	return err
-}
-
-func (l *lWrapper) ServerSubscriber(ctx context.Context, msg server.Message) error {
-	err := l.serverSubscriber(ctx, msg)
-
-	endpoint := msg.Topic()
-	for _, ep := range l.opts.SkipEndpoints {
-		if ep == endpoint {
-			return err
-		}
-	}
-
-	if !l.opts.Enabled {
-		return err
-	}
-
-	var labels []string
-	for _, o := range l.opts.ServerSubscriberObservers {
-		labels = append(labels, o(ctx, msg, err)...)
-	}
-	fields := make(map[string]interface{}, len(labels)/2)
-	for i := 0; i < len(labels); i += 2 {
-		fields[labels[i]] = labels[i+1]
-	}
-	l.opts.Logger.Fields(fields).Log(ctx, l.opts.Level)
+	l.opts.Logger.Fields(labels).Log(ctx, l.opts.Level)
 
 	return err
 }
@@ -387,11 +278,7 @@ func (l *lWrapper) ClientCallFunc(ctx context.Context, addr string, req client.R
 	for _, o := range l.opts.ClientCallFuncObservers {
 		labels = append(labels, o(ctx, addr, req, rsp, opts, err)...)
 	}
-	fields := make(map[string]interface{}, len(labels)/2)
-	for i := 0; i < len(labels); i += 2 {
-		fields[labels[i]] = labels[i+1]
-	}
-	l.opts.Logger.Fields(fields).Log(ctx, l.opts.Level)
+	l.opts.Logger.Fields(labels).Log(ctx, l.opts.Level)
 
 	return err
 }
@@ -408,16 +295,3 @@ func NewServerHandlerWrapper(opts ...Option) server.HandlerWrapper {
 		return l.ServerHandler
 	}
 }
-
-// NewServerSubscriberWrapper accepts an options and returns a Subscriber Wrapper
-func NewServerSubscriberWrapper(opts ...Option) server.SubscriberWrapper {
-	return func(h server.SubscriberFunc) server.SubscriberFunc {
-		options := NewOptions()
-		for _, o := range opts {
-			o(&options)
-		}
-
-		l := &lWrapper{opts: options, serverSubscriber: h}
-		return l.ServerSubscriber
-	}
-}

metadata/context.go

@@ -39,8 +39,6 @@ func FromOutgoingContext(ctx context.Context) (Metadata, bool) {
 
 // FromContext returns metadata from the given context
 // returned metadata shoud not be modified or race condition happens
-//
-// Deprecated: use FromIncomingContext or FromOutgoingContext
 func FromContext(ctx context.Context) (Metadata, bool) {
 	if ctx == nil {
 		return nil, false
@@ -53,8 +51,6 @@ func FromContext(ctx context.Context) (Metadata, bool) {
 }
 
 // NewContext creates a new context with the given metadata
-//
-// Deprecated: use NewIncomingContext or NewOutgoingContext
 func NewContext(ctx context.Context, md Metadata) context.Context {
 	if ctx == nil {
 		ctx = context.Background()

metadata/metadata.go

@@ -1,5 +1,5 @@
 // Package metadata is a way of defining message headers
-package metadata // import "go.unistack.org/micro/v3/metadata"
+package metadata // import "go.unistack.org/micro/v4/metadata"
 
 import (
 	"net/textproto"
@@ -19,6 +19,8 @@ var (
 	HeaderTimeout = "Micro-Timeout"
 	// HeaderAuthorization specifies Authorization header
 	HeaderAuthorization = "Authorization"
+	// HeaderXRequestID specifies request id
+	HeaderXRequestID = "X-Request-Id"
 )
 
 // Metadata is our way of representing request headers internally.

meter/context.go

@@ -22,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/generate.go

@@ -1,12 +0,0 @@
-package meter
-
-//go:generate sh -c "protoc -I./handler -I../ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./handler handler/handler.proto"
-
-import (
-
-	// import required packages
-	_ "go.unistack.org/micro-proto/v3/api"
-
-	// import required packages
-	_ "go.unistack.org/micro-proto/v3/openapiv3"
-)

meter/handler/handler.go

@@ -1,67 +0,0 @@
-package handler // import "go.unistack.org/micro/v3/meter/handler"
-
-import (
-	"bytes"
-	"context"
-
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/errors"
-	"go.unistack.org/micro/v3/meter"
-)
-
-// guard to fail early
-var _ MeterServer = &Handler{}
-
-type Handler struct {
-	opts Options
-}
-
-type Option func(*Options)
-
-type Options struct {
-	Meter        meter.Meter
-	Name         string
-	MeterOptions []meter.Option
-}
-
-func Meter(m meter.Meter) Option {
-	return func(o *Options) {
-		o.Meter = m
-	}
-}
-
-func Name(name string) Option {
-	return func(o *Options) {
-		o.Name = name
-	}
-}
-
-func MeterOptions(opts ...meter.Option) Option {
-	return func(o *Options) {
-		o.MeterOptions = append(o.MeterOptions, opts...)
-	}
-}
-
-func NewOptions(opts ...Option) Options {
-	options := Options{Meter: meter.DefaultMeter}
-	for _, o := range opts {
-		o(&options)
-	}
-	return options
-}
-
-func NewHandler(opts ...Option) *Handler {
-	options := NewOptions(opts...)
-	return &Handler{opts: options}
-}
-
-func (h *Handler) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
-	buf := bytes.NewBuffer(nil)
-	if err := h.opts.Meter.Write(buf, h.opts.MeterOptions...); err != nil {
-		return errors.InternalServerError(h.opts.Name, "%v", err)
-	}
-
-	rsp.Data = buf.Bytes()
-
-	return nil
-}

meter/handler/handler.proto

@@ -1,24 +0,0 @@
-syntax = "proto3";
-
-package micro.meter.handler;
-option go_package = "go.unistack.org/micro/v3/meter/handler;handler";
-
-import "api/annotations.proto";
-import "openapiv3/annotations.proto";
-import "codec/frame.proto";
-
-service Meter {
-	rpc Metrics(micro.codec.Frame) returns (micro.codec.Frame) {
-		option (micro.openapiv3.openapiv3_operation) = {
-      operation_id: "Metrics";
-      responses: {
-        default: {
-          reference: {
-            _ref: "micro.codec.Frame";
-          };
-        };
-      };
-    };
-		option (micro.api.http) = { get: "/metrics"; };
-  };
-};

meter/handler/handler_micro.pb.go

@@ -1,32 +0,0 @@
-// Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
-// source: handler.proto
-
-package handler
-
-import (
-	context "context"
-	api "go.unistack.org/micro/v3/api"
-	codec "go.unistack.org/micro/v3/codec"
-)
-
-var (
-	MeterName = "Meter"
-
-	MeterEndpoints = []api.Endpoint{
-		{
-			Name:    "Meter.Metrics",
-			Path:    []string{"/metrics"},
-			Method:  []string{"GET"},
-			Handler: "rpc",
-		},
-	}
-)
-
-func NewMeterEndpoints() []api.Endpoint {
-	return MeterEndpoints
-}
-
-type MeterServer interface {
-	Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
-}

meter/handler/handler_micro_http.pb.go

@@ -1,35 +0,0 @@
-// Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
-// source: handler.proto
-
-package handler
-
-import (
-	context "context"
-	api "go.unistack.org/micro/v3/api"
-	codec "go.unistack.org/micro/v3/codec"
-	server "go.unistack.org/micro/v3/server"
-)
-
-type meterServer struct {
-	MeterServer
-}
-
-func (h *meterServer) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
-	return h.MeterServer.Metrics(ctx, req, rsp)
-}
-
-func RegisterMeterServer(s server.Server, sh MeterServer, opts ...server.HandlerOption) error {
-	type meter interface {
-		Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error
-	}
-	type Meter struct {
-		meter
-	}
-	h := &meterServer{sh}
-	var nopts []server.HandlerOption
-	for _, endpoint := range MeterEndpoints {
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
-	return s.Handle(s.NewHandler(&Meter{h}, append(nopts, opts...)...))
-}

meter/meter.go

@@ -1,5 +1,5 @@
 // Package meter is for instrumentation
-package meter // import "go.unistack.org/micro/v3/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 (
@@ -31,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
@@ -41,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
@@ -49,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)
 	}
@@ -67,7 +69,7 @@ func (r *noopMeter) Histogram(name string, labels ...string) Histogram {
 }
 
 // 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(w io.Writer, opts ...Option) error {
+func (r *noopMeter) Write(_ io.Writer, _ ...options.Option) error {
 	return nil
 }
 

meter/options.go

@@ -2,13 +2,13 @@ package meter
 
 import (
 	"context"
+	"reflect"
 
-	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/options"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
-// Option powers the configuration for metrics implementations:
-type Option func(*Options)
-
 // Options for metrics implementations
 type Options struct {
 	// Logger used for logging
@@ -34,7 +34,7 @@ type Options struct {
 }
 
 // NewOptions prepares a set of options:
-func NewOptions(opt ...Option) Options {
+func NewOptions(opt ...options.Option) Options {
 	opts := Options{
 		Address:      DefaultAddress,
 		Path:         DefaultPath,
@@ -52,37 +52,23 @@ func NewOptions(opt ...Option) Options {
 }
 
 // LabelPrefix sets the labels prefix
-func LabelPrefix(pref string) Option {
-	return func(o *Options) {
-		o.LabelPrefix = pref
+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) Option {
-	return func(o *Options) {
-		o.MetricPrefix = pref
-	}
-}
-
-// Context sets the metrics context
-func Context(ctx context.Context) Option {
-	return func(o *Options) {
-		o.Context = ctx
+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")
 	}
 }
 
@@ -95,37 +81,34 @@ func TimingObjectives(value map[float64]float64) Option {
 }
 */
 
-// Logger sets the logger
-func Logger(l logger.Logger) Option {
-	return func(o *Options) {
-		o.Logger = l
-	}
-}
-
 // Labels sets the meter labels
-func Labels(ls ...string) 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
+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

@@ -1,56 +1,24 @@
-package wrapper // import "go.unistack.org/micro/v3/meter/wrapper"
+package wrapper // import "go.unistack.org/micro/v4/meter/wrapper"
 
 import (
 	"context"
 	"fmt"
 	"time"
 
-	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/server"
+	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/semconv"
+	"go.unistack.org/micro/v4/server"
 )
 
 var (
-	// ClientRequestDurationSeconds specifies meter metric name
-	ClientRequestDurationSeconds = "client_request_duration_seconds"
-	// ClientRequestLatencyMicroseconds specifies meter metric name
-	ClientRequestLatencyMicroseconds = "client_request_latency_microseconds"
-	// ClientRequestTotal specifies meter metric name
-	ClientRequestTotal = "client_request_total"
-	// ClientRequestInflight specifies meter metric name
-	ClientRequestInflight = "client_request_inflight"
-	// ServerRequestDurationSeconds specifies meter metric name
-	ServerRequestDurationSeconds = "server_request_duration_seconds"
-	// ServerRequestLatencyMicroseconds specifies meter metric name
-	ServerRequestLatencyMicroseconds = "server_request_latency_microseconds"
-	// ServerRequestTotal specifies meter metric name
-	ServerRequestTotal = "server_request_total"
-	// ServerRequestInflight specifies meter metric name
-	ServerRequestInflight = "server_request_inflight"
-	// PublishMessageDurationSeconds specifies meter metric name
-	PublishMessageDurationSeconds = "publish_message_duration_seconds"
-	// PublishMessageLatencyMicroseconds specifies meter metric name
-	PublishMessageLatencyMicroseconds = "publish_message_latency_microseconds"
-	// PublishMessageTotal specifies meter metric name
-	PublishMessageTotal = "publish_message_total"
-	// PublishMessageInflight specifies meter metric name
-	PublishMessageInflight = "publish_message_inflight"
-	// SubscribeMessageDurationSeconds specifies meter metric name
-	SubscribeMessageDurationSeconds = "subscribe_message_duration_seconds"
-	// SubscribeMessageLatencyMicroseconds specifies meter metric name
-	SubscribeMessageLatencyMicroseconds = "subscribe_message_latency_microseconds"
-	// SubscribeMessageTotal specifies meter metric name
-	SubscribeMessageTotal = "subscribe_message_total"
-	// SubscribeMessageInflight specifies meter metric name
-	SubscribeMessageInflight = "subscribe_message_inflight"
-
 	labelSuccess  = "success"
 	labelFailure  = "failure"
 	labelStatus   = "status"
 	labelEndpoint = "endpoint"
 
 	// DefaultSkipEndpoints contains list of endpoints that not evaluted by wrapper
-	DefaultSkipEndpoints = []string{"Meter.Metrics"}
+	DefaultSkipEndpoints = []string{"Meter.Metrics", "Health.Live", "Health.Ready", "Health.Version"}
 )
 
 // Options struct
@@ -150,21 +118,21 @@ func (w *wrapper) CallFunc(ctx context.Context, addr string, req client.Request,
 	labels := make([]string, 0, 4)
 	labels = append(labels, labelEndpoint, endpoint)
 
-	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
+	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(ClientRequestInflight, labels...).Dec()
+	w.opts.Meter.Counter(semconv.ClientRequestInflight, labels...).Dec()
 
-	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
+	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(ClientRequestTotal, labels...).Inc()
+	w.opts.Meter.Counter(semconv.ClientRequestTotal, labels...).Inc()
 
 	return err
 }
@@ -180,21 +148,21 @@ func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{},
 	labels := make([]string, 0, 4)
 	labels = append(labels, labelEndpoint, endpoint)
 
-	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
+	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(ClientRequestInflight, labels...).Dec()
+	w.opts.Meter.Counter(semconv.ClientRequestInflight, labels...).Dec()
 
-	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
+	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(ClientRequestTotal, labels...).Inc()
+	w.opts.Meter.Counter(semconv.ClientRequestTotal, labels...).Inc()
 
 	return err
 }
@@ -210,52 +178,27 @@ func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client
 	labels := make([]string, 0, 4)
 	labels = append(labels, labelEndpoint, endpoint)
 
-	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
+	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(ClientRequestInflight, labels...).Dec()
+	w.opts.Meter.Counter(semconv.ClientRequestInflight, labels...).Dec()
 
-	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
+	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(ClientRequestTotal, labels...).Inc()
+	w.opts.Meter.Counter(semconv.ClientRequestTotal, labels...).Inc()
 
 	return stream, err
 }
 
-func (w *wrapper) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
-	endpoint := p.Topic()
-
-	labels := make([]string, 0, 4)
-	labels = append(labels, labelEndpoint, endpoint)
-
-	w.opts.Meter.Counter(PublishMessageInflight, labels...).Inc()
-	ts := time.Now()
-	err := w.Client.Publish(ctx, p, opts...)
-	te := time.Since(ts)
-	w.opts.Meter.Counter(PublishMessageInflight, labels...).Dec()
-
-	w.opts.Meter.Summary(PublishMessageLatencyMicroseconds, labels...).Update(te.Seconds())
-	w.opts.Meter.Histogram(PublishMessageDurationSeconds, labels...).Update(te.Seconds())
-
-	if err == nil {
-		labels = append(labels, labelStatus, labelSuccess)
-	} else {
-		labels = append(labels, labelStatus, labelFailure)
-	}
-	w.opts.Meter.Counter(PublishMessageTotal, labels...).Inc()
-
-	return err
-}
-
-// NewHandlerWrapper create new server handler wrapper
-func NewHandlerWrapper(opts ...Option) server.HandlerWrapper {
+// NewServerHandlerWrapper create new server handler wrapper
+func NewServerHandlerWrapper(opts ...Option) server.HandlerWrapper {
 	handler := &wrapper{
 		opts: NewOptions(opts...),
 	}
@@ -274,56 +217,21 @@ func (w *wrapper) HandlerFunc(fn server.HandlerFunc) server.HandlerFunc {
 		labels := make([]string, 0, 4)
 		labels = append(labels, labelEndpoint, endpoint)
 
-		w.opts.Meter.Counter(ServerRequestInflight, labels...).Inc()
+		w.opts.Meter.Counter(semconv.ServerRequestInflight, labels...).Inc()
 		ts := time.Now()
 		err := fn(ctx, req, rsp)
 		te := time.Since(ts)
-		w.opts.Meter.Counter(ServerRequestInflight, labels...).Dec()
+		w.opts.Meter.Counter(semconv.ServerRequestInflight, labels...).Dec()
 
-		w.opts.Meter.Summary(ServerRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-		w.opts.Meter.Histogram(ServerRequestDurationSeconds, labels...).Update(te.Seconds())
+		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(ServerRequestTotal, labels...).Inc()
-
-		return err
-	}
-}
-
-// NewSubscriberWrapper create server subscribe wrapper
-func NewSubscriberWrapper(opts ...Option) server.SubscriberWrapper {
-	handler := &wrapper{
-		opts: NewOptions(opts...),
-	}
-	return handler.SubscriberFunc
-}
-
-func (w *wrapper) SubscriberFunc(fn server.SubscriberFunc) server.SubscriberFunc {
-	return func(ctx context.Context, msg server.Message) error {
-		endpoint := msg.Topic()
-
-		labels := make([]string, 0, 4)
-		labels = append(labels, labelEndpoint, endpoint)
-
-		w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Inc()
-		ts := time.Now()
-		err := fn(ctx, msg)
-		te := time.Since(ts)
-		w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Dec()
-
-		w.opts.Meter.Summary(SubscribeMessageLatencyMicroseconds, labels...).Update(te.Seconds())
-		w.opts.Meter.Histogram(SubscribeMessageDurationSeconds, labels...).Update(te.Seconds())
-
-		if err == nil {
-			labels = append(labels, labelStatus, labelSuccess)
-		} else {
-			labels = append(labels, labelStatus, labelFailure)
-		}
-		w.opts.Meter.Counter(SubscribeMessageTotal, labels...).Inc()
+		w.opts.Meter.Counter(semconv.ServerRequestTotal, labels...).Inc()
 
 		return err
 	}

mtls/mtls.go

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

network/network.go

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

network/options.go

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

network/transport/context.go

@@ -1,34 +0,0 @@
-package transport
-
-import (
-	"context"
-)
-
-type transportKey struct{}
-
-// FromContext get transport from context
-func FromContext(ctx context.Context) (Transport, bool) {
-	if ctx == nil {
-		return nil, false
-	}
-	c, ok := ctx.Value(transportKey{}).(Transport)
-	return c, ok
-}
-
-// NewContext put transport in context
-func NewContext(ctx context.Context, c Transport) context.Context {
-	if ctx == nil {
-		ctx = context.Background()
-	}
-	return context.WithValue(ctx, transportKey{}, c)
-}
-
-// SetOption returns a function to setup a context with given value
-func SetOption(k, v interface{}) Option {
-	return func(o *Options) {
-		if o.Context == nil {
-			o.Context = context.Background()
-		}
-		o.Context = context.WithValue(o.Context, k, v)
-	}
-}

network/transport/memory.go

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

network/transport/memory_test.go

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

network/transport/options.go

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

network/transport/transport.go

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

network/tunnel/broker/broker.go

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

network/tunnel/options.go

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

network/tunnel/transport/listener.go

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

network/tunnel/transport/transport.go

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