initial stuff for wrappers

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

.gitea/ISSUE_TEMPLATE/bug_report.md

@@ -1,18 +0,0 @@
----
-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

@@ -1,17 +0,0 @@
----
-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

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

.gitea/autoapprove.yml

@@ -1,28 +0,0 @@
-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/pkgdashcli.yaml

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

.gitea/workflows/autoupdate.yml

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

.gitea/workflows/coverage.yml

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

.gitea/workflows/lint.yml

@@ -1,24 +0,0 @@
-name: lint
-on:
-  pull_request:
-    branches:
-    - master
-    - v3
-jobs:
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup-go
-      uses: https://gitea.com/actions/setup-go@v3
-      with:
-        go-version: 1.21
-    - name: checkout
-      uses: https://gitea.com/actions/checkout@v3
-    - name: deps
-      run: go get -v -d ./...
-    - name: lint
-      uses: https://github.com/golangci/golangci-lint-action@v3.4.0
-      continue-on-error: true
-      with:
-        version: v1.52

.gitea/workflows/pr.yml

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

.github.old/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +0,0 @@
-## 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/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v3.3.1
         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/workflows/dependabot-automerge.yml

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

.github/workflows/pr.yml

@@ -34,7 +34,14 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v3.3.1
         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

.gitignore

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

.golangci.yml

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

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/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 [![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 is a standard library for microservices.
 

api/api.go

@@ -0,0 +1,182 @@
+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

@@ -0,0 +1,245 @@
+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,27 +1,21 @@
 // Package broker is an interface used for asynchronous messaging
-package broker // import "go.unistack.org/micro/v4/broker"
+package broker // import "go.unistack.org/micro/v3/broker"
 
 import (
 	"context"
 	"errors"
-	"time"
 
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v3/metadata"
 )
 
 // DefaultBroker default memory broker
-var DefaultBroker Broker = NewBroker()
+var DefaultBroker = NewBroker()
 
 var (
 	// ErrNotConnected returns when broker used but not connected yet
 	ErrNotConnected = errors.New("broker not connected")
 	// ErrDisconnected returns when broker disconnected
 	ErrDisconnected = errors.New("broker disconnected")
-	// ErrInvalidMessage returns when message has nvalid format
-	ErrInvalidMessage = errors.New("broker message has invalid format")
-	// DefaultGracefulTimeout
-	DefaultGracefulTimeout = 5 * time.Second
 )
 
 // Broker is an interface used for asynchronous messaging.
@@ -29,7 +23,7 @@ type Broker interface {
 	// Name returns broker instance name
 	Name() string
 	// Init initilize broker
-	Init(opts ...options.Option) error
+	Init(opts ...Option) error
 	// Options returns broker options
 	Options() Options
 	// Address return configured address
@@ -38,29 +32,93 @@ type Broker interface {
 	Connect(ctx context.Context) error
 	// Disconnect disconnect from broker
 	Disconnect(ctx context.Context) error
-	// Publish message, msg can be single broker.Message or []broker.Message
-	Publish(ctx context.Context, msg interface{}, opts ...options.Option) error
+	// Publish message to broker topic
+	Publish(ctx context.Context, topic string, msg *Message, opts ...PublishOption) error
 	// Subscribe subscribes to topic message via handler
-	Subscribe(ctx context.Context, topic string, handler interface{}, opts ...options.Option) (Subscriber, error)
+	Subscribe(ctx context.Context, topic string, h Handler, opts ...SubscribeOption) (Subscriber, error)
+	// BatchPublish messages to broker with multiple topics
+	BatchPublish(ctx context.Context, msgs []*Message, opts ...PublishOption) error
+	// BatchSubscribe subscribes to topic messages via handler
+	BatchSubscribe(ctx context.Context, topic string, h BatchHandler, opts ...SubscribeOption) (Subscriber, error)
 	// String type of broker
 	String() string
 }
 
-// Message is given to a subscription handler for processing
-type Message interface {
-	// Context for the message
-	Context() context.Context
-	// Topic
+// 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
 	Topic() string
-	// Header returns message headers
-	Header() metadata.Metadata
-	// Body returns broker message may be []byte slice or some go struct
-	Body() interface{}
+	// Message returns broker message
+	Message() *Message
 	// 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
@@ -72,9 +130,3 @@ type Subscriber interface {
 	// Unsubscribe from topic
 	Unsubscribe(ctx context.Context) error
 }
-
-// MessageHandler func signature for single message processing
-type MessageHandler func(Message) error
-
-// MessagesHandler func signature for batch message processing
-type MessagesHandler func([]Message) error

broker/context.go

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

broker/context_test.go

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

broker/memory.go

@@ -2,22 +2,17 @@ package broker
 
 import (
 	"context"
-	"fmt"
 	"sync"
-	"time"
 
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v4/semconv"
-	maddr "go.unistack.org/micro/v4/util/addr"
-	"go.unistack.org/micro/v4/util/id"
-	mnet "go.unistack.org/micro/v4/util/net"
-	"go.unistack.org/micro/v4/util/rand"
+	"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"
 )
 
-type MemoryBroker struct {
+type memoryBroker struct {
 	subscribers map[string][]*memorySubscriber
 	addr        string
 	opts        Options
@@ -25,15 +20,32 @@ type MemoryBroker struct {
 	connected bool
 }
 
-func (m *MemoryBroker) Options() Options {
+type memoryEvent struct {
+	err     error
+	message interface{}
+	topic   string
+	opts    Options
+}
+
+type memorySubscriber struct {
+	ctx          context.Context
+	exit         chan bool
+	handler      Handler
+	batchhandler BatchHandler
+	id           string
+	topic        string
+	opts         SubscribeOptions
+}
+
+func (m *memoryBroker) Options() Options {
 	return m.opts
 }
 
-func (m *MemoryBroker) Address() string {
+func (m *memoryBroker) Address() string {
 	return m.addr
 }
 
-func (m *MemoryBroker) Connect(ctx context.Context) error {
+func (m *memoryBroker) Connect(ctx context.Context) error {
 	m.Lock()
 	defer m.Unlock()
 
@@ -57,33 +69,35 @@ func (m *MemoryBroker) Connect(ctx context.Context) error {
 	return nil
 }
 
-func (m *MemoryBroker) Disconnect(ctx context.Context) error {
+func (m *memoryBroker) Disconnect(ctx context.Context) error {
 	m.Lock()
 	defer m.Unlock()
 
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-		if m.connected {
-			m.connected = false
-		}
+	if !m.connected {
+		return nil
 	}
 
+	m.connected = false
 	return nil
 }
 
-func (m *MemoryBroker) Init(opts ...options.Option) error {
-	var err error
+func (m *memoryBroker) Init(opts ...Option) error {
 	for _, o := range opts {
-		if err = o(&m.opts); err != nil {
-			return err
-		}
+		o(&m.opts)
 	}
 	return nil
 }
 
-func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ...options.Option) error {
+func (m *memoryBroker) Publish(ctx context.Context, topic string, msg *Message, opts ...PublishOption) error {
+	msg.Header.Set(metadata.HeaderTopic, topic)
+	return m.publish(ctx, []*Message{msg}, opts...)
+}
+
+func (m *memoryBroker) BatchPublish(ctx context.Context, msgs []*Message, opts ...PublishOption) error {
+	return m.publish(ctx, msgs, opts...)
+}
+
+func (m *memoryBroker) publish(ctx context.Context, msgs []*Message, opts ...PublishOption) error {
 	m.RLock()
 	if !m.connected {
 		m.RUnlock()
@@ -98,29 +112,17 @@ func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ..
 		return ctx.Err()
 	default:
 		options := NewPublishOptions(opts...)
-		var msgs []Message
-		switch v := message.(type) {
-		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()
+
+		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
 			} else {
-				cf, ok := m.opts.Codecs[options.ContentType]
-				if !ok {
-					return fmt.Errorf("%s: %s", codec.ErrUnknownContentType, options.ContentType)
-				}
-				p.body, err = cf.Marshal(v)
+				p.topic, _ = v.Header.Get(metadata.HeaderTopic)
+				p.message, err = m.opts.Codec.Marshal(v)
 				if err != nil {
 					return err
 				}
@@ -128,96 +130,110 @@ func (m *MemoryBroker) Publish(ctx context.Context, message interface{}, opts ..
 			msgTopicMap[p.topic] = append(msgTopicMap[p.topic], p)
 		}
 
+		beh := m.opts.BatchErrorHandler
 		eh := m.opts.ErrorHandler
 
 		for t, ms := range msgTopicMap {
-			ts := time.Now()
-
-			m.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", t).Add(len(ms))
-			m.opts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", t).Add(len(ms))
-
 			m.RLock()
 			subs, ok := m.subscribers[t]
 			m.RUnlock()
 			if !ok {
-				m.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", t, "status", "failure").Add(len(ms))
-				m.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", t).Add(-len(ms))
-				m.opts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", t).Add(-len(ms))
 				continue
 			}
 
-			m.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", t, "status", "success").Add(len(ms))
 			for _, sub := range subs {
+				if sub.opts.BatchErrorHandler != nil {
+					beh = sub.opts.BatchErrorHandler
+				}
 				if sub.opts.ErrorHandler != nil {
 					eh = sub.opts.ErrorHandler
 				}
 
-				switch mh := sub.handler.(type) {
-				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)
-								}
-							}
+				switch {
+				// batch processing
+				case sub.batchhandler != nil:
+					if err = sub.batchhandler(ms); err != nil {
+						ms.SetError(err)
+						if beh != nil {
+							_ = beh(ms)
 						} else if m.opts.Logger.V(logger.ErrorLevel) {
 							m.opts.Logger.Error(m.opts.Context, err.Error())
 						}
+					} else if sub.opts.AutoAck {
+						if err = ms.Ack(); err != nil {
+							m.opts.Logger.Errorf(m.opts.Context, "ack failed: %v", err)
+						}
 					}
-				case MessageHandler:
+					// single processing
+				case sub.handler != nil:
 					for _, p := range ms {
-						if err = mh(p); err != nil {
-							m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "failure").Inc()
+						if err = sub.handler(p); err != nil {
+							p.SetError(err)
 							if eh != nil {
-								switch meh := eh.(type) {
-								case MessageHandler:
-									_ = meh(p)
-								case MessagesHandler:
-									_ = meh([]Message{p})
-								}
+								_ = eh(p)
 							} else if m.opts.Logger.V(logger.ErrorLevel) {
 								m.opts.Logger.Error(m.opts.Context, err.Error())
 							}
-						} else {
-							if sub.opts.AutoAck {
-								if err = p.Ack(); err != nil {
-									m.opts.Logger.Error(m.opts.Context, "ack failed: "+err.Error())
-									m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "failure").Inc()
-								} else {
-									m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "success").Inc()
-								}
-							} else {
-								m.opts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", t, "status", "success").Inc()
+						} 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.PublishMessageInflight, "endpoint", t).Add(-1)
-						m.opts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", t).Add(-1)
 					}
 				}
 			}
-
-			te := time.Since(ts)
-			m.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", t).Update(te.Seconds())
-			m.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", t).Update(te.Seconds())
-			m.opts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", t).Update(te.Seconds())
-			m.opts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", t).Update(te.Seconds())
 		}
-
 	}
 
 	return nil
 }
 
-func (m *MemoryBroker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...options.Option) (Subscriber, error) {
+func (m *memoryBroker) BatchSubscribe(ctx context.Context, topic string, handler BatchHandler, opts ...SubscribeOption) (Subscriber, error) {
+	m.RLock()
+	if !m.connected {
+		m.RUnlock()
+		return nil, ErrNotConnected
+	}
+	m.RUnlock()
+
+	sid, err := id.New()
+	if err != nil {
+		return nil, err
+	}
+
+	options := NewSubscribeOptions(opts...)
+
+	sub := &memorySubscriber{
+		exit:         make(chan bool, 1),
+		id:           sid,
+		topic:        topic,
+		batchhandler: handler,
+		opts:         options,
+		ctx:          ctx,
+	}
+
+	m.Lock()
+	m.subscribers[topic] = append(m.subscribers[topic], sub)
+	m.Unlock()
+
+	go func() {
+		<-sub.exit
+		m.Lock()
+		newSubscribers := make([]*memorySubscriber, 0, len(m.subscribers)-1)
+		for _, sb := range m.subscribers[topic] {
+			if sb.id == sub.id {
+				continue
+			}
+			newSubscribers = append(newSubscribers, sb)
+		}
+		m.subscribers[topic] = newSubscribers
+		m.Unlock()
+	}()
+
+	return sub, nil
+}
+
+func (m *memoryBroker) Subscribe(ctx context.Context, topic string, handler Handler, opts ...SubscribeOption) (Subscriber, error) {
 	m.RLock()
 	if !m.connected {
 		m.RUnlock()
@@ -262,54 +278,46 @@ func (m *MemoryBroker) Subscribe(ctx context.Context, topic string, handler inte
 	return sub, nil
 }
 
-func (m *MemoryBroker) String() string {
+func (m *memoryBroker) String() string {
 	return "memory"
 }
 
-func (m *MemoryBroker) Name() string {
+func (m *memoryBroker) Name() string {
 	return m.opts.Name
 }
 
-type memoryMessage struct {
-	err    error
-	body   interface{}
-	topic  string
-	header metadata.Metadata
-	opts   PublishOptions
-	ctx    context.Context
-}
-
-func (m *memoryMessage) Topic() string {
+func (m *memoryEvent) Topic() string {
 	return m.topic
 }
 
-func (m *memoryMessage) Header() metadata.Metadata {
-	return m.header
-}
+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) Body() interface{} {
-	return m.body
-}
-
-func (m *memoryMessage) Ack() error {
 	return nil
 }
 
-func (m *memoryMessage) Error() error {
+func (m *memoryEvent) Ack() error {
+	return nil
+}
+
+func (m *memoryEvent) Error() error {
 	return m.err
 }
 
-func (m *memoryMessage) Context() context.Context {
-	return m.ctx
-}
-
-type memorySubscriber struct {
-	ctx     context.Context
-	exit    chan bool
-	handler interface{}
-	id      string
-	topic   string
-	opts    SubscribeOptions
+func (m *memoryEvent) SetError(err error) {
+	m.err = err
 }
 
 func (m *memorySubscriber) Options() SubscribeOptions {
@@ -326,8 +334,8 @@ func (m *memorySubscriber) Unsubscribe(ctx context.Context) error {
 }
 
 // NewBroker return new memory broker
-func NewBroker(opts ...options.Option) *MemoryBroker {
-	return &MemoryBroker{
+func NewBroker(opts ...Option) Broker {
+	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/v4/metadata"
+	"go.unistack.org/micro/v3/metadata"
 )
 
 func TestMemoryBatchBroker(t *testing.T) {
@@ -19,35 +19,29 @@ func TestMemoryBatchBroker(t *testing.T) {
 	topic := "test"
 	count := 10
 
-	fn := func(evts []Message) error {
-		var err error
-		for _, evt := range evts {
-			if err = evt.Ack(); err != nil {
-				return err
-			}
-		}
-		return nil
+	fn := func(evts Events) error {
+		return evts.Ack()
 	}
 
-	sub, err := b.Subscribe(ctx, topic, fn)
+	sub, err := b.BatchSubscribe(ctx, topic, fn)
 	if err != nil {
 		t.Fatalf("Unexpected error subscribing %v", err)
 	}
 
-	msgs := make([]Message, 0, count)
+	msgs := make([]*Message, 0, count)
 	for i := 0; i < count; i++ {
-		message := &memoryMessage{
-			header: metadata.Metadata{
-				metadata.HeaderTopic: []string{topic},
-				"foo":                []string{"bar"},
-				"id":                 []string{fmt.Sprintf("%d", i)},
+		message := &Message{
+			Header: map[string]string{
+				metadata.HeaderTopic: topic,
+				"foo":                "bar",
+				"id":                 fmt.Sprintf("%d", i),
 			},
-			body: []byte(`"hello world"`),
+			Body: []byte(`"hello world"`),
 		}
 		msgs = append(msgs, message)
 	}
 
-	if err := b.Publish(ctx, msgs); err != nil {
+	if err := b.BatchPublish(ctx, msgs); err != nil {
 		t.Fatalf("Unexpected error publishing %v", err)
 	}
 
@@ -71,8 +65,8 @@ func TestMemoryBroker(t *testing.T) {
 	topic := "test"
 	count := 10
 
-	fn := func(p Message) error {
-		return p.Ack()
+	fn := func(p Event) error {
+		return nil
 	}
 
 	sub, err := b.Subscribe(ctx, topic, fn)
@@ -80,20 +74,24 @@ func TestMemoryBroker(t *testing.T) {
 		t.Fatalf("Unexpected error subscribing %v", err)
 	}
 
-	msgs := make([]Message, 0, count)
+	msgs := make([]*Message, 0, count)
 	for i := 0; i < count; i++ {
-		message := &memoryMessage{
-			header: metadata.Metadata{
-				metadata.HeaderTopic: []string{topic},
-				"foo":                []string{"bar"},
-				"id":                 []string{fmt.Sprintf("%d", i)},
+		message := &Message{
+			Header: map[string]string{
+				metadata.HeaderTopic: topic,
+				"foo":                "bar",
+				"id":                 fmt.Sprintf("%d", i),
 			},
-			body: []byte(`"hello world"`),
+			Body: []byte(`"hello world"`),
 		}
 		msgs = append(msgs, message)
+
+		if err := b.Publish(ctx, topic, message); err != nil {
+			t.Fatalf("Unexpected error publishing %d err: %v", i, err)
+		}
 	}
 
-	if err := b.Publish(ctx, msgs); err != nil {
+	if err := b.BatchPublish(ctx, msgs); err != nil {
 		t.Fatalf("Unexpected error publishing %v", err)
 	}
 

broker/options.go

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

broker/subscriber.go

@@ -1,98 +0,0 @@
-package broker
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-const (
-	subSig      = "func(context.Context, interface{}) error"
-	batchSubSig = "func([]context.Context, []interface{}) error"
-)
-
-// Precompute the reflect type for error. Can't use error directly
-// because Typeof takes an empty interface value. This is annoying.
-var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
-
-// Is this an exported - upper case - name?
-func isExported(name string) bool {
-	r, _ := utf8.DecodeRuneInString(name)
-	return unicode.IsUpper(r)
-}
-
-// 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/v4/util/backoff"
+	"go.unistack.org/micro/v3/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/v4/client"
+package client // import "go.unistack.org/micro/v3/client"
 
 import (
 	"context"
 	"time"
 
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/metadata"
 )
 
 var (
 	// DefaultClient is the global default client
 	DefaultClient = NewClient()
 	// DefaultContentType is the default content-type if not specified
-	DefaultContentType = ""
+	DefaultContentType = "application/json"
 	// 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,8 +22,6 @@ var (
 	DefaultRetries = 0
 	// DefaultRequestTimeout is the default request timeout
 	DefaultRequestTimeout = time.Second * 5
-	// DefaultDialTimeout the default dial timeout
-	DefaultDialTimeout = time.Second * 5
 	// DefaultPoolSize sets the connection pool size
 	DefaultPoolSize = 100
 	// DefaultPoolTTL sets the connection pool ttl
@@ -35,14 +33,25 @@ var (
 // It also supports bidirectional streaming of requests.
 type Client interface {
 	Name() string
-	Init(opts ...options.Option) error
+	Init(opts ...Option) error
 	Options() Options
-	NewRequest(service string, endpoint string, req interface{}, opts ...options.Option) Request
-	Call(ctx context.Context, req Request, rsp interface{}, opts ...options.Option) error
-	Stream(ctx context.Context, req Request, opts ...options.Option) (Stream, error)
+	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
 	String() string
 }
 
+// Message is the interface for publishing asynchronously
+type Message interface {
+	Topic() string
+	Payload() interface{}
+	ContentType() string
+	Metadata() metadata.Metadata
+}
+
 // Request is the interface for a synchronous request used by Call or Stream
 type Request interface {
 	// The service to call
@@ -59,22 +68,16 @@ type Request interface {
 	Codec() codec.Codec
 	// indicates whether the request will be a streaming one rather than unary
 	Stream() bool
-	// Header data
-	// Header() metadata.Metadata
 }
 
 // Response is the response received from a service
 type Response interface {
 	// Read the response
 	Codec() codec.Codec
-	// The content type
-	// ContentType() string
 	// Header data
-	// Header() metadata.Metadata
+	Header() metadata.Metadata
 	// Read the undecoded response
 	Read() ([]byte, error)
-	// The unencoded request body
-	// Body() interface{}
 }
 
 // Stream is the interface for a bidirectional synchronous stream
@@ -100,3 +103,18 @@ type Stream interface {
 	// CloseSend closes the send direction of the stream
 	CloseSend() error
 }
+
+// Option used by the Client
+type Option func(*Options)
+
+// CallOption used by Call or Stream
+type CallOption func(*CallOptions)
+
+// PublishOption used by Publish
+type PublishOption func(*PublishOptions)
+
+// MessageOption used by NewMessage
+type MessageOption func(*MessageOptions)
+
+// RequestOption used by NewRequest
+type RequestOption func(*RequestOptions)

client/client_call_options.go

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

client/client_call_options_test.go

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

client/context.go

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

client/context_test.go

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

client/lookup.go

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

client/noop.go

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

client/options.go

@@ -6,25 +6,31 @@ import (
 	"net"
 	"time"
 
-	"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"
+	"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"
 )
 
 // Options holds client options
 type Options struct {
+	// Transport used for transfer messages
+	Transport transport.Transport
 	// Selector used to select needed address
 	Selector selector.Selector
 	// Logger used to log messages
 	Logger logger.Logger
 	// Tracer used for tracing
 	Tracer tracer.Tracer
+	// Broker used to publish messages
+	Broker broker.Broker
 	// Meter used for metrics
 	Meter meter.Meter
 	// Context is used for external options
@@ -43,6 +49,8 @@ type Options struct {
 	ContentType string
 	// Name is the client name
 	Name string
+	// Wrappers contains wrappers
+	Wrappers []Wrapper
 	// CallOptions contains default CallOptions
 	CallOptions CallOptions
 	// PoolSize connection pool size
@@ -51,12 +59,10 @@ type Options struct {
 	PoolTTL time.Duration
 	// ContextDialer used to connect
 	ContextDialer func(context.Context, string) (net.Conn, error)
-	// Hooks may contains Client func wrapper
-	Hooks options.Hooks
 }
 
 // NewCallOptions creates new call options struct
-func NewCallOptions(opts ...options.Option) CallOptions {
+func NewCallOptions(opts ...CallOption) CallOptions {
 	options := CallOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -105,14 +111,58 @@ type CallOptions struct {
 }
 
 // ContextDialer pass ContextDialer to client
-func ContextDialer(fn func(context.Context, string) (net.Conn, error)) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, fn, ".ContextDialer")
+func ContextDialer(fn func(context.Context, string) (net.Conn, error)) Option {
+	return func(o *Options) {
+		o.ContextDialer = fn
 	}
 }
 
+// Context pass context to client
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
+	}
+}
+
+// NewPublishOptions create new PublishOptions struct from option
+func NewPublishOptions(opts ...PublishOption) PublishOptions {
+	options := PublishOptions{}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
+// PublishOptions holds publish options
+type PublishOptions struct {
+	// Context used for external options
+	Context context.Context
+	// Exchange topic exchange name
+	Exchange string
+	// BodyOnly will publish only message body
+	BodyOnly bool
+}
+
+// NewMessageOptions creates message options struct
+func NewMessageOptions(opts ...MessageOption) MessageOptions {
+	options := MessageOptions{Metadata: metadata.New(1)}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
+// MessageOptions holds client message options
+type MessageOptions struct {
+	// Metadata additional metadata
+	Metadata metadata.Metadata
+	// ContentType specify content-type of message
+	// deprecated
+	ContentType string
+}
+
 // NewRequestOptions creates new RequestOptions struct
-func NewRequestOptions(opts ...options.Option) RequestOptions {
+func NewRequestOptions(opts ...RequestOption) RequestOptions {
 	options := RequestOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -131,7 +181,7 @@ type RequestOptions struct {
 }
 
 // NewOptions creates new options struct
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
 		Context:     context.Background(),
 		ContentType: DefaultContentType,
@@ -142,16 +192,18 @@ func NewOptions(opts ...options.Option) Options {
 			Retry:          DefaultRetry,
 			Retries:        DefaultRetries,
 			RequestTimeout: DefaultRequestTimeout,
-			DialTimeout:    DefaultDialTimeout,
+			DialTimeout:    transport.DefaultDialTimeout,
 		},
-		Lookup:   LookupRoute,
-		PoolSize: DefaultPoolSize,
-		PoolTTL:  DefaultPoolTTL,
-		Selector: random.NewSelector(),
-		Logger:   logger.DefaultLogger,
-		Meter:    meter.DefaultMeter,
-		Tracer:   tracer.DefaultTracer,
-		Router:   router.DefaultRouter,
+		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,
 	}
 
 	for _, o := range opts {
@@ -161,131 +213,381 @@ func NewOptions(opts ...options.Option) Options {
 	return options
 }
 
+// Broker to be used for pub/sub
+func Broker(b broker.Broker) Option {
+	return func(o *Options) {
+		o.Broker = b
+	}
+}
+
+// Tracer to be used for tracing
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
+	}
+}
+
+// Logger to be used for log mesages
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Meter to be used for metrics
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// Codec to be used to encode/decode requests for a given content type
+func Codec(contentType string, c codec.Codec) Option {
+	return func(o *Options) {
+		o.Codecs[contentType] = c
+	}
+}
+
+// ContentType used by default if not specified
+func ContentType(ct string) Option {
+	return func(o *Options) {
+		o.ContentType = ct
+	}
+}
+
 // Proxy sets the proxy address
-func Proxy(addr string) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, addr, ".Proxy")
+func Proxy(addr string) Option {
+	return func(o *Options) {
+		o.Proxy = addr
 	}
 }
 
 // PoolSize sets the connection pool size
-func PoolSize(d int) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, d, ".PoolSize")
+func PoolSize(d int) Option {
+	return func(o *Options) {
+		o.PoolSize = d
 	}
 }
 
 // PoolTTL sets the connection pool ttl
-func PoolTTL(td time.Duration) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, td, ".PoolTTL")
+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
 	}
 }
 
 // Selector is used to select a route
-func Selector(s selector.Selector) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, s, ".Selector")
+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...)
 	}
 }
 
 // Backoff is used to set the backoff function used when retrying Calls
-func Backoff(fn BackoffFunc) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, fn, ".Backoff")
+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
 	}
 }
 
 // Lookup sets the lookup function to use for resolving service names
-func Lookup(fn LookupFunc) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, fn, ".Lookup")
+func Lookup(l LookupFunc) Option {
+	return func(o *Options) {
+		o.Lookup = l
 	}
 }
 
-// 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")
+// 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),
+		)
 	}
 }
 
 // Retries sets the retry count when making the request.
-func Retries(n int) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, n, ".Retries")
+func Retries(i int) Option {
+	return func(o *Options) {
+		o.CallOptions.Retries = i
 	}
 }
 
 // Retry sets the retry function to be used when re-trying.
-func Retry(fn RetryFunc) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, fn, ".Retry")
+func Retry(fn RetryFunc) Option {
+	return func(o *Options) {
+		o.CallOptions.Retry = fn
 	}
 }
 
 // RequestTimeout is the request timeout.
-func RequestTimeout(td time.Duration) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, td, ".RequestTimeout")
+func RequestTimeout(d time.Duration) Option {
+	return func(o *Options) {
+		o.CallOptions.RequestTimeout = d
 	}
 }
 
 // StreamTimeout sets the stream timeout
-func StreamTimeout(td time.Duration) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, td, ".StreamTimeout")
+func StreamTimeout(d time.Duration) Option {
+	return func(o *Options) {
+		o.CallOptions.StreamTimeout = d
 	}
 }
 
 // DialTimeout sets the dial timeout
-func DialTimeout(td time.Duration) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, td, ".DialTimeout")
+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
 	}
 }
 
 // WithResponseMetadata is a CallOption which adds metadata.Metadata to Options.CallOptions
-func ResponseMetadata(md *metadata.Metadata) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, md, ".ResponseMetadata")
+func WithResponseMetadata(md *metadata.Metadata) CallOption {
+	return func(o *CallOptions) {
+		o.ResponseMetadata = md
 	}
 }
 
 // WithRequestMetadata is a CallOption which adds metadata.Metadata to Options.CallOptions
-func RequestMetadata(md metadata.Metadata) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, metadata.Copy(md), ".RequestMetadata")
+func WithRequestMetadata(md metadata.Metadata) CallOption {
+	return func(o *CallOptions) {
+		o.RequestMetadata = md
 	}
 }
 
-// AuthToken is a CallOption which overrides the
+// WithRequestTimeout is a CallOption which overrides that which
+// set in Options.CallOptions
+func WithRequestTimeout(d time.Duration) CallOption {
+	return func(o *CallOptions) {
+		o.RequestTimeout = d
+	}
+}
+
+// WithStreamTimeout sets the stream timeout
+func WithStreamTimeout(d time.Duration) CallOption {
+	return func(o *CallOptions) {
+		o.StreamTimeout = d
+	}
+}
+
+// WithDialTimeout is a CallOption which overrides that which
+// set in Options.CallOptions
+func WithDialTimeout(d time.Duration) CallOption {
+	return func(o *CallOptions) {
+		o.DialTimeout = d
+	}
+}
+
+// WithAuthToken is a CallOption which overrides the
 // authorization header with the services own auth token
-func AuthToken(t string) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, t, ".AuthToken")
+func WithAuthToken(t string) CallOption {
+	return func(o *CallOptions) {
+		o.AuthToken = t
 	}
 }
 
-// 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")
+// 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
 	}
 }
 
-/*
 // WithSelectOptions sets the options to pass to the selector for this call
-func WithSelectOptions(sops ...selector.SelectOption) options.Option {
+func WithSelectOptions(sops ...selector.SelectOption) CallOption {
 	return func(o *CallOptions) {
 		o.SelectOptions = sops
 	}
 }
-*/
 
-// StreamingRequest specifies that request is streaming
-func StreamingRequest(b bool) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, b, ".Stream")
+// 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
 	}
 }

client/retry.go

@@ -3,7 +3,7 @@ package client
 import (
 	"context"
 
-	"go.unistack.org/micro/v4/errors"
+	"go.unistack.org/micro/v3/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/v4/errors"
+	"go.unistack.org/micro/v3/errors"
 )
 
 func TestRetryAlways(t *testing.T) {

client/test_request.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v3/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/v4/codec"
+package codec // import "go.unistack.org/micro/v3/codec"
 
 import (
 	"errors"
 	"io"
 
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v3/metadata"
 )
 
 // Message types
@@ -84,24 +84,3 @@ 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-2023 Unistack LLC
+// Copyright 2021 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/v4/codec;codec";
+option go_package = "go.unistack.org/micro/v3/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/v4/logger"
-	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v3/tracer"
 )
 
 // Option func

config/config.go

@@ -1,13 +1,11 @@
 // Package config is an interface for dynamic configuration.
-package config // import "go.unistack.org/micro/v4/config"
+package config // import "go.unistack.org/micro/v3/config"
 
 import (
 	"context"
 	"errors"
 	"reflect"
 	"time"
-
-	"go.unistack.org/micro/v4/options"
 )
 
 type Validator interface {
@@ -39,15 +37,15 @@ type Config interface {
 	// Name returns name of config
 	Name() string
 	// Init the config
-	Init(opts ...options.Option) error
+	Init(opts ...Option) error
 	// Options in the config
 	Options() Options
 	// Load config from sources
-	Load(context.Context, ...options.Option) error
+	Load(context.Context, ...LoadOption) error
 	// Save config to sources
-	Save(context.Context, ...options.Option) error
+	Save(context.Context, ...SaveOption) error
 	// Watch a config for changes
-	Watch(context.Context, ...options.Option) (Watcher, error)
+	Watch(context.Context, ...WatchOption) (Watcher, error)
 	// String returns config type name
 	String() string
 }
@@ -61,7 +59,7 @@ type Watcher interface {
 }
 
 // Load loads config from config sources
-func Load(ctx context.Context, cs []Config, opts ...options.Option) error {
+func Load(ctx context.Context, cs []Config, opts ...LoadOption) error {
 	var err error
 	for _, c := range cs {
 		if err = c.Init(); err != nil {
@@ -126,29 +124,11 @@ func Validate(ctx context.Context, cfg interface{}) error {
 }
 
 var (
-	// 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.Error(ctx, c.String()+" BeforeLoad error "+err.Error())
-				if !c.Options().AllowFail {
-					return err
-				}
-			}
-		}
-		return nil
-	}
-	// DefaultAfterLoad default func that runs after config Load
+	// 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.Error(ctx, c.String()+" AfterLoad error "+err.Error())
+				c.Options().Logger.Errorf(ctx, "%s AfterLoad err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -156,29 +136,11 @@ var (
 		}
 		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.Error(ctx, c.String()+" BeforeSave error "+err.Error())
-				if !c.Options().AllowFail {
-					return err
-				}
-			}
-		}
-		return nil
-	}
-	// DefaultAfterSave default func that runs after config Save
+	// 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.Error(ctx, c.String()+" AfterSave error "+err.Error())
+				c.Options().Logger.Errorf(ctx, "%s AfterSave err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -186,14 +148,11 @@ var (
 		}
 		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
-			}
+	// DefaultBeforeLoad default func that runs before config load
+	DefaultBeforeLoad = func(ctx context.Context, c Config) error {
+		for _, fn := range c.Options().BeforeLoad {
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" BeforeInit error "+err.Error())
+				c.Options().Logger.Errorf(ctx, "%s BeforeLoad err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -201,14 +160,11 @@ var (
 		}
 		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
-			}
+	// DefaultBeforeSave default func that runs befora config save
+	DefaultBeforeSave = func(ctx context.Context, c Config) error {
+		for _, fn := range c.Options().BeforeSave {
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" AfterInit error "+err.Error())
+				c.Options().Logger.Errorf(ctx, "%s BeforeSave err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}

config/context.go

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

config/context_test.go

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

config/default.go

@@ -5,14 +5,9 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-	"time"
 
-	"dario.cat/mergo"
-	"github.com/google/uuid"
-	"go.unistack.org/micro/v4/options"
-	mid "go.unistack.org/micro/v4/util/id"
-	rutil "go.unistack.org/micro/v4/util/reflect"
-	mtime "go.unistack.org/micro/v4/util/time"
+	"github.com/imdario/mergo"
+	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
 type defaultConfig struct {
@@ -23,28 +18,15 @@ func (c *defaultConfig) Options() Options {
 	return c.opts
 }
 
-func (c *defaultConfig) Init(opts ...options.Option) error {
+func (c *defaultConfig) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&c.opts)
 	}
-
-	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 ...options.Option) error {
-	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
-		return nil
-	}
-
-	if err := DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
+func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error {
+	if err := DefaultBeforeLoad(ctx, c); err != nil {
 		return err
 	}
 
@@ -67,20 +49,21 @@ func (c *defaultConfig) Load(ctx context.Context, opts ...options.Option) error
 		if !c.opts.AllowFail {
 			return err
 		}
-		if err = DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
-			return err
-		}
+		return DefaultAfterLoad(ctx, c)
 	}
 
 	if err = fillValues(reflect.ValueOf(src), c.opts.StructTag); err == nil {
 		err = mergo.Merge(dst, src, mopts...)
 	}
 
-	if err != nil && !c.opts.AllowFail {
-		return err
+	if err != nil {
+		c.opts.Logger.Errorf(ctx, "default load error: %v", err)
+		if !c.opts.AllowFail {
+			return err
+		}
 	}
 
-	if err := DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
+	if err := DefaultAfterLoad(ctx, c); err != nil {
 		return err
 	}
 
@@ -92,7 +75,6 @@ func fillValue(value reflect.Value, val string) error {
 	if !rutil.IsEmpty(value) {
 		return nil
 	}
-
 	switch value.Kind() {
 	case reflect.Map:
 		t := value.Type()
@@ -131,20 +113,6 @@ func fillValue(value reflect.Value, val string) error {
 		}
 		value.Set(reflect.ValueOf(v))
 	case reflect.String:
-		switch val {
-		case "micro:generate uuid":
-			uid, err := uuid.NewRandom()
-			if err != nil {
-				return err
-			}
-			val = uid.String()
-		case "micro:generate id":
-			uid, err := mid.New()
-			if err != nil {
-				return err
-			}
-			val = uid
-		}
 		value.Set(reflect.ValueOf(val))
 	case reflect.Float32:
 		v, err := strconv.ParseFloat(val, 32)
@@ -183,26 +151,11 @@ func fillValue(value reflect.Value, val string) error {
 		}
 		value.Set(reflect.ValueOf(int32(v)))
 	case reflect.Int64:
-		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))
+		v, err := strconv.ParseInt(val, 10, 64)
+		if err != nil {
+			return err
 		}
+		value.Set(reflect.ValueOf(v))
 	case reflect.Uint:
 		v, err := strconv.ParseUint(val, 10, 0)
 		if err != nil {
@@ -296,11 +249,7 @@ func fillValues(valueOf reflect.Value, tname string) error {
 	return nil
 }
 
-func (c *defaultConfig) Save(ctx context.Context, _ ...options.Option) error {
-	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
-		return nil
-	}
-
+func (c *defaultConfig) Save(ctx context.Context, opts ...SaveOption) error {
 	if err := DefaultBeforeSave(ctx, c); err != nil {
 		return err
 	}
@@ -320,12 +269,12 @@ func (c *defaultConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *defaultConfig) Watch(ctx context.Context, opts ...options.Option) (Watcher, error) {
+func (c *defaultConfig) Watch(ctx context.Context, opts ...WatchOption) (Watcher, error) {
 	return nil, ErrWatcherNotImplemented
 }
 
 // NewConfig returns new default config source
-func NewConfig(opts ...options.Option) Config {
+func NewConfig(opts ...Option) Config {
 	options := NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = "default"

config/default_test.go

@@ -4,23 +4,15 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
-	"go.unistack.org/micro/v4/config"
-	mid "go.unistack.org/micro/v4/util/id"
-	mtime "go.unistack.org/micro/v4/util/time"
+	"go.unistack.org/micro/v3/config"
 )
 
 type cfg struct {
-	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"`
+	StringValue string `default:"string_value"`
+	IgnoreValue string `json:"-"`
+	StructValue *cfgStructValue
+	IntValue    int `default:"99"`
 }
 
 type cfgStructValue struct {
@@ -31,9 +23,6 @@ func (c *cfg) Validate() error {
 	if c.IntValue != 10 {
 		return fmt.Errorf("invalid IntValue %d != %d", 10, c.IntValue)
 	}
-	if c.MapValue["key1"] != true {
-		return fmt.Errorf("invalid MapValue %t != %t", true, c.MapValue["key1"])
-	}
 	return nil
 }
 
@@ -74,21 +63,6 @@ func TestDefault(t *testing.T) {
 	if conf.StringValue != "after_load" {
 		t.Fatal("AfterLoad option not working")
 	}
-	if len(conf.MapValue) != 2 {
-		t.Fatalf("map value invalid: %#+v\n", conf.MapValue)
-	}
-
-	if conf.UUIDValue == "" {
-		t.Fatalf("uuid value empty")
-	} else if len(conf.UUIDValue) != 36 {
-		t.Fatalf("uuid value invalid: %s", conf.UUIDValue)
-	}
-
-	if conf.IDValue == "" {
-		t.Fatalf("id value empty")
-	} else if len(conf.IDValue) != mid.DefaultSize {
-		t.Fatalf("id value invalid: %s", conf.IDValue)
-	}
 	_ = conf
 	// t.Logf("%#+v\n", conf)
 }
@@ -108,19 +82,3 @@ func TestValidate(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
-func TestString(t *testing.T) {
-	cfg := config.NewConfig()
-	res := cfg.String()
-	if res != "default" {
-		t.Fatalf("string value invalid: %s", res)
-	}
-}
-
-func TestName(t *testing.T) {
-	cfg := config.NewConfig()
-	res := cfg.Name()
-	if res != "" {
-		t.Fatal("name value not empty")
-	}
-}

config/options.go

@@ -4,11 +4,10 @@ import (
 	"context"
 	"time"
 
-	"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"
+	"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 hold the config options
@@ -29,28 +28,23 @@ 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
-	// 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 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
+	// 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 []func(context.Context, Config) error
 	// AllowFail flag to allow fail in config source
 	AllowFail bool
-	// SkipLoad runs only if condition returns true
-	SkipLoad func(context.Context, Config) bool
-	// SkipSave runs only if condition returns true
-	SkipSave func(context.Context, Config) bool
 }
 
+// Option function signature
+type Option func(o *Options)
+
 // NewOptions new options struct with filed values
-func NewOptions(opts ...options.Option) Options {
+func NewOptions(opts ...Option) Options {
 	options := Options{
 		Logger:  logger.DefaultLogger,
 		Meter:   meter.DefaultMeter,
@@ -64,16 +58,19 @@ func NewOptions(opts ...options.Option) Options {
 	return options
 }
 
+// LoadOption function signature
+type LoadOption func(o *LoadOptions)
+
 // LoadOptions struct
 type LoadOptions struct {
 	Struct   interface{}
-	Context  context.Context
 	Override bool
 	Append   bool
+	Context  context.Context
 }
 
 // NewLoadOptions create LoadOptions struct with provided opts
-func NewLoadOptions(opts ...options.Option) LoadOptions {
+func NewLoadOptions(opts ...LoadOption) LoadOptions {
 	options := LoadOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -82,27 +79,44 @@ func NewLoadOptions(opts ...options.Option) LoadOptions {
 }
 
 // LoadOverride override values when load
-func LoadOverride(b bool) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, b, ".Override")
+func LoadOverride(b bool) LoadOption {
+	return func(o *LoadOptions) {
+		o.Override = b
 	}
 }
 
 // LoadAppend override values when load
-func LoadAppend(b bool) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, b, ".Append")
+func LoadAppend(b bool) LoadOption {
+	return func(o *LoadOptions) {
+		o.Append = b
 	}
 }
 
+// LoadStruct override struct for loading
+func LoadStruct(src interface{}) LoadOption {
+	return func(o *LoadOptions) {
+		o.Struct = src
+	}
+}
+
+// SaveOption function signature
+type SaveOption func(o *SaveOptions)
+
 // SaveOptions struct
 type SaveOptions struct {
 	Struct  interface{}
 	Context context.Context
 }
 
+// SaveStruct override struct for save to config
+func SaveStruct(src interface{}) SaveOption {
+	return func(o *SaveOptions) {
+		o.Struct = src
+	}
+}
+
 // NewSaveOptions fill SaveOptions struct
-func NewSaveOptions(opts ...options.Option) SaveOptions {
+func NewSaveOptions(opts ...SaveOption) SaveOptions {
 	options := SaveOptions{}
 	for _, o := range opts {
 		o(&options)
@@ -111,65 +125,86 @@ func NewSaveOptions(opts ...options.Option) SaveOptions {
 }
 
 // AllowFail allows config source to fail
-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")
+func AllowFail(b bool) Option {
+	return func(o *Options) {
+		o.AllowFail = b
 	}
 }
 
 // BeforeLoad run funcs before config load
-func BeforeLoad(fn ...func(context.Context, Config) error) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, fn, ".BeforeLoad")
+func BeforeLoad(fn ...func(context.Context, Config) error) Option {
+	return func(o *Options) {
+		o.BeforeLoad = fn
 	}
 }
 
 // AfterLoad run funcs after config load
-func AfterLoad(fn ...func(context.Context, Config) error) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, fn, ".AfterLoad")
+func AfterLoad(fn ...func(context.Context, Config) error) Option {
+	return func(o *Options) {
+		o.AfterLoad = fn
 	}
 }
 
 // BeforeSave run funcs before save
-func BeforeSave(fn ...func(context.Context, Config) error) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, fn, ".BeforeSave")
+func BeforeSave(fn ...func(context.Context, Config) error) Option {
+	return func(o *Options) {
+		o.BeforeSave = fn
 	}
 }
 
 // AfterSave run fncs after save
-func AfterSave(fn ...func(context.Context, Config) error) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, fn, ".AfterSave")
+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
 	}
 }
 
 // Struct used as config
-func Struct(v interface{}) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, v, ".Struct")
+func Struct(v interface{}) Option {
+	return func(o *Options) {
+		o.Struct = v
 	}
 }
 
 // StructTag sets the struct tag that used for filling
-func StructTag(name string) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, name, ".StructTag")
+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
 	}
 }
 
@@ -187,8 +222,11 @@ type WatchOptions struct {
 	Coalesce bool
 }
 
+// WatchOption func signature
+type WatchOption func(*WatchOptions)
+
 // NewWatchOptions create WatchOptions struct with provided opts
-func NewWatchOptions(opts ...options.Option) WatchOptions {
+func NewWatchOptions(opts ...WatchOption) WatchOptions {
 	options := WatchOptions{
 		Context:     context.Background(),
 		MinInterval: DefaultWatcherMinInterval,
@@ -200,20 +238,31 @@ func NewWatchOptions(opts ...options.Option) WatchOptions {
 	return options
 }
 
-// Coalesce controls watch event combining
-func WatchCoalesce(b bool) options.Option {
-	return func(src interface{}) error {
-		return options.Set(src, b, ".Coalesce")
+// 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
 	}
 }
 
 // WatchInterval specifies min and max time.Duration for pulling changes
-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
+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
 	}
 }

database/dsn.go

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

database/dsn_test.go

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

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/v4/errors"
+package errors // import "go.unistack.org/micro/v3/errors"
 
 import (
 	"bytes"

errors/errors.proto

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Unistack LLC
+// Copyright 2021 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/v4/errors;errors";
+option go_package = "go.unistack.org/micro/v3/errors;errors";
 option java_multiple_files = true;
 option java_outer_classname = "MicroErrors";
 option java_package = "micro.errors";

event.go

@@ -0,0 +1,27 @@
+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,3 +22,13 @@ func NewContext(ctx context.Context, f Flow) context.Context {
 	}
 	return context.WithValue(ctx, flowKey{}, f)
 }
+
+// SetOption returns a function to setup a context with given value
+func SetOption(k, v interface{}) Option {
+	return func(o *Options) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		o.Context = context.WithValue(o.Context, k, v)
+	}
+}

flow/context_test.go

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

flow/dag_test.go

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

flow/default.go

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

flow/flow.go

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

flow/flow_test.go

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

flow/options.go

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

fsm/default.go

@@ -1,126 +0,0 @@
-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,8 +1,10 @@
-package fsm // import "go.unistack.org/micro/v4/fsm"
+package fsm // import "go.unistack.org/micro/v3/fsm"
 
 import (
 	"context"
 	"errors"
+	"fmt"
+	"sync"
 )
 
 var (
@@ -10,20 +12,170 @@ var (
 	StateEnd        = "end"
 )
 
-type State interface {
-	Name() string
-	Body() interface{}
+// 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
 }
 
-// StateWrapper wraps the StateFunc and returns the equivalent
-type StateWrapper func(StateFunc) StateFunc
+// 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
+	}
+}
 
 // StateFunc called on state transition and return next step and error
-type StateFunc func(ctx context.Context, state State, opts ...StateOption) (State, error)
+type StateFunc func(ctx context.Context, args interface{}, opts ...StateOption) (string, interface{}, error)
 
-type FSM interface {
-	Start(context.Context, interface{}, ...Option) (interface{}, error)
-	Current() string
-	Reset()
-	State(string, StateFunc)
+// 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
+		}
+	}
 }

fsm/fsm_test.go

@@ -1,72 +1,63 @@
 package fsm
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"testing"
-
-	"go.unistack.org/micro/v4/logger"
 )
 
 func TestFSMStart(t *testing.T) {
 	ctx := context.TODO()
-
-	if err := logger.DefaultLogger.Init(); err != nil {
-		t.Fatal(err)
+	buf := bytes.NewBuffer(nil)
+	pfb := func(_ context.Context, state string, _ interface{}) {
+		fmt.Fprintf(buf, "before 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.Attrs("state", s.Name()))
-			return next(sctx, s, opts...)
-		}
+	pfa := func(_ context.Context, state string, _ interface{}) {
+		fmt.Fprintf(buf, "after state %s\n", state)
 	}
-
-	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{})
+	f := New(InitialState("1"), HookBefore(pfb), HookAfter(pfa))
+	f1 := func(_ context.Context, req interface{}, _ ...StateOption) (string, interface{}, error) {
+		args := req.(map[string]interface{})
 		if v, ok := args["request"].(string); !ok || v == "" {
-			return nil, fmt.Errorf("empty request")
+			return "", nil, fmt.Errorf("empty request")
 		}
-		return &state{name: "", body: map[string]interface{}{"response": "state1"}}, nil
+		return "2", map[string]interface{}{"response": "test2"}, nil
 	}
-	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")
-		}
-		args := s.Body().(map[string]interface{})
+	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")
+			return "", nil, fmt.Errorf("empty response")
 		}
-		return &state{name: "", body: map[string]interface{}{"response": "state2"}}, nil
+		return "", map[string]interface{}{"response": "test"}, nil
 	}
-	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")
-		}
-		args := s.Body().(map[string]interface{})
+	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")
+			return "", nil, fmt.Errorf("empty response")
 		}
-		return &state{name: StateEnd, body: map[string]interface{}{"response": "state3"}}, nil
+		return StateEnd, map[string]interface{}{"response": "test_last"}, nil
 	}
 	f.State("1", f1)
 	f.State("2", f2)
 	f.State("3", f3)
-	rsp, err := f.Start(ctx, map[string]interface{}{"request": "state"})
+	rsp, err := f.Start(ctx, map[string]interface{}{"request": "test1"})
 	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 != "state3" {
+	} else if v != "test_last" {
 		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

@@ -1,52 +0,0 @@
-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,20 +1,13 @@
-module go.unistack.org/micro/v4
+module go.unistack.org/micro/v3
 
-go 1.20
+go 1.16
 
 require (
-	dario.cat/mergo v1.0.0
-	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/google/uuid v1.6.0
+	github.com/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/patrickmn/go-cache v2.1.0+incompatible
-	github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5
-	golang.org/x/sync v0.6.0
-	golang.org/x/sys v0.16.0
-	google.golang.org/grpc v1.62.1
-	google.golang.org/protobuf v1.32.0
-)
-
-require (
-	github.com/golang/protobuf v1.5.3 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
+	github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35
+	go.unistack.org/micro-proto/v3 v3.3.1
 )

go.sum

@@ -1,33 +1,160 @@
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
-github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+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/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/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/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+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/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 h1:G/FZtUu7a6NTWl3KUHMV9jkLAh/Rvtf03NWMHaEDl+E=
-github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+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=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
-google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
-google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+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/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+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=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+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=

logger/context.go

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

logger/context_test.go

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

logger/default.go

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

logger/logger.go

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

logger/logger_test.go

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

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

logger/options.go

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

logger/slog/slog.go

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

logger/slog/slog_test.go

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

logger/stdlogger.go

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

logger/unwrap/unwrap.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v3/codec"
 )
 
 const sf = "0-+# "
@@ -35,7 +35,6 @@ var (
 	nilAngleBytes      = []byte("<nil>")
 	circularShortBytes = []byte("<shown>")
 	invalidAngleBytes  = []byte("<invalid>")
-	filteredBytes      = []byte("<filtered>")
 	openBracketBytes   = []byte("[")
 	closeBracketBytes  = []byte("]")
 	percentBytes       = []byte("%")
@@ -46,24 +45,15 @@ var (
 	closeMapBytes      = []byte("}")
 )
 
-type protoMessage interface {
-	Reset()
-	ProtoMessage()
+type unwrap struct {
+	val            interface{}
+	s              fmt.State
+	depth          int
+	pointers       map[uintptr]int
+	opts           *Options
+	ignoreNextType bool
 }
 
-type Wrapper struct {
-	val              interface{}
-	s                fmt.State
-	pointers         map[uintptr]int
-	opts             *Options
-	takeMap          map[int]bool
-	depth            int
-	ignoreNextType   bool
-	protoWrapperType bool
-	sqlWrapperType   bool
-}
-
-// Options struct
 type Options struct {
 	Codec   codec.Codec
 	Indent  string
@@ -71,7 +61,6 @@ type Options struct {
 	Tagged  bool
 }
 
-// NewOptions creates new Options struct via provided args
 func NewOptions(opts ...Option) Options {
 	options := Options{
 		Indent:  " ",
@@ -83,45 +72,40 @@ func NewOptions(opts ...Option) Options {
 	return options
 }
 
-// Option func signature
 type Option func(*Options)
 
-// Indent option specify indent level
 func Indent(f string) Option {
 	return func(o *Options) {
 		o.Indent = f
 	}
 }
 
-// Methods option toggles fmt.Stringer methods
 func Methods(b bool) Option {
 	return func(o *Options) {
 		o.Methods = b
 	}
 }
 
-// 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
 	}
 }
 
-// Tagged option toggles output only logger:"take" fields
 func Tagged(b bool) Option {
 	return func(o *Options) {
 		o.Tagged = b
 	}
 }
 
-func Unwrap(val interface{}, opts ...Option) *Wrapper {
+func Unwrap(val interface{}, opts ...Option) *unwrap {
 	options := NewOptions(opts...)
-	return &Wrapper{val: val, opts: &options, pointers: make(map[uintptr]int), takeMap: make(map[int]bool)}
+	return &unwrap{val: val, opts: &options, pointers: make(map[uintptr]int)}
 }
 
-func (w *Wrapper) unpackValue(v reflect.Value) reflect.Value {
+func (f *unwrap) unpackValue(v reflect.Value) reflect.Value {
 	if v.Kind() == reflect.Interface {
-		w.ignoreNextType = false
+		f.ignoreNextType = false
 		if !v.IsNil() {
 			v = v.Elem()
 		}
@@ -130,19 +114,19 @@ func (w *Wrapper) unpackValue(v reflect.Value) reflect.Value {
 }
 
 // formatPtr handles formatting of pointers by indirecting them as necessary.
-func (w *Wrapper) formatPtr(v reflect.Value) {
+func (f *unwrap) formatPtr(v reflect.Value) {
 	// Display nil if top level pointer is nil.
-	showTypes := w.s.Flag('#')
-	if v.IsNil() && (!showTypes || w.ignoreNextType) {
-		_, _ = w.s.Write(nilAngleBytes)
+	showTypes := f.s.Flag('#')
+	if v.IsNil() && (!showTypes || f.ignoreNextType) {
+		_, _ = f.s.Write(nilAngleBytes)
 		return
 	}
 
 	// Remove pointers at or below the current depth from map used to detect
 	// circular refs.
-	for k, depth := range w.pointers {
-		if depth >= w.depth {
-			delete(w.pointers, k)
+	for k, depth := range f.pointers {
+		if depth >= f.depth {
+			delete(f.pointers, k)
 		}
 	}
 
@@ -164,12 +148,12 @@ func (w *Wrapper) formatPtr(v reflect.Value) {
 		indirects++
 		addr := ve.Pointer()
 		pointerChain = append(pointerChain, addr)
-		if pd, ok := w.pointers[addr]; ok && pd < w.depth {
+		if pd, ok := f.pointers[addr]; ok && pd < f.depth {
 			cycleFound = true
 			indirects--
 			break
 		}
-		w.pointers[addr] = w.depth
+		f.pointers[addr] = f.depth
 
 		ve = ve.Elem()
 		if ve.Kind() == reflect.Interface {
@@ -182,49 +166,51 @@ func (w *Wrapper) formatPtr(v reflect.Value) {
 	}
 
 	// Display type or indirection level depending on flags.
-	if showTypes && !w.ignoreNextType {
-		if w.depth > 0 {
-			_, _ = w.s.Write(openParenBytes)
+	if showTypes && !f.ignoreNextType {
+		if f.depth > 0 {
+			_, _ = f.s.Write(openParenBytes)
 		}
-		if w.depth > 0 {
-			_, _ = w.s.Write(bytes.Repeat(asteriskBytes, indirects))
+		if f.depth > 0 {
+			_, _ = f.s.Write(bytes.Repeat(asteriskBytes, indirects))
 		} else {
-			_, _ = w.s.Write(bytes.Repeat(ampBytes, indirects))
+			_, _ = f.s.Write(bytes.Repeat(ampBytes, indirects))
 		}
-		_, _ = w.s.Write([]byte(ve.Type().String()))
-		if w.depth > 0 {
-			_, _ = w.s.Write(closeParenBytes)
+		_, _ = f.s.Write([]byte(ve.Type().String()))
+		if f.depth > 0 {
+			_, _ = f.s.Write(closeParenBytes)
 		}
 	} else {
 		if nilFound || cycleFound {
 			indirects += strings.Count(ve.Type().String(), "*")
 		}
-		_, _ = w.s.Write(openAngleBytes)
-		_, _ = w.s.Write([]byte(strings.Repeat("*", indirects)))
-		_, _ = w.s.Write(closeAngleBytes)
+		_, _ = f.s.Write(openAngleBytes)
+		_, _ = f.s.Write([]byte(strings.Repeat("*", indirects)))
+		_, _ = f.s.Write(closeAngleBytes)
 	}
 
 	// Display pointer information depending on flags.
-	if w.s.Flag('+') && (len(pointerChain) > 0) {
-		_, _ = w.s.Write(openParenBytes)
+	if f.s.Flag('+') && (len(pointerChain) > 0) {
+		_, _ = f.s.Write(openParenBytes)
 		for i, addr := range pointerChain {
 			if i > 0 {
-				_, _ = w.s.Write(pointerChainBytes)
+				_, _ = f.s.Write(pointerChainBytes)
 			}
-			getHexPtr(w.s, addr)
+			getHexPtr(f.s, addr)
 		}
-		_, _ = w.s.Write(closeParenBytes)
+		_, _ = f.s.Write(closeParenBytes)
 	}
 
 	// Display dereferenced value.
 	switch {
 	case nilFound:
-		_, _ = w.s.Write(nilAngleBytes)
+		_, _ = f.s.Write(nilAngleBytes)
+
 	case cycleFound:
-		_, _ = w.s.Write(circularShortBytes)
+		_, _ = f.s.Write(circularShortBytes)
+
 	default:
-		w.ignoreNextType = true
-		w.format(ve)
+		f.ignoreNextType = true
+		f.format(ve)
 	}
 }
 
@@ -232,73 +218,113 @@ func (w *Wrapper) 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 (w *Wrapper) format(v reflect.Value) {
-	if w.opts.Codec != nil {
-		buf, err := w.opts.Codec.Marshal(v.Interface())
+func (f *unwrap) format(v reflect.Value) {
+	if f.opts.Codec != nil {
+		buf, err := f.opts.Codec.Marshal(v.Interface())
 		if err != nil {
-			_, _ = w.s.Write(invalidAngleBytes)
+			_, _ = f.s.Write(invalidAngleBytes)
 			return
 		}
-		_, _ = w.s.Write(buf)
+		_, _ = f.s.Write(buf)
 		return
 	}
-
 	// Handle invalid reflect values immediately.
 	kind := v.Kind()
 	if kind == reflect.Invalid {
-		_, _ = w.s.Write(invalidAngleBytes)
+		_, _ = f.s.Write(invalidAngleBytes)
+		return
+	}
+
+	if (kind == reflect.Ptr) && (!reflect.Indirect(v).IsValid()) {
+		f.formatPtr(v)
 		return
 	}
 
 	// Handle pointers specially.
-	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
-				}
+	if kind == reflect.Ptr {
+		fmt.Printf("AAAA %s\n", reflect.Indirect(v).Type().String())
+		switch reflect.Indirect(v).Type().String() {
+		case "sql.NullBool":
+			if eva := reflect.Indirect(v).FieldByName("Valid"); eva.IsValid() && eva.Bool() {
+				v = reflect.Indirect(v).FieldByName("Bool")
+				kind = v.Kind()
 			}
-		}
-		w.formatPtr(v)
-		return
-	case reflect.Struct:
-		if !v.IsZero() {
-			if strings.HasPrefix(reflect.Indirect(v).Type().String(), "sql.Null") {
-				w.sqlWrapperType = true
+		case "sql.NullByte":
+			if eva := reflect.Indirect(v).FieldByName("Valid"); eva.IsValid() && eva.Bool() {
+				v = reflect.Indirect(v).FieldByName("Byte")
+				kind = v.Kind()
 			}
+		case "sql.NullFloat64":
+			if eva := reflect.Indirect(v).FieldByName("Valid"); eva.IsValid() && eva.Bool() {
+				v = reflect.Indirect(v).FieldByName("Float64")
+				kind = v.Kind()
+			}
+		case "sql.NullInt16":
+			if eva := reflect.Indirect(v).FieldByName("Valid"); eva.IsValid() && eva.Bool() {
+				v = reflect.Indirect(v).FieldByName("Int16")
+				kind = v.Kind()
+			}
+		case "sql.NullInt32":
+			if eva := reflect.Indirect(v).FieldByName("Valid"); eva.IsValid() && eva.Bool() {
+				v = reflect.Indirect(v).FieldByName("Int32")
+				kind = v.Kind()
+			}
+		case "sql.NullInt64":
+			if eva := reflect.Indirect(v).FieldByName("Valid"); eva.IsValid() && eva.Bool() {
+				v = reflect.Indirect(v).FieldByName("Int64")
+				kind = v.Kind()
+			}
+		case "sql.NullString":
+			fmt.Printf("AAAAAAAAAA")
+			if eva := reflect.Indirect(v).FieldByName("Valid"); eva.IsValid() && eva.Bool() {
+				v = reflect.Indirect(v).FieldByName("String")
+				kind = v.Kind()
+			}
+		case "sql.NullTime":
+			if eva := reflect.Indirect(v).FieldByName("Valid"); eva.IsValid() && eva.Bool() {
+				v = reflect.Indirect(v).FieldByName("Time")
+				kind = v.Kind()
+			}
+		case "wrapperspb.BoolValue", "wrapperspb.BytesValue",
+			"wrapperspb.DoubleValue", "wrapperspb.FloatValue",
+			"wrapperspb.Int32Value", "wrapperspb.Int64Value",
+			"wrapperspb.UInt32Value", "wrapperspb.UInt64Value",
+			"wrapperspb.StringValue":
+			if eva := reflect.Indirect(v).FieldByName("Value"); eva.IsValid() {
+				v = eva
+				kind = v.Kind()
+			}
+		default:
+			f.formatPtr(v)
+			return
 		}
 	}
 
 	// get type information unless already handled elsewhere.
-	if !w.ignoreNextType && w.s.Flag('#') {
+	if !f.ignoreNextType && f.s.Flag('#') {
 		if v.Type().Kind() != reflect.Map &&
 			v.Type().Kind() != reflect.String &&
 			v.Type().Kind() != reflect.Array &&
 			v.Type().Kind() != reflect.Slice {
-			_, _ = w.s.Write(openParenBytes)
+			_, _ = f.s.Write(openParenBytes)
 		}
 		if v.Kind() != reflect.String {
-			_, _ = w.s.Write([]byte(v.Type().String()))
+			_, _ = f.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 {
-			_, _ = w.s.Write(closeParenBytes)
+			_, _ = f.s.Write(closeParenBytes)
 		}
 	}
-	w.ignoreNextType = false
+	f.ignoreNextType = false
 
 	// Call Stringer/error interfaces if they exist and the handle methods
 	// flag is enabled.
-	if w.opts.Methods {
+	if !f.opts.Methods {
 		if (kind != reflect.Invalid) && (kind != reflect.Interface) {
-			if handled := handleMethods(w.opts, w.s, v); handled {
+			if handled := handleMethods(f.opts, f.s, v); handled {
 				return
 			}
 		}
@@ -306,48 +332,48 @@ func (w *Wrapper) format(v reflect.Value) {
 
 	switch kind {
 	case reflect.Invalid:
-		_, _ = w.s.Write(invalidAngleBytes)
+		_, _ = f.s.Write(invalidAngleBytes)
 	case reflect.Bool:
-		getBool(w.s, v.Bool())
+		getBool(f.s, v.Bool())
 	case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int:
-		getInt(w.s, v.Int(), 10)
+		getInt(f.s, v.Int(), 10)
 	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
-		getUint(w.s, v.Uint(), 10)
+		getUint(f.s, v.Uint(), 10)
 	case reflect.Float32:
-		getFloat(w.s, v.Float(), 32)
+		getFloat(f.s, v.Float(), 32)
 	case reflect.Float64:
-		getFloat(w.s, v.Float(), 64)
+		getFloat(f.s, v.Float(), 64)
 	case reflect.Complex64:
-		getComplex(w.s, v.Complex(), 32)
+		getComplex(f.s, v.Complex(), 32)
 	case reflect.Complex128:
-		getComplex(w.s, v.Complex(), 64)
+		getComplex(f.s, v.Complex(), 64)
 	case reflect.Slice:
 		if v.IsNil() {
-			_, _ = w.s.Write(nilAngleBytes)
+			_, _ = f.s.Write(nilAngleBytes)
 			break
 		}
 		fallthrough
 	case reflect.Array:
-		_, _ = w.s.Write(openBraceBytes)
-		w.depth++
+		_, _ = f.s.Write(openBraceBytes)
+		f.depth++
 		numEntries := v.Len()
 		for i := 0; i < numEntries; i++ {
 			if i > 0 {
-				_, _ = w.s.Write(commaBytes)
-				_, _ = w.s.Write(spaceBytes)
+				_, _ = f.s.Write(commaBytes)
+				_, _ = f.s.Write(spaceBytes)
 			}
-			w.ignoreNextType = true
-			w.format(w.unpackValue(v.Index(i)))
+			f.ignoreNextType = true
+			f.format(f.unpackValue(v.Index(i)))
 		}
-		w.depth--
-		_, _ = w.s.Write(closeBraceBytes)
+		f.depth--
+		_, _ = f.s.Write(closeBraceBytes)
 	case reflect.String:
-		_, _ = w.s.Write([]byte(`"` + v.String() + `"`))
+		_, _ = f.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() {
-			_, _ = w.s.Write(nilAngleBytes)
+			_, _ = f.s.Write(nilAngleBytes)
 		}
 	case reflect.Ptr:
 		// Do nothing.  We should never get here since pointers have already
@@ -355,123 +381,84 @@ func (w *Wrapper) format(v reflect.Value) {
 	case reflect.Map:
 		// nil maps should be indicated as different than empty maps
 		if v.IsNil() {
-			_, _ = w.s.Write(nilAngleBytes)
+			_, _ = f.s.Write(nilAngleBytes)
 			break
 		}
-		_, _ = w.s.Write(openMapBytes)
-		w.depth++
+		_, _ = f.s.Write(openMapBytes)
+		f.depth++
 		keys := v.MapKeys()
 		for i, key := range keys {
 			if i > 0 {
-				_, _ = w.s.Write(spaceBytes)
+				_, _ = f.s.Write(spaceBytes)
 			}
-			w.ignoreNextType = true
-			w.format(w.unpackValue(key))
-			_, _ = w.s.Write(colonBytes)
-			w.ignoreNextType = true
-			w.format(w.unpackValue(v.MapIndex(key)))
+			f.ignoreNextType = true
+			f.format(f.unpackValue(key))
+			_, _ = f.s.Write(colonBytes)
+			f.ignoreNextType = true
+			f.format(f.unpackValue(v.MapIndex(key)))
 		}
-		w.depth--
-		_, _ = w.s.Write(closeMapBytes)
+		f.depth--
+		_, _ = f.s.Write(closeMapBytes)
 	case reflect.Struct:
-
 		numFields := v.NumField()
-		numWritten := 0
-		_, _ = w.s.Write(openBraceBytes)
-		w.depth++
-
+		_, _ = f.s.Write(openBraceBytes)
+		f.depth++
 		vt := v.Type()
 		prevSkip := false
-
 		for i := 0; i < numFields; i++ {
-			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 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 {
+			if ok {
+				if sv == "omit" {
 					prevSkip = true
 					continue
 				}
+			} else if f.opts.Tagged {
+				prevSkip = true
+				continue
+			}
+			if i > 0 && !prevSkip {
+				_, _ = f.s.Write(commaBytes)
+				_, _ = f.s.Write(spaceBytes)
 			}
-
 			if prevSkip {
 				prevSkip = false
 			}
-
-			if numWritten > 0 {
-				_, _ = w.s.Write(commaBytes)
-				_, _ = w.s.Write(spaceBytes)
+			vtf := vt.Field(i)
+			if f.s.Flag('+') || f.s.Flag('#') {
+				_, _ = f.s.Write([]byte(vtf.Name))
+				_, _ = f.s.Write(colonBytes)
 			}
-
-			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.format(f.unpackValue(v.Field(i)))
 		}
-		w.depth--
-
-		if numWritten == 0 && w.depth < 0 {
-			_, _ = w.s.Write(filteredBytes)
-		}
-		_, _ = w.s.Write(closeBraceBytes)
+		f.depth--
+		_, _ = f.s.Write(closeBraceBytes)
 	case reflect.Uintptr:
-		getHexPtr(w.s, uintptr(v.Uint()))
+		getHexPtr(f.s, uintptr(v.Uint()))
 	case reflect.UnsafePointer, reflect.Chan, reflect.Func:
-		getHexPtr(w.s, v.Pointer())
+		getHexPtr(f.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 := w.buildDefaultFormat()
+		format := f.buildDefaultFormat()
 		if v.CanInterface() {
-			_, _ = fmt.Fprintf(w.s, format, v.Interface())
+			_, _ = fmt.Fprintf(f.s, format, v.Interface())
 		} else {
-			_, _ = fmt.Fprintf(w.s, format, v.String())
+			_, _ = fmt.Fprintf(f.s, format, v.String())
 		}
 	}
 }
 
-func (w *Wrapper) Format(s fmt.State, verb rune) {
-	w.s = s
+func (f *unwrap) Format(s fmt.State, verb rune) {
+	f.s = s
 
 	// Use standard formatting for verbs that are not v.
 	if verb != 'v' {
-		format := w.constructOrigFormat(verb)
-		_, _ = fmt.Fprintf(s, format, w.val)
+		format := f.constructOrigFormat(verb)
+		_, _ = fmt.Fprintf(s, format, f.val)
 		return
 	}
 
-	if w.val == nil {
+	if f.val == nil {
 		if s.Flag('#') {
 			_, _ = s.Write(interfaceBytes)
 		}
@@ -479,11 +466,7 @@ func (w *Wrapper) Format(s fmt.State, verb rune) {
 		return
 	}
 
-	if w.opts.Tagged {
-		w.buildTakeMap(reflect.ValueOf(w.val), 1)
-	}
-
-	w.format(reflect.ValueOf(w.val))
+	f.format(reflect.ValueOf(f.val))
 }
 
 // handle special methods like error.Error() or fmt.Stringer interface
@@ -599,11 +582,11 @@ func catchPanic(w io.Writer, _ reflect.Value) {
 	}
 }
 
-func (w *Wrapper) buildDefaultFormat() (format string) {
+func (f *unwrap) buildDefaultFormat() (format string) {
 	buf := bytes.NewBuffer(percentBytes)
 
 	for _, flag := range sf {
-		if w.s.Flag(int(flag)) {
+		if f.s.Flag(int(flag)) {
 			_, _ = buf.WriteRune(flag)
 		}
 	}
@@ -614,68 +597,26 @@ func (w *Wrapper) buildDefaultFormat() (format string) {
 	return format
 }
 
-func (w *Wrapper) constructOrigFormat(verb rune) string {
+func (f *unwrap) constructOrigFormat(verb rune) (format string) {
 	buf := bytes.NewBuffer(percentBytes)
 
 	for _, flag := range sf {
-		if w.s.Flag(int(flag)) {
+		if f.s.Flag(int(flag)) {
 			_, _ = buf.WriteRune(flag)
 		}
 	}
 
-	if width, ok := w.s.Width(); ok {
+	if width, ok := f.s.Width(); ok {
 		_, _ = buf.WriteString(strconv.Itoa(width))
 	}
 
-	if precision, ok := w.s.Precision(); ok {
+	if precision, ok := f.s.Precision(); ok {
 		_, _ = buf.Write(precisionBytes)
 		_, _ = buf.WriteString(strconv.Itoa(precision))
 	}
 
 	_, _ = buf.WriteRune(verb)
 
-	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
-	}
+	format = buf.String()
+	return format
 }

logger/unwrap/unwrap_test.go

@@ -1,13 +1,23 @@
 package unwrap
 
 import (
+	"database/sql"
 	"fmt"
 	"strings"
 	"testing"
 
-	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v3/codec"
 )
 
+func TestSql(t *testing.T) {
+	type val struct {
+		S sql.NullString
+	}
+	v := &val{S: sql.NullString{Valid: true, String: "test"}}
+	buf := fmt.Sprintf("%#v", Unwrap(v))
+	t.Logf(buf)
+}
+
 func TestUnwrap(t *testing.T) {
 	string1 := "string1"
 	string2 := "string2"
@@ -22,8 +32,9 @@ func TestUnwrap(t *testing.T) {
 	v1 := &val1{ar: []*string{&string1, &string2}, str: &string1, val: &val1{str: &string2}, mp: map[string]string{"key": "val"}}
 
 	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)
+	chk := `&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"}}`
+	if strings.Compare(buf, chk) != 0 {
+		t.Fatalf("not proper written\n%s\n%s", buf, chk)
 	}
 
 	type val2 struct {
@@ -57,11 +68,10 @@ 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"}
+	v1 := &val{Key1: "val1", Key2: "val2"}
 	buf := fmt.Sprintf("%#v", Unwrap(v1))
-	if strings.Compare(buf, `&unwrap.val{Key2:"val2", Key3:"val3"}`) != 0 {
+	if strings.Compare(buf, `&unwrap.val{Key2:"val2"}`) != 0 {
 		t.Fatalf("not proper written %s", buf)
 	}
 }
@@ -78,23 +88,3 @@ func TestTagged(t *testing.T) {
 		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

@@ -0,0 +1,166 @@
+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

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

metadata/context.go

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

metadata/context_test.go

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

metadata/metadata.go

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

metadata/metadata_test.go

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

meter/context.go

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

meter/context_test.go

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

meter/generate.go

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,67 @@
+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

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,32 @@
+// 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

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

meter/noop.go

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