Merge pull request 'tracer: minimize overhead on noop tracer usage' (#381) from tr into v3

Reviewed-on: #381

.gitea/workflows/job_lint.yml

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

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

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

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

.gitea/workflows/pr.yml

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

.golangci.yml

@@ -1,44 +1,5 @@
 run:
-  concurrency: 4
+  concurrency: 8
   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,4 +1,4 @@
-# Micro [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Doc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/unistack-org/micro/v3?tab=overview) [![Status](https://github.com/unistack-org/micro/workflows/build/badge.svg?branch=master)](https://github.com/unistack-org/micro/actions?query=workflow%3Abuild+branch%3Amaster+event%3Apush) [![Lint](https://goreportcard.com/badge/go.unistack.org/micro/v3)](https://goreportcard.com/report/go.unistack.org/micro/v3) [![Coverage](https://codecov.io/gh/unistack-org/micro/branch/v3/graph/badge.svg?token=OZPO2LP7VS)](https://codecov.io/gh/unistack-org/micro)
+# Micro [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Doc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/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)
 
 Micro is a standard library for microservices.
 

broker/context.go

@@ -15,6 +15,15 @@ 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/memory.go

@@ -109,7 +109,7 @@ func (m *memoryBroker) Init(opts ...broker.Option) error {
 	m.funcSubscribe = m.fnSubscribe
 	m.funcBatchSubscribe = m.fnBatchSubscribe
 
-	m.opts.Hooks.EachNext(func(hook options.Hook) {
+	m.opts.Hooks.EachPrev(func(hook options.Hook) {
 		switch h := hook.(type) {
 		case broker.HookPublish:
 			m.funcPublish = h(m.funcPublish)

broker/memory/memory_test.go

@@ -74,7 +74,7 @@ func TestMemoryBroker(t *testing.T) {
 	topic := "test"
 	count := 10
 
-	fn := func(p broker.Event) error {
+	fn := func(_ broker.Event) error {
 		return nil
 	}
 

broker/noop.go

@@ -59,7 +59,7 @@ func (b *NoopBroker) Init(opts ...Option) error {
 	b.funcSubscribe = b.fnSubscribe
 	b.funcBatchSubscribe = b.fnBatchSubscribe
 
-	b.opts.Hooks.EachNext(func(hook options.Hook) {
+	b.opts.Hooks.EachPrev(func(hook options.Hook) {
 		switch h := hook.(type) {
 		case HookPublish:
 			b.funcPublish = h(b.funcPublish)

broker/options.go

@@ -16,6 +16,9 @@ import (
 
 // Options struct
 type Options struct {
+	// Name holds the broker name
+	Name string
+
 	// Tracer used for tracing
 	Tracer tracer.Tracer
 	// Register can be used for clustering
@@ -28,23 +31,25 @@ 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
-	// Wait waits for a collection of goroutines to finish
-	Wait *sync.WaitGroup
-	// GracefulTimeout contains time to wait to finish in flight requests
-	GracefulTimeout time.Duration
 	// 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

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(min time.Duration, max time.Duration) BackoffFunc {
+func BackoffInterval(minTime time.Duration, maxTime 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 < min {
+		if td < minTime {
-			return min, nil
+			return minTime, nil
-		} else if td > max {
+		} else if td > maxTime {
-			return max, nil
+			return maxTime, nil
 		}
 		return td, nil
 	}

client/backoff_test.go

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

client/context.go

@@ -15,6 +15,15 @@ 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

@@ -194,7 +194,7 @@ func (n *noopClient) Init(opts ...Option) error {
 	n.funcPublish = n.fnPublish
 	n.funcBatchPublish = n.fnBatchPublish
 
-	n.opts.Hooks.EachNext(func(hook options.Hook) {
+	n.opts.Hooks.EachPrev(func(hook options.Hook) {
 		switch h := hook.(type) {
 		case HookCall:
 			n.funcCall = h(n.funcCall)
@@ -222,7 +222,7 @@ func (n *noopClient) Call(ctx context.Context, req Request, rsp interface{}, opt
 	ts := time.Now()
 	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
 	var sp tracer.Span
-	ctx, sp = n.opts.Tracer.Start(ctx, req.Endpoint()+" rpc-client",
+	ctx, sp = n.opts.Tracer.Start(ctx, "rpc-client",
 		tracer.WithSpanKind(tracer.SpanKindClient),
 		tracer.WithSpanLabels("endpoint", req.Endpoint()),
 	)
@@ -298,7 +298,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", err.Error())
+			return errors.InternalServerError("go.micro.client", "%s", err)
 		}
 
 		// only sleep if greater than 0
@@ -312,7 +312,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", err.Error())
+				return errors.InternalServerError("go.micro.client", "%s", err)
 			}
 
 			// balance the list of nodes
@@ -372,7 +372,7 @@ func (n *noopClient) fnCall(ctx context.Context, req Request, rsp interface{}, o
 	return gerr
 }
 
-func (n *noopClient) NewRequest(service, endpoint string, req interface{}, opts ...RequestOption) Request {
+func (n *noopClient) NewRequest(service, endpoint string, _ interface{}, _ ...RequestOption) Request {
 	return &noopRequest{service: service, endpoint: endpoint}
 }
 
@@ -385,7 +385,7 @@ func (n *noopClient) Stream(ctx context.Context, req Request, opts ...CallOption
 	ts := time.Now()
 	n.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
 	var sp tracer.Span
-	ctx, sp = n.opts.Tracer.Start(ctx, req.Endpoint()+" rpc-client",
+	ctx, sp = n.opts.Tracer.Start(ctx, "rpc-client",
 		tracer.WithSpanKind(tracer.SpanKindClient),
 		tracer.WithSpanLabels("endpoint", req.Endpoint()),
 	)
@@ -466,7 +466,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", cerr.Error())
+			return nil, errors.InternalServerError("go.micro.client", "%s", cerr)
 		}
 
 		// only sleep if greater than 0
@@ -480,7 +480,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", err.Error())
+				return nil, errors.InternalServerError("go.micro.client", "%s", err)
 			}
 
 			// balance the list of nodes
@@ -546,7 +546,7 @@ func (n *noopClient) fnStream(ctx context.Context, req Request, opts ...CallOpti
 	return nil, grr
 }
 
-func (n *noopClient) stream(ctx context.Context, addr string, req Request, opts CallOptions) (Stream, error) {
+func (n *noopClient) stream(ctx context.Context, _ string, _ Request, _ CallOptions) (Stream, error) {
 	return &noopStream{ctx: ctx}, nil
 }
 
@@ -609,13 +609,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", err.Error())
+				return errors.InternalServerError("go.micro.client", "%s", err)
 			}
 
 			// set the body
 			b, err := cf.Marshal(p.Payload())
 			if err != nil {
-				return errors.InternalServerError("go.micro.client", err.Error())
+				return errors.InternalServerError("go.micro.client", "%s", err)
 			}
 			body = b
 		}

client/options.go

@@ -21,6 +21,16 @@ import (
 
 // Options holds client options
 type Options struct {
+	// Codecs map
+	Codecs map[string]codec.Codec
+
+	// Proxy is used for proxy requests
+	Proxy string
+	// ContentType is used to select codec
+	ContentType string
+	// Name is the client name
+	Name string
+
 	// Selector used to select needed address
 	Selector selector.Selector
 	// Logger used to log messages
@@ -35,31 +45,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
-	// Proxy is used for proxy requests
+	// ContextDialer used to connect
-	Proxy string
+	ContextDialer func(context.Context, string) (net.Conn, error)
-	// 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)
-	// Hooks can be run before broker Publish/BatchPublish and
-	// Subscribe/BatchSubscribe methods
-	Hooks options.Hooks
 }
 
 // NewCallOptions creates new call options struct
@@ -73,6 +80,16 @@ 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
@@ -80,33 +97,30 @@ 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
-	// Network name
+	// ContextDialer used to connect
-	Network string
+	ContextDialer func(context.Context, string) (net.Conn, error)
-	// Content-Type
+
-	ContentType string
-	// AuthToken string
-	AuthToken string
 	// Address specifies static addr list
 	Address []string
 	// SelectOptions selector options
 	SelectOptions []selector.SelectOption
+
 	// 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

codec/context.go

@@ -15,6 +15,15 @@ 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 {

config/config.go

@@ -13,7 +13,7 @@ type Validator interface {
 }
 
 // DefaultConfig default config
-var DefaultConfig Config = NewConfig()
+var DefaultConfig = NewConfig()
 
 // DefaultWatcherMinInterval default min interval for poll changes
 var DefaultWatcherMinInterval = 5 * time.Second

config/context.go

@@ -15,6 +15,15 @@ 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

@@ -37,7 +37,7 @@ func (c *defaultConfig) Init(opts ...Option) error {
 	c.funcLoad = c.fnLoad
 	c.funcSave = c.fnSave
 
-	c.opts.Hooks.EachNext(func(hook options.Hook) {
+	c.opts.Hooks.EachPrev(func(hook options.Hook) {
 		switch h := hook.(type) {
 		case HookLoad:
 			c.funcLoad = h(c.funcLoad)

config/default_test.go

@@ -3,6 +3,7 @@ package config_test
 import (
 	"context"
 	"fmt"
+	"reflect"
 	"testing"
 	"time"
 
@@ -12,15 +13,17 @@ import (
 )
 
 type cfg struct {
-	StringValue    string `default:"string_value"`
+	MapValue    map[string]bool `default:"key1=true,key2=false"`
-	IgnoreValue    string `json:"-"`
+	StructValue *cfgStructValue
-	StructValue    *cfgStructValue
+
-	IntValue       int             `default:"99"`
+	StringValue string `default:"string_value"`
-	DurationValue  time.Duration   `default:"10s"`
+	IgnoreValue string `json:"-"`
-	MDurationValue mtime.Duration  `default:"10s"`
+	UUIDValue   string `default:"micro:generate uuid"`
-	MapValue       map[string]bool `default:"key1=true,key2=false"`
+	IDValue     string `default:"micro:generate id"`
-	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"`
 }
 
 type cfgStructValue struct {
@@ -134,3 +137,13 @@ func TestValidate(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func Test_SizeOf(t *testing.T) {
+	st := cfg{}
+
+	tVal := reflect.TypeOf(st)
+	for i := 0; i < tVal.NumField(); i++ {
+		field := tVal.Field(i)
+		fmt.Printf("Field: %s, Offset: %d, Size: %d\n", field.Name, field.Offset, field.Type.Size())
+	}
+}

config/options.go

@@ -41,14 +41,16 @@ type Options struct {
 	BeforeInit []func(context.Context, Config) error
 	// AfterInit contains slice of funcs that runs after Init
 	AfterInit []func(context.Context, Config) error
-	// AllowFail flag to allow fail in config source
+
-	AllowFail bool
 	// SkipLoad runs only if condition returns true
 	SkipLoad func(context.Context, Config) bool
 	// SkipSave runs only if condition returns true
 	SkipSave func(context.Context, Config) bool
 	// Hooks can be run before/after config Save/Load
 	Hooks options.Hooks
+
+	// AllowFail flag to allow fail in config source
+	AllowFail bool
 }
 
 // Option function signature
@@ -278,10 +280,10 @@ func WatchCoalesce(b bool) WatchOption {
 }
 
 // WatchInterval specifies min and max time.Duration for pulling changes
-func WatchInterval(min, max time.Duration) WatchOption {
+func WatchInterval(minTime, maxTime time.Duration) WatchOption {
 	return func(o *WatchOptions) {
-		o.MinInterval = min
+		o.MinInterval = minTime
-		o.MaxInterval = max
+		o.MaxInterval = maxTime
 	}
 }
 

errors/errors_test.go

@@ -2,7 +2,7 @@ package errors
 
 import (
 	"encoding/json"
-	er "errors"
+	"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(fmt.Errorf(msg))
+	err = FromError(errors.New(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 = er.New(err.Error())
+	err = errors.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 := er.New("my test err")
+	err3 := errors.New("my test err")
 	if Equal(err1, err3) {
 		t.Fatal("errors must be not equal")
 	}

flow/context.go

@@ -15,6 +15,15 @@ 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 {

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...),

go.mod

@@ -1,32 +1,43 @@
 module go.unistack.org/micro/v3
 
-go 1.22
+go 1.22.0
+
+toolchain go1.23.4
 
 require (
-	dario.cat/mergo v1.0.0
+	dario.cat/mergo v1.0.1
 	github.com/DATA-DOG/go-sqlmock v1.5.0
 	github.com/KimMachineGun/automemlimit v0.6.1
-	github.com/google/uuid v1.3.0
+	github.com/google/uuid v1.6.0
 	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.3.0
+	golang.org/x/sync v0.10.0
-	google.golang.org/grpc v1.57.0
+	google.golang.org/grpc v1.68.1
-	google.golang.org/protobuf v1.33.0
+	google.golang.org/protobuf v1.35.2
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/cilium/ebpf v0.9.1 // indirect
+	github.com/cilium/ebpf v0.16.0 // indirect
-	github.com/containerd/cgroups/v3 v3.0.1 // indirect
+	github.com/containerd/cgroups/v3 v3.0.4 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/containerd/log v0.1.0 // indirect
-	github.com/docker/go-units v0.4.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
-	github.com/godbus/dbus/v5 v5.0.4 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
-	github.com/opencontainers/runtime-spec v1.0.2 // 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/sirupsen/logrus v1.8.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	golang.org/x/net v0.14.0 // indirect
+	github.com/rogpeppe/go-internal v1.13.1 // indirect
-	golang.org/x/sys v0.11.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // 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
 )

go.sum

@@ -1,78 +1,97 @@
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+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/cilium/ebpf v0.9.1 h1:64sn2K3UKw8NbP/blsixRpF3nXuyhz/VjRlRzvlBRu4=
+github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok=
-github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnxUFY=
+github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE=
-github.com/containerd/cgroups/v3 v3.0.1 h1:4hfGvu8rfGIwVIDd+nLzn/B9ZXx4BcCjzt5ToenJRaE=
+github.com/containerd/cgroups/v3 v3.0.4 h1:2fs7l3P0Qxb1nKWuJNFiwhp2CqiKzho71DQkDrHJIo4=
-github.com/containerd/cgroups/v3 v3.0.1/go.mod h1:/vtwk1VXrtoa5AaZLkypuOJgA/6DyPMZHJPGQNtlHnw=
+github.com/containerd/cgroups/v3 v3.0.4/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
-github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+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/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss=
+github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
-github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
+github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
+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/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+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/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0=
+github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g=
-github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+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/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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 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.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 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.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+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.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+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/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
+golang.org/x/exp v0.0.0-20241210194714-1829a127f884 h1:Y/Mj/94zIQQGHVSv1tTtQBDaQaJe62U9bkDZKKyhPCU=
-golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/exp v0.0.0-20241210194714-1829a127f884/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e h1:NumxXLPfHSndr3wBBdeKiVHjGVFzi9RX2HwwQke94iY=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
-google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
-google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
+google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v3 v3.0.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

@@ -4,17 +4,6 @@ import "context"
 
 type loggerKey struct{}
 
-// MustContext returns logger from passed context or DefaultLogger if empty
-func MustContext(ctx context.Context) Logger {
-	if ctx == nil {
-		return DefaultLogger
-	}
-	if l, ok := ctx.Value(loggerKey{}).(Logger); ok && l != nil {
-		return l
-	}
-	return DefaultLogger
-}
-
 // FromContext returns logger from passed context
 func FromContext(ctx context.Context) (Logger, bool) {
 	if ctx == nil {
@@ -24,6 +13,15 @@ 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

@@ -11,7 +11,7 @@ var DefaultContextAttrFuncs []ContextAttrFunc
 
 var (
 	// DefaultLogger variable
-	DefaultLogger Logger = NewLogger()
+	DefaultLogger = NewLogger()
 	// DefaultLevel used by logger
 	DefaultLevel = InfoLevel
 )

logger/options.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"log/slog"
 	"os"
+	"slices"
 	"time"
 
 	"go.unistack.org/micro/v3/meter"
@@ -15,18 +16,6 @@ type Option func(*Options)
 
 // Options holds logger options
 type Options struct {
-	// Out holds the output writer
-	Out io.Writer
-	// Context holds exernal options
-	Context context.Context
-	// Name holds the logger name
-	Name string
-	// Fields holds additional metadata
-	Fields []interface{}
-	// callerSkipCount number of frmaes to skip
-	CallerSkipCount int
-	// ContextAttrFuncs contains funcs that executed before log func on context
-	ContextAttrFuncs []ContextAttrFunc
 	// TimeKey is the key used for the time of the log call
 	TimeKey string
 	// LevelKey is the key used for the level of the log call
@@ -39,16 +28,33 @@ type Options struct {
 	SourceKey string
 	// StacktraceKey is the key used for the stacktrace
 	StacktraceKey string
-	// AddStacktrace controls writing of stacktaces on error
+	// Name holds the logger name
-	AddStacktrace bool
+	Name string
-	// AddSource enabled writing source file and position in log
+
-	AddSource bool
+	// Out holds the output writer
-	// The logging level the logger should log
+	Out io.Writer
-	Level Level
+	// Context holds exernal options
-	// TimeFunc used to obtain current time
+	Context context.Context
-	TimeFunc func() time.Time
 	// 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
+	// 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
 }
 
 // NewOptions creates new options struct
@@ -80,10 +86,32 @@ func WithContextAttrFuncs(fncs ...ContextAttrFunc) Option {
 	}
 }
 
+// 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) {
-		o.Fields = append(o.Fields, fields...)
+		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...)
+		}
 	}
 }
 
@@ -153,8 +181,8 @@ func WithTimeFunc(fn func() time.Time) Option {
 func WithZapKeys() Option {
 	return func(o *Options) {
 		o.TimeKey = "@timestamp"
-		o.LevelKey = "level"
+		o.LevelKey = slog.LevelKey
-		o.MessageKey = "msg"
+		o.MessageKey = slog.MessageKey
 		o.SourceKey = "caller"
 		o.StacktraceKey = "stacktrace"
 		o.ErrorKey = "error"
@@ -163,8 +191,8 @@ func WithZapKeys() Option {
 
 func WithZerologKeys() Option {
 	return func(o *Options) {
-		o.TimeKey = "time"
+		o.TimeKey = slog.TimeKey
-		o.LevelKey = "level"
+		o.LevelKey = slog.LevelKey
 		o.MessageKey = "message"
 		o.SourceKey = "caller"
 		o.StacktraceKey = "stacktrace"
@@ -186,8 +214,8 @@ func WithSlogKeys() Option {
 func WithMicroKeys() Option {
 	return func(o *Options) {
 		o.TimeKey = "timestamp"
-		o.LevelKey = "level"
+		o.LevelKey = slog.LevelKey
-		o.MessageKey = "msg"
+		o.MessageKey = slog.MessageKey
 		o.SourceKey = "caller"
 		o.StacktraceKey = "stacktrace"
 		o.ErrorKey = "error"

logger/slog/slog.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"log/slog"
 	"os"
+	"reflect"
 	"regexp"
 	"runtime"
 	"strconv"
@@ -46,11 +47,11 @@ func (h *wrapper) Handle(ctx context.Context, rec slog.Record) error {
 }
 
 func (h *wrapper) WithAttrs(attrs []slog.Attr) slog.Handler {
-	return h.WithAttrs(attrs)
+	return h.h.WithAttrs(attrs)
 }
 
 func (h *wrapper) WithGroup(name string) slog.Handler {
-	return h.WithGroup(name)
+	return h.h.WithGroup(name)
 }
 
 func (s *slogLogger) renameAttr(_ []string, a slog.Attr) slog.Attr {
@@ -89,7 +90,6 @@ func (s *slogLogger) renameAttr(_ []string, a slog.Attr) slog.Attr {
 }
 
 type slogLogger struct {
-	leveler *slog.LevelVar
 	handler *wrapper
 	opts    logger.Options
 	mu      sync.RWMutex
@@ -142,6 +142,7 @@ func (s *slogLogger) Fields(fields ...interface{}) logger.Logger {
 	s.mu.RUnlock()
 
 	l := &slogLogger{opts: options}
+	logger.WithAddFields(fields...)(&l.opts)
 
 	if len(options.ContextAttrFuncs) == 0 {
 		options.ContextAttrFuncs = logger.DefaultContextAttrFuncs
@@ -172,7 +173,29 @@ func (s *slogLogger) Init(opts ...logger.Option) error {
 	}
 
 	attrs, _ := s.argsAttrs(s.opts.Fields)
-	s.handler = &wrapper{h: slog.NewJSONHandler(s.opts.Out, handleOpt).WithAttrs(attrs)}
+
+	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()
 
@@ -318,7 +341,7 @@ func (s *slogLogger) argsAttrs(args []interface{}) ([]slog.Attr, error) {
 		case string:
 			if idx+1 < len(args) {
 				attrs = append(attrs, slog.Any(arg, args[idx+1]))
-				idx += 1
+				idx++
 			} else {
 				attrs = append(attrs, slog.String(badKey, arg))
 			}
@@ -330,3 +353,15 @@ func (s *slogLogger) argsAttrs(args []interface{}) ([]slog.Attr, error) {
 
 	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

@@ -6,15 +6,84 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"log/slog"
 	"strings"
 	"testing"
 
 	"github.com/google/uuid"
-	"go.unistack.org/micro/v3/metadata"
-
 	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
 )
 
+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)
@@ -115,7 +184,7 @@ func TestErrorf(t *testing.T) {
 
 	buf := bytes.NewBuffer(nil)
 	l := NewLogger(logger.WithLevel(logger.ErrorLevel), logger.WithOutput(buf), logger.WithAddStacktrace(true))
-	if err := l.Init(logger.WithContextAttrFuncs(func(ctx context.Context) []interface{} {
+	if err := l.Init(logger.WithContextAttrFuncs(func(_ context.Context) []interface{} {
 		return nil
 	})); err != nil {
 		t.Fatal(err)

logger/unwrap/unwrap.go

@@ -36,14 +36,14 @@ var (
 	circularShortBytes = []byte("<shown>")
 	invalidAngleBytes  = []byte("<invalid>")
 	filteredBytes      = []byte("<filtered>")
-	openBracketBytes   = []byte("[")
+	// openBracketBytes   = []byte("[")
-	closeBracketBytes  = []byte("]")
+	// closeBracketBytes  = []byte("]")
-	percentBytes       = []byte("%")
+	percentBytes    = []byte("%")
-	precisionBytes     = []byte(".")
+	precisionBytes  = []byte(".")
-	openAngleBytes     = []byte("<")
+	openAngleBytes  = []byte("<")
-	closeAngleBytes    = []byte(">")
+	closeAngleBytes = []byte(">")
-	openMapBytes       = []byte("{")
+	openMapBytes    = []byte("{")
-	closeMapBytes      = []byte("}")
+	closeMapBytes   = []byte("}")
 )
 
 type protoMessage interface {
@@ -52,13 +52,15 @@ type protoMessage interface {
 }
 
 type Wrapper struct {
-	val              interface{}
+	pointers map[uintptr]int
-	s                fmt.State
+	takeMap  map[int]bool
-	pointers         map[uintptr]int
+
-	opts             *Options
+	val  interface{}
+	s    fmt.State
+	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"`
+		// key string `logger:"omit"`
-		val *val   `logger:"take"`
+		val *val `logger:"take"`
 	}
 
 	var iface interface{}

metadata/context.go

@@ -24,6 +24,17 @@ 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) {
@@ -37,6 +48,17 @@ 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) {
@@ -50,15 +72,22 @@ 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()
 	}
-	ctx = context.WithValue(ctx, mdKey{}, &rawMetadata{md})
+	return 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
@@ -90,11 +119,7 @@ func NewIncomingContext(ctx context.Context, md Metadata) context.Context {
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	ctx = context.WithValue(ctx, mdIncomingKey{}, &rawMetadata{md})
+	return 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
@@ -102,11 +127,7 @@ func NewOutgoingContext(ctx context.Context, md Metadata) context.Context {
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	ctx = context.WithValue(ctx, mdOutgoingKey{}, &rawMetadata{md})
+	return 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
@@ -122,7 +143,7 @@ func AppendOutgoingContext(ctx context.Context, kv ...string) context.Context {
 	for k, v := range md {
 		omd.Set(k, v)
 	}
-	return NewOutgoingContext(ctx, omd)
+	return ctx
 }
 
 // AppendIncomingContext apends new md to context
@@ -138,5 +159,21 @@ func AppendIncomingContext(ctx context.Context, kv ...string) context.Context {
 	for k, v := range md {
 		omd.Set(k, v)
 	}
-	return NewIncomingContext(ctx, omd)
+	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
 }

metadata/metadata.go

@@ -4,6 +4,7 @@ package metadata
 import (
 	"net/textproto"
 	"sort"
+	"strings"
 )
 
 var (
@@ -66,6 +67,14 @@ 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
@@ -73,6 +82,9 @@ 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
 }
@@ -94,14 +106,23 @@ 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 {
 	nmd := New(len(md))
-	for key, val := range md {
+	for k, v := range md {
-		nmd.Set(key, val)
+		nmd[k] = v
 	}
 	nmd.Del(exclude...)
 	return nmd
@@ -125,7 +146,7 @@ func Merge(omd Metadata, mmd Metadata, overwrite bool) Metadata {
 		case ok && !overwrite:
 			continue
 		case val != "":
-			nmd.Set(key, val)
+			nmd[key] = val
 		case ok && val == "":
 			nmd.Del(key)
 		}
@@ -139,6 +160,8 @@ func Pairs(kv ...string) (Metadata, bool) {
 		return nil, false
 	}
 	md := New(len(kv) / 2)
-	md.Set(kv...)
+	for idx := 0; idx < len(kv); idx += 2 {
+		md[kv[idx]] = kv[idx+1]
+	}
 	return md, true
 }

metadata/metadata_test.go

@@ -5,6 +5,15 @@ 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)
@@ -23,8 +32,8 @@ func TestMultipleUsage(t *testing.T) {
 		m.Del("key1_3")
 		return ctx
 	}(ctx)
-	t.Logf("imd %#+v", imd)
+	_ = imd
-	t.Logf("omd %#+v", omd)
+	_ = omd
 }
 
 func TestMetadataSetMultiple(t *testing.T) {
@@ -79,6 +88,13 @@ 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")
@@ -102,7 +118,7 @@ func TestMerge(t *testing.T) {
 	}
 }
 
-func TestIterator(t *testing.T) {
+func TestIterator(_ *testing.T) {
 	md := Metadata{
 		"1Last":   "last",
 		"2First":  "first",

meter/context.go

@@ -15,6 +15,15 @@ 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

@@ -11,7 +11,7 @@ import (
 
 var (
 	// DefaultMeter is the default meter
-	DefaultMeter Meter = NewMeter()
+	DefaultMeter = NewMeter()
 	// DefaultAddress data will be made available on this host:port
 	DefaultAddress = ":9090"
 	// DefaultPath the meter endpoint where the Meter data will be made available

meter/noop.go

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

micro.go

@@ -65,6 +65,8 @@ func As(b any, target any) bool {
 			break
 		case targetType.Implements(routerType):
 			break
+		case targetType.Implements(tracerType):
+			break
 		default:
 			return false
 		}
@@ -76,19 +78,21 @@ func As(b any, target any) bool {
 	return false
 }
 
-var brokerType = reflect.TypeOf((*broker.Broker)(nil)).Elem()
+var (
-var loggerType = reflect.TypeOf((*logger.Logger)(nil)).Elem()
+	brokerType   = reflect.TypeOf((*broker.Broker)(nil)).Elem()
-var clientType = reflect.TypeOf((*client.Client)(nil)).Elem()
+	loggerType   = reflect.TypeOf((*logger.Logger)(nil)).Elem()
-var serverType = reflect.TypeOf((*server.Server)(nil)).Elem()
+	clientType   = reflect.TypeOf((*client.Client)(nil)).Elem()
-var codecType = reflect.TypeOf((*codec.Codec)(nil)).Elem()
+	serverType   = reflect.TypeOf((*server.Server)(nil)).Elem()
-var flowType = reflect.TypeOf((*flow.Flow)(nil)).Elem()
+	codecType    = reflect.TypeOf((*codec.Codec)(nil)).Elem()
-var fsmType = reflect.TypeOf((*fsm.FSM)(nil)).Elem()
+	flowType     = reflect.TypeOf((*flow.Flow)(nil)).Elem()
-var meterType = reflect.TypeOf((*meter.Meter)(nil)).Elem()
+	fsmType      = reflect.TypeOf((*fsm.FSM)(nil)).Elem()
-var registerType = reflect.TypeOf((*register.Register)(nil)).Elem()
+	meterType    = reflect.TypeOf((*meter.Meter)(nil)).Elem()
-var resolverType = reflect.TypeOf((*resolver.Resolver)(nil)).Elem()
+	registerType = reflect.TypeOf((*register.Register)(nil)).Elem()
-var routerType = reflect.TypeOf((*router.Router)(nil)).Elem()
+	resolverType = reflect.TypeOf((*resolver.Resolver)(nil)).Elem()
-var selectorType = reflect.TypeOf((*selector.Selector)(nil)).Elem()
+	routerType   = reflect.TypeOf((*router.Router)(nil)).Elem()
-var storeType = reflect.TypeOf((*store.Store)(nil)).Elem()
+	selectorType = reflect.TypeOf((*selector.Selector)(nil)).Elem()
-var syncType = reflect.TypeOf((*sync.Sync)(nil)).Elem()
+	storeType    = reflect.TypeOf((*store.Store)(nil)).Elem()
-var tracerType = reflect.TypeOf((*tracer.Tracer)(nil)).Elem()
+	syncType     = reflect.TypeOf((*sync.Sync)(nil)).Elem()
-var serviceType = reflect.TypeOf((*Service)(nil)).Elem()
+	tracerType   = reflect.TypeOf((*tracer.Tracer)(nil)).Elem()
+	serviceType  = reflect.TypeOf((*Service)(nil)).Elem()
+)

micro_test.go

@@ -18,26 +18,27 @@ func TestAs(t *testing.T) {
 	testCases := []struct {
 		b      any
 		target any
-		match  bool
 		want   any
+
+		match bool
 	}{
 		{
-			broTarget,
+			b:      broTarget,
-			&b,
+			target: &b,
-			true,
+			match:  true,
-			broTarget,
+			want:   broTarget,
 		},
 		{
-			nil,
+			b:      nil,
-			&b,
+			target: &b,
-			false,
+			match:  false,
-			nil,
+			want:   nil,
 		},
 		{
-			fsmTarget,
+			b:      fsmTarget,
-			&b,
+			target: &b,
-			false,
+			match:  false,
-			nil,
+			want:   nil,
 		},
 	}
 	for i, tc := range testCases {
@@ -72,7 +73,7 @@ func (p *bro) Ready() bool { return true }
 
 func (p *bro) Health() bool { return true }
 
-func (p *bro) Init(opts ...broker.Option) error { return nil }
+func (p *bro) Init(_ ...broker.Option) error { return nil }
 
 // Options returns broker options
 func (p *bro) Options() broker.Options { return broker.Options{} }
@@ -81,28 +82,28 @@ func (p *bro) Options() broker.Options { return broker.Options{} }
 func (p *bro) Address() string { return "" }
 
 // Connect connects to broker
-func (p *bro) Connect(ctx context.Context) error { return nil }
+func (p *bro) Connect(_ context.Context) error { return nil }
 
 // Disconnect disconnect from broker
-func (p *bro) Disconnect(ctx context.Context) error { return nil }
+func (p *bro) Disconnect(_ context.Context) error { return nil }
 
 // Publish message, msg can be single broker.Message or []broker.Message
-func (p *bro) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
+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(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (p *bro) BatchPublish(_ context.Context, _ []*broker.Message, _ ...broker.PublishOption) error {
 	return nil
 }
 
 // BatchSubscribe subscribes to topic messages via handler
-func (p *bro) BatchSubscribe(ctx context.Context, topic string, h broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+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(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (p *bro) Subscribe(_ context.Context, _ string, _ broker.Handler, _ ...broker.SubscribeOption) (broker.Subscriber, error) {
 	return nil, nil
 }
 
@@ -113,9 +114,9 @@ type fsmT struct {
 	name string
 }
 
-func (f *fsmT) Start(ctx context.Context, a interface{}, o ...Option) (interface{}, error) {
+func (f *fsmT) Start(_ context.Context, _ interface{}, _ ...Option) (interface{}, error) {
 	return nil, nil
 }
-func (f *fsmT) Current() string                  { return f.name }
+func (f *fsmT) Current() string                 { return f.name }
-func (f *fsmT) Reset()                           {}
+func (f *fsmT) Reset()                          {}
-func (f *fsmT) State(s string, sf fsm.StateFunc) {}
+func (f *fsmT) State(_ string, _ fsm.StateFunc) {}

mtls/options.go

@@ -8,19 +8,20 @@ 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
-	SignatureAlgorithm    x509.SignatureAlgorithm
+	CommonName            string
-	PublicKeyAlgorithm    x509.PublicKeyAlgorithm
+	Organization          []string
+	OrganizationalUnit    []string
+	OCSPServer            []string
+	IssuingCertificateURL []string
 	ExtKeyUsage           []x509.ExtKeyUsage
-	KeyUsage              x509.KeyUsage
+
-	IsCA                  bool
+	SignatureAlgorithm x509.SignatureAlgorithm
+	PublicKeyAlgorithm x509.PublicKeyAlgorithm
+	KeyUsage           x509.KeyUsage
+	IsCA               bool
 }
 
 // CertificateOrganizationalUnit set OrganizationalUnit in certificate subject

network/transport/transport.go

@@ -10,7 +10,7 @@ import (
 
 var (
 	// DefaultTransport is the global default transport
-	DefaultTransport Transport = NewTransport()
+	DefaultTransport = NewTransport()
 	// DefaultDialTimeout the default dial timeout
 	DefaultDialTimeout = time.Second * 5
 )

network/tunnel/broker/broker.go

@@ -84,7 +84,7 @@ func (t *tunBroker) Disconnect(ctx context.Context) error {
 	return t.tunnel.Close(ctx)
 }
 
-func (t *tunBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (t *tunBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, _ ...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 +114,7 @@ func (t *tunBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, op
 	return nil
 }
 
-func (t *tunBroker) Publish(ctx context.Context, topic string, m *broker.Message, opts ...broker.PublishOption) error {
+func (t *tunBroker) Publish(ctx context.Context, topic string, m *broker.Message, _ ...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))

options.go

@@ -269,7 +269,7 @@ func Logger(l logger.Logger, opts ...LoggerOption) Option {
 				}
 			}
 		}
-		
+
 		for _, trc := range o.Tracers {
 			for _, ot := range lopts.tracers {
 				if trc.Name() == ot || all {
@@ -294,8 +294,8 @@ type loggerOptions struct {
 	brokers   []string
 	registers []string
 	stores    []string
-	meters    []string
+	// meters    []string
-	tracers   []string
+	tracers []string
 }
 
 /*

profiler/noop.go

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

profiler/profile.go

@@ -12,7 +12,7 @@ type Profiler interface {
 }
 
 // DefaultProfiler holds the default profiler
-var DefaultProfiler Profiler = NewProfiler()
+var DefaultProfiler = NewProfiler()
 
 // Options holds the options for profiler
 type Options struct {

register/context.go

@@ -15,6 +15,15 @@ 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/memory.go

@@ -31,10 +31,10 @@ type record struct {
 }
 
 type memory struct {
-	sync.RWMutex
 	records  map[string]services
 	watchers map[string]*watcher
 	opts     register.Options
+	sync.RWMutex
 }
 
 // services is a KV map with service name as the key and a map of records as the value
@@ -100,11 +100,11 @@ func (m *memory) sendEvent(r *register.Result) {
 	}
 }
 
-func (m *memory) Connect(ctx context.Context) error {
+func (m *memory) Connect(_ context.Context) error {
 	return nil
 }
 
-func (m *memory) Disconnect(ctx context.Context) error {
+func (m *memory) Disconnect(_ context.Context) error {
 	return nil
 }
 
@@ -124,7 +124,7 @@ func (m *memory) Options() register.Options {
 	return m.opts
 }
 
-func (m *memory) Register(ctx context.Context, s *register.Service, opts ...register.RegisterOption) error {
+func (m *memory) Register(_ context.Context, s *register.Service, opts ...register.RegisterOption) error {
 	m.Lock()
 	defer m.Unlock()
 
@@ -469,9 +469,7 @@ func serviceToRecord(s *register.Service, ttl time.Duration) *record {
 	}
 
 	endpoints := make([]*register.Endpoint, len(s.Endpoints))
-	for i, e := range s.Endpoints {
+	copy(endpoints, s.Endpoints)
-		endpoints[i] = e
-	}
 
 	return &record{
 		Name:      s.Name,

register/memory/memory_test.go

@@ -208,9 +208,9 @@ func TestMemoryRegistryTTLConcurrent(t *testing.T) {
 		}
 	}
 
-	//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{})
@@ -290,27 +290,29 @@ func TestWatcher(t *testing.T) {
 
 	ctx := context.TODO()
 	m := NewRegister()
-	m.Init()
+	if err := m.Init(); err != nil {
-	m.Connect(ctx)
+		t.Fatal(err)
+	}
+	if err := m.Connect(ctx); err != nil {
+		t.Fatal(err)
+	}
 	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() {
-		for {
+		_, err := wc.Next()
-			_, err := wc.Next()
+		if err != nil {
-			if err != nil {
+			cherr <- fmt.Errorf("unexpected err %v", err)
-				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/register.go

@@ -18,7 +18,7 @@ var DefaultDomain = "micro"
 
 var (
 	// DefaultRegister is the global default register
-	DefaultRegister Register = NewRegister()
+	DefaultRegister = NewRegister()
 	// ErrNotFound returned when LookupService is called and no services found
 	ErrNotFound = errors.New("service not found")
 	// ErrWatcherStopped returned when when watcher is stopped

resolver/noop/noop.go

@@ -9,6 +9,6 @@ import (
 type Resolver struct{}
 
 // Resolve returns the list of nodes
-func (r *Resolver) Resolve(name string) ([]*resolver.Record, error) {
+func (r *Resolver) Resolve(_ string) ([]*resolver.Record, error) {
 	return []*resolver.Record{}, nil
 }

router/context.go

@@ -15,6 +15,15 @@ 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/router.go

@@ -7,7 +7,7 @@ import (
 
 var (
 	// DefaultRouter is the global default router
-	DefaultRouter Router = NewRouter()
+	DefaultRouter = NewRouter()
 	// DefaultNetwork is default micro network
 	DefaultNetwork = "micro"
 	// ErrRouteNotFound is returned when no route was found in the routing table

selector/random/random.go

@@ -25,7 +25,7 @@ func (r *random) Select(routes []string, opts ...selector.SelectOption) (selecto
 	}, nil
 }
 
-func (r *random) Record(addr string, err error) error {
+func (r *random) Record(_ string, _ error) error {
 	return nil
 }
 

selector/roundrobin/roundrobin.go

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

semconv/cache.go

@@ -0,0 +1,14 @@
+package semconv
+
+var (
+	// CacheRequestDurationSeconds specifies meter metric name
+	CacheRequestDurationSeconds = "micro_cache_request_duration_seconds"
+	// CacheRequestLatencyMicroseconds specifies meter metric name
+	CacheRequestLatencyMicroseconds = "micro_cache_request_latency_microseconds"
+	// CacheRequestTotal specifies meter metric name
+	CacheRequestTotal = "micro_cache_request_total"
+	// CacheRequestInflight specifies meter metric name
+	CacheRequestInflight = "micro_cache_request_inflight"
+	// CacheItemsTotal specifies total cache items
+	CacheItemsTotal = "micro_cache_items_total"
+)

semconv/metadata.go

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

semconv/store.go

@@ -3,7 +3,7 @@ package semconv
 var (
 	// StoreRequestDurationSeconds specifies meter metric name
 	StoreRequestDurationSeconds = "micro_store_request_duration_seconds"
-	// ClientRequestLatencyMicroseconds specifies meter metric name
+	// StoreRequestLatencyMicroseconds specifies meter metric name
 	StoreRequestLatencyMicroseconds = "micro_store_request_latency_microseconds"
 	// StoreRequestTotal specifies meter metric name
 	StoreRequestTotal = "micro_store_request_total"

server/context.go

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

server/noop.go

@@ -171,7 +171,6 @@ type rpcMessage struct {
 	header      metadata.Metadata
 	topic       string
 	contentType string
-	body        []byte
 }
 
 func (r *rpcMessage) ContentType() string {
@@ -724,7 +723,7 @@ func (n *noopServer) createSubHandler(sb *subscriber, opts Options) broker.Handl
 				return nil
 			}
 
-			opts.Hooks.EachNext(func(hook options.Hook) {
+			opts.Hooks.EachPrev(func(hook options.Hook) {
 				if h, ok := hook.(HookSubHandler); ok {
 					fn = h(fn)
 				}
@@ -776,13 +775,16 @@ func (s *subscriber) Options() SubscriberOptions {
 }
 
 type subscriber struct {
+	topic string
+
 	typ        reflect.Type
 	subscriber interface{}
-	topic      string
+
-	endpoints  []*register.Endpoint
+	endpoints []*register.Endpoint
-	handlers   []*handler
+	handlers  []*handler
-	opts       SubscriberOptions
+
-	rcvr       reflect.Value
+	rcvr reflect.Value
+	opts SubscriberOptions
 }
 
 type handler struct {

server/noop_test.go

@@ -9,6 +9,7 @@ import (
 	"go.unistack.org/micro/v3/client"
 	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/options"
 	"go.unistack.org/micro/v3/server"
 )
 
@@ -38,7 +39,9 @@ func TestNoopSub(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	logger.DefaultLogger.Init(logger.WithLevel(logger.ErrorLevel))
+	if err := logger.DefaultLogger.Init(logger.WithLevel(logger.ErrorLevel)); err != nil {
+		t.Fatal(err)
+	}
 	s := server.NewServer(
 		server.Broker(b),
 		server.Codec("application/octet-stream", codec.NewCodec()),
@@ -82,3 +85,40 @@ func TestNoopSub(t *testing.T) {
 		}
 	}()
 }
+
+func TestHooks_Wrap(t *testing.T) {
+	n := 5
+	fn1 := func(next server.FuncSubHandler) server.FuncSubHandler {
+		return func(ctx context.Context, msg server.Message) (err error) {
+			n *= 2
+			return next(ctx, msg)
+		}
+	}
+	fn2 := func(next server.FuncSubHandler) server.FuncSubHandler {
+		return func(ctx context.Context, msg server.Message) (err error) {
+			n -= 10
+			return next(ctx, msg)
+		}
+	}
+
+	hs := &options.Hooks{}
+	hs.Append(server.HookSubHandler(fn1), server.HookSubHandler(fn2))
+
+	var fn = func(ctx context.Context, msg server.Message) error {
+		return nil
+	}
+
+	hs.EachPrev(func(hook options.Hook) {
+		if h, ok := hook.(server.HookSubHandler); ok {
+			fn = h(fn)
+		}
+	})
+
+	if err := fn(nil, nil); err != nil {
+		t.Fatal(err)
+	}
+
+	if n != 0 {
+		t.Fatalf("uncorrected hooks call")
+	}
+}

server/options.go

@@ -24,36 +24,11 @@ type Option func(*Options)
 
 // Options server struct
 type Options struct {
-	// Context holds the external options and can be used for server shutdown
-	Context context.Context
-	// Broker holds the server broker
-	Broker broker.Broker
-	// Register holds the register
-	Register register.Register
-	// Tracer holds the tracer
-	Tracer tracer.Tracer
-	// Logger holds the logger
-	Logger logger.Logger
-	// Meter holds the meter
-	Meter meter.Meter
-
-	/*
-		// Router for requests
-		Router Router
-	*/
-
-	// Listener may be passed if already created
-	Listener net.Listener
-	// Wait group
-	Wait *msync.WaitGroup
-	// TLSConfig specifies tls.Config for secure serving
-	TLSConfig *tls.Config
-	// Metadata holds the server metadata
-	Metadata metadata.Metadata
-	// RegisterCheck run before register server
-	RegisterCheck func(context.Context) error
 	// Codecs map to handle content-type
 	Codecs map[string]codec.Codec
+	// Metadata holds the server metadata
+	Metadata metadata.Metadata
+
 	// ID holds the id of the server
 	ID string
 	// Namespace for te server
@@ -66,21 +41,46 @@ type Options struct {
 	Advertise string
 	// Version holds the server version
 	Version string
-	// RegisterAttempts holds the number of register attempts before error
+
-	RegisterAttempts int
+	// Context holds the external options and can be used for server shutdown
+	Context context.Context
+	// Broker holds the server broker
+	Broker broker.Broker
+	// Register holds the register
+	Register register.Register
+	// Tracer holds the tracer
+	Tracer tracer.Tracer
+	// Logger holds the logger
+	Logger logger.Logger
+	// Meter holds the meter
+	Meter meter.Meter
+	// Listener may be passed if already created
+	Listener net.Listener
+
+	// TLSConfig specifies tls.Config for secure serving
+	TLSConfig *tls.Config
+	// Wait group
+	Wait *msync.WaitGroup
+
+	// RegisterCheck run before register server
+	RegisterCheck func(context.Context) error
+
+	// Hooks may contains hook actions that performs before/after server handler
+	// or server subscriber handler
+	Hooks options.Hooks
+
 	// RegisterInterval holds he interval for re-register
 	RegisterInterval time.Duration
 	// RegisterTTL specifies TTL for register record
 	RegisterTTL time.Duration
+	// GracefulTimeout timeout for graceful stop server
+	GracefulTimeout time.Duration
 	// MaxConn limits number of connections
 	MaxConn int
 	// DeregisterAttempts holds the number of deregister attempts before error
 	DeregisterAttempts int
-	// Hooks may contains hook actions that performs before/after server handler
+	// RegisterAttempts holds the number of register attempts before error
-	// or server subscriber handler
+	RegisterAttempts int
-	Hooks options.Hooks
-	// GracefulTimeout timeout for graceful stop server
-	GracefulTimeout time.Duration
 }
 
 // NewOptions returns new options struct with default or passed values
@@ -318,14 +318,14 @@ type SubscriberOptions struct {
 	Context context.Context
 	// Queue holds the subscription queue
 	Queue string
+	// BatchWait flag specifies max wait time for batch filling
+	BatchWait time.Duration
+	// BatchSize flag specifies max size of batch
+	BatchSize int
 	// AutoAck flag for auto ack messages after processing
 	AutoAck bool
 	// BodyOnly flag specifies that message without headers
 	BodyOnly bool
-	// BatchSize flag specifies max size of batch
-	BatchSize int
-	// BatchWait flag specifies max wait time for batch filling
-	BatchWait time.Duration
 }
 
 // NewSubscriberOptions create new SubscriberOptions

server/server.go

@@ -12,7 +12,7 @@ import (
 
 // DefaultServer default server
 var (
-	DefaultServer Server = NewServer()
+	DefaultServer = NewServer()
 )
 
 var (

service.go

@@ -23,8 +23,8 @@ import (
 )
 
 func init() {
-	maxprocs.Set()
+	_, _ = maxprocs.Set()
-	memlimit.SetGoMemLimitWithOpts(
+	_, _ = memlimit.SetGoMemLimitWithOpts(
 		memlimit.WithRatio(0.9),
 		memlimit.WithProvider(
 			memlimit.ApplyFallback(
@@ -34,7 +34,10 @@ func init() {
 		),
 	)
 
-	net.DefaultResolver = utildns.NewNetResolver(utildns.Timeout(1 * time.Second))
+	net.DefaultResolver = utildns.NewNetResolver(
+		utildns.Timeout(1*time.Second),
+		utildns.MinCacheTTL(5*time.Second),
+	)
 }
 
 // Service is an interface that wraps the lower level components.

service_test.go

@@ -121,8 +121,10 @@ func TestNewService(t *testing.T) {
 	}
 	tests := []struct {
 		name string
-		args args
+
 		want Service
+
+		args args
 	}{
 		{
 			name: "NewService",
@@ -146,9 +148,10 @@ func Test_service_Name(t *testing.T) {
 		opts Options
 	}
 	tests := []struct {
-		name   string
+		name string
+		want string
+
 		fields fields
-		want   string
 	}{
 		{
 			name: "Test_service_Name",
@@ -245,10 +248,12 @@ func Test_service_Broker(t *testing.T) {
 		names []string
 	}
 	tests := []struct {
-		name   string
+		name string
+
+		want broker.Broker
+
 		fields fields
 		args   args
-		want   broker.Broker
 	}{
 		{
 			name: "service.Broker",
@@ -301,10 +306,12 @@ func Test_service_Tracer(t *testing.T) {
 		names []string
 	}
 	tests := []struct {
-		name   string
+		name string
+
+		want tracer.Tracer
+
 		fields fields
 		args   args
-		want   tracer.Tracer
 	}{
 		{
 			name: "service.Tracer",
@@ -338,10 +345,11 @@ func Test_service_Config(t *testing.T) {
 		names []string
 	}
 	tests := []struct {
-		name   string
+		name string
+		want config.Config
+
 		fields fields
 		args   args
-		want   config.Config
 	}{
 		{
 			name: "service.Config",
@@ -375,10 +383,12 @@ func Test_service_Client(t *testing.T) {
 		names []string
 	}
 	tests := []struct {
-		name   string
+		name string
+
+		want client.Client
+
 		fields fields
 		args   args
-		want   client.Client
 	}{
 		{
 			name: "service.Client",
@@ -412,10 +422,12 @@ func Test_service_Server(t *testing.T) {
 		names []string
 	}
 	tests := []struct {
-		name   string
+		name string
+
+		want server.Server
+
 		fields fields
 		args   args
-		want   server.Server
 	}{
 		{
 			name: "service.Server",
@@ -449,10 +461,12 @@ func Test_service_Store(t *testing.T) {
 		names []string
 	}
 	tests := []struct {
-		name   string
+		name string
+
+		want store.Store
+
 		fields fields
 		args   args
-		want   store.Store
 	}{
 		{
 			name: "service.Store",
@@ -486,10 +500,12 @@ func Test_service_Register(t *testing.T) {
 		names []string
 	}
 	tests := []struct {
-		name   string
+		name string
+
+		want register.Register
+
 		fields fields
 		args   args
-		want   register.Register
 	}{
 		{
 			name: "service.Register",
@@ -523,10 +539,12 @@ func Test_service_Logger(t *testing.T) {
 		names []string
 	}
 	tests := []struct {
-		name   string
+		name string
+
+		want logger.Logger
+
 		fields fields
 		args   args
-		want   logger.Logger
 	}{
 		{
 			name: "service.Logger",
@@ -560,10 +578,12 @@ func Test_service_Router(t *testing.T) {
 		names []string
 	}
 	tests := []struct {
-		name   string
+		name string
+
+		want router.Router
+
 		fields fields
 		args   args
-		want   router.Router
 	}{
 		{
 			name: "service.Router",
@@ -597,10 +617,12 @@ func Test_service_Meter(t *testing.T) {
 		names []string
 	}
 	tests := []struct {
-		name   string
+		name string
+
+		want meter.Meter
+
 		fields fields
 		args   args
-		want   meter.Meter
 	}{
 		{
 			name: "service.Meter",
@@ -631,8 +653,8 @@ func Test_service_String(t *testing.T) {
 	}
 	tests := []struct {
 		name   string
-		fields fields
 		want   string
+		fields fields
 	}{
 		{
 			name: "service.String",

store/context.go

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

store/memory/memory.go

@@ -96,15 +96,15 @@ func (m *memoryStore) list(prefix string, limit, offset uint) []string {
 	if limit != 0 || offset != 0 {
 		sort.Slice(allKeys, func(i, j int) bool { return allKeys[i] < allKeys[j] })
 		sort.Slice(allKeys, func(i, j int) bool { return allKeys[i] < allKeys[j] })
-		end := len(allKeys)
+		end := uint(len(allKeys))
 		if limit > 0 {
-			calcLimit := int(offset + limit)
+			calcLimit := offset + limit
 			if calcLimit < end {
 				end = calcLimit
 			}
 		}
 
-		if int(offset) >= end {
+		if offset >= end {
 			return nil
 		}
 		return allKeys[offset:end]
@@ -123,7 +123,7 @@ func (m *memoryStore) Init(opts ...store.Option) error {
 	m.funcList = m.fnList
 	m.funcDelete = m.fnDelete
 
-	m.opts.Hooks.EachNext(func(hook options.Hook) {
+	m.opts.Hooks.EachPrev(func(hook options.Hook) {
 		switch h := hook.(type) {
 		case store.HookRead:
 			m.funcRead = h(m.funcRead)

store/noop.go

@@ -12,15 +12,18 @@ import (
 var _ Store = (*noopStore)(nil)
 
 type noopStore struct {
-	mu          sync.Mutex
+	watchers map[string]Watcher
-	watchers    map[string]Watcher
+
-	funcRead    FuncRead
+	funcRead   FuncRead
-	funcWrite   FuncWrite
+	funcWrite  FuncWrite
-	funcExists  FuncExists
+	funcExists FuncExists
-	funcList    FuncList
+	funcList   FuncList
-	funcDelete  FuncDelete
+	funcDelete FuncDelete
+
 	opts        Options
 	isConnected atomic.Int32
+
+	mu sync.Mutex
 }
 
 func (n *noopStore) Live() bool {
@@ -35,7 +38,7 @@ func (n *noopStore) Health() bool {
 	return true
 }
 
-func NewStore(opts ...Option) *noopStore {
+func NewStore(opts ...Option) Store {
 	options := NewOptions(opts...)
 	return &noopStore{opts: options}
 }
@@ -51,7 +54,7 @@ func (n *noopStore) Init(opts ...Option) error {
 	n.funcList = n.fnList
 	n.funcDelete = n.fnDelete
 
-	n.opts.Hooks.EachNext(func(hook options.Hook) {
+	n.opts.Hooks.EachPrev(func(hook options.Hook) {
 		switch h := hook.(type) {
 		case HookRead:
 			n.funcRead = h(n.funcRead)
@@ -94,7 +97,7 @@ func (n *noopStore) Read(ctx context.Context, key string, val interface{}, opts
 	return n.funcRead(ctx, key, val, opts...)
 }
 
-func (n *noopStore) fnRead(ctx context.Context, key string, val interface{}, opts ...ReadOption) error {
+func (n *noopStore) fnRead(ctx context.Context, _ string, _ interface{}, _ ...ReadOption) error {
 	select {
 	case <-ctx.Done():
 		return ctx.Err()
@@ -112,7 +115,7 @@ func (n *noopStore) Delete(ctx context.Context, key string, opts ...DeleteOption
 	return n.funcDelete(ctx, key, opts...)
 }
 
-func (n *noopStore) fnDelete(ctx context.Context, key string, opts ...DeleteOption) error {
+func (n *noopStore) fnDelete(ctx context.Context, _ string, _ ...DeleteOption) error {
 	select {
 	case <-ctx.Done():
 		return ctx.Err()
@@ -130,7 +133,7 @@ func (n *noopStore) Exists(ctx context.Context, key string, opts ...ExistsOption
 	return n.funcExists(ctx, key, opts...)
 }
 
-func (n *noopStore) fnExists(ctx context.Context, key string, opts ...ExistsOption) error {
+func (n *noopStore) fnExists(ctx context.Context, _ string, _ ...ExistsOption) error {
 	select {
 	case <-ctx.Done():
 		return ctx.Err()
@@ -148,7 +151,7 @@ func (n *noopStore) Write(ctx context.Context, key string, val interface{}, opts
 	return n.funcWrite(ctx, key, val, opts...)
 }
 
-func (n *noopStore) fnWrite(ctx context.Context, key string, val interface{}, opts ...WriteOption) error {
+func (n *noopStore) fnWrite(ctx context.Context, _ string, _ interface{}, _ ...WriteOption) error {
 	select {
 	case <-ctx.Done():
 		return ctx.Err()
@@ -200,13 +203,13 @@ func (n *noopStore) connect(ctx context.Context) error {
 }
 
 type watcher struct {
+	opts WatchOptions
+	ch   chan Event
 	exit chan bool
 	id   string
-	ch   chan Event
-	opts WatchOptions
 }
 
-func (m *noopStore) Watch(ctx context.Context, opts ...WatchOption) (Watcher, error) {
+func (n *noopStore) Watch(_ context.Context, opts ...WatchOption) (Watcher, error) {
 	id, err := id.New()
 	if err != nil {
 		return nil, err
@@ -223,9 +226,9 @@ func (m *noopStore) Watch(ctx context.Context, opts ...WatchOption) (Watcher, er
 		opts: wo,
 	}
 
-	m.mu.Lock()
+	n.mu.Lock()
-	m.watchers[w.id] = w
+	n.watchers[w.id] = w
-	m.mu.Unlock()
+	n.mu.Unlock()
 
 	return w, nil
 }

store/options.go

@@ -15,6 +15,13 @@ import (
 
 // Options contains configuration for the Store
 type Options struct {
+	// Name specifies store name
+	Name string
+	// Namespace of the records
+	Namespace string
+	// Separator used as key parts separator
+	Separator string
+
 	// Meter used for metrics
 	Meter meter.Meter
 	// Tracer used for tracing
@@ -25,22 +32,17 @@ type Options struct {
 	Codec codec.Codec
 	// Logger used for logging
 	Logger logger.Logger
+
 	// TLSConfig holds tls.TLSConfig options
 	TLSConfig *tls.Config
-	// Name specifies store name
+
-	Name string
-	// Namespace of the records
-	Namespace string
-	// Separator used as key parts separator
-	Separator string
 	// Addrs contains store address
 	Addrs []string
-	// Wrappers store wrapper that called before actual functions
-	// Wrappers []Wrapper
-	// Timeout specifies timeout duration for all operations
-	Timeout time.Duration
 	// Hooks can be run before/after store Read/List/Write/Exists/Delete
 	Hooks options.Hooks
+
+	// Timeout specifies timeout duration for all operations
+	Timeout time.Duration
 	// LazyConnect creates a connection when using store
 	LazyConnect bool
 }

store/store.go

@@ -10,13 +10,13 @@ import (
 var (
 	ErrWatcherStopped = errors.New("watcher stopped")
 	// ErrNotConnected is returned when a store is not connected
-	ErrNotConnected = errors.New("not conected")
+	ErrNotConnected = errors.New("not connected")
 	// ErrNotFound is returned when a key doesn't exist
 	ErrNotFound = errors.New("not found")
 	// ErrInvalidKey is returned when a key has empty or have invalid format
 	ErrInvalidKey = errors.New("invalid key")
 	// DefaultStore is the global default store
-	DefaultStore Store = NewStore()
+	DefaultStore = NewStore()
 	// DefaultSeparator is the gloabal default key parts separator
 	DefaultSeparator = "/"
 )
@@ -105,3 +105,7 @@ func NewWatchOptions(opts ...WatchOption) (WatchOptions, error) {
 
 	return options, err
 }
+
+func Watch(context.Context) (Watcher, error) {
+	return nil, nil
+}

sync/memory.go

@@ -6,9 +6,10 @@ import (
 )
 
 type memorySync struct {
-	mtx     gosync.RWMutex
 	locks   map[string]*memoryLock
 	options Options
+
+	mtx gosync.RWMutex
 }
 
 type memoryLock struct {

tracer/context.go

@@ -18,6 +18,15 @@ func FromContext(ctx context.Context) (Tracer, bool) {
 	return nil, false
 }
 
+// MustContext returns a tracer from context
+func MustContext(ctx context.Context) Tracer {
+	t, ok := FromContext(ctx)
+	if !ok {
+		panic("missing tracer")
+	}
+	return t
+}
+
 // NewContext saves the tracer in the context
 func NewContext(ctx context.Context, tracer Tracer) context.Context {
 	if ctx == nil {
@@ -28,6 +37,15 @@ func NewContext(ctx context.Context, tracer Tracer) context.Context {
 
 type spanKey struct{}
 
+// SpanFromContext returns a span from context
+func SpanMustContext(ctx context.Context) Span {
+	sp, ok := SpanFromContext(ctx)
+	if !ok {
+		panic("missing span")
+	}
+	return sp
+}
+
 // SpanFromContext returns a span from context
 func SpanFromContext(ctx context.Context) (Span, bool) {
 	if ctx == nil {

tracer/memory/memory.go

@@ -25,6 +25,7 @@ func (t *Tracer) Start(ctx context.Context, name string, opts ...tracer.SpanOpti
 		name:      name,
 		ctx:       ctx,
 		tracer:    t,
+		labels:    options.Labels,
 		kind:      options.Kind,
 		startTime: time.Now(),
 	}
@@ -37,6 +38,14 @@ func (t *Tracer) Start(ctx context.Context, name string, opts ...tracer.SpanOpti
 	return tracer.NewSpanContext(ctx, span), span
 }
 
+type memoryStringer struct {
+	s string
+}
+
+func (s memoryStringer) String() string {
+	return s.s
+}
+
 func (t *Tracer) Flush(_ context.Context) error {
 	return nil
 }
@@ -52,14 +61,6 @@ func (t *Tracer) Name() string {
 	return t.opts.Name
 }
 
-type noopStringer struct {
-	s string
-}
-
-func (s noopStringer) String() string {
-	return s.s
-}
-
 type Span struct {
 	ctx        context.Context
 	tracer     tracer.Tracer
@@ -67,8 +68,8 @@ type Span struct {
 	statusMsg  string
 	startTime  time.Time
 	finishTime time.Time
-	traceID    noopStringer
+	traceID    memoryStringer
-	spanID     noopStringer
+	spanID     memoryStringer
 	events     []*Event
 	labels     []interface{}
 	logs       []interface{}

tracer/noop.go

@@ -2,6 +2,7 @@ package tracer
 
 import (
 	"context"
+	"time"
 
 	"go.unistack.org/micro/v3/util/id"
 )
@@ -20,18 +21,18 @@ func (t *noopTracer) Spans() []Span {
 func (t *noopTracer) Start(ctx context.Context, name string, opts ...SpanOption) (context.Context, Span) {
 	options := NewSpanOptions(opts...)
 	span := &noopSpan{
-		name:   name,
+		name:      name,
-		ctx:    ctx,
+		ctx:       ctx,
-		tracer: t,
+		tracer:    t,
-		labels: options.Labels,
+		startTime: time.Now(),
-		kind:   options.Kind,
+		labels:    options.Labels,
+		kind:      options.Kind,
 	}
 	span.spanID.s, _ = id.New()
 	span.traceID.s, _ = id.New()
 	if span.ctx == nil {
 		span.ctx = context.Background()
 	}
-	t.spans = append(t.spans, span)
 	return NewSpanContext(ctx, span), span
 }
 
@@ -58,23 +59,18 @@ func (t *noopTracer) Name() string {
 	return t.opts.Name
 }
 
-type noopEvent struct {
-	name   string
-	labels []interface{}
-}
-
 type noopSpan struct {
-	ctx       context.Context
+	ctx        context.Context
-	tracer    Tracer
+	tracer     Tracer
-	name      string
+	name       string
-	statusMsg string
+	statusMsg  string
-	traceID   noopStringer
+	startTime  time.Time
-	spanID    noopStringer
+	finishTime time.Time
-	events    []*noopEvent
+	traceID    noopStringer
-	labels    []interface{}
+	spanID     noopStringer
-	logs      []interface{}
+	labels     []interface{}
-	kind      SpanKind
+	kind       SpanKind
-	status    SpanStatus
+	status     SpanStatus
 }
 
 func (s *noopSpan) TraceID() string {
@@ -86,6 +82,7 @@ func (s *noopSpan) SpanID() string {
 }
 
 func (s *noopSpan) Finish(_ ...SpanOption) {
+	s.finishTime = time.Now()
 }
 
 func (s *noopSpan) Context() context.Context {
@@ -97,8 +94,6 @@ func (s *noopSpan) Tracer() Tracer {
 }
 
 func (s *noopSpan) AddEvent(name string, opts ...EventOption) {
-	options := NewEventOptions(opts...)
-	s.events = append(s.events, &noopEvent{name: name, labels: options.Labels})
 }
 
 func (s *noopSpan) SetName(name string) {
@@ -106,7 +101,6 @@ func (s *noopSpan) SetName(name string) {
 }
 
 func (s *noopSpan) AddLogs(kv ...interface{}) {
-	s.logs = append(s.logs, kv...)
 }
 
 func (s *noopSpan) AddLabels(kv ...interface{}) {

util/dns/cache.go

@@ -6,6 +6,9 @@ import (
 	"net"
 	"sync"
 	"time"
+
+	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v3/semconv"
 )
 
 // DialFunc is a [net.Resolver.Dial] function.
@@ -19,6 +22,11 @@ func NewNetResolver(opts ...Option) *net.Resolver {
 		o(&options)
 	}
 
+	if options.Meter == nil {
+		options.Meter = meter.DefaultMeter
+		opts = append(opts, Meter(options.Meter))
+	}
+
 	return &net.Resolver{
 		PreferGo:     true,
 		StrictErrors: options.Resolver.StrictErrors,
@@ -35,7 +43,7 @@ func NewNetDialer(parent DialFunc, opts ...Option) DialFunc {
 	if cache.opts.MaxCacheEntries == 0 {
 		cache.opts.MaxCacheEntries = DefaultMaxCacheEntries
 	}
-	return func(ctx context.Context, network, address string) (net.Conn, error) {
+	return func(_ context.Context, network, address string) (net.Conn, error) {
 		conn := &dnsConn{}
 		conn.roundTrip = cachingRoundTrip(&cache, network, address)
 		return conn, nil
@@ -56,6 +64,7 @@ type Options struct {
 	PreferIPV4      bool
 	PreferIPV6      bool
 	Timeout         time.Duration
+	Meter           meter.Meter
 }
 
 // MaxCacheEntries sets the maximum number of entries to cache.
@@ -87,6 +96,13 @@ func NegativeCache(b bool) Option {
 	}
 }
 
+// Meter sets meter.Meter
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
 // Timeout sets upstream *net.Resolver timeout
 func Timeout(td time.Duration) Option {
 	return func(o *Options) {
@@ -116,12 +132,12 @@ func PreferIPV6(b bool) Option {
 }
 
 type cache struct {
-	sync.RWMutex
-
-	dial    DialFunc
 	entries map[string]cacheEntry
+	dial    DialFunc
 
 	opts Options
+
+	sync.RWMutex
 }
 
 type cacheEntry struct {
@@ -156,7 +172,6 @@ func (c *cache) put(req string, res string) {
 	}
 
 	c.Lock()
-	defer c.Unlock()
 	if c.entries == nil {
 		c.entries = make(map[string]cacheEntry)
 	}
@@ -165,6 +180,8 @@ func (c *cache) put(req string, res string) {
 	var tested, evicted int
 	for k, e := range c.entries {
 		if time.Until(e.deadline) <= 0 {
+			c.opts.Meter.Counter(semconv.CacheItemsTotal, "type", "dns").Dec()
+			c.opts.Meter.Counter(semconv.CacheRequestTotal, "type", "dns", "method", "evict").Inc()
 			// delete expired entry
 			delete(c.entries, k)
 			evicted++
@@ -175,6 +192,8 @@ func (c *cache) put(req string, res string) {
 			continue
 		}
 		if evicted == 0 && c.opts.MaxCacheEntries > 0 && len(c.entries) >= c.opts.MaxCacheEntries {
+			c.opts.Meter.Counter(semconv.CacheItemsTotal, "type", "dns").Dec()
+			c.opts.Meter.Counter(semconv.CacheRequestTotal, "type", "dns", "method", "evict").Inc()
 			// delete at least one entry
 			delete(c.entries, k)
 		}
@@ -186,6 +205,9 @@ func (c *cache) put(req string, res string) {
 		deadline: time.Now().Add(ttl),
 		value:    res[2:],
 	}
+
+	c.opts.Meter.Counter(semconv.CacheItemsTotal, "type", "dns").Inc()
+	c.Unlock()
 }
 
 func (c *cache) get(req string) (res string) {
@@ -210,6 +232,7 @@ func (c *cache) get(req string) (res string) {
 		// prepend correct ID
 		return req[:2] + entry.value
 	}
+
 	return ""
 }
 
@@ -283,7 +306,7 @@ func getNameLen(msg string) int {
 	for i < len(msg) {
 		if msg[i] == 0 {
 			// end of name
-			i += 1
+			i++
 			break
 		}
 		if msg[i] >= 0xc0 {
@@ -310,10 +333,18 @@ func getUint32(s string) int {
 
 func cachingRoundTrip(cache *cache, network, address string) roundTripper {
 	return func(ctx context.Context, req string) (res string, err error) {
+		cache.opts.Meter.Counter(semconv.CacheRequestInflight, "type", "dns").Inc()
+		defer cache.opts.Meter.Counter(semconv.CacheRequestInflight, "type", "dns").Dec()
 		// check cache
-		if res := cache.get(req); res != "" {
+		if res = cache.get(req); res != "" {
 			return res, nil
 		}
+		cache.opts.Meter.Counter(semconv.CacheRequestTotal, "type", "dns", "method", "get", "status", "miss").Inc()
+		ts := time.Now()
+		defer func() {
+			cache.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "type", "dns", "method", "get").UpdateDuration(ts)
+			cache.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "type", "dns", "method", "get").UpdateDuration(ts)
+		}()
 
 		switch {
 		case cache.opts.PreferIPV4 && cache.opts.PreferIPV6:
@@ -340,6 +371,7 @@ func cachingRoundTrip(cache *cache, network, address string) roundTripper {
 			var d net.Dialer
 			conn, err = d.DialContext(ctx, network, address)
 		}
+
 		if err != nil {
 			return "", err
 		}

util/dns/cache_test.go

@@ -8,9 +8,13 @@ import (
 func TestCache(t *testing.T) {
 	net.DefaultResolver = NewNetResolver(PreferIPV4(true))
 
-	addrs, err := net.LookupHost("unistack.org")
+	_, err := net.LookupHost("unistack.org")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = net.LookupHost("unistack.org")
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Logf("addrs %v", addrs)
 }

util/dns/conn.go

@@ -11,15 +11,16 @@ import (
 )
 
 type dnsConn struct {
-	sync.Mutex
+	ctx       context.Context
+	cancel    context.CancelFunc
+	roundTrip roundTripper
+
+	deadline time.Time
 
 	ibuf bytes.Buffer
 	obuf bytes.Buffer
 
-	ctx       context.Context
+	sync.Mutex
-	cancel    context.CancelFunc
-	deadline  time.Time
-	roundTrip roundTripper
 }
 
 type roundTripper func(ctx context.Context, req string) (res string, err error)
@@ -66,19 +67,24 @@ func (c *dnsConn) RemoteAddr() net.Addr {
 }
 
 func (c *dnsConn) SetDeadline(t time.Time) error {
-	c.SetReadDeadline(t)
+	var err error
-	c.SetWriteDeadline(t)
+	if err = c.SetReadDeadline(t); err != nil {
+		return err
+	}
+	if err = c.SetWriteDeadline(t); err != nil {
+		return err
+	}
 	return nil
 }
 
 func (c *dnsConn) SetReadDeadline(t time.Time) error {
 	c.Lock()
-	defer c.Unlock()
 	c.deadline = t
+	c.Unlock()
 	return nil
 }
 
-func (c *dnsConn) SetWriteDeadline(t time.Time) error {
+func (c *dnsConn) SetWriteDeadline(_ time.Time) error {
 	// writes do not timeout
 	return nil
 }
@@ -156,23 +162,22 @@ func readMessage(c net.Conn) (string, error) {
 			return "", err
 		}
 		return string(b[:n]), nil
-	} else {
-		var sz [2]byte
-		_, err := io.ReadFull(c, sz[:])
-		if err != nil {
-			return "", err
-		}
-
-		size := int64(sz[0])<<8 | int64(sz[1])
-
-		var str strings.Builder
-		_, err = io.CopyN(&str, c, size)
-		if err == io.EOF {
-			return "", io.ErrUnexpectedEOF
-		}
-		if err != nil {
-			return "", err
-		}
-		return str.String(), nil
 	}
+	var sz [2]byte
+	_, err := io.ReadFull(c, sz[:])
+	if err != nil {
+		return "", err
+	}
+
+	size := int64(sz[0])<<8 | int64(sz[1])
+
+	var str strings.Builder
+	_, err = io.CopyN(&str, c, size)
+	if err == io.EOF {
+		return "", io.ErrUnexpectedEOF
+	}
+	if err != nil {
+		return "", err
+	}
+	return str.String(), nil
 }

util/grpc/tracer.go

@@ -71,7 +71,7 @@ func (h *serverHandler) HandleRPC(ctx context.Context, rs stats.RPCStats) {
 }
 
 // TagConn can attach some information to the given context.
-func (h *serverHandler) TagConn(ctx context.Context, info *stats.ConnTagInfo) context.Context {
+func (h *serverHandler) TagConn(ctx context.Context, _ *stats.ConnTagInfo) context.Context {
 	if span, ok := tracer.SpanFromContext(ctx); ok {
 		attrs := peerAttr(peerFromCtx(ctx))
 		span.AddLabels(attrs...)
@@ -80,7 +80,7 @@ func (h *serverHandler) TagConn(ctx context.Context, info *stats.ConnTagInfo) co
 }
 
 // HandleConn processes the Conn stats.
-func (h *serverHandler) HandleConn(ctx context.Context, info stats.ConnStats) {
+func (h *serverHandler) HandleConn(_ context.Context, _ stats.ConnStats) {
 }
 
 type clientHandler struct {

util/http/trie.go

@@ -665,12 +665,12 @@ func patParamKeys(pattern string) ([]string, error) {
 // longestPrefix finds the length of the shared prefix
 // of two strings
 func longestPrefix(k1, k2 string) int {
-	max := len(k1)
+	maxLen := len(k1)
-	if l := len(k2); l < max {
+	if l := len(k2); l < maxLen {
-		max = l
+		maxLen = l
 	}
 	var i int
-	for i = 0; i < max; i++ {
+	for i = 0; i < maxLen; i++ {
 		if k1[i] != k2[i] {
 			break
 		}

util/jitter/random.go

@@ -14,7 +14,7 @@ func Random(d time.Duration) time.Duration {
 	return time.Duration(v)
 }
 
-func RandomInterval(min, max time.Duration) time.Duration {
+func RandomInterval(minTime, maxTime time.Duration) time.Duration {
 	var rng rand.Rand
-	return time.Duration(rng.Int63n(max.Nanoseconds()-min.Nanoseconds())+min.Nanoseconds()) * time.Nanosecond
+	return time.Duration(rng.Int63n(maxTime.Nanoseconds()-minTime.Nanoseconds())+minTime.Nanoseconds()) * time.Nanosecond
 }

util/jitter/ticker.go

@@ -16,7 +16,6 @@ type Ticker struct {
 	C    chan time.Time
 	min  int64
 	max  int64
-	exp  int64
 	exit bool
 	rng  rand.Rand
 }
@@ -24,12 +23,12 @@ type Ticker struct {
 // NewTickerContext returns a pointer to an initialized instance of the Ticker.
 // It works like NewTicker except that it has ability to close via context.
 // Also it works fine with context.WithTimeout to handle max time to run ticker.
-func NewTickerContext(ctx context.Context, min, max time.Duration) *Ticker {
+func NewTickerContext(ctx context.Context, minTime, maxTime time.Duration) *Ticker {
 	ticker := &Ticker{
 		C:    make(chan time.Time),
 		done: make(chan chan struct{}),
-		min:  min.Nanoseconds(),
+		min:  minTime.Nanoseconds(),
-		max:  max.Nanoseconds(),
+		max:  maxTime.Nanoseconds(),
 		ctx:  ctx,
 	}
 	go ticker.run()
@@ -39,12 +38,12 @@ func NewTickerContext(ctx context.Context, min, max time.Duration) *Ticker {
 // NewTicker returns a pointer to an initialized instance of the Ticker.
 // Min and max are durations of the shortest and longest allowed
 // ticks. Ticker will run in a goroutine until explicitly stopped.
-func NewTicker(min, max time.Duration) *Ticker {
+func NewTicker(minTime, maxTime time.Duration) *Ticker {
 	ticker := &Ticker{
 		C:    make(chan time.Time),
 		done: make(chan chan struct{}),
-		min:  min.Nanoseconds(),
+		min:  minTime.Nanoseconds(),
-		max:  max.Nanoseconds(),
+		max:  maxTime.Nanoseconds(),
 		ctx:  context.Background(),
 	}
 	go ticker.run()

util/jitter/ticker_test.go

@@ -31,26 +31,26 @@ loop:
 func TestTicker(t *testing.T) {
 	t.Parallel()
 
-	min := time.Duration(10)
+	minTime := time.Duration(10)
-	max := time.Duration(20)
+	maxTime := time.Duration(20)
 
 	// tick can take a little longer since we're not adjusting it to account for
 	// processing.
 	precision := time.Duration(4)
 
-	rt := NewTicker(min*time.Millisecond, max*time.Millisecond)
+	rt := NewTicker(minTime*time.Millisecond, maxTime*time.Millisecond)
 	for i := 0; i < 5; i++ {
 		t0 := time.Now()
 		t1 := <-rt.C
 		td := t1.Sub(t0)
-		if td < min*time.Millisecond {
+		if td < minTime*time.Millisecond {
 			t.Fatalf("tick was shorter than expected: %s", td)
-		} else if td > (max+precision)*time.Millisecond {
+		} else if td > (maxTime+precision)*time.Millisecond {
 			t.Fatalf("tick was longer than expected: %s", td)
 		}
 	}
 	rt.Stop()
-	time.Sleep((max + precision) * time.Millisecond)
+	time.Sleep((maxTime + precision) * time.Millisecond)
 	select {
 	case v, ok := <-rt.C:
 		if ok || !v.IsZero() {

util/net/net.go

@@ -48,19 +48,19 @@ func Listen(addr string, fn func(string) (net.Listener, error)) (net.Listener, e
 	// we have a port range
 
 	// extract min port
-	min, err := strconv.Atoi(prange[0])
+	minPort, err := strconv.Atoi(prange[0])
 	if err != nil {
 		return nil, errors.New("unable to extract port range")
 	}
 
 	// extract max port
-	max, err := strconv.Atoi(prange[1])
+	maxPort, err := strconv.Atoi(prange[1])
 	if err != nil {
 		return nil, errors.New("unable to extract port range")
 	}
 
 	// range the ports
-	for port := min; port <= max; port++ {
+	for port := minPort; port <= maxPort; port++ {
 		// try bind to host:port
 		ln, err := fn(HostPort(host, port))
 		if err == nil {
@@ -68,7 +68,7 @@ func Listen(addr string, fn func(string) (net.Listener, error)) (net.Listener, e
 		}
 
 		// hit max port
-		if port == max {
+		if port == maxPort {
 			return nil, err
 		}
 	}

util/reflect/path.go

@@ -155,7 +155,7 @@ func indexFunction(v reflect.Value) func(i int) reflect.Value {
 			return v.MapIndex(keys[i])
 		}
 	}
-	return func(i int) reflect.Value { return reflect.Value{} }
+	return func(_ int) reflect.Value { return reflect.Value{} }
 }
 
 func mergeValue(values []reflect.Value) reflect.Value {

util/reflect/reflect.go

@@ -91,7 +91,7 @@ func Merge(dst interface{}, mp map[string]interface{}, opts ...Option) error {
 	}
 
 	if mapper, ok := dst.(map[string]interface{}); ok {
-		dst = mergeMap(mapper, mp, 0)
+		mergeMap(mapper, mp, 0)
 		return nil
 	}
 

util/reflect/reflect_test.go

@@ -1,9 +1,38 @@
 package reflect
 
 import (
+	"fmt"
 	"testing"
 )
 
+func TestMergeMapStringInterface(t *testing.T) {
+	var dst interface{} //nolint:gosimple
+	dst = map[string]interface{}{
+		"xx": 11,
+	}
+
+	src := map[string]interface{}{
+		"zz": "aa",
+	}
+
+	if err := Merge(dst, src); err != nil {
+		t.Fatal(err)
+	}
+
+	mp, ok := dst.(map[string]interface{})
+	if !ok || mp == nil {
+		t.Fatalf("xxx %#+v\n", dst)
+	}
+
+	if fmt.Sprintf("%v", mp["xx"]) != "11" {
+		t.Fatalf("xxx zzzz %#+v", mp)
+	}
+
+	if fmt.Sprintf("%v", mp["zz"]) != "aa" {
+		t.Fatalf("xxx zzzz %#+v", mp)
+	}
+}
+
 func TestMergeMap(t *testing.T) {
 	src := map[string]interface{}{
 		"skey1": "sval1",
@@ -101,16 +130,16 @@ func TestMergeString(t *testing.T) {
 
 func TestMergeNested(t *testing.T) {
 	type CallReqNested struct {
+		Nested     *CallReqNested `json:"nested2"`
 		StringArgs []string       `json:"string_args"`
 		Uint64Args []uint64       `json:"uint64_args"`
-		Nested     *CallReqNested `json:"nested2"`
 	}
 
 	type CallReq struct {
+		Nested *CallReqNested `json:"nested"`
 		Name   string         `json:"name"`
 		Req    string         `json:"req"`
 		Arg2   int            `json:"arg2"`
-		Nested *CallReqNested `json:"nested"`
 	}
 
 	dst := &CallReq{

util/register/util.go

@@ -109,12 +109,11 @@ func Merge(olist []*register.Service, nlist []*register.Service) []*register.Ser
 				seen = true
 				srv = append(srv, sp)
 				break
-			} else {
-				sp := &register.Service{}
-				// make copy
-				*sp = *o
-				srv = append(srv, sp)
 			}
+			sp := &register.Service{}
+			// make copy
+			*sp = *o
+			srv = append(srv, sp)
 		}
 		if !seen {
 			srv = append(srv, Copy([]*register.Service{n})...)
@@ -153,14 +152,14 @@ func Remove(old, del []*register.Service) []*register.Service {
 
 // WaitService using register wait for service to appear with min/max interval for check and optional timeout.
 // Timeout can be 0 to wait infinitive.
-func WaitService(ctx context.Context, reg register.Register, name string, min time.Duration, max time.Duration, timeout time.Duration, opts ...register.LookupOption) error {
+func WaitService(ctx context.Context, reg register.Register, name string, minTime time.Duration, maxTime time.Duration, timeout time.Duration, opts ...register.LookupOption) error {
 	if timeout > 0 {
 		var cancel context.CancelFunc
 		ctx, cancel = context.WithTimeout(ctx, timeout)
 		defer cancel()
 	}
 
-	ticker := jitter.NewTickerContext(ctx, min, max)
+	ticker := jitter.NewTickerContext(ctx, minTime, maxTime)
 	defer ticker.Stop()
 
 	for {

util/ring/buffer.go

@@ -10,10 +10,11 @@ import (
 
 // Buffer is ring buffer
 type Buffer struct {
-	sync.RWMutex
 	streams map[string]*Stream
 	vals    []*Entry
 	size    int
+
+	sync.RWMutex
 }
 
 // Entry is ring buffer data entry

util/socket/pool.go

@@ -6,8 +6,8 @@ import (
 
 // Pool holds the socket pool
 type Pool struct {
-	sync.RWMutex
 	pool map[string]*Socket
+	sync.RWMutex
 }
 
 // Get socket from pool

util/sort/sort.go

@@ -1,7 +1,6 @@
 package sort
 
 import (
-	"fmt"
 	"sort"
 )
 
@@ -9,7 +8,7 @@ import (
 type byKey []interface{}
 
 func (k byKey) Len() int           { return len(k) / 2 }
-func (k byKey) Less(i, j int) bool { return fmt.Sprintf("%s", k[i*2]) < fmt.Sprintf("%s", k[j*2]) }
+func (k byKey) Less(i, j int) bool { return k[i*2].(string) < k[j*2].(string) }
 func (k byKey) Swap(i, j int) {
 	k[i*2], k[j*2] = k[j*2], k[i*2]
 	k[i*2+1], k[j*2+1] = k[j*2+1], k[i*2+1]

util/stream/stream.go

@@ -20,10 +20,11 @@ type Stream interface {
 }
 
 type stream struct {
-	sync.RWMutex
 	Stream
 	err     error
 	request *request
+
+	sync.RWMutex
 }
 
 type request struct {

util/structfs/metadata_digitalocean.go

@@ -10,11 +10,18 @@ import (
 type DigitalOceanMetadata struct {
 	Metadata struct {
 		V1 struct {
-			DropletID  int64    `json:"droplet_id"`
+			Features map[string]interface{} `json:"features"`
-			Hostname   string   `json:"hostname"`
+
-			VendorData string   `json:"vendor_data"`
+			Hostname   string `json:"hostname"`
+			VendorData string `json:"vendor_data"`
+			Region     string `json:"region"`
+
 			PublicKeys []string `json:"public_keys"`
-			Region     string   `json:"region"`
+
+			DNS struct {
+				Nameservers []string `json:"nameservers"`
+			} `json:"dns"`
+
 			Interfaces struct {
 				Private []struct {
 					IPv4 struct {
@@ -31,24 +38,23 @@ type DigitalOceanMetadata struct {
 						Netmask string `json:"netmask"`
 						Gateway string `json:"gateway"`
 					} `json:"ipv4"`
-					IPv6 struct {
-						Address string `json:"ip_address"`
-						CIDR    int    `json:"cidr"`
-						Gateway string `json:"gateway"`
-					} `json:"ipv6"`
 					Mac  string `json:"mac"`
 					Type string `json:"type"`
+					IPv6 struct {
+						Address string `json:"ip_address"`
+						Gateway string `json:"gateway"`
+						CIDR    int    `json:"cidr"`
+					} `json:"ipv6"`
 				} `json:"public"`
 			} `json:"interfaces"`
+
+			DropletID int64 `json:"droplet_id"`
+
 			FloatingIP struct {
 				IPv4 struct {
 					Active bool `json:"active"`
 				} `json:"ipv4"`
 			} `json:"floating_ip"`
-			DNS struct {
-				Nameservers []string `json:"nameservers"`
-			} `json:"dns"`
-			Features map[string]interface{} `json:"features"`
 		} `json:"v1"`
 	} `json:"metadata"`
 }
@@ -56,7 +62,7 @@ type DigitalOceanMetadata struct {
 func (stfs *DigitalOceanMetadata) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	switch r.URL.Path {
 	case "/metadata/v1.json":
-		json.NewEncoder(w).Encode(stfs.Metadata.V1)
+		_ = json.NewEncoder(w).Encode(stfs.Metadata.V1)
 	default:
 		fs := FileServer(stfs, "json", time.Now())
 		idx := strings.Index(r.URL.Path[1:], "/")

util/structfs/metadata_ec2.go

@@ -2,29 +2,29 @@ package structfs
 
 type EC2Metadata struct {
 	Latest struct {
+		Userdata string `json:"user-data"`
 		Metadata struct {
-			AMIID              int      `json:"ami-id"`
+			AMIManifestPath  string `json:"ami-manifest-path"`
-			AMILaunchIndex     int      `json:"ami-launch-index"`
+			InstanceType     string `json:"instance-type"`
-			AMIManifestPath    string   `json:"ami-manifest-path"`
+			LocalHostname    string `json:"local-hostname"`
-			AncestorAMIIDs     []int    `json:"ancestor-ami-ids"`
+			LocalIPv4        string `json:"local-ipv4"`
-			BlockDeviceMapping []string `json:"block-device-mapping"`
+			Placement        string `json:"placement"`
-			InstanceID         int      `json:"instance-id"`
+			AvailabilityZone string `json:"availability-zone"`
-			InstanceType       string   `json:"instance-type"`
+			ProductCodes     string `json:"product-codes"`
-			LocalHostname      string   `json:"local-hostname"`
+			PublicHostname   string `json:"public-hostname"`
-			LocalIPv4          string   `json:"local-ipv4"`
+			PublicIPv4       string `json:"public-ipv4"`
-			kernelID           int      `json:"kernel-id"`
+			PublicKeys       []struct {
-			Placement          string   `json:"placement"`
-			AvailabilityZone   string   `json:"availability-zone"`
-			ProductCodes       string   `json:"product-codes"`
-			PublicHostname     string   `json:"public-hostname"`
-			PublicIPv4         string   `json:"public-ipv4"`
-			PublicKeys         []struct {
 				Key []string `json:"-"`
 			} `json:"public-keys"`
-			RamdiskID      int      `json:"ramdisk-id"`
+			AncestorAMIIDs     []int    `json:"ancestor-ami-ids"`
-			ReservationID  int      `json:"reservation-id"`
+			BlockDeviceMapping []string `json:"block-device-mapping"`
-			SecurityGroups []string `json:"security-groups"`
+			SecurityGroups     []string `json:"security-groups"`
+			RamdiskID          int      `json:"ramdisk-id"`
+			ReservationID      int      `json:"reservation-id"`
+			AMIID              int      `json:"ami-id"`
+			AMILaunchIndex     int      `json:"ami-launch-index"`
+			KernelID           int      `json:"kernel-id"`
+			InstanceID         int      `json:"instance-id"`
 		} `json:"meta-data"`
-		Userdata string `json:"user-data"`
 	} `json:"latest"`
 }

util/structfs/structfs.go

@@ -27,7 +27,7 @@ func (fs *fs) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	f, err := fs.Open(r.URL.Path)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		w.Write([]byte(err.Error()))
+		_, _ = w.Write([]byte(err.Error()))
 		return
 	}
 	w.Header().Set("Content-Type", "application/octet-stream")
@@ -35,22 +35,22 @@ func (fs *fs) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 type fs struct {
+	modtime time.Time
 	iface   interface{}
 	tag     string
-	modtime time.Time
 }
 
 type file struct {
-	name    string
-	offset  int64
-	data    []byte
 	modtime time.Time
+	name    string
+	data    []byte
+	offset  int64
 }
 
 type fileInfo struct {
+	modtime time.Time
 	name    string
 	size    int64
-	modtime time.Time
 }
 
 func (fi *fileInfo) Sys() interface{} {
@@ -67,9 +67,9 @@ func (fi *fileInfo) Name() string {
 
 func (fi *fileInfo) Mode() os.FileMode {
 	if strings.HasSuffix(fi.name, "/") {
-		return os.FileMode(0755) | os.ModeDir
+		return os.FileMode(0o755) | os.ModeDir
 	}
-	return os.FileMode(0644)
+	return os.FileMode(0o644)
 }
 
 func (fi *fileInfo) IsDir() bool {
@@ -105,22 +105,21 @@ func (f *file) Read(b []byte) (int, error) {
 	return n, err
 }
 
-func (f *file) Readdir(count int) ([]os.FileInfo, error) {
+func (f *file) Readdir(_ int) ([]os.FileInfo, error) {
 	return nil, nil
 }
 
 func (f *file) Seek(offset int64, whence int) (int64, error) {
 	//	log.Printf("seek %d %d %s\n", offset, whence, f.name)
 	switch whence {
-	case os.SEEK_SET:
+	case io.SeekStart:
 		f.offset = offset
-	case os.SEEK_CUR:
+	case io.SeekCurrent:
 		f.offset += offset
-	case os.SEEK_END:
+	case io.SeekEnd:
 		f.offset = int64(len(f.data)) + offset
 	}
 	return f.offset, nil
-
 }
 
 func (f *file) Stat() (os.FileInfo, error) {
@@ -222,6 +221,7 @@ func getValue(name string, iface interface{}, tag string) ([]byte, error) {
 	return nil, fmt.Errorf("failed to find %s in interface %T", name, iface)
 }
 
+/*
 func hasValidType(obj interface{}, types []reflect.Kind) bool {
 	for _, t := range types {
 		if reflect.TypeOf(obj).Kind() == t {
@@ -231,6 +231,7 @@ func hasValidType(obj interface{}, types []reflect.Kind) bool {
 
 	return false
 }
+*/
 
 func reflectValue(obj interface{}) reflect.Value {
 	var val reflect.Value

util/structfs/structfs_test.go

@@ -2,7 +2,7 @@ package structfs
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"reflect"
 	"testing"
@@ -61,7 +61,7 @@ var doOrig = []byte(`{
 }
 `)
 
-func server(t *testing.T) {
+func server(t *testing.T, ch chan error) {
 	stfs := DigitalOceanMetadata{}
 	err := json.Unmarshal(doOrig, &stfs.Metadata.V1)
 	if err != nil {
@@ -71,7 +71,7 @@ func server(t *testing.T) {
 	http.Handle("/metadata/v1/", FileServer(&stfs, "json", time.Now()))
 	http.Handle("/metadata/v1.json", &stfs)
 	go func() {
-		t.Fatal(http.ListenAndServe("127.0.0.1:8080", nil))
+		ch <- http.ListenAndServe("127.0.0.1:8080", nil)
 	}()
 	time.Sleep(2 * time.Second)
 }
@@ -82,17 +82,18 @@ func get(path string) ([]byte, error) {
 		return nil, err
 	}
 	defer res.Body.Close()
-	return ioutil.ReadAll(res.Body)
+	return io.ReadAll(res.Body)
 }
 
 func TestAll(t *testing.T) {
-	server(t)
+	ch := make(chan error)
+	server(t, ch)
 
-	var tests = []struct {
+	tests := []struct {
 		in  string
 		out string
 	}{
-		{"http://127.0.0.1:8080/metadata/v1/", "droplet_id\nhostname\nvendor_data\npublic_keys\nregion\ninterfaces\nfloating_ip\ndns\nfeatures"},
+		{"http://127.0.0.1:8080/metadata/v1/", "features\nhostname\nvendor_data\nregion\npublic_keys\ndns\ninterfaces\ndroplet_id\nfloating_ip"},
 		{"http://127.0.0.1:8080/metadata/v1/droplet_id", "2756294"},
 		{"http://127.0.0.1:8080/metadata/v1/dns/", "nameservers"},
 		{"http://127.0.0.1:8080/metadata/v1/dns/nameservers", "2001:4860:4860::8844\n2001:4860:4860::8888\n8.8.8.8"},
@@ -100,34 +101,44 @@ func TestAll(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		buf, err := get(tt.in)
+		select {
+		case err := <-ch:
+			t.Fatal(err)
+		default:
+			buf, err := get(tt.in)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if string(buf) != tt.out {
+				t.Errorf("req %s output %s not match requested %s", tt.in, string(buf), tt.out)
+			}
+		}
+	}
+
+	select {
+	case err := <-ch:
+		t.Fatal(err)
+	default:
+		doTest, err := get("http://127.0.0.1:8080/metadata/v1.json")
 		if err != nil {
 			t.Fatal(err)
 		}
-		if string(buf) != tt.out {
+
-			t.Errorf("req %s output %s not match requested %s", tt.in, string(buf), tt.out)
+		oSt := DigitalOceanMetadata{}
+		err = json.Unmarshal(doOrig, &oSt.Metadata.V1)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		nSt := DigitalOceanMetadata{}
+
+		err = json.Unmarshal(doTest, &nSt.Metadata.V1)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !reflect.DeepEqual(oSt, nSt) {
+			t.Fatalf("%v not match %v", oSt, nSt)
 		}
 	}
-
-	doTest, err := get("http://127.0.0.1:8080/metadata/v1.json")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	oSt := DigitalOceanMetadata{}
-	err = json.Unmarshal(doOrig, &oSt.Metadata.V1)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	nSt := DigitalOceanMetadata{}
-
-	err = json.Unmarshal(doTest, &nSt.Metadata.V1)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !reflect.DeepEqual(oSt, nSt) {
-		t.Fatalf("%v not match %v", oSt, nSt)
-	}
 }

util/test/test.go

@@ -78,8 +78,8 @@ var (
 			for _, se := range st.Details() {
 				switch ne := se.(type) {
 				case proto.Message:
-					buf, err := testCodec.Marshal(ne)
+					var buf []byte
-					if err != nil {
+					if buf, err = testCodec.Marshal(ne); err != nil {
 						return fmt.Errorf("failed to marshal err: %w", err)
 					}
 					if err = testCodec.Unmarshal(buf, &testMap); err != nil {
@@ -438,10 +438,10 @@ func Run(ctx context.Context, c client.Client, m sqlmock.Sqlmock, dir string, ex
 }
 
 type Case struct {
-	dbfiles []string
 	reqfile string
 	rspfile string
 	errfile string
+	dbfiles []string
 }
 
 func GetCases(dir string, exts []string) ([]Case, error) {

util/text/text.go

@@ -1,6 +1,5 @@
 package text
 
-
 func DetectEncoding(text string) map[string]int {
 	charsets := map[string]int{
 		"UTF-8":      0,
@@ -19,7 +18,7 @@ func DetectEncoding(text string) map[string]int {
 	utfupper := 5
 	lowercase := 3
 	uppercase := 1
-	last_simb := 0
+	lastSimb := 0
 
 	for a := 0; a < len(text); a++ {
 		char := int(text[a])
@@ -30,10 +29,10 @@ func DetectEncoding(text string) map[string]int {
 		}
 
 		// UTF-8
-		if (last_simb == 208) && ((char > 143 && char < 176) || char == 129) {
+		if (lastSimb == 208) && ((char > 143 && char < 176) || char == 129) {
 			charsets["UTF-8"] += (utfupper * 2)
 		}
-		if ((last_simb == 208) && ((char > 175 && char < 192) || char == 145)) || (last_simb == 209 && char > 127 && char < 144) {
+		if ((lastSimb == 208) && ((char > 175 && char < 192) || char == 145)) || (lastSimb == 209 && char > 127 && char < 144) {
 			charsets["UTF-8"] += (utflower * 2)
 		}
 
@@ -77,7 +76,7 @@ func DetectEncoding(text string) map[string]int {
 			charsets["MAC"] += uppercase
 		}
 
-	  last_simb = char
+		lastSimb = char
 	}
 
 	return charsets