.gitea/workflows/job_coverage.yml

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

.gitea/workflows/job_lint.yml

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

.gitea/workflows/job_test.yml

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

.gitea/workflows/job_tests.yml

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

.gitea/workflows/lint.yml

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

.gitea/workflows/pr.yml

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

.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,44 @@
 run:
-  concurrency: 8
+  concurrency: 4
   deadline: 5m
   issues-exit-code: 1
   tests: true
+
+linters-settings:
+  govet:
+    check-shadowing: true
+    enable:
+      - fieldalignment
+
+linters:
+  enable:
+    - govet
+    - deadcode
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - bodyclose
+    - gci
+    - goconst
+    - gocritic
+    - gosimple
+    - gofmt
+    - gofumpt
+    - goimports
+    - revive
+    - gosec
+    - makezero
+    - misspell
+    - nakedret
+    - nestif
+    - nilerr
+    - noctx
+    - prealloc
+    - unconvert
+    - unparam
+  disable-all: false

README.md

@@ -1,5 +1,4 @@
-# Micro 
-[![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Doc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/unistack-org/micro/v3?tab=overview) [![Status](https://git.unistack.org/unistack-org/micro/actions/workflows/job_tests.yml/badge.svg?branch=v3)](https://git.unistack.org/unistack-org/micro/actions?query=workflow%3Abuild+branch%3Av3+event%3Apush) [![Lint](https://goreportcard.com/badge/go.unistack.org/micro/v3)](https://goreportcard.com/report/go.unistack.org/micro/v3)![Coverage](https://img.shields.io/badge/Coverage-44.9%25-yellow)
+# 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.
 

broker/broker.go

@@ -1,25 +1,22 @@
 // Package broker is an interface used for asynchronous messaging
-package broker
+package broker // import "go.unistack.org/micro/v3/broker"
 
 import (
 	"context"
 	"errors"
-	"time"
 
 	"go.unistack.org/micro/v3/codec"
 	"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")
-	// DefaultGracefulTimeout
-	DefaultGracefulTimeout = 5 * time.Second
 )
 
 // Broker is an interface used for asynchronous messaging.
@@ -46,25 +43,8 @@ type Broker interface {
 	BatchSubscribe(ctx context.Context, topic string, h BatchHandler, opts ...SubscribeOption) (Subscriber, error)
 	// String type of broker
 	String() string
-	// Live returns broker liveness
-	Live() bool
-	// Ready returns broker readiness
-	Ready() bool
-	// Health returns broker health
-	Health() bool
 }
 
-type (
-	FuncPublish        func(ctx context.Context, topic string, msg *Message, opts ...PublishOption) error
-	HookPublish        func(next FuncPublish) FuncPublish
-	FuncBatchPublish   func(ctx context.Context, msgs []*Message, opts ...PublishOption) error
-	HookBatchPublish   func(next FuncBatchPublish) FuncBatchPublish
-	FuncSubscribe      func(ctx context.Context, topic string, h Handler, opts ...SubscribeOption) (Subscriber, error)
-	HookSubscribe      func(next FuncSubscribe) FuncSubscribe
-	FuncBatchSubscribe func(ctx context.Context, topic string, h BatchHandler, opts ...SubscribeOption) (Subscriber, error)
-	HookBatchSubscribe func(next FuncBatchSubscribe) FuncBatchSubscribe
-)
-
 // Handler is used to process messages via a subscription of a topic.
 type Handler func(Event) error
 
@@ -94,8 +74,6 @@ type BatchHandler func(Events) error
 
 // Event is given to a subscription handler for processing
 type Event interface {
-	// Context return context.Context for event
-	Context() context.Context
 	// Topic returns event topic
 	Topic() string
 	// Message returns broker message

broker/context.go

@@ -15,15 +15,6 @@ func FromContext(ctx context.Context) (Broker, bool) {
 	return c, ok
 }
 
-// MustContext returns broker from passed context
-func MustContext(ctx context.Context) Broker {
-	b, ok := FromContext(ctx)
-	if !ok {
-		panic("missing broker")
-	}
-	return b
-}
-
 // NewContext savess broker in context
 func NewContext(ctx context.Context, s Broker) context.Context {
 	if ctx == nil {

broker/memory.go

@@ -4,10 +4,8 @@ import (
 	"context"
 	"sync"
 
-	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/options"
 	maddr "go.unistack.org/micro/v3/util/addr"
 	"go.unistack.org/micro/v3/util/id"
 	mnet "go.unistack.org/micro/v3/util/net"
@@ -15,13 +13,9 @@ import (
 )
 
 type memoryBroker struct {
-	funcPublish        broker.FuncPublish
-	funcBatchPublish   broker.FuncBatchPublish
-	funcSubscribe      broker.FuncSubscribe
-	funcBatchSubscribe broker.FuncBatchSubscribe
-	subscribers        map[string][]*memorySubscriber
-	addr               string
-	opts               broker.Options
+	subscribers map[string][]*memorySubscriber
+	addr        string
+	opts        Options
 	sync.RWMutex
 	connected bool
 }
@@ -30,20 +24,20 @@ type memoryEvent struct {
 	err     error
 	message interface{}
 	topic   string
-	opts    broker.Options
+	opts    Options
 }
 
 type memorySubscriber struct {
 	ctx          context.Context
 	exit         chan bool
-	handler      broker.Handler
-	batchhandler broker.BatchHandler
+	handler      Handler
+	batchhandler BatchHandler
 	id           string
 	topic        string
-	opts         broker.SubscribeOptions
+	opts         SubscribeOptions
 }
 
-func (m *memoryBroker) Options() broker.Options {
+func (m *memoryBroker) Options() Options {
 	return m.opts
 }
 
@@ -52,12 +46,6 @@ func (m *memoryBroker) Address() string {
 }
 
 func (m *memoryBroker) Connect(ctx context.Context) error {
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
-
 	m.Lock()
 	defer m.Unlock()
 
@@ -82,12 +70,6 @@ func (m *memoryBroker) Connect(ctx context.Context) error {
 }
 
 func (m *memoryBroker) Disconnect(ctx context.Context) error {
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-	}
-
 	m.Lock()
 	defer m.Unlock()
 
@@ -99,54 +81,27 @@ func (m *memoryBroker) Disconnect(ctx context.Context) error {
 	return nil
 }
 
-func (m *memoryBroker) Init(opts ...broker.Option) error {
+func (m *memoryBroker) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&m.opts)
 	}
-
-	m.funcPublish = m.fnPublish
-	m.funcBatchPublish = m.fnBatchPublish
-	m.funcSubscribe = m.fnSubscribe
-	m.funcBatchSubscribe = m.fnBatchSubscribe
-
-	m.opts.Hooks.EachPrev(func(hook options.Hook) {
-		switch h := hook.(type) {
-		case broker.HookPublish:
-			m.funcPublish = h(m.funcPublish)
-		case broker.HookBatchPublish:
-			m.funcBatchPublish = h(m.funcBatchPublish)
-		case broker.HookSubscribe:
-			m.funcSubscribe = h(m.funcSubscribe)
-		case broker.HookBatchSubscribe:
-			m.funcBatchSubscribe = h(m.funcBatchSubscribe)
-		}
-	})
-
 	return nil
 }
 
-func (m *memoryBroker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
-	return m.funcPublish(ctx, topic, msg, opts...)
-}
-
-func (m *memoryBroker) fnPublish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) 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, []*broker.Message{msg}, opts...)
+	return m.publish(ctx, []*Message{msg}, opts...)
 }
 
-func (m *memoryBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
-	return m.funcBatchPublish(ctx, msgs, opts...)
-}
-
-func (m *memoryBroker) fnBatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+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 []*broker.Message, opts ...broker.PublishOption) error {
+func (m *memoryBroker) publish(ctx context.Context, msgs []*Message, opts ...PublishOption) error {
 	m.RLock()
 	if !m.connected {
 		m.RUnlock()
-		return broker.ErrNotConnected
+		return ErrNotConnected
 	}
 	m.RUnlock()
 
@@ -156,9 +111,9 @@ func (m *memoryBroker) publish(ctx context.Context, msgs []*broker.Message, opts
 	case <-ctx.Done():
 		return ctx.Err()
 	default:
-		options := broker.NewPublishOptions(opts...)
+		options := NewPublishOptions(opts...)
 
-		msgTopicMap := make(map[string]broker.Events)
+		msgTopicMap := make(map[string]Events)
 		for _, v := range msgs {
 			p := &memoryEvent{opts: m.opts}
 
@@ -206,7 +161,7 @@ func (m *memoryBroker) publish(ctx context.Context, msgs []*broker.Message, opts
 						}
 					} else if sub.opts.AutoAck {
 						if err = ms.Ack(); err != nil {
-							m.opts.Logger.Error(m.opts.Context, "broker ack error", err)
+							m.opts.Logger.Errorf(m.opts.Context, "ack failed: %v", err)
 						}
 					}
 					// single processing
@@ -217,11 +172,11 @@ func (m *memoryBroker) publish(ctx context.Context, msgs []*broker.Message, opts
 							if eh != nil {
 								_ = eh(p)
 							} else if m.opts.Logger.V(logger.ErrorLevel) {
-								m.opts.Logger.Error(m.opts.Context, "broker handler error", err)
+								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, "broker ack error", err)
+								m.opts.Logger.Errorf(m.opts.Context, "ack failed: %v", err)
 							}
 						}
 					}
@@ -233,15 +188,11 @@ func (m *memoryBroker) publish(ctx context.Context, msgs []*broker.Message, opts
 	return nil
 }
 
-func (m *memoryBroker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	return m.funcBatchSubscribe(ctx, topic, handler, opts...)
-}
-
-func (m *memoryBroker) fnBatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.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, broker.ErrNotConnected
+		return nil, ErrNotConnected
 	}
 	m.RUnlock()
 
@@ -250,7 +201,7 @@ func (m *memoryBroker) fnBatchSubscribe(ctx context.Context, topic string, handl
 		return nil, err
 	}
 
-	options := broker.NewSubscribeOptions(opts...)
+	options := NewSubscribeOptions(opts...)
 
 	sub := &memorySubscriber{
 		exit:         make(chan bool, 1),
@@ -282,15 +233,11 @@ func (m *memoryBroker) fnBatchSubscribe(ctx context.Context, topic string, handl
 	return sub, nil
 }
 
-func (m *memoryBroker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	return m.funcSubscribe(ctx, topic, handler, opts...)
-}
-
-func (m *memoryBroker) fnSubscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (m *memoryBroker) Subscribe(ctx context.Context, topic string, handler Handler, opts ...SubscribeOption) (Subscriber, error) {
 	m.RLock()
 	if !m.connected {
 		m.RUnlock()
-		return nil, broker.ErrNotConnected
+		return nil, ErrNotConnected
 	}
 	m.RUnlock()
 
@@ -299,7 +246,7 @@ func (m *memoryBroker) fnSubscribe(ctx context.Context, topic string, handler br
 		return nil, err
 	}
 
-	options := broker.NewSubscribeOptions(opts...)
+	options := NewSubscribeOptions(opts...)
 
 	sub := &memorySubscriber{
 		exit:    make(chan bool, 1),
@@ -339,28 +286,16 @@ func (m *memoryBroker) Name() string {
 	return m.opts.Name
 }
 
-func (m *memoryBroker) Live() bool {
-	return true
-}
-
-func (m *memoryBroker) Ready() bool {
-	return true
-}
-
-func (m *memoryBroker) Health() bool {
-	return true
-}
-
 func (m *memoryEvent) Topic() string {
 	return m.topic
 }
 
-func (m *memoryEvent) Message() *broker.Message {
+func (m *memoryEvent) Message() *Message {
 	switch v := m.message.(type) {
-	case *broker.Message:
+	case *Message:
 		return v
 	case []byte:
-		msg := &broker.Message{}
+		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)
@@ -385,11 +320,7 @@ func (m *memoryEvent) SetError(err error) {
 	m.err = err
 }
 
-func (m *memoryEvent) Context() context.Context {
-	return m.opts.Context
-}
-
-func (m *memorySubscriber) Options() broker.SubscribeOptions {
+func (m *memorySubscriber) Options() SubscribeOptions {
 	return m.opts
 }
 
@@ -403,9 +334,9 @@ func (m *memorySubscriber) Unsubscribe(ctx context.Context) error {
 }
 
 // NewBroker return new memory broker
-func NewBroker(opts ...broker.Option) broker.Broker {
+func NewBroker(opts ...Option) Broker {
 	return &memoryBroker{
-		opts:        broker.NewOptions(opts...),
+		opts:        NewOptions(opts...),
 		subscribers: make(map[string][]*memorySubscriber),
 	}
 }

broker/memory_test.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"testing"
 
-	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/metadata"
 )
 
@@ -13,10 +12,6 @@ func TestMemoryBatchBroker(t *testing.T) {
 	b := NewBroker()
 	ctx := context.Background()
 
-	if err := b.Init(); err != nil {
-		t.Fatalf("Unexpected init error %v", err)
-	}
-
 	if err := b.Connect(ctx); err != nil {
 		t.Fatalf("Unexpected connect error %v", err)
 	}
@@ -24,7 +19,7 @@ func TestMemoryBatchBroker(t *testing.T) {
 	topic := "test"
 	count := 10
 
-	fn := func(evts broker.Events) error {
+	fn := func(evts Events) error {
 		return evts.Ack()
 	}
 
@@ -33,9 +28,9 @@ func TestMemoryBatchBroker(t *testing.T) {
 		t.Fatalf("Unexpected error subscribing %v", err)
 	}
 
-	msgs := make([]*broker.Message, 0, count)
+	msgs := make([]*Message, 0, count)
 	for i := 0; i < count; i++ {
-		message := &broker.Message{
+		message := &Message{
 			Header: map[string]string{
 				metadata.HeaderTopic: topic,
 				"foo":                "bar",
@@ -63,10 +58,6 @@ func TestMemoryBroker(t *testing.T) {
 	b := NewBroker()
 	ctx := context.Background()
 
-	if err := b.Init(); err != nil {
-		t.Fatalf("Unexpected init error %v", err)
-	}
-
 	if err := b.Connect(ctx); err != nil {
 		t.Fatalf("Unexpected connect error %v", err)
 	}
@@ -74,7 +65,7 @@ func TestMemoryBroker(t *testing.T) {
 	topic := "test"
 	count := 10
 
-	fn := func(_ broker.Event) error {
+	fn := func(p Event) error {
 		return nil
 	}
 
@@ -83,9 +74,9 @@ func TestMemoryBroker(t *testing.T) {
 		t.Fatalf("Unexpected error subscribing %v", err)
 	}
 
-	msgs := make([]*broker.Message, 0, count)
+	msgs := make([]*Message, 0, count)
 	for i := 0; i < count; i++ {
-		message := &broker.Message{
+		message := &Message{
 			Header: map[string]string{
 				metadata.HeaderTopic: topic,
 				"foo":                "bar",

broker/noop.go

@@ -1,140 +0,0 @@
-package broker
-
-import (
-	"context"
-	"strings"
-
-	"go.unistack.org/micro/v3/options"
-)
-
-type NoopBroker struct {
-	funcPublish        FuncPublish
-	funcBatchPublish   FuncBatchPublish
-	funcSubscribe      FuncSubscribe
-	funcBatchSubscribe FuncBatchSubscribe
-	opts               Options
-}
-
-func NewBroker(opts ...Option) *NoopBroker {
-	b := &NoopBroker{opts: NewOptions(opts...)}
-	b.funcPublish = b.fnPublish
-	b.funcBatchPublish = b.fnBatchPublish
-	b.funcSubscribe = b.fnSubscribe
-	b.funcBatchSubscribe = b.fnBatchSubscribe
-
-	return b
-}
-
-func (b *NoopBroker) Health() bool {
-	return true
-}
-
-func (b *NoopBroker) Live() bool {
-	return true
-}
-
-func (b *NoopBroker) Ready() bool {
-	return true
-}
-
-func (b *NoopBroker) Name() string {
-	return b.opts.Name
-}
-
-func (b *NoopBroker) String() string {
-	return "noop"
-}
-
-func (b *NoopBroker) Options() Options {
-	return b.opts
-}
-
-func (b *NoopBroker) Init(opts ...Option) error {
-	for _, opt := range opts {
-		opt(&b.opts)
-	}
-
-	b.funcPublish = b.fnPublish
-	b.funcBatchPublish = b.fnBatchPublish
-	b.funcSubscribe = b.fnSubscribe
-	b.funcBatchSubscribe = b.fnBatchSubscribe
-
-	b.opts.Hooks.EachPrev(func(hook options.Hook) {
-		switch h := hook.(type) {
-		case HookPublish:
-			b.funcPublish = h(b.funcPublish)
-		case HookBatchPublish:
-			b.funcBatchPublish = h(b.funcBatchPublish)
-		case HookSubscribe:
-			b.funcSubscribe = h(b.funcSubscribe)
-		case HookBatchSubscribe:
-			b.funcBatchSubscribe = h(b.funcBatchSubscribe)
-		}
-	})
-
-	return nil
-}
-
-func (b *NoopBroker) Connect(_ context.Context) error {
-	return nil
-}
-
-func (b *NoopBroker) Disconnect(_ context.Context) error {
-	return nil
-}
-
-func (b *NoopBroker) Address() string {
-	return strings.Join(b.opts.Addrs, ",")
-}
-
-func (b *NoopBroker) fnBatchPublish(_ context.Context, _ []*Message, _ ...PublishOption) error {
-	return nil
-}
-
-func (b *NoopBroker) BatchPublish(ctx context.Context, msgs []*Message, opts ...PublishOption) error {
-	return b.funcBatchPublish(ctx, msgs, opts...)
-}
-
-func (b *NoopBroker) fnPublish(_ context.Context, _ string, _ *Message, _ ...PublishOption) error {
-	return nil
-}
-
-func (b *NoopBroker) Publish(ctx context.Context, topic string, msg *Message, opts ...PublishOption) error {
-	return b.funcPublish(ctx, topic, msg, opts...)
-}
-
-type NoopSubscriber struct {
-	ctx          context.Context
-	topic        string
-	handler      Handler
-	batchHandler BatchHandler
-	opts         SubscribeOptions
-}
-
-func (b *NoopBroker) fnBatchSubscribe(ctx context.Context, topic string, handler BatchHandler, opts ...SubscribeOption) (Subscriber, error) {
-	return &NoopSubscriber{ctx: ctx, topic: topic, opts: NewSubscribeOptions(opts...), batchHandler: handler}, nil
-}
-
-func (b *NoopBroker) BatchSubscribe(ctx context.Context, topic string, handler BatchHandler, opts ...SubscribeOption) (Subscriber, error) {
-	return b.funcBatchSubscribe(ctx, topic, handler, opts...)
-}
-
-func (b *NoopBroker) fnSubscribe(ctx context.Context, topic string, handler Handler, opts ...SubscribeOption) (Subscriber, error) {
-	return &NoopSubscriber{ctx: ctx, topic: topic, opts: NewSubscribeOptions(opts...), handler: handler}, nil
-}
-
-func (b *NoopBroker) Subscribe(ctx context.Context, topic string, handler Handler, opts ...SubscribeOption) (Subscriber, error) {
-	return b.funcSubscribe(ctx, topic, handler, opts...)
-}
-
-func (s *NoopSubscriber) Options() SubscribeOptions {
-	return s.opts
-}
-
-func (s *NoopSubscriber) Topic() string {
-	return s.topic
-}
-
-func (s *NoopSubscriber) Unsubscribe(_ context.Context) error {
-	return nil
-}

broker/noop_test.go

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

broker/options.go

@@ -8,17 +8,12 @@ import (
 	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/options"
 	"go.unistack.org/micro/v3/register"
-	"go.unistack.org/micro/v3/sync"
 	"go.unistack.org/micro/v3/tracer"
 )
 
 // Options struct
 type Options struct {
-	// Name holds the broker name
-	Name string
-
 	// Tracer used for tracing
 	Tracer tracer.Tracer
 	// Register can be used for clustering
@@ -31,37 +26,27 @@ type Options struct {
 	Meter meter.Meter
 	// Context holds external options
 	Context context.Context
-
-	// Wait waits for a collection of goroutines to finish
-	Wait *sync.WaitGroup
 	// TLSConfig holds tls.TLSConfig options
 	TLSConfig *tls.Config
-
 	// ErrorHandler used when broker 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
 	// Addrs holds the broker address
 	Addrs []string
-	// Hooks can be run before broker Publish/BatchPublish and
-	// Subscribe/BatchSubscribe methods
-	Hooks options.Hooks
-
-	// GracefulTimeout contains time to wait to finish in flight requests
-	GracefulTimeout time.Duration
 }
 
 // NewOptions create new Options
 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,
-		GracefulTimeout: DefaultGracefulTimeout,
+		Register: register.DefaultRegister,
+		Logger:   logger.DefaultLogger,
+		Context:  context.Background(),
+		Meter:    meter.DefaultMeter,
+		Codec:    codec.DefaultCodec,
+		Tracer:   tracer.DefaultTracer,
 	}
 	for _, o := range opts {
 		o(&options)
@@ -239,13 +224,6 @@ func Name(n string) Option {
 	}
 }
 
-// Hooks sets hook runs before action
-func Hooks(h ...options.Hook) Option {
-	return func(o *Options) {
-		o.Hooks = append(o.Hooks, h...)
-	}
-}
-
 // SubscribeContext set context
 func SubscribeContext(ctx context.Context) SubscribeOption {
 	return func(o *SubscribeOptions) {

client/backoff.go

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

client/backoff_test.go

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

client/client.go

@@ -1,5 +1,5 @@
 // Package client is an interface for an RPC client
-package client
+package client // import "go.unistack.org/micro/v3/client"
 
 import (
 	"context"
@@ -44,17 +44,6 @@ type Client interface {
 	String() string
 }
 
-type (
-	FuncCall         func(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error
-	HookCall         func(next FuncCall) FuncCall
-	FuncStream       func(ctx context.Context, req Request, opts ...CallOption) (Stream, error)
-	HookStream       func(next FuncStream) FuncStream
-	FuncPublish      func(ctx context.Context, msg Message, opts ...PublishOption) error
-	HookPublish      func(next FuncPublish) FuncPublish
-	FuncBatchPublish func(ctx context.Context, msg []Message, opts ...PublishOption) error
-	HookBatchPublish func(next FuncBatchPublish) FuncBatchPublish
-)
-
 // Message is the interface for publishing asynchronously
 type Message interface {
 	Topic() string

client/client_call_options_test.go

@@ -0,0 +1,26 @@
+package client
+
+import (
+	"context"
+	"testing"
+	"time"
+)
+
+func TestNewClientCallOptions(t *testing.T) {
+	var flag bool
+	w := func(fn CallFunc) CallFunc {
+		flag = true
+		return fn
+	}
+	c := NewClientCallOptions(NewClient(),
+		WithAddress("127.0.0.1"),
+		WithCallWrapper(w),
+		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 {
+		t.Fatalf("NewClientCallOptions not works")
+	}
+}

client/context.go

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

client/noop.go

@@ -4,17 +4,13 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"strconv"
 	"time"
 
 	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/errors"
 	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/options"
 	"go.unistack.org/micro/v3/selector"
-	"go.unistack.org/micro/v3/semconv"
-	"go.unistack.org/micro/v3/tracer"
 )
 
 // DefaultCodecs will be used to encode/decode data
@@ -23,11 +19,7 @@ var DefaultCodecs = map[string]codec.Codec{
 }
 
 type noopClient struct {
-	funcPublish      FuncPublish
-	funcBatchPublish FuncBatchPublish
-	funcCall         FuncCall
-	funcStream       FuncStream
-	opts             Options
+	opts Options
 }
 
 type noopMessage struct {
@@ -48,14 +40,16 @@ type noopRequest struct {
 
 // NewClient returns new noop client
 func NewClient(opts ...Option) Client {
-	n := &noopClient{opts: NewOptions(opts...)}
+	nc := &noopClient{opts: NewOptions(opts...)}
+	// wrap in reverse
 
-	n.funcCall = n.fnCall
-	n.funcStream = n.fnStream
-	n.funcPublish = n.fnPublish
-	n.funcBatchPublish = n.fnBatchPublish
+	c := Client(nc)
 
-	return n
+	for i := len(nc.opts.Wrappers); i > 0; i-- {
+		c = nc.opts.Wrappers[i-1](c)
+	}
+
+	return c
 }
 
 func (n *noopClient) Name() string {
@@ -107,13 +101,10 @@ func (n *noopResponse) Read() ([]byte, error) {
 	return nil, nil
 }
 
-type noopStream struct {
-	err error
-	ctx context.Context
-}
+type noopStream struct{}
 
 func (n *noopStream) Context() context.Context {
-	return n.ctx
+	return context.Background()
 }
 
 func (n *noopStream) Request() Request {
@@ -141,21 +132,15 @@ func (n *noopStream) RecvMsg(interface{}) error {
 }
 
 func (n *noopStream) Error() error {
-	return n.err
+	return nil
 }
 
 func (n *noopStream) Close() error {
-	if sp, ok := tracer.SpanFromContext(n.ctx); ok && sp != nil {
-		if n.err != nil {
-			sp.SetStatus(tracer.SpanStatusError, n.err.Error())
-		}
-		sp.Finish()
-	}
-	return n.err
+	return nil
 }
 
 func (n *noopStream) CloseSend() error {
-	return n.err
+	return nil
 }
 
 func (n *noopMessage) Topic() string {
@@ -188,25 +173,6 @@ func (n *noopClient) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&n.opts)
 	}
-
-	n.funcCall = n.fnCall
-	n.funcStream = n.fnStream
-	n.funcPublish = n.fnPublish
-	n.funcBatchPublish = n.fnBatchPublish
-
-	n.opts.Hooks.EachPrev(func(hook options.Hook) {
-		switch h := hook.(type) {
-		case HookCall:
-			n.funcCall = h(n.funcCall)
-		case HookStream:
-			n.funcStream = h(n.funcStream)
-		case HookPublish:
-			n.funcPublish = h(n.funcPublish)
-		case HookBatchPublish:
-			n.funcBatchPublish = h(n.funcBatchPublish)
-		}
-	})
-
 	return nil
 }
 
@@ -219,31 +185,6 @@ func (n *noopClient) String() string {
 }
 
 func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error {
-	ts := time.Now()
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
-	var sp tracer.Span
-	ctx, sp = n.opts.Tracer.Start(ctx, "rpc-client",
-		tracer.WithSpanKind(tracer.SpanKindClient),
-		tracer.WithSpanLabels("endpoint", req.Endpoint()),
-	)
-	err := n.funcCall(ctx, req, rsp, opts...)
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
-	te := time.Since(ts)
-	n.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-	n.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-
-	if me := errors.FromError(err); me == nil {
-		sp.Finish()
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(200))).Inc()
-	} else {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code))).Inc()
-	}
-
-	return err
-}
-
-func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, opts ...CallOption) error {
 	// make a copy of call opts
 	callOpts := n.opts.CallOptions
 	for _, opt := range opts {
@@ -272,8 +213,11 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 	}
 
 	// make copy of call method
-	hcall := func(ctx context.Context, addr string, req Request, rsp interface{}, opts CallOptions) error {
-		return nil
+	hcall := n.call
+
+	// wrap the call in reverse
+	for i := len(callOpts.CallWrappers); i > 0; i-- {
+		hcall = callOpts.CallWrappers[i-1](hcall)
 	}
 
 	// use the router passed as a call option, or fallback to the rpc clients router
@@ -298,7 +242,7 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 		// call backoff first. Someone may want an initial start delay
 		t, err := callOpts.Backoff(ctx, req, i)
 		if err != nil {
-			return errors.InternalServerError("go.micro.client", "%s", err)
+			return errors.InternalServerError("go.micro.client", err.Error())
 		}
 
 		// only sleep if greater than 0
@@ -312,7 +256,7 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 			// TODO apply any filtering here
 			routes, err = n.opts.Lookup(ctx, req, callOpts)
 			if err != nil {
-				return errors.InternalServerError("go.micro.client", "%s", err)
+				return errors.InternalServerError("go.micro.client", err.Error())
 			}
 
 			// balance the list of nodes
@@ -372,7 +316,11 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 	return gerr
 }
 
-func (n *noopClient) NewRequest(service, endpoint string, _ interface{}, _ ...RequestOption) Request {
+func (n *noopClient) call(ctx context.Context, addr string, req Request, rsp interface{}, opts CallOptions) error {
+	return nil
+}
+
+func (n *noopClient) NewRequest(service, endpoint string, req interface{}, opts ...RequestOption) Request {
 	return &noopRequest{service: service, endpoint: endpoint}
 }
 
@@ -382,31 +330,6 @@ func (n *noopClient) NewMessage(topic string, msg interface{}, opts ...MessageOp
 }
 
 func (n *noopClient) Stream(ctx context.Context, req Request, opts ...CallOption) (Stream, error) {
-	ts := time.Now()
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
-	var sp tracer.Span
-	ctx, sp = n.opts.Tracer.Start(ctx, "rpc-client",
-		tracer.WithSpanKind(tracer.SpanKindClient),
-		tracer.WithSpanLabels("endpoint", req.Endpoint()),
-	)
-	stream, err := n.funcStream(ctx, req, opts...)
-	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
-	te := time.Since(ts)
-	n.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-	n.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())
-
-	if me := errors.FromError(err); me == nil {
-		sp.Finish()
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(200))).Inc()
-	} else {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
-		n.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code))).Inc()
-	}
-
-	return stream, err
-}
-
-func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOption) (Stream, error) {
 	var err error
 
 	// make a copy of call opts
@@ -466,7 +389,7 @@ func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOpti
 		// call backoff first. Someone may want an initial start delay
 		t, cerr := callOpts.Backoff(ctx, req, i)
 		if cerr != nil {
-			return nil, errors.InternalServerError("go.micro.client", "%s", cerr)
+			return nil, errors.InternalServerError("go.micro.client", cerr.Error())
 		}
 
 		// only sleep if greater than 0
@@ -480,7 +403,7 @@ func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOpti
 			// TODO apply any filtering here
 			routes, err = n.opts.Lookup(ctx, req, callOpts)
 			if err != nil {
-				return nil, errors.InternalServerError("go.micro.client", "%s", err)
+				return nil, errors.InternalServerError("go.micro.client", err.Error())
 			}
 
 			// balance the list of nodes
@@ -546,23 +469,15 @@ func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOpti
 	return nil, grr
 }
 
-func (n *noopClient) stream(ctx context.Context, _ string, _ Request, _ CallOptions) (Stream, error) {
-	return &noopStream{ctx: ctx}, nil
+func (n *noopClient) stream(ctx context.Context, addr string, req Request, opts CallOptions) (Stream, error) {
+	return &noopStream{}, nil
 }
 
 func (n *noopClient) BatchPublish(ctx context.Context, ps []Message, opts ...PublishOption) error {
-	return n.funcBatchPublish(ctx, ps, opts...)
-}
-
-func (n *noopClient) fnBatchPublish(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.funcPublish(ctx, p, opts...)
-}
-
-func (n *noopClient) fnPublish(ctx context.Context, p Message, opts ...PublishOption) error {
 	return n.publish(ctx, []Message{p}, opts...)
 }
 
@@ -609,13 +524,13 @@ func (n *noopClient) publish(ctx context.Context, ps []Message, opts ...PublishO
 			// use codec for payload
 			cf, err := n.newCodec(p.ContentType())
 			if err != nil {
-				return errors.InternalServerError("go.micro.client", "%s", err)
+				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", "%s", err)
+				return errors.InternalServerError("go.micro.client", err.Error())
 			}
 			body = b
 		}
@@ -623,13 +538,6 @@ func (n *noopClient) publish(ctx context.Context, ps []Message, opts ...PublishO
 		msgs = append(msgs, &broker.Message{Header: md, Body: body})
 	}
 
-	if len(msgs) == 1 {
-		return n.opts.Broker.Publish(ctx, msgs[0].Header[metadata.HeaderTopic], msgs[0],
-			broker.PublishContext(options.Context),
-			broker.PublishBodyOnly(options.BodyOnly),
-		)
-	}
-
 	return n.opts.Broker.BatchPublish(ctx, msgs,
 		broker.PublishContext(options.Context),
 		broker.PublishBodyOnly(options.BodyOnly),

client/noop_test.go

@@ -1,35 +0,0 @@
-package client
-
-import (
-	"context"
-	"testing"
-)
-
-type testHook struct {
-	f bool
-}
-
-func (t *testHook) Publish(fn FuncPublish) FuncPublish {
-	return func(ctx context.Context, msg Message, opts ...PublishOption) error {
-		t.f = true
-		return fn(ctx, msg, opts...)
-	}
-}
-
-func TestNoopHook(t *testing.T) {
-	h := &testHook{}
-
-	c := NewClient(Hooks(HookPublish(h.Publish)))
-
-	if err := c.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := c.Publish(context.TODO(), c.NewMessage("", nil, MessageContentType("application/octet-stream"))); err != nil {
-		t.Fatal(err)
-	}
-
-	if !h.f {
-		t.Fatal("hook not works")
-	}
-}

client/options.go

@@ -11,7 +11,7 @@ import (
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
 	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/options"
+	"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"
@@ -21,16 +21,8 @@ import (
 
 // Options holds client options
 type Options struct {
-	// Codecs map
-	Codecs map[string]codec.Codec
-
-	// Proxy is used for proxy requests
-	Proxy string
-	// ContentType is used to select codec
-	ContentType string
-	// Name is the client name
-	Name string
-
+	// Transport used for transfer messages
+	Transport transport.Transport
 	// Selector used to select needed address
 	Selector selector.Selector
 	// Logger used to log messages
@@ -45,28 +37,28 @@ type Options struct {
 	Context context.Context
 	// Router used to get route
 	Router router.Router
-
 	// TLSConfig specifies tls.Config for secure connection
 	TLSConfig *tls.Config
-
+	// Codecs map
+	Codecs map[string]codec.Codec
 	// Lookup func used to get destination addr
 	Lookup LookupFunc
-	// ContextDialer used to connect
-	ContextDialer func(context.Context, string) (net.Conn, error)
-
+	// Proxy is used for proxy requests
+	Proxy string
+	// ContentType is used to select codec
+	ContentType string
+	// Name is the client name
+	Name string
 	// Wrappers contains wrappers
 	Wrappers []Wrapper
-	// Hooks can be run before broker Publish/BatchPublish and
-	// Subscribe/BatchSubscribe methods
-	Hooks options.Hooks
-
 	// CallOptions contains default CallOptions
 	CallOptions CallOptions
-
 	// PoolSize connection pool size
 	PoolSize int
 	// PoolTTL connection pool ttl
 	PoolTTL time.Duration
+	// ContextDialer used to connect
+	ContextDialer func(context.Context, string) (net.Conn, error)
 }
 
 // NewCallOptions creates new call options struct
@@ -80,16 +72,6 @@ func NewCallOptions(opts ...CallOption) CallOptions {
 
 // CallOptions holds client call options
 type CallOptions struct {
-	// RequestMetadata holds additional metadata for call
-	RequestMetadata metadata.Metadata
-
-	// Network name
-	Network string
-	// Content-Type
-	ContentType string
-	// AuthToken string
-	AuthToken string
-
 	// Selector selects addr
 	Selector selector.Selector
 	// Context used for deadline
@@ -97,30 +79,35 @@ type CallOptions struct {
 	// Router used for route
 	Router router.Router
 	// Retry func used for retries
-
-	// ResponseMetadata holds additional metadata from call
-	ResponseMetadata *metadata.Metadata
-
 	Retry RetryFunc
 	// Backoff func used for backoff when retry
 	Backoff BackoffFunc
-	// ContextDialer used to connect
-	ContextDialer func(context.Context, string) (net.Conn, error)
-
+	// Network name
+	Network string
+	// Content-Type
+	ContentType string
+	// AuthToken string
+	AuthToken string
 	// Address specifies static addr list
 	Address []string
 	// SelectOptions selector options
 	SelectOptions []selector.SelectOption
-
+	// CallWrappers call wrappers
+	CallWrappers []CallWrapper
 	// StreamTimeout stream timeout
 	StreamTimeout time.Duration
 	// RequestTimeout request timeout
 	RequestTimeout time.Duration
-
+	// RequestMetadata holds additional metadata for call
+	RequestMetadata metadata.Metadata
+	// ResponseMetadata holds additional metadata from call
+	ResponseMetadata *metadata.Metadata
 	// DialTimeout dial timeout
 	DialTimeout time.Duration
 	// Retries specifies retries num
 	Retries int
+	// ContextDialer used to connect
+	ContextDialer func(context.Context, string) (net.Conn, error)
 }
 
 // ContextDialer pass ContextDialer to client
@@ -198,23 +185,25 @@ func NewOptions(opts ...Option) Options {
 	options := Options{
 		Context:     context.Background(),
 		ContentType: DefaultContentType,
-		Codecs:      DefaultCodecs,
+		Codecs:      make(map[string]codec.Codec),
 		CallOptions: CallOptions{
 			Context:        context.Background(),
 			Backoff:        DefaultBackoff,
 			Retry:          DefaultRetry,
 			Retries:        DefaultRetries,
 			RequestTimeout: DefaultRequestTimeout,
+			DialTimeout:    transport.DefaultDialTimeout,
 		},
-		Lookup:   LookupRoute,
-		PoolSize: DefaultPoolSize,
-		PoolTTL:  DefaultPoolTTL,
-		Selector: random.NewSelector(),
-		Logger:   logger.DefaultLogger,
-		Broker:   broker.DefaultBroker,
-		Meter:    meter.DefaultMeter,
-		Tracer:   tracer.DefaultTracer,
-		Router:   router.DefaultRouter,
+		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 {
@@ -287,6 +276,13 @@ func PoolTTL(d time.Duration) Option {
 	}
 }
 
+// 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) {
@@ -310,6 +306,20 @@ func Selector(s selector.Selector) Option {
 	}
 }
 
+// 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) Option {
 	return func(o *Options) {
@@ -336,6 +346,14 @@ 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),
+		)
 	}
 }
 
@@ -432,6 +450,13 @@ func WithAddress(a ...string) CallOption {
 	}
 }
 
+// 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 {
@@ -501,6 +526,13 @@ func WithAuthToken(t string) CallOption {
 	}
 }
 
+// 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) {
@@ -559,10 +591,3 @@ func RequestContentType(ct string) RequestOption {
 		o.ContentType = ct
 	}
 }
-
-// Hooks sets hook runs before action
-func Hooks(h ...options.Hook) Option {
-	return func(o *Options) {
-		o.Hooks = append(o.Hooks, h...)
-	}
-}

cluster/cluster.go

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

codec/codec.go

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

codec/context.go

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

codec/noop.go

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

codec/options.go

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

config/config.go

@@ -1,5 +1,5 @@
 // Package config is an interface for dynamic configuration.
-package config
+package config // import "go.unistack.org/micro/v3/config"
 
 import (
 	"context"
@@ -50,13 +50,6 @@ type Config interface {
 	String() string
 }
 
-type (
-	FuncLoad func(ctx context.Context, opts ...LoadOption) error
-	HookLoad func(next FuncLoad) FuncLoad
-	FuncSave func(ctx context.Context, opts ...SaveOption) error
-	HookSave func(next FuncSave) FuncSave
-)
-
 // Watcher is the config watcher
 type Watcher interface {
 	// Next blocks until update happens or error returned
@@ -138,7 +131,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" BeforeLoad error", err)
+				c.Options().Logger.Errorf(ctx, "%s BeforeLoad err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -153,7 +146,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" AfterLoad error", err)
+				c.Options().Logger.Errorf(ctx, "%s AfterLoad err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -168,7 +161,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" BeforeSave error", err)
+				c.Options().Logger.Errorf(ctx, "%s BeforeSave err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -183,7 +176,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" AfterSave error", err)
+				c.Options().Logger.Errorf(ctx, "%s AfterSave err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -198,7 +191,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" BeforeInit error", err)
+				c.Options().Logger.Errorf(ctx, "%s BeforeInit err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}
@@ -213,7 +206,7 @@ var (
 				return nil
 			}
 			if err := fn(ctx, c); err != nil {
-				c.Options().Logger.Error(ctx, c.String()+" AfterInit error", err)
+				c.Options().Logger.Errorf(ctx, "%s AfterInit err: %v", c.String(), err)
 				if !c.Options().AllowFail {
 					return err
 				}

config/context.go

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

config/default.go

@@ -7,18 +7,15 @@ import (
 	"strings"
 	"time"
 
-	"dario.cat/mergo"
 	"github.com/google/uuid"
-	"go.unistack.org/micro/v3/options"
+	"github.com/imdario/mergo"
 	mid "go.unistack.org/micro/v3/util/id"
 	rutil "go.unistack.org/micro/v3/util/reflect"
 	mtime "go.unistack.org/micro/v3/util/time"
 )
 
 type defaultConfig struct {
-	funcLoad FuncLoad
-	funcSave FuncSave
-	opts     Options
+	opts Options
 }
 
 func (c *defaultConfig) Options() Options {
@@ -34,18 +31,6 @@ func (c *defaultConfig) Init(opts ...Option) error {
 		return err
 	}
 
-	c.funcLoad = c.fnLoad
-	c.funcSave = c.fnSave
-
-	c.opts.Hooks.EachPrev(func(hook options.Hook) {
-		switch h := hook.(type) {
-		case HookLoad:
-			c.funcLoad = h(c.funcLoad)
-		case HookSave:
-			c.funcSave = h(c.funcSave)
-		}
-	})
-
 	if err := DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
@@ -54,17 +39,11 @@ func (c *defaultConfig) Init(opts ...Option) error {
 }
 
 func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error {
-	return c.funcLoad(ctx, opts...)
-}
-
-func (c *defaultConfig) fnLoad(ctx context.Context, opts ...LoadOption) error {
-	var err error
-
 	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
 		return nil
 	}
 
-	if err = DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
+	if err := DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
@@ -254,7 +233,6 @@ func fillValue(value reflect.Value, val string) error {
 		}
 		value.Set(reflect.ValueOf(v))
 	}
-
 	return nil
 }
 
@@ -317,11 +295,7 @@ func fillValues(valueOf reflect.Value, tname string) error {
 	return nil
 }
 
-func (c *defaultConfig) Save(ctx context.Context, opts ...SaveOption) error {
-	return c.funcSave(ctx, opts...)
-}
-
-func (c *defaultConfig) fnSave(ctx context.Context, opts ...SaveOption) error {
+func (c *defaultConfig) Save(ctx context.Context, _ ...SaveOption) error {
 	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
 		return nil
 	}
@@ -345,7 +319,7 @@ func (c *defaultConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *defaultConfig) Watch(_ context.Context, _ ...WatchOption) (Watcher, error) {
+func (c *defaultConfig) Watch(ctx context.Context, opts ...WatchOption) (Watcher, error) {
 	return nil, ErrWatcherNotImplemented
 }
 
@@ -355,9 +329,5 @@ func NewConfig(opts ...Option) Config {
 	if len(options.StructTag) == 0 {
 		options.StructTag = "default"
 	}
-	c := &defaultConfig{opts: options}
-	c.funcLoad = c.fnLoad
-	c.funcSave = c.fnSave
-
-	return c
+	return &defaultConfig{opts: options}
 }

config/default_test.go

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

config/options.go

@@ -7,7 +7,6 @@ import (
 	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/options"
 	"go.unistack.org/micro/v3/tracer"
 )
 
@@ -41,16 +40,12 @@ type Options struct {
 	BeforeInit []func(context.Context, Config) error
 	// AfterInit contains slice of funcs that runs after Init
 	AfterInit []func(context.Context, Config) error
-
+	// AllowFail flag to allow fail in config source
+	AllowFail bool
 	// SkipLoad runs only if condition returns true
 	SkipLoad func(context.Context, Config) bool
 	// SkipSave runs only if condition returns true
 	SkipSave func(context.Context, Config) bool
-	// Hooks can be run before/after config Save/Load
-	Hooks options.Hooks
-
-	// AllowFail flag to allow fail in config source
-	AllowFail bool
 }
 
 // Option function signature
@@ -280,10 +275,10 @@ func WatchCoalesce(b bool) WatchOption {
 }
 
 // WatchInterval specifies min and max time.Duration for pulling changes
-func WatchInterval(minTime, maxTime time.Duration) WatchOption {
+func WatchInterval(min, max time.Duration) WatchOption {
 	return func(o *WatchOptions) {
-		o.MinInterval = minTime
-		o.MaxInterval = maxTime
+		o.MinInterval = min
+		o.MaxInterval = max
 	}
 }
 
@@ -293,10 +288,3 @@ func WatchStruct(src interface{}) WatchOption {
 		o.Struct = src
 	}
 }
-
-// Hooks sets hook runs before action
-func Hooks(h ...options.Hook) Option {
-	return func(o *Options) {
-		o.Hooks = append(o.Hooks, h...)
-	}
-}

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
+package errors // import "go.unistack.org/micro/v3/errors"
 
 import (
 	"bytes"
@@ -44,20 +44,6 @@ var (
 	ErrGatewayTimeout = &Error{Code: 504}
 )
 
-const ProblemContentType = "application/problem+json"
-
-type Problem struct {
-	Type     string `json:"type,omitempty"`
-	Title    string `json:"title,omitempty"`
-	Detail   string `json:"detail,omitempty"`
-	Instance string `json:"instance,omitempty"`
-	Errors   []struct {
-		Title  string `json:"title,omitempty"`
-		Detail string `json:"detail,omitempty"`
-	} `json:"errors,omitempty"`
-	Status int `json:"status,omitempty"`
-}
-
 // Error type
 type Error struct {
 	// ID holds error id or service, usually someting like my_service or id
@@ -276,10 +262,6 @@ func CodeIn(err interface{}, codes ...int32) bool {
 
 // FromError try to convert go error to *Error
 func FromError(err error) *Error {
-	if err == nil {
-		return nil
-	}
-
 	if verr, ok := err.(*Error); ok && verr != nil {
 		return verr
 	}

errors/errors_test.go

@@ -2,7 +2,7 @@ package errors
 
 import (
 	"encoding/json"
-	"errors"
+	er "errors"
 	"fmt"
 	"net/http"
 	"testing"
@@ -26,7 +26,7 @@ func TestMarshalJSON(t *testing.T) {
 func TestEmpty(t *testing.T) {
 	msg := "test"
 	var err *Error
-	err = FromError(errors.New(msg))
+	err = FromError(fmt.Errorf(msg))
 	if err.Detail != msg {
 		t.Fatalf("invalid error %v", err)
 	}
@@ -42,7 +42,7 @@ func TestFromError(t *testing.T) {
 	if merr.ID != "go.micro.test" || merr.Code != 404 {
 		t.Fatalf("invalid conversation %v != %v", err, merr)
 	}
-	err = errors.New(err.Error())
+	err = er.New(err.Error())
 	merr = FromError(err)
 	if merr.ID != "go.micro.test" || merr.Code != 404 {
 		t.Fatalf("invalid conversation %v != %v", err, merr)
@@ -57,7 +57,7 @@ func TestEqual(t *testing.T) {
 		t.Fatal("errors must be equal")
 	}
 
-	err3 := errors.New("my test err")
+	err3 := er.New("my test err")
 	if Equal(err1, err3) {
 		t.Fatal("errors must be not equal")
 	}

flow/context.go

@@ -15,15 +15,6 @@ func FromContext(ctx context.Context) (Flow, bool) {
 	return c, ok
 }
 
-// MustContext returns Flow from context
-func MustContext(ctx context.Context) Flow {
-	f, ok := FromContext(ctx)
-	if !ok {
-		panic("missing flow")
-	}
-	return f
-}
-
 // NewContext stores Flow to context
 func NewContext(ctx context.Context, f Flow) context.Context {
 	if ctx == nil {

flow/default.go

@@ -188,7 +188,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu
 	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", werr)
+			w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr)
 		}
 		return "", err
 	}
@@ -212,7 +212,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu
 	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", werr)
+		w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr)
 		return eid, werr
 	}
 	for idx := range steps {
@@ -237,7 +237,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu
 					return
 				}
 				if w.opts.Logger.V(logger.TraceLevel) {
-					w.opts.Logger.Trace(nctx, fmt.Sprintf("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
@@ -257,21 +257,21 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu
 						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", werr)
+								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", werr)
+								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", werr)
+							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", werr)
+							w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
 							cherr <- werr
 							return
 						}
@@ -290,16 +290,16 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu
 					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", werr)
+							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", werr)
+							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", werr)
+						w.opts.Logger.Errorf(ctx, "store write error: %v", werr)
 						cherr <- werr
 						return
 					}
@@ -317,7 +317,7 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu
 		return eid, nil
 	}
 
-	logger.DefaultLogger.Trace(ctx, "wait for finish or error")
+	logger.Tracef(ctx, "wait for finish or error")
 	select {
 	case <-nctx.Done():
 		err = nctx.Err()
@@ -333,15 +333,15 @@ func (w *microWorkflow) Execute(ctx context.Context, req *Message, opts ...Execu
 	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", werr)
+			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", werr)
+			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", werr)
+			w.opts.Logger.Errorf(w.opts.Context, "store error: %v", werr)
 		}
 	}
 

flow/flow.go

@@ -1,5 +1,5 @@
 // Package flow is an interface used for saga pattern microservice workflow
-package flow
+package flow // import "go.unistack.org/micro/v3/flow"
 
 import (
 	"context"

fsm/default.go

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

fsm/fsm.go

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

fsm/fsm_test.go

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

go.mod

@@ -1,43 +1,20 @@
 module go.unistack.org/micro/v3
 
-go 1.23.4
+go 1.19
 
 require (
-	dario.cat/mergo v1.0.1
 	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/KimMachineGun/automemlimit v0.6.1
-	github.com/ash3in/uuidv8 v1.0.1
-	github.com/google/uuid v1.6.0
-	github.com/matoous/go-nanoid v1.5.1
+	github.com/google/uuid v1.3.0
+	github.com/imdario/mergo v0.3.15
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5
-	go.uber.org/automaxprocs v1.6.0
-	go.unistack.org/micro-proto/v3 v3.4.1
-	golang.org/x/sync v0.10.0
-	google.golang.org/grpc v1.68.1
-	google.golang.org/protobuf v1.35.2
-	gopkg.in/yaml.v3 v3.0.1
+	golang.org/x/sync v0.3.0
+	google.golang.org/grpc v1.57.0
+	google.golang.org/protobuf v1.31.0
 )
 
 require (
-	github.com/cilium/ebpf v0.16.0 // indirect
-	github.com/containerd/cgroups/v3 v3.0.4 // indirect
-	github.com/containerd/log v0.1.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/go-units v0.5.0 // indirect
-	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/moby/sys/userns v0.1.0 // indirect
-	github.com/opencontainers/runtime-spec v1.2.0 // indirect
-	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/stretchr/testify v1.10.0 // indirect
-	go.uber.org/goleak v1.3.0 // indirect
-	golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
-	golang.org/x/net v0.32.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
 )

go.sum

@@ -1,102 +1,33 @@
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
-github.com/KimMachineGun/automemlimit v0.6.1 h1:ILa9j1onAAMadBsyyUJv5cack8Y1WT26yLj/V+ulKp8=
-github.com/KimMachineGun/automemlimit v0.6.1/go.mod h1:T7xYht7B8r6AG/AqFcUdc7fzd2bIdBKmepfP2S1svPY=
-github.com/ash3in/uuidv8 v1.0.1 h1:dIq1XRkWT8lGA7N5s7WRTB4V3k49WTBLvILz7aCLp80=
-github.com/ash3in/uuidv8 v1.0.1/go.mod h1:EoyUgCtxNBnrnpc9efw5rVN1cQ+LFGCoJiFuD6maOMw=
-github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok=
-github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE=
-github.com/containerd/cgroups/v3 v3.0.4 h1:2fs7l3P0Qxb1nKWuJNFiwhp2CqiKzho71DQkDrHJIo4=
-github.com/containerd/cgroups/v3 v3.0.4/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
-github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
-github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
-github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
-github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
-github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
-github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
-github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
-github.com/jsimonetti/rtnetlink/v2 v2.0.1 h1:xda7qaHDSVOsADNouv7ukSuicKZO7GgVUCXxpaIEIlM=
-github.com/jsimonetti/rtnetlink/v2 v2.0.1/go.mod h1:7MoNYNbb3UaDHtF8udiJo/RH6VsTKP1pqKLUTVCvToE=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIct4=
-github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
-github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g=
-github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
-github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
-github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
-github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
-github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
-github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
-github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
+github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
-github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 h1:G/FZtUu7a6NTWl3KUHMV9jkLAh/Rvtf03NWMHaEDl+E=
 github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
-go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
-golang.org/x/exp v0.0.0-20241210194714-1829a127f884 h1:Y/Mj/94zIQQGHVSv1tTtQBDaQaJe62U9bkDZKKyhPCU=
-golang.org/x/exp v0.0.0-20241210194714-1829a127f884/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
-google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
+golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e h1:NumxXLPfHSndr3wBBdeKiVHjGVFzi9RX2HwwQke94iY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
+google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

logger/context.go

@@ -13,15 +13,6 @@ func FromContext(ctx context.Context) (Logger, bool) {
 	return l, ok
 }
 
-// MustContext returns logger from passed context or DefaultLogger if empty
-func MustContext(ctx context.Context) Logger {
-	l, ok := FromContext(ctx)
-	if !ok {
-		panic("missing logger")
-	}
-	return l
-}
-
 // NewContext stores logger into passed context
 func NewContext(ctx context.Context, l Logger) context.Context {
 	if ctx == nil {

logger/logger.go

@@ -1,19 +1,18 @@
 // Package logger provides a log interface
-package logger
+package logger // import "go.unistack.org/micro/v3/logger"
 
 import (
 	"context"
+	"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
+	DefaultCallerSkipCount = 2
 )
 
 // Logger is a generic logging interface
@@ -31,24 +30,111 @@ type Logger interface {
 	// Fields set fields to always be logged with keyval pairs
 	Fields(fields ...interface{}) Logger
 	// Info level message
-	Info(ctx context.Context, msg string, args ...interface{})
+	Info(ctx context.Context, args ...interface{})
 	// Trace level message
-	Trace(ctx context.Context, msg string, args ...interface{})
+	Trace(ctx context.Context, args ...interface{})
 	// Debug level message
-	Debug(ctx context.Context, msg string, args ...interface{})
+	Debug(ctx context.Context, args ...interface{})
 	// Warn level message
-	Warn(ctx context.Context, msg string, args ...interface{})
+	Warn(ctx context.Context, args ...interface{})
 	// Error level message
-	Error(ctx context.Context, msg string, args ...interface{})
+	Error(ctx context.Context, args ...interface{})
 	// Fatal level message
-	Fatal(ctx context.Context, msg string, args ...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, args ...interface{})
-	// Name returns broker instance name
-	Name() string
-	// String returns the type of logger
+	Log(ctx context.Context, level Level, args ...interface{})
+	// Logf logs message with needed level
+	Logf(ctx context.Context, level Level, msg string, args ...interface{})
+	// String returns the name of logger
 	String() string
 }
 
 // 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 msg to default logger on error level
+func Error(ctx context.Context, args ...interface{}) {
+	DefaultLogger.Error(ctx, args...)
+}
+
+// Debug writes msg to default logger on debug level
+func Debug(ctx context.Context, args ...interface{}) {
+	DefaultLogger.Debug(ctx, args...)
+}
+
+// Warn writes msg to default logger on warn level
+func Warn(ctx context.Context, args ...interface{}) {
+	DefaultLogger.Warn(ctx, args...)
+}
+
+// Trace writes msg to default logger on trace level
+func Trace(ctx context.Context, args ...interface{}) {
+	DefaultLogger.Trace(ctx, args...)
+}
+
+// Fatal writes msg to default logger on fatal level
+func Fatal(ctx context.Context, args ...interface{}) {
+	DefaultLogger.Fatal(ctx, args...)
+}
+
+// Infof writes formatted msg to default logger on info level
+func Infof(ctx context.Context, msg string, args ...interface{}) {
+	DefaultLogger.Infof(ctx, msg, args...)
+}
+
+// Errorf writes formatted msg to default logger on error level
+func Errorf(ctx context.Context, msg string, args ...interface{}) {
+	DefaultLogger.Errorf(ctx, msg, args...)
+}
+
+// Debugf writes formatted msg to default logger on debug level
+func Debugf(ctx context.Context, msg string, 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
+func V(level Level) bool {
+	return DefaultLogger.V(level)
+}
+
+// Init initialize logger
+func Init(opts ...Option) error {
+	return DefaultLogger.Init(opts...)
+}
+
+// Fields create logger with specific fields
+func Fields(fields ...interface{}) Logger {
+	return DefaultLogger.Fields(fields...)
+}

logger/logger_test.go

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

logger/noop.go

@@ -4,29 +4,20 @@ import (
 	"context"
 )
 
-const (
-	defaultCallerSkipCount = 2
-)
-
 type noopLogger struct {
 	opts Options
 }
 
 func NewLogger(opts ...Option) Logger {
 	options := NewOptions(opts...)
-	options.CallerSkipCount = defaultCallerSkipCount
 	return &noopLogger{opts: options}
 }
 
-func (l *noopLogger) V(_ Level) bool {
+func (l *noopLogger) V(lvl Level) bool {
 	return false
 }
 
-func (l *noopLogger) Level(_ Level) {
-}
-
-func (l *noopLogger) Name() string {
-	return l.opts.Name
+func (l *noopLogger) Level(lvl Level) {
 }
 
 func (l *noopLogger) Init(opts ...Option) error {
@@ -44,7 +35,7 @@ func (l *noopLogger) Clone(opts ...Option) Logger {
 	return nl
 }
 
-func (l *noopLogger) Fields(_ ...interface{}) Logger {
+func (l *noopLogger) Fields(attrs ...interface{}) Logger {
 	return l
 }
 
@@ -56,23 +47,44 @@ func (l *noopLogger) String() string {
 	return "noop"
 }
 
-func (l *noopLogger) Log(ctx context.Context, lvl Level, msg string, attrs ...interface{}) {
+func (l *noopLogger) Log(ctx context.Context, lvl Level, attrs ...interface{}) {
 }
 
-func (l *noopLogger) Info(ctx context.Context, msg string, attrs ...interface{}) {
+func (l *noopLogger) Info(ctx context.Context, attrs ...interface{}) {
 }
 
-func (l *noopLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) {
+func (l *noopLogger) Debug(ctx context.Context, attrs ...interface{}) {
 }
 
-func (l *noopLogger) Error(ctx context.Context, msg string, attrs ...interface{}) {
+func (l *noopLogger) Error(ctx context.Context, attrs ...interface{}) {
 }
 
-func (l *noopLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) {
+func (l *noopLogger) Trace(ctx context.Context, attrs ...interface{}) {
 }
 
-func (l *noopLogger) Warn(ctx context.Context, msg string, attrs ...interface{}) {
+func (l *noopLogger) Warn(ctx context.Context, attrs ...interface{}) {
 }
 
-func (l *noopLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) {
+func (l *noopLogger) Fatal(ctx context.Context, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Logf(ctx context.Context, lvl Level, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Infof(ctx context.Context, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Debugf(ctx context.Context, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Errorf(ctx context.Context, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Tracef(ctx context.Context, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Warnf(ctx context.Context, msg string, attrs ...interface{}) {
+}
+
+func (l *noopLogger) Fatalf(ctx context.Context, msg string, attrs ...interface{}) {
 }

logger/options.go

@@ -3,115 +3,43 @@ package logger
 import (
 	"context"
 	"io"
-	"log/slog"
 	"os"
-	"slices"
-	"time"
-
-	"go.unistack.org/micro/v3/meter"
 )
 
-// Option func signature
+// Option func
 type Option func(*Options)
 
 // Options holds logger options
 type Options struct {
-	// TimeKey is the key used for the time of the log call
-	TimeKey string
-	// LevelKey is the key used for the level of the log call
-	LevelKey string
-	// ErroreKey is the key used for the error of the log call
-	ErrorKey string
-	// MessageKey is the key used for the message of the log call
-	MessageKey string
-	// SourceKey is the key used for the source file and line of the log call
-	SourceKey string
-	// StacktraceKey is the key used for the stacktrace
-	StacktraceKey string
-	// Name holds the logger name
-	Name string
 	// Out holds the output writer
 	Out io.Writer
 	// Context holds exernal options
 	Context context.Context
-	// Meter used to count logs for specific level
-	Meter meter.Meter
-	// TimeFunc used to obtain current time
-	TimeFunc func() time.Time
 	// Fields holds additional metadata
 	Fields []interface{}
-	// ContextAttrFuncs contains funcs that executed before log func on context
-	ContextAttrFuncs []ContextAttrFunc
-	// callerSkipCount number of frmaes to skip
-	CallerSkipCount int
+	// Name holds the logger name
+	Name string
 	// The logging level the logger should log
 	Level Level
-	// AddSource enabled writing source file and position in log
-	AddSource bool
-	// AddStacktrace controls writing of stacktaces on error
-	AddStacktrace bool
-	// DedupKeys deduplicate keys in log output
-	DedupKeys bool
+	// CallerSkipCount number of frmaes to skip
+	CallerSkipCount int
 }
 
 // NewOptions creates new options struct
 func NewOptions(opts ...Option) Options {
 	options := Options{
-		Level:            DefaultLevel,
-		Fields:           make([]interface{}, 0, 6),
-		Out:              os.Stderr,
-		Context:          context.Background(),
-		ContextAttrFuncs: DefaultContextAttrFuncs,
-		AddSource:        true,
-		TimeFunc:         time.Now,
-		Meter:            meter.DefaultMeter,
+		Level:           DefaultLevel,
+		Fields:          make([]interface{}, 0, 6),
+		Out:             os.Stderr,
+		CallerSkipCount: DefaultCallerSkipCount,
+		Context:         context.Background(),
 	}
-
-	WithMicroKeys()(&options)
-
 	for _, o := range opts {
 		o(&options)
 	}
-
 	return options
 }
 
-// WithContextAttrFuncs appends default funcs for the context attrs filler
-func WithContextAttrFuncs(fncs ...ContextAttrFunc) Option {
-	return func(o *Options) {
-		o.ContextAttrFuncs = append(o.ContextAttrFuncs, fncs...)
-	}
-}
-
-// WithDedupKeys dont log duplicate keys
-func WithDedupKeys(b bool) Option {
-	return func(o *Options) {
-		o.DedupKeys = b
-	}
-}
-
-// WithAddFields add fields for the logger
-func WithAddFields(fields ...interface{}) Option {
-	return func(o *Options) {
-		if o.DedupKeys {
-			for i := 0; i < len(o.Fields); i += 2 {
-				for j := 0; j < len(fields); j += 2 {
-					iv, iok := o.Fields[i].(string)
-					jv, jok := fields[j].(string)
-					if iok && jok && iv == jv {
-						fields = slices.Delete(fields, j, j+2)
-					}
-				}
-			}
-			if len(fields) > 0 {
-				o.Fields = append(o.Fields, fields...)
-			}
-		} else {
-			o.Fields = append(o.Fields, fields...)
-		}
-	}
-}
-
 // WithFields set default fields for the logger
 func WithFields(fields ...interface{}) Option {
 	return func(o *Options) {
@@ -133,17 +61,10 @@ func WithOutput(out io.Writer) Option {
 	}
 }
 
-// WithAddStacktrace controls writing stacktrace on error
-func WithAddStacktrace(v bool) Option {
+// WithCallerSkipCount set frame count to skip
+func WithCallerSkipCount(c int) Option {
 	return func(o *Options) {
-		o.AddStacktrace = v
-	}
-}
-
-// WithAddSource controls writing source file and pos in log
-func WithAddSource(v bool) Option {
-	return func(o *Options) {
-		o.AddSource = v
+		o.CallerSkipCount = c
 	}
 }
 
@@ -160,70 +81,3 @@ func WithName(n string) Option {
 		o.Name = n
 	}
 }
-
-// WithMeter sets the meter
-func WithMeter(m meter.Meter) Option {
-	return func(o *Options) {
-		o.Meter = m
-	}
-}
-
-// WithTimeFunc sets the func to obtain current time
-func WithTimeFunc(fn func() time.Time) Option {
-	return func(o *Options) {
-		o.TimeFunc = fn
-	}
-}
-
-func WithZapKeys() Option {
-	return func(o *Options) {
-		o.TimeKey = "@timestamp"
-		o.LevelKey = slog.LevelKey
-		o.MessageKey = slog.MessageKey
-		o.SourceKey = "caller"
-		o.StacktraceKey = "stacktrace"
-		o.ErrorKey = "error"
-	}
-}
-
-func WithZerologKeys() Option {
-	return func(o *Options) {
-		o.TimeKey = slog.TimeKey
-		o.LevelKey = slog.LevelKey
-		o.MessageKey = "message"
-		o.SourceKey = "caller"
-		o.StacktraceKey = "stacktrace"
-		o.ErrorKey = "error"
-	}
-}
-
-func WithSlogKeys() Option {
-	return func(o *Options) {
-		o.TimeKey = slog.TimeKey
-		o.LevelKey = slog.LevelKey
-		o.MessageKey = slog.MessageKey
-		o.SourceKey = slog.SourceKey
-		o.StacktraceKey = "stacktrace"
-		o.ErrorKey = "error"
-	}
-}
-
-func WithMicroKeys() Option {
-	return func(o *Options) {
-		o.TimeKey = "timestamp"
-		o.LevelKey = slog.LevelKey
-		o.MessageKey = slog.MessageKey
-		o.SourceKey = "caller"
-		o.StacktraceKey = "stacktrace"
-		o.ErrorKey = "error"
-	}
-}
-
-// WithAddCallerSkipCount add skip count for copy logger
-func WithAddCallerSkipCount(n int) Option {
-	return func(o *Options) {
-		if n > 0 {
-			o.CallerSkipCount += n
-		}
-	}
-}

logger/slog/options.go

@@ -0,0 +1,27 @@
+package slog
+
+import "go.unistack.org/micro/v3/logger"
+
+type sourceKey struct{}
+
+func WithSourceKey(v string) logger.Option {
+	return logger.SetOption(sourceKey{}, v)
+}
+
+type timeKey struct{}
+
+func WithTimeKey(v string) logger.Option {
+	return logger.SetOption(timeKey{}, v)
+}
+
+type messageKey struct{}
+
+func WithMessageKey(v string) logger.Option {
+	return logger.SetOption(messageKey{}, v)
+}
+
+type levelKey struct{}
+
+func WithLevelKey(v string) logger.Option {
+	return logger.SetOption(levelKey{}, v)
+}

logger/slog/slog.go

@@ -2,30 +2,24 @@ package slog
 
 import (
 	"context"
-	"io"
+	"fmt"
 	"log/slog"
 	"os"
-	"reflect"
-	"regexp"
 	"runtime"
 	"strconv"
-	"sync"
-	"sync/atomic"
 	"time"
 
 	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/semconv"
 	"go.unistack.org/micro/v3/tracer"
 )
 
-const (
-	badKey = "!BADKEY"
-	// defaultCallerSkipCount used by logger
-	defaultCallerSkipCount = 3
+var (
+	DefaultSourceKey  string = slog.SourceKey
+	DefaultTimeKey    string = slog.TimeKey
+	DefaultMessageKey string = slog.MessageKey
+	DefaultLevelKey   string = slog.LevelKey
 )
 
-var reTrace = regexp.MustCompile(`.*/slog/logger\.go.*\n`)
-
 var (
 	traceValue = slog.StringValue("trace")
 	debugValue = slog.StringValue("debug")
@@ -35,41 +29,20 @@ var (
 	fatalValue = slog.StringValue("fatal")
 )
 
-type wrapper struct {
-	h     slog.Handler
-	level atomic.Int64
-}
-
-func (h *wrapper) Enabled(ctx context.Context, level slog.Level) bool {
-	return level >= slog.Level(int(h.level.Load()))
-}
-
-func (h *wrapper) Handle(ctx context.Context, rec slog.Record) error {
-	return h.h.Handle(ctx, rec)
-}
-
-func (h *wrapper) WithAttrs(attrs []slog.Attr) slog.Handler {
-	return h.h.WithAttrs(attrs)
-}
-
-func (h *wrapper) WithGroup(name string) slog.Handler {
-	return h.h.WithGroup(name)
-}
-
 func (s *slogLogger) renameAttr(_ []string, a slog.Attr) slog.Attr {
 	switch a.Key {
 	case slog.SourceKey:
 		source := a.Value.Any().(*slog.Source)
 		a.Value = slog.StringValue(source.File + ":" + strconv.Itoa(source.Line))
-		a.Key = s.opts.SourceKey
+		a.Key = s.sourceKey
 	case slog.TimeKey:
-		a.Key = s.opts.TimeKey
+		a.Key = s.timeKey
 	case slog.MessageKey:
-		a.Key = s.opts.MessageKey
+		a.Key = s.messageKey
 	case slog.LevelKey:
 		level := a.Value.Any().(slog.Level)
 		lvl := slogToLoggerLevel(level)
-		a.Key = s.opts.LevelKey
+		a.Key = s.levelKey
 		switch {
 		case lvl < logger.DebugLevel:
 			a.Value = traceValue
@@ -92,213 +65,322 @@ func (s *slogLogger) renameAttr(_ []string, a slog.Attr) slog.Attr {
 }
 
 type slogLogger struct {
-	handler *wrapper
-	opts    logger.Options
-	mu      sync.RWMutex
+	slog       *slog.Logger
+	leveler    *slog.LevelVar
+	levelKey   string
+	messageKey string
+	sourceKey  string
+	timeKey    string
+	opts       logger.Options
 }
 
 func (s *slogLogger) Clone(opts ...logger.Option) logger.Logger {
-	s.mu.RLock()
 	options := s.opts
-	s.mu.RUnlock()
 
 	for _, o := range opts {
 		o(&options)
 	}
 
-	if len(options.ContextAttrFuncs) == 0 {
-		options.ContextAttrFuncs = logger.DefaultContextAttrFuncs
+	l := &slogLogger{
+		opts:       options,
+		levelKey:   s.levelKey,
+		messageKey: s.messageKey,
+		sourceKey:  s.sourceKey,
+		timeKey:    s.timeKey,
 	}
 
-	attrs, _ := s.argsAttrs(options.Fields)
-	l := &slogLogger{
-		handler: &wrapper{h: s.handler.h.WithAttrs(attrs)},
-		opts:    options,
+	if v, ok := l.opts.Context.Value(levelKey{}).(string); ok && v != "" {
+		l.levelKey = v
 	}
-	l.handler.level.Store(int64(loggerToSlogLevel(options.Level)))
+	if v, ok := l.opts.Context.Value(messageKey{}).(string); ok && v != "" {
+		l.messageKey = v
+	}
+	if v, ok := l.opts.Context.Value(sourceKey{}).(string); ok && v != "" {
+		l.sourceKey = v
+	}
+	if v, ok := l.opts.Context.Value(timeKey{}).(string); ok && v != "" {
+		l.timeKey = v
+	}
+
+	l.leveler = new(slog.LevelVar)
+	handleOpt := &slog.HandlerOptions{
+		ReplaceAttr: s.renameAttr,
+		Level:       l.leveler,
+		AddSource:   true,
+	}
+	l.leveler.Set(loggerToSlogLevel(l.opts.Level))
+	handler := slog.NewJSONHandler(options.Out, handleOpt)
+	l.slog = slog.New(handler).With(options.Fields...)
 
 	return l
 }
 
 func (s *slogLogger) V(level logger.Level) bool {
-	s.mu.Lock()
-	v := s.opts.Level.Enabled(level)
-	s.mu.Unlock()
-	return v
+	return s.opts.Level.Enabled(level)
 }
 
 func (s *slogLogger) Level(level logger.Level) {
-	s.mu.Lock()
-	s.opts.Level = level
-	s.handler.level.Store(int64(loggerToSlogLevel(level)))
-	s.mu.Unlock()
+	s.leveler.Set(loggerToSlogLevel(level))
 }
 
 func (s *slogLogger) Options() logger.Options {
 	return s.opts
 }
 
-func (s *slogLogger) Fields(fields ...interface{}) logger.Logger {
-	s.mu.RLock()
-	options := s.opts
-	s.mu.RUnlock()
+func (s *slogLogger) Fields(attrs ...interface{}) logger.Logger {
+	nl := &slogLogger{
+		opts:       s.opts,
+		levelKey:   s.levelKey,
+		messageKey: s.messageKey,
+		sourceKey:  s.sourceKey,
+		timeKey:    s.timeKey,
+	}
+	nl.leveler = new(slog.LevelVar)
+	nl.leveler.Set(s.leveler.Level())
 
-	l := &slogLogger{opts: options}
-	logger.WithAddFields(fields...)(&l.opts)
-
-	if len(options.ContextAttrFuncs) == 0 {
-		options.ContextAttrFuncs = logger.DefaultContextAttrFuncs
+	handleOpt := &slog.HandlerOptions{
+		ReplaceAttr: nl.renameAttr,
+		Level:       s.leveler,
+		AddSource:   true,
 	}
 
-	attrs, _ := s.argsAttrs(fields)
-	l.handler = &wrapper{h: s.handler.h.WithAttrs(attrs)}
-	l.handler.level.Store(int64(loggerToSlogLevel(l.opts.Level)))
+	handler := slog.NewJSONHandler(s.opts.Out, handleOpt)
+	nl.slog = slog.New(handler).With(attrs...)
 
-	return l
+	return nl
 }
 
 func (s *slogLogger) Init(opts ...logger.Option) error {
-	s.mu.Lock()
-
 	for _, o := range opts {
 		o(&s.opts)
 	}
 
-	if len(s.opts.ContextAttrFuncs) == 0 {
-		s.opts.ContextAttrFuncs = logger.DefaultContextAttrFuncs
+	if v, ok := s.opts.Context.Value(levelKey{}).(string); ok && v != "" {
+		s.levelKey = v
+	}
+	if v, ok := s.opts.Context.Value(messageKey{}).(string); ok && v != "" {
+		s.messageKey = v
+	}
+	if v, ok := s.opts.Context.Value(sourceKey{}).(string); ok && v != "" {
+		s.sourceKey = v
+	}
+	if v, ok := s.opts.Context.Value(timeKey{}).(string); ok && v != "" {
+		s.timeKey = v
 	}
 
+	s.leveler = new(slog.LevelVar)
 	handleOpt := &slog.HandlerOptions{
 		ReplaceAttr: s.renameAttr,
-		Level:       loggerToSlogLevel(logger.TraceLevel),
-		AddSource:   s.opts.AddSource,
+		Level:       s.leveler,
+		AddSource:   true,
 	}
+	s.leveler.Set(loggerToSlogLevel(s.opts.Level))
+	handler := slog.NewJSONHandler(s.opts.Out, handleOpt)
+	s.slog = slog.New(handler).With(s.opts.Fields...)
 
-	attrs, _ := s.argsAttrs(s.opts.Fields)
-
-	var h slog.Handler
-	if s.opts.Context != nil {
-		if v, ok := s.opts.Context.Value(handlerKey{}).(slog.Handler); ok && v != nil {
-			h = v
-		}
-
-		if fn := s.opts.Context.Value(handlerFnKey{}); fn != nil {
-			if rfn := reflect.ValueOf(fn); rfn.Kind() == reflect.Func {
-				if ret := rfn.Call([]reflect.Value{reflect.ValueOf(s.opts.Out), reflect.ValueOf(handleOpt)}); len(ret) == 1 {
-					if iface, ok := ret[0].Interface().(slog.Handler); ok && iface != nil {
-						h = iface
-					}
-				}
-			}
-		}
-	}
-
-	if h == nil {
-		h = slog.NewJSONHandler(s.opts.Out, handleOpt)
-	}
-
-	s.handler = &wrapper{h: h.WithAttrs(attrs)}
-	s.handler.level.Store(int64(loggerToSlogLevel(s.opts.Level)))
-	s.mu.Unlock()
+	slog.SetDefault(s.slog)
 
 	return nil
 }
 
-func (s *slogLogger) Log(ctx context.Context, lvl logger.Level, msg string, attrs ...interface{}) {
-	s.printLog(ctx, lvl, msg, attrs...)
-}
-
-func (s *slogLogger) Info(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.InfoLevel, msg, attrs...)
-}
-
-func (s *slogLogger) Debug(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.DebugLevel, msg, attrs...)
-}
-
-func (s *slogLogger) Trace(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.TraceLevel, msg, attrs...)
-}
-
-func (s *slogLogger) Error(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.ErrorLevel, msg, attrs...)
-}
-
-func (s *slogLogger) Fatal(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.FatalLevel, msg, attrs...)
-	if closer, ok := s.opts.Out.(io.Closer); ok {
-		closer.Close()
+func (s *slogLogger) Log(ctx context.Context, lvl logger.Level, attrs ...interface{}) {
+	if !s.V(lvl) {
+		return
 	}
-	time.Sleep(1 * time.Second)
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(time.Now(), loggerToSlogLevel(lvl), fmt.Sprintf("%s", attrs[0]), pcs[0])
+	// r.Add(attrs[1:]...)
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Logf(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(time.Now(), loggerToSlogLevel(lvl), fmt.Sprintf(msg, attrs...), pcs[0])
+	// r.Add(attrs...)
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Info(ctx context.Context, attrs ...interface{}) {
+	if !s.V(logger.InfoLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(time.Now(), slog.LevelInfo, fmt.Sprintf("%s", attrs[0]), pcs[0])
+	// r.Add(attrs[1:]...)
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Infof(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(time.Now(), slog.LevelInfo, fmt.Sprintf(msg, attrs...), pcs[0])
+	// r.Add(attrs...)
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Debug(ctx context.Context, attrs ...interface{}) {
+	if !s.V(logger.DebugLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(time.Now(), slog.LevelDebug, fmt.Sprintf("%s", attrs[0]), pcs[0])
+	// r.Add(attrs[1:]...)
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Debugf(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(time.Now(), slog.LevelDebug, fmt.Sprintf(msg, attrs...), pcs[0])
+	// r.Add(attrs...)
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Trace(ctx context.Context, attrs ...interface{}) {
+	if !s.V(logger.TraceLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(time.Now(), slog.LevelDebug-1, fmt.Sprintf("%s", attrs[0]), pcs[0])
+	// r.Add(attrs[1:]...)
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Tracef(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(time.Now(), slog.LevelDebug-1, fmt.Sprintf(msg, attrs...), pcs[0])
+	// r.Add(attrs...)
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Error(ctx context.Context, attrs ...interface{}) {
+	if !s.V(logger.ErrorLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(time.Now(), slog.LevelError, fmt.Sprintf("%s", attrs[0]), pcs[0])
+	//	r.Add(attrs[1:]...)
+	r.Attrs(func(a slog.Attr) bool {
+		if a.Key == "error" {
+			if span, ok := tracer.SpanFromContext(ctx); ok {
+				span.SetStatus(tracer.SpanStatusError, a.Value.String())
+				return false
+			}
+		}
+		return true
+	})
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Errorf(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(time.Now(), slog.LevelError, fmt.Sprintf(msg, attrs...), pcs[0])
+	// r.Add(attrs...)
+	r.Attrs(func(a slog.Attr) bool {
+		if a.Key == "error" {
+			if span, ok := tracer.SpanFromContext(ctx); ok {
+				span.SetStatus(tracer.SpanStatusError, a.Value.String())
+				return false
+			}
+		}
+		return true
+	})
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Fatal(ctx context.Context, attrs ...interface{}) {
+	if !s.V(logger.FatalLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(time.Now(), slog.LevelError+1, fmt.Sprintf("%s", attrs[0]), pcs[0])
+	// r.Add(attrs[1:]...)
+	_ = s.slog.Handler().Handle(ctx, r)
 	os.Exit(1)
 }
 
-func (s *slogLogger) Warn(ctx context.Context, msg string, attrs ...interface{}) {
-	s.printLog(ctx, logger.WarnLevel, msg, attrs...)
+func (s *slogLogger) Fatalf(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(time.Now(), slog.LevelError+1, fmt.Sprintf(msg, attrs...), pcs[0])
+	// r.Add(attrs...)
+	_ = s.slog.Handler().Handle(ctx, r)
+	os.Exit(1)
 }
 
-func (s *slogLogger) Name() string {
-	return s.opts.Name
+func (s *slogLogger) Warn(ctx context.Context, attrs ...interface{}) {
+	if !s.V(logger.WarnLevel) {
+		return
+	}
+	var pcs [1]uintptr
+	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, Infof]
+	r := slog.NewRecord(time.Now(), slog.LevelWarn, fmt.Sprintf("%s", attrs[0]), pcs[0])
+	// r.Add(attrs[1:]...)
+	_ = s.slog.Handler().Handle(ctx, r)
+}
+
+func (s *slogLogger) Warnf(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(time.Now(), slog.LevelWarn, fmt.Sprintf(msg, attrs...), pcs[0])
+	// r.Add(attrs...)
+	_ = s.slog.Handler().Handle(ctx, r)
 }
 
 func (s *slogLogger) String() string {
 	return "slog"
 }
 
-func (s *slogLogger) printLog(ctx context.Context, lvl logger.Level, msg string, args ...interface{}) {
-	if !s.V(lvl) {
-		return
-	}
-	var argError error
-
-	s.opts.Meter.Counter(semconv.LoggerMessageTotal, "level", lvl.String()).Inc()
-
-	attrs, err := s.argsAttrs(args)
-	if err != nil {
-		argError = err
-	}
-	if argError != nil {
-		if span, ok := tracer.SpanFromContext(ctx); ok {
-			span.SetStatus(tracer.SpanStatusError, argError.Error())
-		}
-	}
-
-	for _, fn := range s.opts.ContextAttrFuncs {
-		ctxAttrs, err := s.argsAttrs(fn(ctx))
-		if err != nil {
-			argError = err
-		}
-		attrs = append(attrs, ctxAttrs...)
-	}
-	if argError != nil {
-		if span, ok := tracer.SpanFromContext(ctx); ok {
-			span.SetStatus(tracer.SpanStatusError, argError.Error())
-		}
-	}
-
-	if (s.opts.AddStacktrace || lvl == logger.FatalLevel) || (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]))
-			}
-		}
-	}
-
-	var pcs [1]uintptr
-	runtime.Callers(s.opts.CallerSkipCount, pcs[:]) // skip [Callers, printLog, LogLvlMethod]
-	r := slog.NewRecord(s.opts.TimeFunc(), loggerToSlogLevel(lvl), msg, pcs[0])
-	r.AddAttrs(attrs...)
-	_ = s.handler.Handle(ctx, r)
-}
-
 func NewLogger(opts ...logger.Option) logger.Logger {
 	s := &slogLogger{
-		opts: logger.NewOptions(opts...),
+		opts:       logger.NewOptions(opts...),
+		sourceKey:  DefaultSourceKey,
+		timeKey:    DefaultTimeKey,
+		messageKey: DefaultMessageKey,
+		levelKey:   DefaultLevelKey,
+	}
+	if v, ok := s.opts.Context.Value(levelKey{}).(string); ok && v != "" {
+		s.levelKey = v
+	}
+	if v, ok := s.opts.Context.Value(messageKey{}).(string); ok && v != "" {
+		s.messageKey = v
+	}
+	if v, ok := s.opts.Context.Value(sourceKey{}).(string); ok && v != "" {
+		s.sourceKey = v
+	}
+	if v, ok := s.opts.Context.Value(timeKey{}).(string); ok && v != "" {
+		s.timeKey = v
 	}
-	s.opts.CallerSkipCount = defaultCallerSkipCount
-
 	return s
 }
 
@@ -335,39 +417,3 @@ func slogToLoggerLevel(level slog.Level) logger.Level {
 		return logger.InfoLevel
 	}
 }
-
-func (s *slogLogger) argsAttrs(args []interface{}) ([]slog.Attr, error) {
-	attrs := make([]slog.Attr, 0, len(args))
-	var err error
-
-	for idx := 0; idx < len(args); idx++ {
-		switch arg := args[idx].(type) {
-		case slog.Attr:
-			attrs = append(attrs, arg)
-		case string:
-			if idx+1 < len(args) {
-				attrs = append(attrs, slog.Any(arg, args[idx+1]))
-				idx++
-			} else {
-				attrs = append(attrs, slog.String(badKey, arg))
-			}
-		case error:
-			attrs = append(attrs, slog.String(s.opts.ErrorKey, arg.Error()))
-			err = arg
-		}
-	}
-
-	return attrs, err
-}
-
-type handlerKey struct{}
-
-func WithHandler(h slog.Handler) logger.Option {
-	return logger.SetOption(handlerKey{}, h)
-}
-
-type handlerFnKey struct{}
-
-func WithHandlerFunc(fn any) logger.Option {
-	return logger.SetOption(handlerFnKey{}, fn)
-}

logger/slog/slog_test.go

@@ -3,226 +3,12 @@ package slog
 import (
 	"bytes"
 	"context"
-	"errors"
-	"fmt"
 	"log"
-	"log/slog"
-	"strings"
 	"testing"
 
-	"github.com/google/uuid"
 	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/metadata"
 )
 
-func TestStacktrace(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(buf),
-		WithHandlerFunc(slog.NewTextHandler),
-		logger.WithAddStacktrace(true),
-	)
-	if err := l.Init(logger.WithFields("key1", "val1")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Error(ctx, "msg1", errors.New("err"))
-
-	if !bytes.Contains(buf.Bytes(), []byte(`slog_test.go:29`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestWithFields(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf),
-		WithHandlerFunc(slog.NewTextHandler),
-		logger.WithDedupKeys(true),
-	)
-	if err := l.Init(logger.WithFields("key1", "val1")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg1")
-
-	l = l.Fields("key1", "val2")
-
-	l.Info(ctx, "msg2")
-
-	if !bytes.Contains(buf.Bytes(), []byte(`msg=msg2 key1=val1`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestWithDedupKeysWithAddFields(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf),
-		WithHandlerFunc(slog.NewTextHandler),
-		logger.WithDedupKeys(true),
-	)
-	if err := l.Init(logger.WithFields("key1", "val1")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg1")
-
-	if err := l.Init(logger.WithAddFields("key2", "val2")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg2")
-
-	if err := l.Init(logger.WithAddFields("key2", "val3", "key1", "val4")); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg3")
-
-	if !bytes.Contains(buf.Bytes(), []byte(`msg=msg3 key1=val1 key2=val2`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestWithHandlerFunc(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf),
-		WithHandlerFunc(slog.NewTextHandler),
-	)
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg1")
-
-	if !bytes.Contains(buf.Bytes(), []byte(`msg=msg1`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestWithAddFields(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "msg1")
-
-	if err := l.Init(logger.WithAddFields("key1", "val1")); err != nil {
-		t.Fatal(err)
-	}
-	l.Info(ctx, "msg2")
-
-	if err := l.Init(logger.WithAddFields("key2", "val2")); err != nil {
-		t.Fatal(err)
-	}
-	l.Info(ctx, "msg3")
-
-	if !bytes.Contains(buf.Bytes(), []byte(`"key1"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"key2"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestMultipleFieldsWithLevel(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l = l.Fields("key", "val")
-
-	l.Info(ctx, "msg1")
-	nl := l.Clone(logger.WithLevel(logger.DebugLevel))
-	nl.Debug(ctx, "msg2")
-	l.Debug(ctx, "msg3")
-	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"msg1"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"msg2"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-	if bytes.Contains(buf.Bytes(), []byte(`"msg3"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestMultipleFields(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.InfoLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l = l.Fields("key", "val")
-
-	l = l.Fields("key1", "val1")
-
-	l.Info(ctx, "msg")
-
-	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"key1":"val1"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestError(t *testing.T) {
-	ctx := context.TODO()
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(buf), logger.WithAddStacktrace(true))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Error(ctx, "message", fmt.Errorf("error message"))
-	if !bytes.Contains(buf.Bytes(), []byte(`"stacktrace":"`)) {
-		t.Fatalf("logger stacktrace not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"error":"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
-func TestErrorf(t *testing.T) {
-	ctx := context.TODO()
-
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(buf), logger.WithAddStacktrace(true))
-	if err := l.Init(logger.WithContextAttrFuncs(func(_ context.Context) []interface{} {
-		return nil
-	})); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Log(ctx, logger.ErrorLevel, "message", errors.New("error msg"))
-
-	l.Log(ctx, logger.ErrorLevel, "", errors.New("error msg"))
-	if !bytes.Contains(buf.Bytes(), []byte(`"error":"error msg"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-
-	if !bytes.Contains(buf.Bytes(), []byte(`"stacktrace":"`)) {
-		t.Fatalf("logger stacktrace not works, buf contains: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`"error":"`)) {
-		t.Fatalf("logger error not works, buf contains: %s", buf.Bytes())
-	}
-}
-
 func TestContext(t *testing.T) {
 	ctx := context.TODO()
 	buf := bytes.NewBuffer(nil)
@@ -278,11 +64,6 @@ func TestFromContextWithFields(t *testing.T) {
 	if !bytes.Contains(buf.Bytes(), []byte(`"key":"val"`)) {
 		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
 	}
-
-	l.Info(ctx, "test", "uncorrected number attributes")
-	if !bytes.Contains(buf.Bytes(), []byte(`"!BADKEY":"uncorrected number attributes"`)) {
-		t.Fatalf("logger fields not works, buf contains: %s", buf.Bytes())
-	}
 }
 
 func TestClone(t *testing.T) {
@@ -358,52 +139,3 @@ func TestLogger(t *testing.T) {
 		t.Fatalf("logger warn, buf %s", buf.Bytes())
 	}
 }
-
-func Test_WithContextAttrFunc(t *testing.T) {
-	loggerContextAttrFuncs := []logger.ContextAttrFunc{
-		func(ctx context.Context) []interface{} {
-			md, ok := metadata.FromIncomingContext(ctx)
-			if !ok {
-				return nil
-			}
-			attrs := make([]interface{}, 0, 10)
-			for k, v := range md {
-				switch k {
-				case "X-Request-Id", "Phone", "External-Id", "Source-Service", "X-App-Install-Id", "Client-Id", "Client-Ip":
-					attrs = append(attrs, strings.ToLower(k), v)
-				}
-			}
-			return attrs
-		},
-	}
-
-	logger.DefaultContextAttrFuncs = append(logger.DefaultContextAttrFuncs, loggerContextAttrFuncs...)
-
-	ctx := context.TODO()
-	ctx = metadata.AppendIncomingContext(ctx, "X-Request-Id", uuid.New().String(),
-		"Source-Service", "Test-System")
-
-	buf := bytes.NewBuffer(nil)
-	l := NewLogger(logger.WithLevel(logger.TraceLevel), logger.WithOutput(buf))
-	if err := l.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	l.Info(ctx, "test message")
-	if !(bytes.Contains(buf.Bytes(), []byte(`"level":"info"`)) && bytes.Contains(buf.Bytes(), []byte(`"msg":"test message"`))) {
-		t.Fatalf("logger info, buf %s", buf.Bytes())
-	}
-	if !(bytes.Contains(buf.Bytes(), []byte(`"x-request-id":"`))) {
-		t.Fatalf("logger info, buf %s", buf.Bytes())
-	}
-	if !(bytes.Contains(buf.Bytes(), []byte(`"source-service":"Test-System"`))) {
-		t.Fatalf("logger info, buf %s", buf.Bytes())
-	}
-	buf.Reset()
-	imd, _ := metadata.FromIncomingContext(ctx)
-	l.Info(ctx, "test message1")
-	imd.Set("Source-Service", "Test-System2")
-	l.Info(ctx, "test message2")
-
-	// t.Logf("xxx %s", buf.Bytes())
-}

logger/unwrap/unwrap.go

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

logger/unwrap/unwrap_test.go

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

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

@@ -24,17 +24,6 @@ func FromIncomingContext(ctx context.Context) (Metadata, bool) {
 	return md.md, ok
 }
 
-// MustIncomingContext returns metadata from incoming ctx
-// returned metadata shoud not be modified or race condition happens.
-// If metadata not exists panics.
-func MustIncomingContext(ctx context.Context) Metadata {
-	md, ok := FromIncomingContext(ctx)
-	if !ok {
-		panic("missing metadata")
-	}
-	return md
-}
-
 // FromOutgoingContext returns metadata from outgoing ctx
 // returned metadata shoud not be modified or race condition happens
 func FromOutgoingContext(ctx context.Context) (Metadata, bool) {
@@ -48,17 +37,6 @@ func FromOutgoingContext(ctx context.Context) (Metadata, bool) {
 	return md.md, ok
 }
 
-// MustOutgoingContext returns metadata from outgoing ctx
-// returned metadata shoud not be modified or race condition happens.
-// If metadata not exists panics.
-func MustOutgoingContext(ctx context.Context) Metadata {
-	md, ok := FromOutgoingContext(ctx)
-	if !ok {
-		panic("missing metadata")
-	}
-	return md
-}
-
 // FromContext returns metadata from the given context
 // returned metadata shoud not be modified or race condition happens
 func FromContext(ctx context.Context) (Metadata, bool) {
@@ -72,22 +50,15 @@ func FromContext(ctx context.Context) (Metadata, bool) {
 	return md.md, ok
 }
 
-// MustContext returns metadata from the given context
-// returned metadata shoud not be modified or race condition happens
-func MustContext(ctx context.Context) Metadata {
-	md, ok := FromContext(ctx)
-	if !ok {
-		panic("missing metadata")
-	}
-	return md
-}
-
 // NewContext creates a new context with the given metadata
 func NewContext(ctx context.Context, md Metadata) context.Context {
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	return context.WithValue(ctx, mdKey{}, &rawMetadata{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
@@ -119,7 +90,11 @@ func NewIncomingContext(ctx context.Context, md Metadata) context.Context {
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	return context.WithValue(ctx, mdIncomingKey{}, &rawMetadata{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
 }
 
 // NewOutgoingContext creates a new context with outcoming metadata attached
@@ -127,7 +102,11 @@ func NewOutgoingContext(ctx context.Context, md Metadata) context.Context {
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	return context.WithValue(ctx, mdOutgoingKey{}, &rawMetadata{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
@@ -143,7 +122,7 @@ func AppendOutgoingContext(ctx context.Context, kv ...string) context.Context {
 	for k, v := range md {
 		omd.Set(k, v)
 	}
-	return ctx
+	return NewOutgoingContext(ctx, omd)
 }
 
 // AppendIncomingContext apends new md to context
@@ -159,21 +138,5 @@ func AppendIncomingContext(ctx context.Context, kv ...string) context.Context {
 	for k, v := range md {
 		omd.Set(k, v)
 	}
-	return ctx
-}
-
-// AppendContext apends new md to context
-func AppendContext(ctx context.Context, kv ...string) context.Context {
-	md, ok := Pairs(kv...)
-	if !ok {
-		return ctx
-	}
-	omd, ok := FromContext(ctx)
-	if !ok {
-		return NewContext(ctx, md)
-	}
-	for k, v := range md {
-		omd.Set(k, v)
-	}
-	return ctx
+	return NewIncomingContext(ctx, omd)
 }

metadata/metadata.go

@@ -1,10 +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"
 	"sort"
-	"strings"
 )
 
 var (
@@ -67,14 +66,6 @@ func (md Metadata) Iterator() *Iterator {
 	return iter
 }
 
-func (md Metadata) MustGet(key string) string {
-	val, ok := md.Get(key)
-	if !ok {
-		panic("missing metadata key")
-	}
-	return val
-}
-
 // Get returns value from metadata by key
 func (md Metadata) Get(key string) (string, bool) {
 	// fast path
@@ -82,9 +73,6 @@ func (md Metadata) Get(key string) (string, bool) {
 	if !ok {
 		// slow path
 		val, ok = md[textproto.CanonicalMIMEHeaderKey(key)]
-		if !ok {
-			val, ok = md[strings.ToLower(key)]
-		}
 	}
 	return val, ok
 }
@@ -106,25 +94,15 @@ func (md Metadata) Del(keys ...string) {
 		delete(md, key)
 		// slow path
 		delete(md, textproto.CanonicalMIMEHeaderKey(key))
-		// very slow path
-		delete(md, strings.ToLower(key))
 	}
 }
 
 // Copy makes a copy of the metadata
-func (md Metadata) CopyTo(dst Metadata) {
-	for k, v := range md {
-		dst[k] = v
-	}
-}
-
-// Copy makes a copy of the metadata
-func Copy(md Metadata, exclude ...string) Metadata {
+func Copy(md Metadata) Metadata {
 	nmd := New(len(md))
-	for k, v := range md {
-		nmd[k] = v
+	for key, val := range md {
+		nmd.Set(key, val)
 	}
-	nmd.Del(exclude...)
 	return nmd
 }
 
@@ -146,7 +124,7 @@ func Merge(omd Metadata, mmd Metadata, overwrite bool) Metadata {
 		case ok && !overwrite:
 			continue
 		case val != "":
-			nmd[key] = val
+			nmd.Set(key, val)
 		case ok && val == "":
 			nmd.Del(key)
 		}
@@ -160,8 +138,6 @@ func Pairs(kv ...string) (Metadata, bool) {
 		return nil, false
 	}
 	md := New(len(kv) / 2)
-	for idx := 0; idx < len(kv); idx += 2 {
-		md[kv[idx]] = kv[idx+1]
-	}
+	md.Set(kv...)
 	return md, true
 }

metadata/metadata_test.go

@@ -5,37 +5,6 @@ import (
 	"testing"
 )
 
-func TestLowercase(t *testing.T) {
-	md := New(1)
-	md["x-request-id"] = "12345"
-	v, ok := md.Get("X-Request-Id")
-	if !ok || v == "" {
-		t.Fatalf("metadata invalid %#+v", md)
-	}
-}
-
-func TestMultipleUsage(t *testing.T) {
-	ctx := context.TODO()
-	md := New(0)
-	md.Set("key1_1", "val1_1", "key1_2", "val1_2", "key1_3", "val1_3")
-	ctx = NewIncomingContext(ctx, Copy(md))
-	ctx = NewOutgoingContext(ctx, Copy(md))
-	imd, _ := FromIncomingContext(ctx)
-	omd, _ := FromOutgoingContext(ctx)
-	_ = func(x context.Context) context.Context {
-		m, _ := FromIncomingContext(x)
-		m.Del("key1_2")
-		return ctx
-	}(ctx)
-	_ = func(x context.Context) context.Context {
-		m, _ := FromIncomingContext(x)
-		m.Del("key1_3")
-		return ctx
-	}(ctx)
-	_ = imd
-	_ = omd
-}
-
 func TestMetadataSetMultiple(t *testing.T) {
 	md := New(4)
 	md.Set("key1", "val1", "key2", "val2", "key3")
@@ -88,13 +57,6 @@ func TestPassing(t *testing.T) {
 
 	ctx = NewIncomingContext(ctx, md1)
 	testCtx(ctx)
-	_, ok := FromOutgoingContext(ctx)
-	if ok {
-		t.Fatalf("create outgoing context")
-	}
-
-	ctx = NewOutgoingContext(ctx, New(1))
-	testCtx(ctx)
 	md, ok := FromOutgoingContext(ctx)
 	if !ok {
 		t.Fatalf("missing metadata from outgoing context")
@@ -118,7 +80,7 @@ func TestMerge(t *testing.T) {
 	}
 }
 
-func TestIterator(_ *testing.T) {
+func TestIterator(t *testing.T) {
 	md := Metadata{
 		"1Last":   "last",
 		"2First":  "first",
@@ -228,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"] != "val1" {
-		t.Fatal("Copy exclude not works")
-	}
-}

meter/context.go

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

meter/meter.go

@@ -1,5 +1,5 @@
 // Package meter is for instrumentation
-package meter
+package meter // import "go.unistack.org/micro/v3/meter"
 
 import (
 	"io"
@@ -16,19 +16,14 @@ var (
 	DefaultAddress = ":9090"
 	// DefaultPath the meter endpoint where the Meter data will be made available
 	DefaultPath = "/metrics"
-	// DefaultMeterStatsInterval specifies interval for meter updating
-	DefaultMeterStatsInterval = 5 * time.Second
+	// DefaultMetricPrefix holds the string that prepends to all metrics
+	DefaultMetricPrefix = "micro_"
+	// DefaultLabelPrefix holds the string that prepends to all labels
+	DefaultLabelPrefix = "micro_"
 	// DefaultSummaryQuantiles is the default spread of stats for summary
 	DefaultSummaryQuantiles = []float64{0.5, 0.9, 0.97, 0.99, 1}
 	// DefaultSummaryWindow is the default window for summary
 	DefaultSummaryWindow = 5 * time.Minute
-	// DefaultSkipEndpoints is the slice of endpoint that must not be metered
-	DefaultSkipEndpoints = []string{
-		"MeterService.Metrics",
-		"HealthService.Live",
-		"HealthService.Ready",
-		"HealthService.Version",
-	}
 )
 
 // Meter is an interface for collecting and instrumenting metrics

meter/noop.go

@@ -37,32 +37,32 @@ func (r *noopMeter) Init(opts ...Option) error {
 }
 
 // Counter implements the Meter interface
-func (r *noopMeter) Counter(_ string, labels ...string) Counter {
+func (r *noopMeter) Counter(name string, labels ...string) Counter {
 	return &noopCounter{labels: labels}
 }
 
 // FloatCounter implements the Meter interface
-func (r *noopMeter) FloatCounter(_ string, labels ...string) FloatCounter {
+func (r *noopMeter) FloatCounter(name string, labels ...string) FloatCounter {
 	return &noopFloatCounter{labels: labels}
 }
 
 // Gauge implements the Meter interface
-func (r *noopMeter) Gauge(_ string, _ func() float64, labels ...string) Gauge {
+func (r *noopMeter) Gauge(name string, f func() float64, labels ...string) Gauge {
 	return &noopGauge{labels: labels}
 }
 
 // Summary implements the Meter interface
-func (r *noopMeter) Summary(_ string, labels ...string) Summary {
+func (r *noopMeter) Summary(name string, labels ...string) Summary {
 	return &noopSummary{labels: labels}
 }
 
 // SummaryExt implements the Meter interface
-func (r *noopMeter) SummaryExt(_ string, _ time.Duration, _ []float64, labels ...string) Summary {
+func (r *noopMeter) SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) Summary {
 	return &noopSummary{labels: labels}
 }
 
 // Histogram implements the Meter interface
-func (r *noopMeter) Histogram(_ string, labels ...string) Histogram {
+func (r *noopMeter) Histogram(name string, labels ...string) Histogram {
 	return &noopHistogram{labels: labels}
 }
 
@@ -77,7 +77,7 @@ func (r *noopMeter) Set(opts ...Option) Meter {
 	return m
 }
 
-func (r *noopMeter) Write(_ io.Writer, _ ...Option) error {
+func (r *noopMeter) Write(w io.Writer, opts ...Option) error {
 	return nil
 }
 

meter/options.go

@@ -2,6 +2,8 @@ package meter
 
 import (
 	"context"
+
+	"go.unistack.org/micro/v3/logger"
 )
 
 // Option powers the configuration for metrics implementations:
@@ -9,6 +11,8 @@ type Option func(*Options)
 
 // Options for metrics implementations
 type Options struct {
+	// Logger used for logging
+	Logger logger.Logger
 	// Context holds external options
 	Context context.Context
 	// Name holds the meter name
@@ -17,6 +21,10 @@ type Options struct {
 	Address string
 	// Path holds the path for metrics
 	Path string
+	// MetricPrefix holds the prefix for all metrics
+	MetricPrefix string
+	// LabelPrefix holds the prefix for all labels
+	LabelPrefix string
 	// Labels holds the default labels
 	Labels []string
 	// WriteProcessMetrics flag to write process metrics
@@ -28,9 +36,12 @@ type Options struct {
 // NewOptions prepares a set of options:
 func NewOptions(opt ...Option) Options {
 	opts := Options{
-		Address: DefaultAddress,
-		Path:    DefaultPath,
-		Context: context.Background(),
+		Address:      DefaultAddress,
+		Path:         DefaultPath,
+		Context:      context.Background(),
+		Logger:       logger.DefaultLogger,
+		MetricPrefix: DefaultMetricPrefix,
+		LabelPrefix:  DefaultLabelPrefix,
 	}
 
 	for _, o := range opt {
@@ -40,6 +51,20 @@ func NewOptions(opt ...Option) Options {
 	return opts
 }
 
+// LabelPrefix sets the labels prefix
+func LabelPrefix(pref string) Option {
+	return func(o *Options) {
+		o.LabelPrefix = pref
+	}
+}
+
+// MetricPrefix sets the metric prefix
+func MetricPrefix(pref string) Option {
+	return func(o *Options) {
+		o.MetricPrefix = pref
+	}
+}
+
 // Context sets the metrics context
 func Context(ctx context.Context) Option {
 	return func(o *Options) {
@@ -70,7 +95,14 @@ func TimingObjectives(value map[float64]float64) Option {
 }
 */
 
-// Labels add the meter labels
+// Logger sets the logger
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Labels sets the meter labels
 func Labels(ls ...string) Option {
 	return func(o *Options) {
 		o.Labels = append(o.Labels, ls...)

meter/wrapper/wrapper.go

@@ -0,0 +1,347 @@
+package wrapper // import "go.unistack.org/micro/v3/meter/wrapper"
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v3/server"
+)
+
+var (
+	// ClientRequestDurationSeconds specifies meter metric name
+	ClientRequestDurationSeconds = "client_request_duration_seconds"
+	// ClientRequestLatencyMicroseconds specifies meter metric name
+	ClientRequestLatencyMicroseconds = "client_request_latency_microseconds"
+	// ClientRequestTotal specifies meter metric name
+	ClientRequestTotal = "client_request_total"
+	// ClientRequestInflight specifies meter metric name
+	ClientRequestInflight = "client_request_inflight"
+	// ServerRequestDurationSeconds specifies meter metric name
+	ServerRequestDurationSeconds = "server_request_duration_seconds"
+	// ServerRequestLatencyMicroseconds specifies meter metric name
+	ServerRequestLatencyMicroseconds = "server_request_latency_microseconds"
+	// ServerRequestTotal specifies meter metric name
+	ServerRequestTotal = "server_request_total"
+	// ServerRequestInflight specifies meter metric name
+	ServerRequestInflight = "server_request_inflight"
+	// PublishMessageDurationSeconds specifies meter metric name
+	PublishMessageDurationSeconds = "publish_message_duration_seconds"
+	// PublishMessageLatencyMicroseconds specifies meter metric name
+	PublishMessageLatencyMicroseconds = "publish_message_latency_microseconds"
+	// PublishMessageTotal specifies meter metric name
+	PublishMessageTotal = "publish_message_total"
+	// PublishMessageInflight specifies meter metric name
+	PublishMessageInflight = "publish_message_inflight"
+	// SubscribeMessageDurationSeconds specifies meter metric name
+	SubscribeMessageDurationSeconds = "subscribe_message_duration_seconds"
+	// SubscribeMessageLatencyMicroseconds specifies meter metric name
+	SubscribeMessageLatencyMicroseconds = "subscribe_message_latency_microseconds"
+	// SubscribeMessageTotal specifies meter metric name
+	SubscribeMessageTotal = "subscribe_message_total"
+	// SubscribeMessageInflight specifies meter metric name
+	SubscribeMessageInflight = "subscribe_message_inflight"
+
+	labelSuccess  = "success"
+	labelFailure  = "failure"
+	labelStatus   = "status"
+	labelEndpoint = "endpoint"
+
+	// DefaultSkipEndpoints contains list of endpoints that not evaluted by wrapper
+	DefaultSkipEndpoints = []string{"Meter.Metrics", "Health.Live", "Health.Ready", "Health.Version"}
+)
+
+// Options struct
+type Options struct {
+	Meter         meter.Meter
+	lopts         []meter.Option
+	SkipEndpoints []string
+}
+
+// Option func signature
+type Option func(*Options)
+
+// NewOptions creates new Options struct
+func NewOptions(opts ...Option) Options {
+	options := Options{
+		Meter:         meter.DefaultMeter,
+		lopts:         make([]meter.Option, 0, 5),
+		SkipEndpoints: DefaultSkipEndpoints,
+	}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
+// ServiceName passes service name to meter label
+func ServiceName(name string) Option {
+	return func(o *Options) {
+		o.lopts = append(o.lopts, meter.Labels("name", name))
+	}
+}
+
+// ServiceVersion passes service version to meter label
+func ServiceVersion(version string) Option {
+	return func(o *Options) {
+		o.lopts = append(o.lopts, meter.Labels("version", version))
+	}
+}
+
+// ServiceID passes service id to meter label
+func ServiceID(id string) Option {
+	return func(o *Options) {
+		o.lopts = append(o.lopts, meter.Labels("id", id))
+	}
+}
+
+// Meter passes meter
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// SkipEndoints add endpoint to skip
+func SkipEndoints(eps ...string) Option {
+	return func(o *Options) {
+		o.SkipEndpoints = append(o.SkipEndpoints, eps...)
+	}
+}
+
+type wrapper struct {
+	client.Client
+	callFunc client.CallFunc
+	opts     Options
+}
+
+// NewClientWrapper create new client wrapper
+func NewClientWrapper(opts ...Option) client.Wrapper {
+	return func(c client.Client) client.Client {
+		handler := &wrapper{
+			opts:   NewOptions(opts...),
+			Client: c,
+		}
+		return handler
+	}
+}
+
+// NewCallWrapper create new call wrapper
+func NewCallWrapper(opts ...Option) client.CallWrapper {
+	return func(fn client.CallFunc) client.CallFunc {
+		handler := &wrapper{
+			opts:     NewOptions(opts...),
+			callFunc: fn,
+		}
+		return handler.CallFunc
+	}
+}
+
+func (w *wrapper) CallFunc(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
+	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
+	for _, ep := range w.opts.SkipEndpoints {
+		if ep == endpoint {
+			return w.callFunc(ctx, addr, req, rsp, opts)
+		}
+	}
+
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
+	ts := time.Now()
+	err := w.callFunc(ctx, addr, req, rsp, opts)
+	te := time.Since(ts)
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Dec()
+
+	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
+
+	if err == nil {
+		labels = append(labels, labelStatus, labelSuccess)
+	} else {
+		labels = append(labels, labelStatus, labelFailure)
+	}
+	w.opts.Meter.Counter(ClientRequestTotal, labels...).Inc()
+
+	return err
+}
+
+func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
+	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
+	for _, ep := range w.opts.SkipEndpoints {
+		if ep == endpoint {
+			return w.Client.Call(ctx, req, rsp, opts...)
+		}
+	}
+
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
+	ts := time.Now()
+	err := w.Client.Call(ctx, req, rsp, opts...)
+	te := time.Since(ts)
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Dec()
+
+	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
+
+	if err == nil {
+		labels = append(labels, labelStatus, labelSuccess)
+	} else {
+		labels = append(labels, labelStatus, labelFailure)
+	}
+	w.opts.Meter.Counter(ClientRequestTotal, labels...).Inc()
+
+	return err
+}
+
+func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
+	endpoint := fmt.Sprintf("%s.%s", req.Service(), req.Endpoint())
+	for _, ep := range w.opts.SkipEndpoints {
+		if ep == endpoint {
+			return w.Client.Stream(ctx, req, opts...)
+		}
+	}
+
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
+	ts := time.Now()
+	stream, err := w.Client.Stream(ctx, req, opts...)
+	te := time.Since(ts)
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Dec()
+
+	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
+
+	if err == nil {
+		labels = append(labels, labelStatus, labelSuccess)
+	} else {
+		labels = append(labels, labelStatus, labelFailure)
+	}
+	w.opts.Meter.Counter(ClientRequestTotal, labels...).Inc()
+
+	return stream, err
+}
+
+func (w *wrapper) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
+	endpoint := p.Topic()
+
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(PublishMessageInflight, labels...).Inc()
+	ts := time.Now()
+	err := w.Client.Publish(ctx, p, opts...)
+	te := time.Since(ts)
+	w.opts.Meter.Counter(PublishMessageInflight, labels...).Dec()
+
+	w.opts.Meter.Summary(PublishMessageLatencyMicroseconds, labels...).Update(te.Seconds())
+	w.opts.Meter.Histogram(PublishMessageDurationSeconds, labels...).Update(te.Seconds())
+
+	if err == nil {
+		labels = append(labels, labelStatus, labelSuccess)
+	} else {
+		labels = append(labels, labelStatus, labelFailure)
+	}
+	w.opts.Meter.Counter(PublishMessageTotal, labels...).Inc()
+
+	return err
+}
+
+// NewHandlerWrapper create new server handler wrapper
+// deprecated
+func NewHandlerWrapper(opts ...Option) server.HandlerWrapper {
+	handler := &wrapper{
+		opts: NewOptions(opts...),
+	}
+	return handler.HandlerFunc
+}
+
+// NewServerHandlerWrapper create new server handler wrapper
+func NewServerHandlerWrapper(opts ...Option) server.HandlerWrapper {
+	handler := &wrapper{
+		opts: NewOptions(opts...),
+	}
+	return handler.HandlerFunc
+}
+
+func (w *wrapper) HandlerFunc(fn server.HandlerFunc) server.HandlerFunc {
+	return func(ctx context.Context, req server.Request, rsp interface{}) error {
+		endpoint := req.Service() + "." + req.Endpoint()
+		for _, ep := range w.opts.SkipEndpoints {
+			if ep == endpoint {
+				return fn(ctx, req, rsp)
+			}
+		}
+
+		labels := make([]string, 0, 4)
+		labels = append(labels, labelEndpoint, endpoint)
+
+		w.opts.Meter.Counter(ServerRequestInflight, labels...).Inc()
+		ts := time.Now()
+		err := fn(ctx, req, rsp)
+		te := time.Since(ts)
+		w.opts.Meter.Counter(ServerRequestInflight, labels...).Dec()
+
+		w.opts.Meter.Summary(ServerRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+		w.opts.Meter.Histogram(ServerRequestDurationSeconds, labels...).Update(te.Seconds())
+
+		if err == nil {
+			labels = append(labels, labelStatus, labelSuccess)
+		} else {
+			labels = append(labels, labelStatus, labelFailure)
+		}
+		w.opts.Meter.Counter(ServerRequestTotal, labels...).Inc()
+
+		return err
+	}
+}
+
+// NewSubscriberWrapper create server subscribe wrapper
+// deprecated
+func NewSubscriberWrapper(opts ...Option) server.SubscriberWrapper {
+	handler := &wrapper{
+		opts: NewOptions(opts...),
+	}
+	return handler.SubscriberFunc
+}
+
+func NewServerSubscriberWrapper(opts ...Option) server.SubscriberWrapper {
+	handler := &wrapper{
+		opts: NewOptions(opts...),
+	}
+	return handler.SubscriberFunc
+}
+
+func (w *wrapper) SubscriberFunc(fn server.SubscriberFunc) server.SubscriberFunc {
+	return func(ctx context.Context, msg server.Message) error {
+		endpoint := msg.Topic()
+
+		labels := make([]string, 0, 4)
+		labels = append(labels, labelEndpoint, endpoint)
+
+		w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Inc()
+		ts := time.Now()
+		err := fn(ctx, msg)
+		te := time.Since(ts)
+		w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Dec()
+
+		w.opts.Meter.Summary(SubscribeMessageLatencyMicroseconds, labels...).Update(te.Seconds())
+		w.opts.Meter.Histogram(SubscribeMessageDurationSeconds, labels...).Update(te.Seconds())
+
+		if err == nil {
+			labels = append(labels, labelStatus, labelSuccess)
+		} else {
+			labels = append(labels, labelStatus, labelFailure)
+		}
+		w.opts.Meter.Counter(SubscribeMessageTotal, labels...).Inc()
+
+		return err
+	}
+}

micro.go

@@ -1,98 +0,0 @@
-package micro
-
-import (
-	"reflect"
-
-	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/flow"
-	"go.unistack.org/micro/v3/fsm"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/meter"
-	"go.unistack.org/micro/v3/register"
-	"go.unistack.org/micro/v3/resolver"
-	"go.unistack.org/micro/v3/router"
-	"go.unistack.org/micro/v3/selector"
-	"go.unistack.org/micro/v3/server"
-	"go.unistack.org/micro/v3/store"
-	"go.unistack.org/micro/v3/sync"
-	"go.unistack.org/micro/v3/tracer"
-)
-
-func As(b any, target any) bool {
-	if b == nil {
-		return false
-	}
-	if target == nil {
-		return false
-	}
-	val := reflect.ValueOf(target)
-	typ := val.Type()
-	if typ.Kind() != reflect.Ptr || val.IsNil() {
-		return false
-	}
-	targetType := typ.Elem()
-	if targetType.Kind() != reflect.Interface {
-		switch {
-		case targetType.Implements(brokerType):
-			break
-		case targetType.Implements(loggerType):
-			break
-		case targetType.Implements(clientType):
-			break
-		case targetType.Implements(serverType):
-			break
-		case targetType.Implements(codecType):
-			break
-		case targetType.Implements(flowType):
-			break
-		case targetType.Implements(fsmType):
-			break
-		case targetType.Implements(meterType):
-			break
-		case targetType.Implements(registerType):
-			break
-		case targetType.Implements(resolverType):
-			break
-		case targetType.Implements(selectorType):
-			break
-		case targetType.Implements(storeType):
-			break
-		case targetType.Implements(syncType):
-			break
-		case targetType.Implements(serviceType):
-			break
-		case targetType.Implements(routerType):
-			break
-		case targetType.Implements(tracerType):
-			break
-		default:
-			return false
-		}
-	}
-	if reflect.TypeOf(b).AssignableTo(targetType) {
-		val.Elem().Set(reflect.ValueOf(b))
-		return true
-	}
-	return false
-}
-
-var (
-	brokerType   = reflect.TypeOf((*broker.Broker)(nil)).Elem()
-	loggerType   = reflect.TypeOf((*logger.Logger)(nil)).Elem()
-	clientType   = reflect.TypeOf((*client.Client)(nil)).Elem()
-	serverType   = reflect.TypeOf((*server.Server)(nil)).Elem()
-	codecType    = reflect.TypeOf((*codec.Codec)(nil)).Elem()
-	flowType     = reflect.TypeOf((*flow.Flow)(nil)).Elem()
-	fsmType      = reflect.TypeOf((*fsm.FSM)(nil)).Elem()
-	meterType    = reflect.TypeOf((*meter.Meter)(nil)).Elem()
-	registerType = reflect.TypeOf((*register.Register)(nil)).Elem()
-	resolverType = reflect.TypeOf((*resolver.Resolver)(nil)).Elem()
-	routerType   = reflect.TypeOf((*router.Router)(nil)).Elem()
-	selectorType = reflect.TypeOf((*selector.Selector)(nil)).Elem()
-	storeType    = reflect.TypeOf((*store.Store)(nil)).Elem()
-	syncType     = reflect.TypeOf((*sync.Sync)(nil)).Elem()
-	tracerType   = reflect.TypeOf((*tracer.Tracer)(nil)).Elem()
-	serviceType  = reflect.TypeOf((*Service)(nil)).Elem()
-)

micro_test.go

@@ -1,122 +0,0 @@
-package micro
-
-import (
-	"context"
-	"fmt"
-	"reflect"
-	"testing"
-
-	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/fsm"
-)
-
-func TestAs(t *testing.T) {
-	var b *bro
-	broTarget := &bro{name: "kafka"}
-	fsmTarget := &fsmT{name: "fsm"}
-
-	testCases := []struct {
-		b      any
-		target any
-		want   any
-
-		match bool
-	}{
-		{
-			b:      broTarget,
-			target: &b,
-			match:  true,
-			want:   broTarget,
-		},
-		{
-			b:      nil,
-			target: &b,
-			match:  false,
-			want:   nil,
-		},
-		{
-			b:      fsmTarget,
-			target: &b,
-			match:  false,
-			want:   nil,
-		},
-	}
-	for i, tc := range testCases {
-		name := fmt.Sprintf("%d:As(Errorf(..., %v), %v)", i, tc.b, tc.target)
-		// Clear the target pointer, in case it was set in a previous test.
-		rtarget := reflect.ValueOf(tc.target)
-		rtarget.Elem().Set(reflect.Zero(reflect.TypeOf(tc.target).Elem()))
-		t.Run(name, func(t *testing.T) {
-			match := As(tc.b, tc.target)
-			if match != tc.match {
-				t.Fatalf("match: got %v; want %v", match, tc.match)
-			}
-			if !match {
-				return
-			}
-			if got := rtarget.Elem().Interface(); got != tc.want {
-				t.Fatalf("got %#v, want %#v", got, tc.want)
-			}
-		})
-	}
-}
-
-type bro struct {
-	name string
-}
-
-func (p *bro) Name() string { return p.name }
-
-func (p *bro) Live() bool { return true }
-
-func (p *bro) Ready() bool { return true }
-
-func (p *bro) Health() bool { return true }
-
-func (p *bro) Init(_ ...broker.Option) error { return nil }
-
-// Options returns broker options
-func (p *bro) Options() broker.Options { return broker.Options{} }
-
-// Address return configured address
-func (p *bro) Address() string { return "" }
-
-// Connect connects to broker
-func (p *bro) Connect(_ context.Context) error { return nil }
-
-// Disconnect disconnect from broker
-func (p *bro) Disconnect(_ context.Context) error { return nil }
-
-// Publish message, msg can be single broker.Message or []broker.Message
-func (p *bro) Publish(_ context.Context, _ string, _ *broker.Message, _ ...broker.PublishOption) error {
-	return nil
-}
-
-// BatchPublish messages to broker with multiple topics
-func (p *bro) BatchPublish(_ context.Context, _ []*broker.Message, _ ...broker.PublishOption) error {
-	return nil
-}
-
-// BatchSubscribe subscribes to topic messages via handler
-func (p *bro) BatchSubscribe(_ context.Context, _ string, _ broker.BatchHandler, _ ...broker.SubscribeOption) (broker.Subscriber, error) {
-	return nil, nil
-}
-
-// Subscribe subscribes to topic message via handler
-func (p *bro) Subscribe(_ context.Context, _ string, _ broker.Handler, _ ...broker.SubscribeOption) (broker.Subscriber, error) {
-	return nil, nil
-}
-
-// String type of broker
-func (p *bro) String() string { return p.name }
-
-type fsmT struct {
-	name string
-}
-
-func (f *fsmT) Start(_ context.Context, _ interface{}, _ ...Option) (interface{}, error) {
-	return nil, nil
-}
-func (f *fsmT) Current() string                 { return f.name }
-func (f *fsmT) Reset()                          {}
-func (f *fsmT) State(_ string, _ fsm.StateFunc) {}

mtls/mtls.go

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

mtls/options.go

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

network/network.go

@@ -1,5 +1,5 @@
 // Package network is for creating internetworks
-package network
+package network // import "go.unistack.org/micro/v3/network"
 
 import (
 	"go.unistack.org/micro/v3/client"

network/options.go

@@ -119,7 +119,7 @@ func Tracer(t tracer.Tracer) Option {
 // NewOptions returns network default options
 func NewOptions(opts ...Option) Options {
 	options := Options{
-		ID:      id.MustNew(),
+		ID:      id.Must(),
 		Name:    "go.micro",
 		Address: ":0",
 		Logger:  logger.DefaultLogger,

network/transport/transport.go

@@ -1,5 +1,5 @@
 // Package transport is an interface for synchronous connection based communication
-package transport
+package transport // import "go.unistack.org/micro/v3/network/transport"
 
 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 
 var (
 	// DefaultTransport is the global default transport
-	DefaultTransport = NewTransport()
+	DefaultTransport Transport = NewTransport()
 	// DefaultDialTimeout the default dial timeout
 	DefaultDialTimeout = time.Second * 5
 )

network/tunnel/broker/broker.go

@@ -1,5 +1,5 @@
 // Package broker is a tunnel broker
-package broker
+package broker // import "go.unistack.org/micro/v3/network/tunnel/broker"
 
 import (
 	"context"
@@ -45,18 +45,6 @@ type (
 	tunnelAddr struct{}
 )
 
-func (t *tunBroker) Live() bool {
-	return true
-}
-
-func (t *tunBroker) Ready() bool {
-	return true
-}
-
-func (t *tunBroker) Health() bool {
-	return true
-}
-
 func (t *tunBroker) Init(opts ...broker.Option) error {
 	for _, o := range opts {
 		o(&t.opts)
@@ -84,7 +72,7 @@ func (t *tunBroker) Disconnect(ctx context.Context) error {
 	return t.tunnel.Close(ctx)
 }
 
-func (t *tunBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, _ ...broker.PublishOption) error {
+func (t *tunBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
 	// TODO: this is probably inefficient, we might want to just maintain an open connection
 	// it may be easier to add broadcast to the tunnel
 	topicMap := make(map[string]tunnel.Session)
@@ -114,7 +102,7 @@ func (t *tunBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, _
 	return nil
 }
 
-func (t *tunBroker) Publish(ctx context.Context, topic string, m *broker.Message, _ ...broker.PublishOption) error {
+func (t *tunBroker) Publish(ctx context.Context, topic string, m *broker.Message, opts ...broker.PublishOption) error {
 	// TODO: this is probably inefficient, we might want to just maintain an open connection
 	// it may be easier to add broadcast to the tunnel
 	c, err := t.tunnel.Dial(ctx, topic, tunnel.DialMode(tunnel.Multicast))
@@ -189,12 +177,12 @@ func (t *tunBatchSubscriber) run() {
 		// receive message
 		m := new(transport.Message)
 		if err := c.Recv(m); err != nil {
-			if logger.DefaultLogger.V(logger.ErrorLevel) {
-				logger.DefaultLogger.Error(t.opts.Context, err.Error(), err)
+			if logger.V(logger.ErrorLevel) {
+				logger.Error(t.opts.Context, err.Error())
 			}
 			if err = c.Close(); err != nil {
-				if logger.DefaultLogger.V(logger.ErrorLevel) {
-					logger.DefaultLogger.Error(t.opts.Context, err.Error(), err)
+				if logger.V(logger.ErrorLevel) {
+					logger.Error(t.opts.Context, err.Error())
 				}
 			}
 			continue
@@ -234,12 +222,12 @@ func (t *tunSubscriber) run() {
 		// receive message
 		m := new(transport.Message)
 		if err := c.Recv(m); err != nil {
-			if logger.DefaultLogger.V(logger.ErrorLevel) {
-				logger.DefaultLogger.Error(t.opts.Context, err.Error(), err)
+			if logger.V(logger.ErrorLevel) {
+				logger.Error(t.opts.Context, err.Error())
 			}
 			if err = c.Close(); err != nil {
-				if logger.DefaultLogger.V(logger.ErrorLevel) {
-					logger.DefaultLogger.Error(t.opts.Context, err.Error(), err)
+				if logger.V(logger.ErrorLevel) {
+					logger.Error(t.opts.Context, err.Error())
 				}
 			}
 			continue
@@ -317,10 +305,6 @@ func (t *tunEvent) SetError(err error) {
 	t.err = err
 }
 
-func (t *tunEvent) Context() context.Context {
-	return context.TODO()
-}
-
 // NewBroker returns new tunnel broker
 func NewBroker(opts ...broker.Option) (broker.Broker, error) {
 	options := broker.NewOptions(opts...)

network/tunnel/options.go

@@ -164,7 +164,7 @@ func DialWait(b bool) DialOption {
 // NewOptions returns router default options with filled values
 func NewOptions(opts ...Option) Options {
 	options := Options{
-		ID:      id.MustNew(),
+		ID:      id.Must(),
 		Address: DefaultAddress,
 		Token:   DefaultToken,
 		Logger:  logger.DefaultLogger,

network/tunnel/transport/transport.go

@@ -1,5 +1,5 @@
 // Package transport provides a tunnel transport
-package transport
+package transport // import "go.unistack.org/micro/v3/network/tunnel/transport"
 
 import (
 	"context"

network/tunnel/tunnel.go

@@ -1,5 +1,5 @@
 // Package tunnel provides gre network tunnelling
-package tunnel
+package tunnel // import "go.unistack.org/micro/v3/network/transport/tunnel"
 
 import (
 	"context"

options.go

@@ -269,7 +269,15 @@ func Logger(l logger.Logger, opts ...LoggerOption) Option {
 				}
 			}
 		}
-
+		for _, mtr := range o.Meters {
+			for _, or := range lopts.meters {
+				if mtr.Name() == or || all {
+					if err = mtr.Init(meter.Logger(l)); err != nil {
+						return err
+					}
+				}
+			}
+		}
 		for _, trc := range o.Tracers {
 			for _, ot := range lopts.tracers {
 				if trc.Name() == ot || all {
@@ -294,8 +302,8 @@ type loggerOptions struct {
 	brokers   []string
 	registers []string
 	stores    []string
-	// meters    []string
-	tracers []string
+	meters    []string
+	tracers   []string
 }
 
 /*

options/hooks.go

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

profiler/http/http.go

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

profiler/noop.go

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

profiler/pprof/pprof.go

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

profiler/profile.go

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

proxy/proxy.go

@@ -1,5 +1,5 @@
 // Package proxy is a transparent proxy built on the micro/server
-package proxy
+package proxy // import "go.unistack.org/micro/v3/proxy"
 
 import (
 	"context"

register/context.go

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

register/memory.go

@@ -2,12 +2,10 @@ package register
 
 import (
 	"context"
-	"fmt"
 	"sync"
 	"time"
 
 	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/register"
 	"go.unistack.org/micro/v3/util/id"
 )
 
@@ -18,7 +16,7 @@ var (
 
 type node struct {
 	LastSeen time.Time
-	*register.Node
+	*Node
 	TTL time.Duration
 }
 
@@ -27,23 +25,23 @@ type record struct {
 	Version   string
 	Metadata  map[string]string
 	Nodes     map[string]*node
-	Endpoints []*register.Endpoint
+	Endpoints []*Endpoint
 }
 
 type memory struct {
+	sync.RWMutex
 	records  map[string]services
 	watchers map[string]*watcher
-	opts     register.Options
-	sync.RWMutex
+	opts     Options
 }
 
 // services is a KV map with service name as the key and a map of records as the value
 type services map[string]map[string]*record
 
 // NewRegister returns an initialized in-memory register
-func NewRegister(opts ...register.Option) register.Register {
+func NewRegister(opts ...Option) Register {
 	r := &memory{
-		opts:     register.NewOptions(opts...),
+		opts:     NewOptions(opts...),
 		records:  make(map[string]services),
 		watchers: make(map[string]*watcher),
 	}
@@ -65,7 +63,7 @@ func (m *memory) ttlPrune() {
 					for id, n := range record.Nodes {
 						if n.TTL != 0 && time.Since(n.LastSeen) > n.TTL {
 							if m.opts.Logger.V(logger.DebugLevel) {
-								m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register TTL expired for node %s of service %s", n.ID, service))
+								m.opts.Logger.Debugf(m.opts.Context, "Register TTL expired for node %s of service %s", n.ID, service)
 							}
 							delete(m.records[domain][service][version].Nodes, id)
 						}
@@ -77,7 +75,7 @@ func (m *memory) ttlPrune() {
 	}
 }
 
-func (m *memory) sendEvent(r *register.Result) {
+func (m *memory) sendEvent(r *Result) {
 	m.RLock()
 	watchers := make([]*watcher, 0, len(m.watchers))
 	for _, w := range m.watchers {
@@ -100,15 +98,15 @@ func (m *memory) sendEvent(r *register.Result) {
 	}
 }
 
-func (m *memory) Connect(_ context.Context) error {
+func (m *memory) Connect(ctx context.Context) error {
 	return nil
 }
 
-func (m *memory) Disconnect(_ context.Context) error {
+func (m *memory) Disconnect(ctx context.Context) error {
 	return nil
 }
 
-func (m *memory) Init(opts ...register.Option) error {
+func (m *memory) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&m.opts)
 	}
@@ -120,15 +118,15 @@ func (m *memory) Init(opts ...register.Option) error {
 	return nil
 }
 
-func (m *memory) Options() register.Options {
+func (m *memory) Options() Options {
 	return m.opts
 }
 
-func (m *memory) Register(_ context.Context, s *register.Service, opts ...register.RegisterOption) error {
+func (m *memory) Register(ctx context.Context, s *Service, opts ...RegisterOption) error {
 	m.Lock()
 	defer m.Unlock()
 
-	options := register.NewRegisterOptions(opts...)
+	options := NewRegisterOptions(opts...)
 
 	// get the services for this domain from the register
 	srvs, ok := m.records[options.Domain]
@@ -152,10 +150,10 @@ func (m *memory) Register(_ context.Context, s *register.Service, opts ...regist
 	if _, ok := srvs[s.Name][s.Version]; !ok {
 		srvs[s.Name][s.Version] = r
 		if m.opts.Logger.V(logger.DebugLevel) {
-			m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register added new service: %s, version: %s", s.Name, s.Version))
+			m.opts.Logger.Debugf(m.opts.Context, "Register added new service: %s, version: %s", s.Name, s.Version)
 		}
 		m.records[options.Domain] = srvs
-		go m.sendEvent(&register.Result{Action: "create", Service: s})
+		go m.sendEvent(&Result{Action: "create", Service: s})
 	}
 
 	var addedNodes bool
@@ -178,7 +176,7 @@ func (m *memory) Register(_ context.Context, s *register.Service, opts ...regist
 
 		// add the node
 		srvs[s.Name][s.Version].Nodes[n.ID] = &node{
-			Node: &register.Node{
+			Node: &Node{
 				ID:       n.ID,
 				Address:  n.Address,
 				Metadata: metadata,
@@ -192,14 +190,14 @@ func (m *memory) Register(_ context.Context, s *register.Service, opts ...regist
 
 	if addedNodes {
 		if m.opts.Logger.V(logger.DebugLevel) {
-			m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register added new node to service: %s, version: %s", s.Name, s.Version))
+			m.opts.Logger.Debugf(m.opts.Context, "Register added new node to service: %s, version: %s", s.Name, s.Version)
 		}
-		go m.sendEvent(&register.Result{Action: "update", Service: s})
+		go m.sendEvent(&Result{Action: "update", Service: s})
 	} else {
 		// refresh TTL and timestamp
 		for _, n := range s.Nodes {
 			if m.opts.Logger.V(logger.DebugLevel) {
-				m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Updated registration for service: %s, version: %s", s.Name, s.Version))
+				m.opts.Logger.Debugf(m.opts.Context, "Updated registration for service: %s, version: %s", s.Name, s.Version)
 			}
 			srvs[s.Name][s.Version].Nodes[n.ID].TTL = options.TTL
 			srvs[s.Name][s.Version].Nodes[n.ID].LastSeen = time.Now()
@@ -210,11 +208,11 @@ func (m *memory) Register(_ context.Context, s *register.Service, opts ...regist
 	return nil
 }
 
-func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...register.DeregisterOption) error {
+func (m *memory) Deregister(ctx context.Context, s *Service, opts ...DeregisterOption) error {
 	m.Lock()
 	defer m.Unlock()
 
-	options := register.NewDeregisterOptions(opts...)
+	options := NewDeregisterOptions(opts...)
 
 	// domain is set in metadata so it can be passed to watchers
 	if s.Metadata == nil {
@@ -244,7 +242,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
 	for _, n := range s.Nodes {
 		if _, ok := version.Nodes[n.ID]; ok {
 			if m.opts.Logger.V(logger.DebugLevel) {
-				m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register removed node from service: %s, version: %s", s.Name, s.Version))
+				m.opts.Logger.Debugf(m.opts.Context, "Register removed node from service: %s, version: %s", s.Name, s.Version)
 			}
 			delete(version.Nodes, n.ID)
 		}
@@ -254,7 +252,7 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
 	// is cleanup
 	if len(version.Nodes) > 0 {
 		m.records[options.Domain][s.Name][s.Version] = version
-		go m.sendEvent(&register.Result{Action: "update", Service: s})
+		go m.sendEvent(&Result{Action: "update", Service: s})
 		return nil
 	}
 
@@ -262,38 +260,38 @@ func (m *memory) Deregister(ctx context.Context, s *register.Service, opts ...re
 	// register and exit
 	if len(versions) == 1 {
 		delete(m.records[options.Domain], s.Name)
-		go m.sendEvent(&register.Result{Action: "delete", Service: s})
+		go m.sendEvent(&Result{Action: "delete", Service: s})
 
 		if m.opts.Logger.V(logger.DebugLevel) {
-			m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register removed service: %s", s.Name))
+			m.opts.Logger.Debugf(m.opts.Context, "Register removed service: %s", s.Name)
 		}
 		return nil
 	}
 
 	// there are other versions of the service running, so only remove this version of it
 	delete(m.records[options.Domain][s.Name], s.Version)
-	go m.sendEvent(&register.Result{Action: "delete", Service: s})
+	go m.sendEvent(&Result{Action: "delete", Service: s})
 	if m.opts.Logger.V(logger.DebugLevel) {
-		m.opts.Logger.Debug(m.opts.Context, fmt.Sprintf("Register removed service: %s, version: %s", s.Name, s.Version))
+		m.opts.Logger.Debugf(m.opts.Context, "Register removed service: %s, version: %s", s.Name, s.Version)
 	}
 
 	return nil
 }
 
-func (m *memory) LookupService(ctx context.Context, name string, opts ...register.LookupOption) ([]*register.Service, error) {
-	options := register.NewLookupOptions(opts...)
+func (m *memory) LookupService(ctx context.Context, name string, opts ...LookupOption) ([]*Service, error) {
+	options := NewLookupOptions(opts...)
 
 	// if it's a wildcard domain, return from all domains
-	if options.Domain == register.WildcardDomain {
+	if options.Domain == WildcardDomain {
 		m.RLock()
 		recs := m.records
 		m.RUnlock()
 
-		var services []*register.Service
+		var services []*Service
 
 		for domain := range recs {
-			srvs, err := m.LookupService(ctx, name, append(opts, register.LookupDomain(domain))...)
-			if err == register.ErrNotFound {
+			srvs, err := m.LookupService(ctx, name, append(opts, LookupDomain(domain))...)
+			if err == ErrNotFound {
 				continue
 			} else if err != nil {
 				return nil, err
@@ -302,7 +300,7 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
 		}
 
 		if len(services) == 0 {
-			return nil, register.ErrNotFound
+			return nil, ErrNotFound
 		}
 		return services, nil
 	}
@@ -313,17 +311,17 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
 	// check the domain exists
 	services, ok := m.records[options.Domain]
 	if !ok {
-		return nil, register.ErrNotFound
+		return nil, ErrNotFound
 	}
 
 	// check the service exists
 	versions, ok := services[name]
 	if !ok || len(versions) == 0 {
-		return nil, register.ErrNotFound
+		return nil, ErrNotFound
 	}
 
 	// serialize the response
-	result := make([]*register.Service, len(versions))
+	result := make([]*Service, len(versions))
 
 	var i int
 
@@ -335,19 +333,19 @@ func (m *memory) LookupService(ctx context.Context, name string, opts ...registe
 	return result, nil
 }
 
-func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption) ([]*register.Service, error) {
-	options := register.NewListOptions(opts...)
+func (m *memory) ListServices(ctx context.Context, opts ...ListOption) ([]*Service, error) {
+	options := NewListOptions(opts...)
 
 	// if it's a wildcard domain, list from all domains
-	if options.Domain == register.WildcardDomain {
+	if options.Domain == WildcardDomain {
 		m.RLock()
 		recs := m.records
 		m.RUnlock()
 
-		var services []*register.Service
+		var services []*Service
 
 		for domain := range recs {
-			srvs, err := m.ListServices(ctx, append(opts, register.ListDomain(domain))...)
+			srvs, err := m.ListServices(ctx, append(opts, ListDomain(domain))...)
 			if err != nil {
 				return nil, err
 			}
@@ -363,11 +361,11 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
 	// ensure the domain exists
 	services, ok := m.records[options.Domain]
 	if !ok {
-		return make([]*register.Service, 0), nil
+		return make([]*Service, 0), nil
 	}
 
 	// serialize the result, each version counts as an individual service
-	var result []*register.Service
+	var result []*Service
 
 	for _, service := range services {
 		for _, version := range service {
@@ -378,16 +376,16 @@ func (m *memory) ListServices(ctx context.Context, opts ...register.ListOption)
 	return result, nil
 }
 
-func (m *memory) Watch(ctx context.Context, opts ...register.WatchOption) (register.Watcher, error) {
+func (m *memory) Watch(ctx context.Context, opts ...WatchOption) (Watcher, error) {
 	id, err := id.New()
 	if err != nil {
 		return nil, err
 	}
-	wo := register.NewWatchOptions(opts...)
+	wo := NewWatchOptions(opts...)
 	// construct the watcher
 	w := &watcher{
 		exit: make(chan bool),
-		res:  make(chan *register.Result),
+		res:  make(chan *Result),
 		id:   id,
 		wo:   wo,
 	}
@@ -408,13 +406,13 @@ func (m *memory) String() string {
 }
 
 type watcher struct {
-	res  chan *register.Result
+	res  chan *Result
 	exit chan bool
-	wo   register.WatchOptions
+	wo   WatchOptions
 	id   string
 }
 
-func (m *watcher) Next() (*register.Result, error) {
+func (m *watcher) Next() (*Result, error) {
 	for {
 		select {
 		case r := <-m.res:
@@ -431,15 +429,15 @@ func (m *watcher) Next() (*register.Result, error) {
 			if r.Service.Metadata != nil && len(r.Service.Metadata["domain"]) > 0 {
 				domain = r.Service.Metadata["domain"]
 			} else {
-				domain = register.DefaultDomain
+				domain = DefaultDomain
 			}
 
 			// only send the event if watching the wildcard or this specific domain
-			if m.wo.Domain == register.WildcardDomain || m.wo.Domain == domain {
+			if m.wo.Domain == WildcardDomain || m.wo.Domain == domain {
 				return r, nil
 			}
 		case <-m.exit:
-			return nil, register.ErrWatcherStopped
+			return nil, ErrWatcherStopped
 		}
 	}
 }
@@ -453,7 +451,7 @@ func (m *watcher) Stop() {
 	}
 }
 
-func serviceToRecord(s *register.Service, ttl time.Duration) *record {
+func serviceToRecord(s *Service, ttl time.Duration) *record {
 	metadata := make(map[string]string, len(s.Metadata))
 	for k, v := range s.Metadata {
 		metadata[k] = v
@@ -468,8 +466,10 @@ func serviceToRecord(s *register.Service, ttl time.Duration) *record {
 		}
 	}
 
-	endpoints := make([]*register.Endpoint, len(s.Endpoints))
-	copy(endpoints, s.Endpoints)
+	endpoints := make([]*Endpoint, len(s.Endpoints))
+	for i, e := range s.Endpoints {
+		endpoints[i] = e
+	}
 
 	return &record{
 		Name:      s.Name,
@@ -480,7 +480,7 @@ func serviceToRecord(s *register.Service, ttl time.Duration) *record {
 	}
 }
 
-func recordToService(r *record, domain string) *register.Service {
+func recordToService(r *record, domain string) *Service {
 	metadata := make(map[string]string, len(r.Metadata))
 	for k, v := range r.Metadata {
 		metadata[k] = v
@@ -489,14 +489,14 @@ func recordToService(r *record, domain string) *register.Service {
 	// set the domain in metadata so it can be determined when a wildcard query is performed
 	metadata["domain"] = domain
 
-	endpoints := make([]*register.Endpoint, len(r.Endpoints))
+	endpoints := make([]*Endpoint, len(r.Endpoints))
 	for i, e := range r.Endpoints {
 		md := make(map[string]string, len(e.Metadata))
 		for k, v := range e.Metadata {
 			md[k] = v
 		}
 
-		endpoints[i] = &register.Endpoint{
+		endpoints[i] = &Endpoint{
 			Name:     e.Name,
 			Request:  e.Request,
 			Response: e.Response,
@@ -504,7 +504,7 @@ func recordToService(r *record, domain string) *register.Service {
 		}
 	}
 
-	nodes := make([]*register.Node, len(r.Nodes))
+	nodes := make([]*Node, len(r.Nodes))
 	i := 0
 	for _, n := range r.Nodes {
 		md := make(map[string]string, len(n.Metadata))
@@ -512,7 +512,7 @@ func recordToService(r *record, domain string) *register.Service {
 			md[k] = v
 		}
 
-		nodes[i] = &register.Node{
+		nodes[i] = &Node{
 			ID:       n.ID,
 			Address:  n.Address,
 			Metadata: md,
@@ -520,7 +520,7 @@ func recordToService(r *record, domain string) *register.Service {
 		i++
 	}
 
-	return &register.Service{
+	return &Service{
 		Name:      r.Name,
 		Version:   r.Version,
 		Metadata:  metadata,

register/memory_test.go

@@ -6,16 +6,14 @@ import (
 	"sync"
 	"testing"
 	"time"
-
-	"go.unistack.org/micro/v3/register"
 )
 
-var testData = map[string][]*register.Service{
+var testData = map[string][]*Service{
 	"foo": {
 		{
 			Name:    "foo",
 			Version: "1.0.0",
-			Nodes: []*register.Node{
+			Nodes: []*Node{
 				{
 					ID:      "foo-1.0.0-123",
 					Address: "localhost:9999",
@@ -29,7 +27,7 @@ var testData = map[string][]*register.Service{
 		{
 			Name:    "foo",
 			Version: "1.0.1",
-			Nodes: []*register.Node{
+			Nodes: []*Node{
 				{
 					ID:      "foo-1.0.1-321",
 					Address: "localhost:6666",
@@ -39,7 +37,7 @@ var testData = map[string][]*register.Service{
 		{
 			Name:    "foo",
 			Version: "1.0.3",
-			Nodes: []*register.Node{
+			Nodes: []*Node{
 				{
 					ID:      "foo-1.0.3-345",
 					Address: "localhost:8888",
@@ -51,7 +49,7 @@ var testData = map[string][]*register.Service{
 		{
 			Name:    "bar",
 			Version: "default",
-			Nodes: []*register.Node{
+			Nodes: []*Node{
 				{
 					ID:      "bar-1.0.0-123",
 					Address: "localhost:9999",
@@ -65,7 +63,7 @@ var testData = map[string][]*register.Service{
 		{
 			Name:    "bar",
 			Version: "latest",
-			Nodes: []*register.Node{
+			Nodes: []*Node{
 				{
 					ID:      "bar-1.0.1-321",
 					Address: "localhost:6666",
@@ -80,7 +78,7 @@ func TestMemoryRegistry(t *testing.T) {
 	ctx := context.TODO()
 	m := NewRegister()
 
-	fn := func(k string, v []*register.Service) {
+	fn := func(k string, v []*Service) {
 		services, err := m.LookupService(ctx, k)
 		if err != nil {
 			t.Errorf("Unexpected error getting service %s: %v", k, err)
@@ -157,8 +155,8 @@ func TestMemoryRegistry(t *testing.T) {
 	for _, v := range testData {
 		for _, service := range v {
 			services, err := m.LookupService(ctx, service.Name)
-			if err != register.ErrNotFound {
-				t.Errorf("Expected error: %v, got: %v", register.ErrNotFound, err)
+			if err != ErrNotFound {
+				t.Errorf("Expected error: %v, got: %v", ErrNotFound, err)
 			}
 			if len(services) != 0 {
 				t.Errorf("Expected %d services for %s, got %d", 0, service.Name, len(services))
@@ -173,7 +171,7 @@ func TestMemoryRegistryTTL(t *testing.T) {
 
 	for _, v := range testData {
 		for _, service := range v {
-			if err := m.Register(ctx, service, register.RegisterTTL(time.Millisecond)); err != nil {
+			if err := m.Register(ctx, service, RegisterTTL(time.Millisecond)); err != nil {
 				t.Fatal(err)
 			}
 		}
@@ -202,15 +200,15 @@ func TestMemoryRegistryTTLConcurrent(t *testing.T) {
 	ctx := context.TODO()
 	for _, v := range testData {
 		for _, service := range v {
-			if err := m.Register(ctx, service, register.RegisterTTL(waitTime/2)); err != nil {
+			if err := m.Register(ctx, service, RegisterTTL(waitTime/2)); err != nil {
 				t.Fatal(err)
 			}
 		}
 	}
 
-	// if len(os.Getenv("IN_TRAVIS_CI")) == 0 {
+	//if len(os.Getenv("IN_TRAVIS_CI")) == 0 {
 	//	t.Logf("test will wait %v, then check TTL timeouts", waitTime)
-	// }
+	//}
 
 	errChan := make(chan error, concurrency)
 	syncChan := make(chan struct{})
@@ -251,34 +249,34 @@ func TestMemoryWildcard(t *testing.T) {
 	m := NewRegister()
 	ctx := context.TODO()
 
-	testSrv := &register.Service{Name: "foo", Version: "1.0.0"}
+	testSrv := &Service{Name: "foo", Version: "1.0.0"}
 
-	if err := m.Register(ctx, testSrv, register.RegisterDomain("one")); err != nil {
+	if err := m.Register(ctx, testSrv, RegisterDomain("one")); err != nil {
 		t.Fatalf("Register err: %v", err)
 	}
-	if err := m.Register(ctx, testSrv, register.RegisterDomain("two")); err != nil {
+	if err := m.Register(ctx, testSrv, RegisterDomain("two")); err != nil {
 		t.Fatalf("Register err: %v", err)
 	}
 
-	if recs, err := m.ListServices(ctx, register.ListDomain("one")); err != nil {
+	if recs, err := m.ListServices(ctx, ListDomain("one")); err != nil {
 		t.Errorf("List err: %v", err)
 	} else if len(recs) != 1 {
 		t.Errorf("Expected 1 record, got %v", len(recs))
 	}
 
-	if recs, err := m.ListServices(ctx, register.ListDomain("*")); err != nil {
+	if recs, err := m.ListServices(ctx, ListDomain("*")); err != nil {
 		t.Errorf("List err: %v", err)
 	} else if len(recs) != 2 {
 		t.Errorf("Expected 2 records, got %v", len(recs))
 	}
 
-	if recs, err := m.LookupService(ctx, testSrv.Name, register.LookupDomain("one")); err != nil {
+	if recs, err := m.LookupService(ctx, testSrv.Name, LookupDomain("one")); err != nil {
 		t.Errorf("Lookup err: %v", err)
 	} else if len(recs) != 1 {
 		t.Errorf("Expected 1 record, got %v", len(recs))
 	}
 
-	if recs, err := m.LookupService(ctx, testSrv.Name, register.LookupDomain("*")); err != nil {
+	if recs, err := m.LookupService(ctx, testSrv.Name, LookupDomain("*")); err != nil {
 		t.Errorf("Lookup err: %v", err)
 	} else if len(recs) != 2 {
 		t.Errorf("Expected 2 records, got %v", len(recs))
@@ -286,33 +284,31 @@ func TestMemoryWildcard(t *testing.T) {
 }
 
 func TestWatcher(t *testing.T) {
-	testSrv := &register.Service{Name: "foo", Version: "1.0.0"}
+	testSrv := &Service{Name: "foo", Version: "1.0.0"}
 
 	ctx := context.TODO()
 	m := NewRegister()
-	if err := m.Init(); err != nil {
-		t.Fatal(err)
-	}
-	if err := m.Connect(ctx); err != nil {
-		t.Fatal(err)
-	}
+	m.Init()
+	m.Connect(ctx)
 	wc, err := m.Watch(ctx)
 	if err != nil {
 		t.Fatalf("cant watch: %v", err)
 	}
 	defer wc.Stop()
 
-	cherr := make(chan error, 10)
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
-		_, err := wc.Next()
-		if err != nil {
-			cherr <- fmt.Errorf("unexpected err %v", err)
+		for {
+			_, err := wc.Next()
+			if err != nil {
+				t.Fatal("unexpected err", err)
+			}
+			// t.Logf("changes %#+v", ch.Service)
+			wc.Stop()
+			wg.Done()
+			return
 		}
-		// t.Logf("changes %#+v", ch.Service)
-		wc.Stop()
-		wg.Done()
 	}()
 
 	if err := m.Register(ctx, testSrv); err != nil {

register/noop.go

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

register/register.go

@@ -1,5 +1,5 @@
 // Package register is an interface for service discovery
-package register
+package register // import "go.unistack.org/micro/v3/register"
 
 import (
 	"context"
@@ -29,32 +29,17 @@ var (
 // and an abstraction over varying implementations
 // {consul, etcd, zookeeper, ...}
 type Register interface {
-	// Name returns register name
 	Name() string
-	// Init initialize register
 	Init(...Option) error
-	// Options returns options for register
 	Options() Options
-	// Connect initialize connect to register
 	Connect(context.Context) error
-	// Disconnect initialize discconection from register
 	Disconnect(context.Context) error
-	// Register service in registry
 	Register(context.Context, *Service, ...RegisterOption) error
-	// Deregister service from registry
 	Deregister(context.Context, *Service, ...DeregisterOption) error
-	// LookupService in registry
 	LookupService(context.Context, string, ...LookupOption) ([]*Service, error)
-	// ListServices in registry
 	ListServices(context.Context, ...ListOption) ([]*Service, error)
-	// Watch registry events
 	Watch(context.Context, ...WatchOption) (Watcher, error)
-	// String returns registry string representation
 	String() string
-	// Live returns register liveness
-	// Live() bool
-	// Ready returns register readiness
-	// Ready() bool
 }
 
 // Service holds service register info

resolver/dns/dns.go

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

resolver/dnssrv/dnssrv.go

@@ -1,5 +1,5 @@
 // Package dnssrv resolves names to dns srv records
-package dnssrv
+package dnssrv // import "go.unistack.org/micro/v3/resolver/dnssrv"
 
 import (
 	"fmt"

resolver/http/http.go

@@ -1,5 +1,5 @@
 // Package http resolves names to network addresses using a http request
-package http
+package http // import "go.unistack.org/micro/v3/resolver/http"
 
 import (
 	"encoding/json"

resolver/noop/noop.go

@@ -1,5 +1,5 @@
 // Package noop is a noop resolver
-package noop
+package noop // import "go.unistack.org/micro/v3/resolver/noop"
 
 import (
 	"go.unistack.org/micro/v3/resolver"
@@ -9,6 +9,6 @@ import (
 type Resolver struct{}
 
 // Resolve returns the list of nodes
-func (r *Resolver) Resolve(_ string) ([]*resolver.Record, error) {
+func (r *Resolver) Resolve(name string) ([]*resolver.Record, error) {
 	return []*resolver.Record{}, nil
 }

resolver/registry/registry.go

@@ -1,5 +1,5 @@
 // Package register resolves names using the micro register
-package register
+package register // import "go.unistack.org/micro/v3/resolver/registry"
 
 import (
 	"context"

resolver/resolver.go

@@ -1,5 +1,5 @@
 // Package resolver resolves network names to addresses
-package resolver
+package resolver // import "go.unistack.org/micro/v3/resolver"
 
 // Resolver is network resolver. It's used to find network nodes
 // via the name to connect to. This is done based on Network.Name().

resolver/static/static.go

@@ -1,5 +1,5 @@
 // Package static is a static resolver
-package static
+package static // import "go.unistack.org/micro/v3/resolver/static"
 
 import (
 	"go.unistack.org/micro/v3/resolver"

router/context.go

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

router/options.go

@@ -80,7 +80,7 @@ func Name(n string) Option {
 // NewOptions returns router default options
 func NewOptions(opts ...Option) Options {
 	options := Options{
-		ID:       id.MustNew(),
+		ID:       id.Must(),
 		Network:  DefaultNetwork,
 		Register: register.DefaultRegister,
 		Logger:   logger.DefaultLogger,

router/router.go

@@ -1,5 +1,5 @@
 // Package router provides a network routing control plane
-package router
+package router // import "go.unistack.org/micro/v3/router"
 
 import (
 	"errors"

selector/random/random.go

@@ -1,4 +1,4 @@
-package random
+package random // import "go.unistack.org/micro/v3/selector/random"
 
 import (
 	"go.unistack.org/micro/v3/selector"
@@ -25,7 +25,7 @@ func (r *random) Select(routes []string, opts ...selector.SelectOption) (selecto
 	}, nil
 }
 
-func (r *random) Record(_ string, _ error) error {
+func (r *random) Record(addr string, err error) error {
 	return nil
 }
 

selector/roundrobin/roundrobin.go

@@ -1,4 +1,4 @@
-package roundrobin
+package roundrobin // import "go.unistack.org/micro/v3/selector/roundrobin"
 
 import (
 	"go.unistack.org/micro/v3/selector"
@@ -6,14 +6,14 @@ import (
 )
 
 // NewSelector returns an initialised round robin selector
-func NewSelector(_ ...selector.Option) selector.Selector {
+func NewSelector(opts ...selector.Option) selector.Selector {
 	return new(roundrobin)
 }
 
 type roundrobin struct{}
 
 // Select return routes based on algo
-func (r *roundrobin) Select(routes []string, _ ...selector.SelectOption) (selector.Next, error) {
+func (r *roundrobin) Select(routes []string, opts ...selector.SelectOption) (selector.Next, error) {
 	if len(routes) == 0 {
 		return nil, selector.ErrNoneAvailable
 	}
@@ -28,7 +28,7 @@ func (r *roundrobin) Select(routes []string, _ ...selector.SelectOption) (select
 	}, nil
 }
 
-func (r *roundrobin) Record(_ string, _ error) error { return nil }
+func (r *roundrobin) Record(addr string, err error) error { return nil }
 
 func (r *roundrobin) Reset() error { return nil }
 

selector/selector.go

@@ -1,5 +1,5 @@
 // Package selector is for node selection and load balancing
-package selector
+package selector // import "go.unistack.org/micro/v3/selector"
 
 import (
 	"errors"

semconv/broker.go

@@ -1,22 +0,0 @@
-package semconv
-
-var (
-	// PublishMessageDurationSeconds specifies meter metric name
-	PublishMessageDurationSeconds = "micro_publish_message_duration_seconds"
-	// PublishMessageLatencyMicroseconds specifies meter metric name
-	PublishMessageLatencyMicroseconds = "micro_publish_message_latency_microseconds"
-	// PublishMessageTotal specifies meter metric name
-	PublishMessageTotal = "micro_publish_message_total"
-	// PublishMessageInflight specifies meter metric name
-	PublishMessageInflight = "micro_publish_message_inflight"
-	// SubscribeMessageDurationSeconds specifies meter metric name
-	SubscribeMessageDurationSeconds = "micro_subscribe_message_duration_seconds"
-	// SubscribeMessageLatencyMicroseconds specifies meter metric name
-	SubscribeMessageLatencyMicroseconds = "micro_subscribe_message_latency_microseconds"
-	// SubscribeMessageTotal specifies meter metric name
-	SubscribeMessageTotal = "micro_subscribe_message_total"
-	// SubscribeMessageInflight specifies meter metric name
-	SubscribeMessageInflight = "micro_subscribe_message_inflight"
-	// BrokerGroupLag specifies broker lag
-	BrokerGroupLag = "micro_broker_group_lag"
-)