logger: add wrapper support

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

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Maintain dependencies for Golang
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/generate.sh

@@ -1,15 +0,0 @@
-#!/bin/bash -e
-
-find . -type f -name '*.pb.*.go' -o -name '*.pb.go' -a ! -name 'message.pb.go' -delete
-PROTOS=$(find . -type f -name '*.proto' | grep -v proto/google/api)
-
-mkdir -p proto/google/api
-curl -s -o proto/google/api/annotations.proto -L https://raw.githubusercontent.com/googleapis/googleapis/master/google/api/annotations.proto
-curl -s -o proto/google/api/http.proto -L https://raw.githubusercontent.com/googleapis/googleapis/master/google/api/http.proto
-
-for PROTO in $PROTOS; do
-  echo $PROTO
-  protoc -I./proto -I. -I$(dirname $PROTO) --go-grpc_out=paths=source_relative:. --go_out=paths=source_relative:. --micro_out=paths=source_relative:. $PROTO
-done
-
-rm -r proto

.github/renovate.json

@@ -1,20 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ],
-  "postUpdateOptions": ["gomodTidy"],
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true
-    },
-    {
-      "groupName": "all deps",
-      "separateMajorMinor": true,
-      "groupSlug": "all",
-      "packagePatterns": [
-        "*"
-      ]
-    }
-  ]
-}

.github/stale.sh

@@ -1,13 +0,0 @@
-#!/bin/bash -ex
-
-export PATH=$PATH:$(pwd)/bin
-export GO111MODULE=on
-export GOBIN=$(pwd)/bin
-
-#go get github.com/rvflash/goup@v0.4.1
-
-#goup -v ./...
-#go get github.com/psampaz/go-mod-outdated@v0.6.0
-go list -u -m -mod=mod -json all | go-mod-outdated -update -direct -ci || true
-
-#go list -u -m -json all | go-mod-outdated -update

.github/workflows/build.yml

@@ -53,7 +53,7 @@ jobs:
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
+          version: v1.39
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
           # Optional: golangci-lint command line arguments.

.github/workflows/pr.yml

@@ -53,7 +53,7 @@ jobs:
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
+          version: v1.39
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
           # Optional: golangci-lint command line arguments.

.golangci.yml

@@ -1,30 +1,44 @@
 run:
+  concurrency: 4
   deadline: 5m
-  modules-download-mode: readonly
+  issues-exit-code: 1
-  skip-files:
+  tests: true
-    - ".*\\.pb\\.go$"
+
-    - ".*\\.pb\\.micro\\.go$"
+linters-settings:
+  govet:
+    check-shadowing: true
+    enable:
+      - fieldalignment
+
 linters:
-  disable-all: false
-  enable-all: false
   enable:
-    - megacheck
-    - staticcheck
-    - deadcode
-    - varcheck
-    - gosimple
-    - unused
-    - prealloc
-    - scopelint
-    - gocritic
-    - goimports
-    - unconvert
     - govet
-    - nakedret
+    - deadcode
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
     - structcheck
-    - gosec
-  disable:
-    - maligned
-    - interfacer
     - typecheck
-    - dupl
+    - unused
+    - varcheck
+    - bodyclose
+    - gci
+    - goconst
+    - gocritic
+    - gosimple
+    - gofmt
+    - gofumpt
+    - goimports
+    - golint
+    - gosec
+    - makezero
+    - misspell
+    - nakedret
+    - nestif
+    - nilerr
+    - noctx
+    - prealloc
+    - unconvert
+    - unparam
+  disable-all: false

api/api_test.go

@@ -149,5 +149,4 @@ func TestValidate(t *testing.T) {
 	if err := Validate(epPcreInvalid); err == nil {
 		t.Fatalf("invalid pcre %v", epPcreInvalid.Path[0])
 	}
-
 }

api/handler/options.go

@@ -6,10 +6,8 @@ import (
 	"github.com/unistack-org/micro/v3/logger"
 )
 
-var (
+// DefaultMaxRecvSize specifies max recv size for handler
-	// DefaultMaxRecvSize specifies max recv size for handler
+var DefaultMaxRecvSize int64 = 1024 * 1024 * 100 // 10Mb
-	DefaultMaxRecvSize int64 = 1024 * 1024 * 100 // 10Mb
-)
 
 // Options struct holds handler options
 type Options struct {

api/resolver/subdomain/subdomain.go

@@ -15,12 +15,12 @@ import (
 // NewResolver creates new subdomain api resolver
 func NewResolver(parent resolver.Resolver, opts ...resolver.Option) resolver.Resolver {
 	options := resolver.NewOptions(opts...)
-	return &subdomainResolver{options, parent}
+	return &subdomainResolver{opts: options, Resolver: parent}
 }
 
 type subdomainResolver struct {
-	opts resolver.Options
 	resolver.Resolver
+	opts resolver.Options
 }
 
 // Resolve resolve endpoint based on subdomain

api/resolver/vpath/vpath.go

@@ -19,9 +19,7 @@ type vpathResolver struct {
 	opts resolver.Options
 }
 
-var (
+var re = regexp.MustCompile("^v[0-9]+$")
-	re = regexp.MustCompile("^v[0-9]+$")
-)
 
 // Resolve endpoint
 func (r *vpathResolver) Resolve(req *http.Request, opts ...resolver.ResolveOption) (*resolver.Endpoint, error) {

api/router/router.go

@@ -7,10 +7,8 @@ import (
 	"github.com/unistack-org/micro/v3/api"
 )
 
-var (
+// DefaultRouter contains default router implementation
-	// DefaultRouter contains default router implementation
+var DefaultRouter Router
-	DefaultRouter Router
-)
 
 // Router is used to determine an endpoint for a request
 type Router interface {

auth/rules_test.go

@@ -24,11 +24,11 @@ func TestVerify(t *testing.T) {
 	}
 
 	tt := []struct {
-		Name     string
+		Error    error
-		Rules    []*Rule
 		Account  *Account
 		Resource *Resource
-		Error    error
+		Name     string
+		Rules    []*Rule
 	}{
 		{
 			Name:     "NoRules",

broker/broker.go

@@ -3,14 +3,13 @@ package broker
 
 import (
 	"context"
+	"errors"
 
 	"github.com/unistack-org/micro/v3/metadata"
 )
 
-var (
+// DefaultBroker default broker
-	// DefaultBroker default broker
+var DefaultBroker Broker = NewBroker()
-	DefaultBroker Broker = NewBroker()
-)
 
 // Broker is an interface used for asynchronous messaging.
 type Broker interface {
@@ -36,10 +35,31 @@ type Event interface {
 	Error() error
 }
 
+// RawMessage is a raw encoded JSON value.
+// It implements Marshaler and Unmarshaler and can be used to delay decoding or precompute a encoding.
+type RawMessage []byte
+
+// MarshalJSON returns m as the JSON encoding of m.
+func (m *RawMessage) MarshalJSON() ([]byte, error) {
+	if m == nil {
+		return []byte("null"), nil
+	}
+	return *m, nil
+}
+
+// UnmarshalJSON sets *m to a copy of data.
+func (m *RawMessage) UnmarshalJSON(data []byte) error {
+	if m == nil {
+		return errors.New("RawMessage UnmarshalJSON on nil pointer")
+	}
+	*m = append((*m)[0:0], data...)
+	return nil
+}
+
 // Message is used to transfer data
 type Message struct {
 	Header metadata.Metadata // contains message metadata
-	Body   []byte            // contains message body
+	Body   RawMessage        // contains message body
 }
 
 // Subscriber is a convenience return type for the Subscribe method

broker/memory.go

@@ -13,27 +13,27 @@ import (
 )
 
 type memoryBroker struct {
-	opts        Options
 	Subscribers map[string][]*memorySubscriber
 	addr        string
+	opts        Options
 	sync.RWMutex
 	connected bool
 }
 
 type memoryEvent struct {
-	opts    Options
 	err     error
 	message interface{}
 	topic   string
+	opts    Options
 }
 
 type memorySubscriber struct {
-	opts    SubscribeOptions
 	ctx     context.Context
 	exit    chan bool
 	handler Handler
 	id      string
 	topic   string
+	opts    SubscribeOptions
 }
 
 func (m *memoryBroker) Options() Options {

broker/memory_test.go

@@ -32,7 +32,7 @@ func TestMemoryBroker(t *testing.T) {
 				"foo": "bar",
 				"id":  fmt.Sprintf("%d", i),
 			},
-			Body: []byte(`hello world`),
+			Body: []byte(`"hello world"`),
 		}
 
 		if err := b.Publish(ctx, topic, message); err != nil {

client/noop.go

@@ -9,16 +9,10 @@ import (
 	"github.com/unistack-org/micro/v3/metadata"
 )
 
-var (
+// DefaultCodecs will be used to encode/decode data
-	// DefaultCodecs will be used to encode/decode data
+var DefaultCodecs = map[string]codec.Codec{
-	DefaultCodecs = map[string]codec.Codec{
+	"application/octet-stream": codec.NewCodec(),
-		//"application/json":         cjson.NewCodec,
+}
-		//"application/json-rpc":     cjsonrpc.NewCodec,
-		//"application/protobuf":     cproto.NewCodec,
-		//"application/proto-rpc":    cprotorpc.NewCodec,
-		"application/octet-stream": codec.NewCodec(),
-	}
-)
 
 type noopClient struct {
 	opts Options
@@ -227,5 +221,8 @@ func (n *noopClient) Publish(ctx context.Context, p Message, opts ...PublishOpti
 	return n.opts.Broker.Publish(ctx, topic, &broker.Message{
 		Header: md,
 		Body:   body,
-	}, broker.PublishContext(options.Context))
+	},
+		broker.PublishContext(options.Context),
+		broker.PublishBodyOnly(options.BodyOnly),
+	)
 }

client/options.go

@@ -19,8 +19,8 @@ import (
 
 // Options holds client options
 type Options struct {
-	// CallOptions contains default CallOptions
+	// Selector used to select needed address
-	CallOptions CallOptions
+	Selector selector.Selector
 	// Logger used to log messages
 	Logger logger.Logger
 	// Tracer used for tracing
@@ -31,30 +31,30 @@ type Options struct {
 	Meter meter.Meter
 	// Router used to get route
 	Router router.Router
-	// Selector used to select needed address
-	Selector selector.Selector
 	// Transport used for transfer messages
 	Transport transport.Transport
 	// Context is used for external options
 	Context context.Context
-	// Codecs map
-	Codecs map[string]codec.Codec
 	// Lookup func used to get destination addr
 	Lookup LookupFunc
+	// Codecs map
+	Codecs map[string]codec.Codec
+	// TLSConfig specifies tls.Config for secure connection
+	TLSConfig *tls.Config
 	// Proxy is used for proxy requests
 	Proxy string
-	// ContentType is Used to select codec
+	// ContentType is used to select codec
 	ContentType string
 	// Name is the client name
 	Name string
 	// Wrappers contains wrappers
 	Wrappers []Wrapper
+	// CallOptions contains default CallOptions
+	CallOptions CallOptions
 	// PoolSize connection pool size
 	PoolSize int
 	// PoolTTL connection pool ttl
 	PoolTTL time.Duration
-	// TLSConfig specifies tls.Config for secure connection
-	TLSConfig *tls.Config
 }
 
 // NewCallOptions creates new call options struct
@@ -118,6 +118,8 @@ func NewPublishOptions(opts ...PublishOption) PublishOptions {
 
 // PublishOptions holds publish options
 type PublishOptions struct {
+	// BodyOnly will publish only message body
+	BodyOnly bool
 	// Context used for external options
 	Context context.Context
 	// Exchange topic exchange name
@@ -377,6 +379,13 @@ func WithExchange(e string) PublishOption {
 	}
 }
 
+// WithBodyOnly publish only message body
+func WithBodyOnly(b bool) PublishOption {
+	return func(o *PublishOptions) {
+		o.BodyOnly = b
+	}
+}
+
 // PublishContext sets the context in publish options
 func PublishContext(ctx context.Context) PublishOption {
 	return func(o *PublishOptions) {

client/test_request.go

@@ -5,13 +5,13 @@ import (
 )
 
 type testRequest struct {
-	opts        RequestOptions
 	codec       codec.Codec
 	body        interface{}
+	service     string
 	method      string
 	endpoint    string
 	contentType string
-	service     string
+	opts        RequestOptions
 }
 
 func (r *testRequest) ContentType() string {

codec/codec.go

@@ -28,6 +28,8 @@ var (
 	DefaultMaxMsgSize int = 1024 * 1024 * 4 // 4Mb
 	// DefaultCodec is the global default codec
 	DefaultCodec Codec = NewCodec()
+	// DefaultTagName specifies struct tag name to control codec Marshal/Unmarshal
+	DefaultTagName = "codec"
 )
 
 // MessageType specifies message type for codec

codec/noop.go

@@ -5,8 +5,7 @@ import (
 	"io"
 )
 
-type noopCodec struct {
+type noopCodec struct{}
-}
 
 func (c *noopCodec) ReadHeader(conn io.Reader, m *Message, t MessageType) error {
 	return nil

config/config.go

@@ -6,10 +6,8 @@ import (
 	"errors"
 )
 
-var (
+// DefaultConfig default config
-	// DefaultConfig default config
+var DefaultConfig Config = NewConfig()
-	DefaultConfig Config = NewConfig()
-)
 
 var (
 	// ErrCodecMissing is returned when codec needed and not specified
@@ -22,34 +20,36 @@ var (
 
 // Config is an interface abstraction for dynamic configuration
 type Config interface {
+	// Name returns name of config
 	Name() string
 	// Init the config
 	Init(opts ...Option) error
 	// Options in the config
 	Options() Options
 	// Load config from sources
-	Load(context.Context) error
+	Load(context.Context, ...LoadOption) error
 	// Save config to sources
-	Save(context.Context) error
+	Save(context.Context, ...SaveOption) error
 	// Watch a value for changes
-	//	Watch(interface{}) (Watcher, error)
+	//Watch(context.Context) (Watcher, error)
+	// String returns config type name
 	String() string
 }
 
 // Watcher is the config watcher
-//type Watcher interface {
+type Watcher interface {
-//	Next() (, error)
+	// Next() (, error)
-//	Stop() error
+	Stop() error
-//}
+}
 
 // Load loads config from config sources
-func Load(ctx context.Context, cs ...Config) error {
+func Load(ctx context.Context, cs []Config, opts ...LoadOption) error {
 	var err error
 	for _, c := range cs {
 		if err = c.Init(); err != nil {
 			return err
 		}
-		if err = c.Load(ctx); err != nil {
+		if err = c.Load(ctx, opts...); err != nil {
 			return err
 		}
 	}

config/default.go

@@ -25,18 +25,27 @@ func (c *defaultConfig) Init(opts ...Option) error {
 	return nil
 }
 
-func (c *defaultConfig) Load(ctx context.Context) error {
+func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error {
 	for _, fn := range c.opts.BeforeLoad {
 		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
 			return err
 		}
 	}
 
+	options := NewLoadOptions(opts...)
+	mopts := []func(*mergo.Config){mergo.WithTypeCheck}
+	if options.Override {
+		mopts = append(mopts, mergo.WithOverride)
+	}
+	if options.Append {
+		mopts = append(mopts, mergo.WithAppendSlice)
+	}
+
 	src, err := rutil.Zero(c.opts.Struct)
 	if err == nil {
 		valueOf := reflect.ValueOf(src)
-		if err = c.fillValues(ctx, valueOf); err == nil {
+		if err = c.fillValues(valueOf); err == nil {
-			err = mergo.Merge(c.opts.Struct, src, mergo.WithOverride, mergo.WithTypeCheck, mergo.WithAppendSlice)
+			err = mergo.Merge(c.opts.Struct, src, mopts...)
 		}
 	}
 
@@ -54,7 +63,7 @@ func (c *defaultConfig) Load(ctx context.Context) error {
 }
 
 //nolint:gocyclo
-func (c *defaultConfig) fillValue(ctx context.Context, value reflect.Value, val string) error {
+func (c *defaultConfig) fillValue(value reflect.Value, val string) error {
 	if !rutil.IsEmpty(value) {
 		return nil
 	}
@@ -71,10 +80,10 @@ func (c *defaultConfig) fillValue(ctx context.Context, value reflect.Value, val
 			kv := strings.FieldsFunc(nval, func(c rune) bool { return c == '=' })
 			mkey := reflect.Indirect(reflect.New(kt))
 			mval := reflect.Indirect(reflect.New(et))
-			if err := c.fillValue(ctx, mkey, kv[0]); err != nil {
+			if err := c.fillValue(mkey, kv[0]); err != nil {
 				return err
 			}
-			if err := c.fillValue(ctx, mval, kv[1]); err != nil {
+			if err := c.fillValue(mval, kv[1]); err != nil {
 				return err
 			}
 			value.SetMapIndex(mkey, mval)
@@ -84,7 +93,7 @@ func (c *defaultConfig) fillValue(ctx context.Context, value reflect.Value, val
 		value.Set(reflect.MakeSlice(reflect.SliceOf(value.Type().Elem()), len(nvals), len(nvals)))
 		for idx, nval := range nvals {
 			nvalue := reflect.Indirect(reflect.New(value.Type().Elem()))
-			if err := c.fillValue(ctx, nvalue, nval); err != nil {
+			if err := c.fillValue(nvalue, nval); err != nil {
 				return err
 			}
 			value.Index(idx).Set(nvalue)
@@ -173,7 +182,7 @@ func (c *defaultConfig) fillValue(ctx context.Context, value reflect.Value, val
 	return nil
 }
 
-func (c *defaultConfig) fillValues(ctx context.Context, valueOf reflect.Value) error {
+func (c *defaultConfig) fillValues(valueOf reflect.Value) error {
 	var values reflect.Value
 
 	if valueOf.Kind() == reflect.Ptr {
@@ -200,7 +209,7 @@ func (c *defaultConfig) fillValues(ctx context.Context, valueOf reflect.Value) e
 		switch value.Kind() {
 		case reflect.Struct:
 			value.Set(reflect.Indirect(reflect.New(value.Type())))
-			if err := c.fillValues(ctx, value); err != nil {
+			if err := c.fillValues(value); err != nil {
 				return err
 			}
 			continue
@@ -214,7 +223,7 @@ func (c *defaultConfig) fillValues(ctx context.Context, valueOf reflect.Value) e
 				value.Set(reflect.New(value.Type().Elem()))
 			}
 			value = value.Elem()
-			if err := c.fillValues(ctx, value); err != nil {
+			if err := c.fillValues(value); err != nil {
 				return err
 			}
 			continue
@@ -224,7 +233,7 @@ func (c *defaultConfig) fillValues(ctx context.Context, valueOf reflect.Value) e
 			continue
 		}
 
-		if err := c.fillValue(ctx, value, tag); err != nil {
+		if err := c.fillValue(value, tag); err != nil {
 			return err
 		}
 	}
@@ -232,7 +241,7 @@ func (c *defaultConfig) fillValues(ctx context.Context, valueOf reflect.Value) e
 	return nil
 }
 
-func (c *defaultConfig) Save(ctx context.Context) error {
+func (c *defaultConfig) Save(ctx context.Context, opts ...SaveOption) error {
 	for _, fn := range c.opts.BeforeSave {
 		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
 			return err

config/default_test.go

@@ -10,30 +10,30 @@ import (
 
 type Cfg struct {
 	StringValue string `default:"string_value"`
-	IntValue    int    `default:"99"`
 	IgnoreValue string `json:"-"`
 	StructValue struct {
 		StringValue string `default:"string_value"`
 	}
+	IntValue int `default:"99"`
 }
 
 func TestDefault(t *testing.T) {
 	ctx := context.Background()
 	conf := &Cfg{IntValue: 10}
 	blfn := func(ctx context.Context, cfg config.Config) error {
-		conf, ok := cfg.Options().Struct.(*Cfg)
+		nconf, ok := cfg.Options().Struct.(*Cfg)
 		if !ok {
 			return fmt.Errorf("failed to get Struct from options: %v", cfg.Options())
 		}
-		conf.StringValue = "before_load"
+		nconf.StringValue = "before_load"
 		return nil
 	}
 	alfn := func(ctx context.Context, cfg config.Config) error {
-		conf, ok := cfg.Options().Struct.(*Cfg)
+		nconf, ok := cfg.Options().Struct.(*Cfg)
 		if !ok {
 			return fmt.Errorf("failed to get Struct from options: %v", cfg.Options())
 		}
-		conf.StringValue = "after_load"
+		nconf.StringValue = "after_load"
 		return nil
 	}
 

config/options.go

@@ -57,6 +57,52 @@ func NewOptions(opts ...Option) Options {
 	return options
 }
 
+// LoadOption function signature
+type LoadOption func(o *LoadOptions)
+
+// LoadOptions struct
+type LoadOptions struct {
+	Override bool
+	Append   bool
+}
+
+func NewLoadOptions(opts ...LoadOption) LoadOptions {
+	options := LoadOptions{}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
+// LoadOverride override values when load
+func LoadOverride(b bool) LoadOption {
+	return func(o *LoadOptions) {
+		o.Override = b
+	}
+}
+
+// LoadAppend override values when load
+func LoadAppend(b bool) LoadOption {
+	return func(o *LoadOptions) {
+		o.Append = b
+	}
+}
+
+// SaveOption function signature
+type SaveOption func(o *SaveOptions)
+
+// SaveOptions struct
+type SaveOptions struct {
+}
+
+func NewSaveOptions(opts ...SaveOption) SaveOptions {
+	options := SaveOptions{}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
 // AllowFail allows config source to fail
 func AllowFail(b bool) Option {
 	return func(o *Options) {

config/reflect_test.go

@@ -7,9 +7,9 @@ import (
 )
 
 type Config struct {
-	Value     string
 	SubConfig *SubConfig
 	Config    *Config
+	Value     string
 }
 
 type SubConfig struct {

errors/errors_test.go

@@ -17,7 +17,6 @@ func TestFromError(t *testing.T) {
 	if merr.Id != "go.micro.test" || merr.Code != 404 {
 		t.Fatalf("invalid conversation %v != %v", err, merr)
 	}
-
 }
 
 func TestEqual(t *testing.T) {
@@ -32,7 +31,6 @@ func TestEqual(t *testing.T) {
 	if Equal(err1, err3) {
 		t.Fatal("errors must be not equal")
 	}
-
 }
 
 func TestErrors(t *testing.T) {

flow/context.go

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

flow/dag_test.go

@@ -44,10 +44,10 @@ func TestDag(t *testing.T) {
 	var steps [][]string
 	fn := func(n dag.Vertex, idx int) error {
 		if idx == 0 {
-			steps = make([][]string, 1, 1)
+			steps = make([][]string, 1)
 			steps[0] = make([]string, 0, 1)
 		} else if idx >= len(steps) {
-			tsteps := make([][]string, idx+1, idx+1)
+			tsteps := make([][]string, idx+1)
 			copy(tsteps, steps)
 			steps = tsteps
 			steps[idx] = make([]string, 0, 1)

flow/default.go

@@ -0,0 +1,319 @@
+package flow
+
+import (
+	"context"
+	"fmt"
+	"sync"
+
+	"github.com/google/uuid"
+	"github.com/silas/dag"
+	"github.com/unistack-org/micro/v3/client"
+	"github.com/unistack-org/micro/v3/codec"
+)
+
+type microFlow struct {
+	opts Options
+}
+
+type microWorkflow struct {
+	id   string
+	g    *dag.AcyclicGraph
+	init bool
+	sync.RWMutex
+	opts  Options
+	steps map[string]Step
+}
+
+func (w *microWorkflow) ID() string {
+	return w.id
+}
+
+func (w *microWorkflow) Steps() [][]Step {
+	return nil
+}
+
+func (w *microWorkflow) AppendSteps(ctx context.Context, steps ...Step) error {
+	return nil
+}
+
+func (w *microWorkflow) RemoveSteps(ctx context.Context, steps ...Step) error {
+	return nil
+}
+
+func (w *microWorkflow) Execute(ctx context.Context, req interface{}, opts ...ExecuteOption) (string, error) {
+	w.Lock()
+	if !w.init {
+		if err := w.g.Validate(); err != nil {
+			w.Unlock()
+			return "", err
+		}
+		w.g.TransitiveReduction()
+		w.init = true
+	}
+	w.Unlock()
+
+	uid, err := uuid.NewRandom()
+	if err != nil {
+		return "", err
+	}
+
+	options := NewExecuteOptions(opts...)
+	var steps [][]Step
+	fn := func(n dag.Vertex, idx int) error {
+		if idx == 0 {
+			steps = make([][]Step, 1)
+			steps[0] = make([]Step, 0, 1)
+		} else if idx >= len(steps) {
+			tsteps := make([][]Step, idx+1)
+			copy(tsteps, steps)
+			steps = tsteps
+			steps[idx] = make([]Step, 0, 1)
+		}
+		steps[idx] = append(steps[idx], n.(Step))
+		return nil
+	}
+
+	var root dag.Vertex
+	if options.Start != "" {
+		var ok bool
+		w.RLock()
+		root, ok = w.steps[options.Start]
+		w.RUnlock()
+		if !ok {
+			return "", ErrStepNotExists
+		}
+	} else {
+		root, err = w.g.Root()
+		if err != nil {
+			return "", err
+		}
+	}
+	if options.Reverse {
+		err = w.g.SortedReverseDepthFirstWalk([]dag.Vertex{root}, fn)
+	} else {
+		err = w.g.SortedDepthFirstWalk([]dag.Vertex{root}, fn)
+	}
+	if err != nil {
+		return "", err
+	}
+
+	var wg sync.WaitGroup
+	cherr := make(chan error, 1)
+	defer close(cherr)
+
+	nctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+	nopts := make([]ExecuteOption, 0, len(opts)+5)
+	nopts = append(nopts, ExecuteClient(w.opts.Client), ExecuteTracer(w.opts.Tracer), ExecuteLogger(w.opts.Logger), ExecuteMeter(w.opts.Meter), ExecuteStore(w.opts.Store))
+
+	go func() {
+		for idx := range steps {
+			wg.Add(len(steps[idx]))
+			for nidx := range steps[idx] {
+				go func(step Step) {
+					defer wg.Done()
+					if err = step.Execute(nctx, req, nopts...); err != nil {
+						cherr <- err
+						cancel()
+					}
+				}(steps[idx][nidx])
+			}
+			wg.Wait()
+		}
+		cherr <- nil
+	}()
+
+	err = <-cherr
+
+	return uid.String(), err
+}
+
+func NewFlow(opts ...Option) Flow {
+	options := NewOptions(opts...)
+	return &microFlow{opts: options}
+}
+
+func (f *microFlow) Options() Options {
+	return f.opts
+}
+
+func (f *microFlow) Init(opts ...Option) error {
+	for _, o := range opts {
+		o(&f.opts)
+	}
+	if err := f.opts.Client.Init(); err != nil {
+		return err
+	}
+	if err := f.opts.Tracer.Init(); err != nil {
+		return err
+	}
+	if err := f.opts.Logger.Init(); err != nil {
+		return err
+	}
+	if err := f.opts.Meter.Init(); err != nil {
+		return err
+	}
+	if err := f.opts.Store.Init(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (f *microFlow) WorkflowList(ctx context.Context) ([]Workflow, error) {
+	return nil, nil
+}
+
+func (f *microFlow) WorkflowCreate(ctx context.Context, id string, steps ...Step) (Workflow, error) {
+	w := &microWorkflow{opts: f.opts, id: id, g: &dag.AcyclicGraph{}, steps: make(map[string]Step, len(steps))}
+
+	for _, s := range steps {
+		w.steps[s.String()] = s
+		w.g.Add(s)
+	}
+
+	for _, dst := range steps {
+		for _, req := range dst.Requires() {
+			src, ok := w.steps[req]
+			if !ok {
+				return nil, ErrStepNotExists
+			}
+			w.g.Connect(dag.BasicEdge(src, dst))
+		}
+	}
+
+	if err := w.g.Validate(); err != nil {
+		return nil, err
+	}
+	w.g.TransitiveReduction()
+
+	w.init = true
+
+	return w, nil
+}
+
+func (f *microFlow) WorkflowRemove(ctx context.Context, id string) error {
+	return nil
+}
+
+func (f *microFlow) WorkflowSave(ctx context.Context, w Workflow) error {
+	return nil
+}
+
+func (f *microFlow) WorkflowLoad(ctx context.Context, id string) (Workflow, error) {
+	return nil, nil
+}
+
+type microCallStep struct {
+	opts    StepOptions
+	service string
+	method  string
+}
+
+func (s *microCallStep) ID() string {
+	return s.String()
+}
+
+func (s *microCallStep) Options() StepOptions {
+	return s.opts
+}
+
+func (s *microCallStep) Endpoint() string {
+	return s.method
+}
+
+func (s *microCallStep) Requires() []string {
+	return s.opts.Requires
+}
+
+func (s *microCallStep) Require(steps ...Step) error {
+	for _, step := range steps {
+		s.opts.Requires = append(s.opts.Requires, step.String())
+	}
+	return nil
+}
+
+func (s *microCallStep) String() string {
+	if s.opts.ID != "" {
+		return s.opts.ID
+	}
+	return fmt.Sprintf("%s.%s", s.service, s.method)
+}
+
+func (s *microCallStep) Name() string {
+	return s.String()
+}
+
+func (s *microCallStep) Hashcode() interface{} {
+	return s.String()
+}
+
+func (s *microCallStep) Execute(ctx context.Context, req interface{}, opts ...ExecuteOption) error {
+	options := NewExecuteOptions(opts...)
+	if options.Client == nil {
+		return fmt.Errorf("client not set")
+	}
+	rsp := &codec.Frame{}
+	copts := []client.CallOption{client.WithRetries(0)}
+	if options.Timeout > 0 {
+		copts = append(copts, client.WithRequestTimeout(options.Timeout), client.WithDialTimeout(options.Timeout))
+	}
+	err := options.Client.Call(ctx, options.Client.NewRequest(s.service, s.method, req), rsp)
+	return err
+}
+
+type microPublishStep struct {
+	opts  StepOptions
+	topic string
+}
+
+func (s *microPublishStep) ID() string {
+	return s.String()
+}
+
+func (s *microPublishStep) Options() StepOptions {
+	return s.opts
+}
+
+func (s *microPublishStep) Endpoint() string {
+	return s.topic
+}
+
+func (s *microPublishStep) Requires() []string {
+	return s.opts.Requires
+}
+
+func (s *microPublishStep) Require(steps ...Step) error {
+	for _, step := range steps {
+		s.opts.Requires = append(s.opts.Requires, step.String())
+	}
+	return nil
+}
+
+func (s *microPublishStep) String() string {
+	if s.opts.ID != "" {
+		return s.opts.ID
+	}
+	return fmt.Sprintf("%s", s.topic)
+}
+
+func (s *microPublishStep) Name() string {
+	return s.String()
+}
+
+func (s *microPublishStep) Hashcode() interface{} {
+	return s.String()
+}
+
+func (s *microPublishStep) Execute(ctx context.Context, req interface{}, opts ...ExecuteOption) error {
+	return nil
+}
+
+func NewCallStep(service string, method string, opts ...StepOption) Step {
+	options := NewStepOptions(opts...)
+	return &microCallStep{service: service, method: method, opts: options}
+}
+
+func NewPublishStep(topic string, opts ...StepOption) Step {
+	options := NewStepOptions(opts...)
+	return &microPublishStep{topic: topic, opts: options}
+}

flow/flow.go

@@ -1,7 +1,59 @@
-// Package flow is an interface used for saga pattern messaging
+// Package flow is an interface used for saga pattern microservice workflow
 package flow
 
+import (
+	"context"
+	"errors"
+)
+
+var (
+	ErrStepNotExists = errors.New("step not exists")
+)
+
+// Step represents dedicated workflow step
 type Step interface {
-	// Endpoint returns service_name.service_method
+	// ID returns step id
+	ID() string
+	// Endpoint returns rpc endpoint service_name.service_method or broker topic
 	Endpoint() string
+	// Execute step run
+	Execute(ctx context.Context, req interface{}, opts ...ExecuteOption) error
+	// Requires returns dependent steps
+	Requires() []string
+	// Options returns step options
+	Options() StepOptions
+	// Require add required steps
+	Require(steps ...Step) error
+	// String
+	String() string
+}
+
+// Workflow contains all steps to execute
+type Workflow interface {
+	// ID returns id of the workflow
+	ID() string
+	// Steps returns steps slice where parallel steps returned on the same level
+	Steps() [][]Step
+	// Execute workflow with args, return execution id and error
+	Execute(ctx context.Context, req interface{}, opts ...ExecuteOption) (string, error)
+	// RemoveSteps remove steps from workflow
+	RemoveSteps(ctx context.Context, steps ...Step) error
+	// AppendSteps append steps to workflow
+	AppendSteps(ctx context.Context, steps ...Step) error
+}
+
+// Flow the base interface to interact with workflows
+type Flow interface {
+	// Options returns options
+	Options() Options
+	// Init initialize
+	Init(...Option) error
+	// WorkflowCreate creates new workflow with specific id and steps
+	WorkflowCreate(ctx context.Context, id string, steps ...Step) (Workflow, error)
+	// WorkflowSave saves workflow
+	WorkflowSave(ctx context.Context, w Workflow) error
+	// WorkflowLoad loads workflow with specific id
+	WorkflowLoad(ctx context.Context, id string) (Workflow, error)
+	// WorkflowList lists all workflows
+	WorkflowList(ctx context.Context) ([]Workflow, error)
 }

flow/options.go

@@ -0,0 +1,222 @@
+package flow
+
+import (
+	"context"
+	"time"
+
+	"github.com/unistack-org/micro/v3/client"
+	"github.com/unistack-org/micro/v3/logger"
+	"github.com/unistack-org/micro/v3/meter"
+	"github.com/unistack-org/micro/v3/store"
+	"github.com/unistack-org/micro/v3/tracer"
+)
+
+// Option func
+type Option func(*Options)
+
+// Options server struct
+type Options struct {
+	// Context holds the external options and can be used for flow shutdown
+	Context context.Context
+	// Client holds the client.Client
+	Client client.Client
+	// Tracer holds the tracer
+	Tracer tracer.Tracer
+	// Logger holds the logger
+	Logger logger.Logger
+	// Meter holds the meter
+	Meter meter.Meter
+	// Store used for intermediate results
+	Store store.Store
+}
+
+// NewOptions returns new options struct with default or passed values
+func NewOptions(opts ...Option) Options {
+	options := Options{
+		Context: context.Background(),
+		Logger:  logger.DefaultLogger,
+		Meter:   meter.DefaultMeter,
+		Tracer:  tracer.DefaultTracer,
+		Client:  client.DefaultClient,
+	}
+
+	for _, o := range opts {
+		o(&options)
+	}
+
+	return options
+}
+
+// Logger sets the logger option
+func Logger(l logger.Logger) Option {
+	return func(o *Options) {
+		o.Logger = l
+	}
+}
+
+// Meter sets the meter option
+func Meter(m meter.Meter) Option {
+	return func(o *Options) {
+		o.Meter = m
+	}
+}
+
+// Client to use for sync/async communication
+func Client(c client.Client) Option {
+	return func(o *Options) {
+		o.Client = c
+	}
+}
+
+// Context specifies a context for the service.
+// Can be used to signal shutdown of the flow
+// Can be used for extra option values.
+func Context(ctx context.Context) Option {
+	return func(o *Options) {
+		o.Context = ctx
+	}
+}
+
+// Tracer mechanism for distributed tracking
+func Tracer(t tracer.Tracer) Option {
+	return func(o *Options) {
+		o.Tracer = t
+	}
+}
+
+// Store used for intermediate results
+func Store(s store.Store) Option {
+	return func(o *Options) {
+		o.Store = s
+	}
+}
+
+// WorflowOption signature
+type WorkflowOption func(*WorkflowOptions)
+
+// WorkflowOptions holds workflow options
+type WorkflowOptions struct {
+	ID      string
+	Context context.Context
+}
+
+// WorkflowID set workflow id
+func WorkflowID(id string) WorkflowOption {
+	return func(o *WorkflowOptions) {
+		o.ID = id
+	}
+}
+
+type ExecuteOptions struct {
+	// Client holds the client.Client
+	Client client.Client
+	// Tracer holds the tracer
+	Tracer tracer.Tracer
+	// Logger holds the logger
+	Logger logger.Logger
+	// Meter holds the meter
+	Meter meter.Meter
+	// Store used for intermediate results
+	Store store.Store
+	// Context can be used to abort execution or pass additional opts
+	Context context.Context
+	// Start step
+	Start string
+	// Reverse execution
+	Reverse bool
+	// Timeout for execution
+	Timeout time.Duration
+}
+
+type ExecuteOption func(*ExecuteOptions)
+
+func ExecuteClient(c client.Client) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Client = c
+	}
+}
+
+func ExecuteTracer(t tracer.Tracer) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Tracer = t
+	}
+}
+
+func ExecuteLogger(l logger.Logger) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Logger = l
+	}
+}
+
+func ExecuteMeter(m meter.Meter) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Meter = m
+	}
+}
+
+func ExecuteStore(s store.Store) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Store = s
+	}
+}
+
+func ExecuteContext(ctx context.Context) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Context = ctx
+	}
+}
+
+func ExecuteReverse(b bool) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Reverse = b
+	}
+}
+
+func ExecuteTimeout(td time.Duration) ExecuteOption {
+	return func(o *ExecuteOptions) {
+		o.Timeout = td
+	}
+}
+
+func NewExecuteOptions(opts ...ExecuteOption) ExecuteOptions {
+	options := ExecuteOptions{}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
+type StepOptions struct {
+	ID       string
+	Context  context.Context
+	Requires []string
+	Fallback string
+}
+
+type StepOption func(*StepOptions)
+
+func NewStepOptions(opts ...StepOption) StepOptions {
+	options := StepOptions{Context: context.Background()}
+	for _, o := range opts {
+		o(&options)
+	}
+	return options
+}
+
+func StepID(id string) StepOption {
+	return func(o *StepOptions) {
+		o.ID = id
+	}
+}
+
+func StepRequires(steps ...string) StepOption {
+	return func(o *StepOptions) {
+		o.Requires = steps
+	}
+}
+
+func StepFallback(step string) StepOption {
+	return func(o *StepOptions) {
+		o.Fallback = step
+	}
+}

generate.go

@@ -1,3 +0,0 @@
-package micro
-
-//go:generate ./.github/generate.sh

go.mod

@@ -9,5 +9,5 @@ require (
 	github.com/imdario/mergo v0.3.12
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/silas/dag v0.0.0-20210121180416-41cf55125c34
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed
 )

go.sum

@@ -10,12 +10,12 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/silas/dag v0.0.0-20210121180416-41cf55125c34 h1:vBfVmA5mZhsQa2jr1FOL9nfA37N/jnbBmi5XUfviVTI=
 github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=

logger/default.go

@@ -21,9 +21,11 @@ func init() {
 }
 
 type defaultLogger struct {
-	opts Options
 	enc  *json.Encoder
+	opts Options
 	sync.RWMutex
+	logFunc  LogFunc
+	logfFunc LogfFunc
 }
 
 // Init(opts...) should only overwrite provided options
@@ -33,6 +35,15 @@ func (l *defaultLogger) Init(opts ...Option) error {
 		o(&l.opts)
 	}
 	l.enc = json.NewEncoder(l.opts.Out)
+
+	l.logFunc = l.Log
+	l.logfFunc = l.Logf
+	// wrap the Log func
+	for i := len(l.opts.Wrappers); i > 0; i-- {
+		l.logFunc = l.opts.Wrappers[i-1].Log(l.logFunc)
+		l.logfFunc = l.opts.Wrappers[i-1].Logf(l.logfFunc)
+	}
+
 	l.Unlock()
 	return nil
 }
@@ -121,27 +132,27 @@ func (l *defaultLogger) Fatal(ctx context.Context, args ...interface{}) {
 }
 
 func (l *defaultLogger) Infof(ctx context.Context, msg string, args ...interface{}) {
-	l.Logf(ctx, InfoLevel, msg, args...)
+	l.logfFunc(ctx, InfoLevel, msg, args...)
 }
 
 func (l *defaultLogger) Errorf(ctx context.Context, msg string, args ...interface{}) {
-	l.Logf(ctx, ErrorLevel, msg, args...)
+	l.logfFunc(ctx, ErrorLevel, msg, args...)
 }
 
 func (l *defaultLogger) Debugf(ctx context.Context, msg string, args ...interface{}) {
-	l.Logf(ctx, DebugLevel, msg, args...)
+	l.logfFunc(ctx, DebugLevel, msg, args...)
 }
 
 func (l *defaultLogger) Warnf(ctx context.Context, msg string, args ...interface{}) {
-	l.Logf(ctx, WarnLevel, msg, args...)
+	l.logfFunc(ctx, WarnLevel, msg, args...)
 }
 
 func (l *defaultLogger) Tracef(ctx context.Context, msg string, args ...interface{}) {
-	l.Logf(ctx, TraceLevel, msg, args...)
+	l.logfFunc(ctx, TraceLevel, msg, args...)
 }
 
 func (l *defaultLogger) Fatalf(ctx context.Context, msg string, args ...interface{}) {
-	l.Logf(ctx, FatalLevel, msg, args...)
+	l.logfFunc(ctx, FatalLevel, msg, args...)
 	os.Exit(1)
 }
 

logger/logger_test.go

@@ -1,6 +1,7 @@
 package logger
 
 import (
+	"bytes"
 	"context"
 	"testing"
 )
@@ -16,3 +17,21 @@ func TestLogger(t *testing.T) {
 	l.Fields(map[string]interface{}{"error": "test"}).Info(ctx, "error message")
 	l.Warn(ctx, "first", " ", "second")
 }
+
+func TestLoggerWrapper(t *testing.T) {
+	ctx := context.TODO()
+	buf := bytes.NewBuffer(nil)
+	l := NewLogger(WithLevel(TraceLevel), WithOutput(buf))
+	if err := l.Init(WrapLogger(NewOmitWrapper())); err != nil {
+		t.Fatal(err)
+	}
+	type secret struct {
+		Name  string
+		Passw string `logger:"omit"`
+	}
+	s := &secret{Name: "name", Passw: "secret"}
+	l.Errorf(ctx, "test %#+v", s)
+	if !bytes.Contains(buf.Bytes(), []byte(`logger.secret{Name:\"name\", Passw:\"\"}"`)) {
+		t.Fatalf("omit not works, struct: %v, output: %s", s, buf.Bytes())
+	}
+}

logger/options.go

@@ -23,6 +23,8 @@ type Options struct {
 	CallerSkipCount int
 	// The logging level the logger should log
 	Level Level
+	// Wrappers logger wrapper that called before actual Log/Logf function
+	Wrappers []Wrapper
 }
 
 // NewOptions creates new options struct
@@ -76,8 +78,15 @@ func WithContext(ctx context.Context) Option {
 }
 
 // WithName sets the name
-func withName(n string) Option {
+func WithName(n string) Option {
 	return func(o *Options) {
 		o.Name = n
 	}
 }
+
+// WrapLogger adds a logger Wrapper to a list of options passed into the logger
+func WrapLogger(w Wrapper) Option {
+	return func(o *Options) {
+		o.Wrappers = append(o.Wrappers, w)
+	}
+}

logger/wrapper.go

@@ -0,0 +1,68 @@
+package logger
+
+import (
+	"context"
+	"reflect"
+
+	rutil "github.com/unistack-org/micro/v3/util/reflect"
+)
+
+// LogFunc function used for Log method
+type LogFunc func(ctx context.Context, level Level, args ...interface{})
+
+// LogfFunc function used for Logf method
+type LogfFunc func(ctx context.Context, level Level, msg string, args ...interface{})
+
+type Wrapper interface {
+	// Log logs message with needed level
+	Log(LogFunc) LogFunc
+	//	Log(ctx context.Context, level Level, args ...interface{})
+	// Logf logs message with needed level
+	Logf(LogfFunc) LogfFunc
+	//Logf(ctx context.Context, level Level, msg string, args ...interface{})
+}
+
+type OmitWrapper struct{}
+
+func NewOmitWrapper() Wrapper {
+	return &OmitWrapper{}
+}
+
+func getArgs(args []interface{}) []interface{} {
+	nargs := make([]interface{}, 0, len(args))
+	var err error
+	for _, arg := range args {
+		val := reflect.ValueOf(arg)
+		switch val.Kind() {
+		case reflect.Ptr:
+			val = val.Elem()
+		}
+		narg := arg
+		if val.Kind() == reflect.Struct {
+			if narg, err = rutil.Zero(arg); err == nil {
+				rutil.CopyDefaults(narg, arg)
+				if flds, ferr := rutil.StructFields(narg); ferr == nil {
+					for _, fld := range flds {
+						if tv, ok := fld.Field.Tag.Lookup("logger"); ok && tv == "omit" {
+							fld.Value.Set(reflect.Zero(fld.Value.Type()))
+						}
+					}
+				}
+			}
+		}
+		nargs = append(nargs, narg)
+	}
+	return nargs
+}
+
+func (w *OmitWrapper) Log(fn LogFunc) LogFunc {
+	return func(ctx context.Context, level Level, args ...interface{}) {
+		fn(ctx, level, getArgs(args)...)
+	}
+}
+
+func (w *OmitWrapper) Logf(fn LogfFunc) LogfFunc {
+	return func(ctx context.Context, level Level, msg string, args ...interface{}) {
+		fn(ctx, level, msg, getArgs(args)...)
+	}
+}

logger/wrapper/wrapper.go

@@ -70,21 +70,23 @@ type lWrapper struct {
 	opts             Options
 }
 
-type ClientCallObserver func(context.Context, client.Request, interface{}, []client.CallOption, error) []string
+type (
-type ClientStreamObserver func(context.Context, client.Request, []client.CallOption, client.Stream, error) []string
+	ClientCallObserver       func(context.Context, client.Request, interface{}, []client.CallOption, error) []string
-type ClientPublishObserver func(context.Context, client.Message, []client.PublishOption, error) []string
+	ClientStreamObserver     func(context.Context, client.Request, []client.CallOption, client.Stream, error) []string
-type ClientCallFuncObserver func(context.Context, string, client.Request, interface{}, client.CallOptions, error) []string
+	ClientPublishObserver    func(context.Context, client.Message, []client.PublishOption, error) []string
-type ServerHandlerObserver func(context.Context, server.Request, interface{}, error) []string
+	ClientCallFuncObserver   func(context.Context, string, client.Request, interface{}, client.CallOptions, error) []string
-type ServerSubscriberObserver func(context.Context, server.Message, error) []string
+	ServerHandlerObserver    func(context.Context, server.Request, interface{}, error) []string
+	ServerSubscriberObserver func(context.Context, server.Message, error) []string
+)
 
 // Options struct for wrapper
 type Options struct {
 	// Logger that used for log
 	Logger logger.Logger
-	// Level for logger
+	// ServerHandlerObservers funcs
-	Level logger.Level
+	ServerHandlerObservers []ServerHandlerObserver
-	// Enabled flag
+	// ServerSubscriberObservers funcs
-	Enabled bool
+	ServerSubscriberObservers []ServerSubscriberObserver
 	// ClientCallObservers funcs
 	ClientCallObservers []ClientCallObserver
 	// ClientStreamObservers funcs
@@ -93,12 +95,12 @@ type Options struct {
 	ClientPublishObservers []ClientPublishObserver
 	// ClientCallFuncObservers funcs
 	ClientCallFuncObservers []ClientCallFuncObserver
-	// ServerHandlerObservers funcs
-	ServerHandlerObservers []ServerHandlerObserver
-	// ServerSubscriberObservers funcs
-	ServerSubscriberObservers []ServerSubscriberObserver
 	// SkipEndpoints
 	SkipEndpoints []string
+	// Level for logger
+	Level logger.Level
+	// Enabled flag
+	Enabled bool
 }
 
 // Option func signature
@@ -213,7 +215,7 @@ func (l *lWrapper) Call(ctx context.Context, req client.Request, rsp interface{}
 	for _, o := range l.opts.ClientCallObservers {
 		labels = append(labels, o(ctx, req, rsp, opts, err)...)
 	}
-	fields := make(map[string]interface{}, int(len(labels)/2))
+	fields := make(map[string]interface{}, len(labels)/2)
 	for i := 0; i < len(labels); i += 2 {
 		fields[labels[i]] = labels[i+1]
 	}
@@ -240,7 +242,7 @@ func (l *lWrapper) Stream(ctx context.Context, req client.Request, opts ...clien
 	for _, o := range l.opts.ClientStreamObservers {
 		labels = append(labels, o(ctx, req, opts, stream, err)...)
 	}
-	fields := make(map[string]interface{}, int(len(labels)/2))
+	fields := make(map[string]interface{}, len(labels)/2)
 	for i := 0; i < len(labels); i += 2 {
 		fields[labels[i]] = labels[i+1]
 	}
@@ -267,7 +269,7 @@ func (l *lWrapper) Publish(ctx context.Context, msg client.Message, opts ...clie
 	for _, o := range l.opts.ClientPublishObservers {
 		labels = append(labels, o(ctx, msg, opts, err)...)
 	}
-	fields := make(map[string]interface{}, int(len(labels)/2))
+	fields := make(map[string]interface{}, len(labels)/2)
 	for i := 0; i < len(labels); i += 2 {
 		fields[labels[i]] = labels[i+1]
 	}
@@ -294,7 +296,7 @@ func (l *lWrapper) ServerHandler(ctx context.Context, req server.Request, rsp in
 	for _, o := range l.opts.ServerHandlerObservers {
 		labels = append(labels, o(ctx, req, rsp, err)...)
 	}
-	fields := make(map[string]interface{}, int(len(labels)/2))
+	fields := make(map[string]interface{}, len(labels)/2)
 	for i := 0; i < len(labels); i += 2 {
 		fields[labels[i]] = labels[i+1]
 	}
@@ -321,7 +323,7 @@ func (l *lWrapper) ServerSubscriber(ctx context.Context, msg server.Message) err
 	for _, o := range l.opts.ServerSubscriberObservers {
 		labels = append(labels, o(ctx, msg, err)...)
 	}
-	fields := make(map[string]interface{}, int(len(labels)/2))
+	fields := make(map[string]interface{}, len(labels)/2)
 	for i := 0; i < len(labels); i += 2 {
 		fields[labels[i]] = labels[i+1]
 	}
@@ -372,7 +374,7 @@ func (l *lWrapper) ClientCallFunc(ctx context.Context, addr string, req client.R
 	for _, o := range l.opts.ClientCallFuncObservers {
 		labels = append(labels, o(ctx, addr, req, rsp, opts, err)...)
 	}
-	fields := make(map[string]interface{}, int(len(labels)/2))
+	fields := make(map[string]interface{}, len(labels)/2)
 	for i := 0; i < len(labels); i += 2 {
 		fields[labels[i]] = labels[i+1]
 	}

metadata/context.go

@@ -5,9 +5,11 @@ import (
 	"context"
 )
 
-type mdIncomingKey struct{}
+type (
-type mdOutgoingKey struct{}
+	mdIncomingKey struct{}
-type mdKey struct{}
+	mdOutgoingKey struct{}
+	mdKey         struct{}
+)
 
 // FromIncomingContext returns metadata from incoming ctx
 // returned metadata shoud not be modified or race condition happens

metadata/metadata.go

@@ -6,10 +6,8 @@ import (
 	"sort"
 )
 
-var (
+// HeaderPrefix for all headers passed
-	// HeaderPrefix for all headers passed
+var HeaderPrefix = "Micro-"
-	HeaderPrefix = "Micro-"
-)
 
 // Metadata is our way of representing request headers internally.
 // They're used at the RPC level and translate back and forth
@@ -20,10 +18,8 @@ type rawMetadata struct {
 	md Metadata
 }
 
-var (
+// defaultMetadataSize used when need to init new Metadata
-	// defaultMetadataSize used when need to init new Metadata
+var defaultMetadataSize = 2
-	defaultMetadataSize = 2
-)
 
 // Iterator used to iterate over metadata with order
 type Iterator struct {

metadata/metadata_test.go

@@ -76,7 +76,7 @@ func TestIterator(t *testing.T) {
 	var k, v string
 
 	for iter.Next(&k, &v) {
-		//fmt.Printf("k: %s, v: %s\n", k, v)
+		// fmt.Printf("k: %s, v: %s\n", k, v)
 	}
 }
 
@@ -102,7 +102,6 @@ func TestMedataCanonicalKey(t *testing.T) {
 	} else if v != "12345" {
 		t.Fatalf("invalid metadata value: %s != %s", "12345", v)
 	}
-
 }
 
 func TestMetadataSet(t *testing.T) {
@@ -130,7 +129,6 @@ func TestMetadataDelete(t *testing.T) {
 	if ok {
 		t.Fatal("key Baz not deleted")
 	}
-
 }
 
 func TestNilContext(t *testing.T) {

meter/handler/handler.go

@@ -9,12 +9,10 @@ import (
 	"github.com/unistack-org/micro/v3/meter"
 )
 
-var (
+// guard to fail early
-	// guard to fail early
+var _ MeterServer = &Handler{}
-	_ MeterServer = &handler{}
-)
 
-type handler struct {
+type Handler struct {
 	opts Options
 }
 
@@ -22,8 +20,8 @@ type Option func(*Options)
 
 type Options struct {
 	Meter        meter.Meter
-	MeterOptions []meter.Option
 	Name         string
+	MeterOptions []meter.Option
 }
 
 func Meter(m meter.Meter) Option {
@@ -52,12 +50,12 @@ func NewOptions(opts ...Option) Options {
 	return options
 }
 
-func NewHandler(opts ...Option) *handler {
+func NewHandler(opts ...Option) *Handler {
 	options := NewOptions(opts...)
-	return &handler{opts: options}
+	return &Handler{opts: options}
 }
 
-func (h *handler) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
+func (h *Handler) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
 	buf := bytes.NewBuffer(nil)
 	if err := h.opts.Meter.Write(buf, h.opts.MeterOptions...); err != nil {
 		return errors.InternalServerError(h.opts.Name, "%v", err)

meter/meter.go

@@ -29,13 +29,13 @@ var (
 type Meter interface {
 	Name() string
 	Init(opts ...Option) error
-	Counter(name string, opts ...Option) Counter
+	Counter(name string, labels ...string) Counter
-	FloatCounter(name string, opts ...Option) FloatCounter
+	FloatCounter(name string, labels ...string) FloatCounter
-	Gauge(name string, fn func() float64, opts ...Option) Gauge
+	Gauge(name string, fn func() float64, labels ...string) Gauge
 	Set(opts ...Option) Meter
-	Histogram(name string, opts ...Option) Histogram
+	Histogram(name string, labels ...string) Histogram
-	Summary(name string, opts ...Option) Summary
+	Summary(name string, labels ...string) Summary
-	SummaryExt(name string, window time.Duration, quantiles []float64, opts ...Option) Summary
+	SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) Summary
 	Write(w io.Writer, opts ...Option) error
 	Options() Options
 	String() string

meter/meter_test.go

@@ -10,7 +10,7 @@ func TestNoopMeter(t *testing.T) {
 		t.Fatalf("invalid options parsing: %v", m.Options())
 	}
 
-	cnt := m.Counter("counter", Labels("server", "noop"))
+	cnt := m.Counter("counter", "server", "noop")
 	cnt.Inc()
 }
 

meter/noop.go

@@ -28,57 +28,33 @@ func (r *noopMeter) Init(opts ...Option) error {
 }
 
 // Counter implements the Meter interface
-func (r *noopMeter) Counter(name string, opts ...Option) Counter {
+func (r *noopMeter) Counter(name string, labels ...string) Counter {
-	options := Options{}
+	return &noopCounter{labels: labels}
-	for _, o := range opts {
-		o(&options)
-	}
-	return &noopCounter{labels: options.Labels}
 }
 
 // FloatCounter implements the Meter interface
-func (r *noopMeter) FloatCounter(name string, opts ...Option) FloatCounter {
+func (r *noopMeter) FloatCounter(name string, labels ...string) FloatCounter {
-	options := Options{}
+	return &noopFloatCounter{labels: labels}
-	for _, o := range opts {
-		o(&options)
-	}
-	return &noopFloatCounter{labels: options.Labels}
 }
 
 // Gauge implements the Meter interface
-func (r *noopMeter) Gauge(name string, f func() float64, opts ...Option) Gauge {
+func (r *noopMeter) Gauge(name string, f func() float64, labels ...string) Gauge {
-	options := Options{}
+	return &noopGauge{labels: labels}
-	for _, o := range opts {
-		o(&options)
-	}
-	return &noopGauge{labels: options.Labels}
 }
 
 // Summary implements the Meter interface
-func (r *noopMeter) Summary(name string, opts ...Option) Summary {
+func (r *noopMeter) Summary(name string, labels ...string) Summary {
-	options := Options{}
+	return &noopSummary{labels: labels}
-	for _, o := range opts {
-		o(&options)
-	}
-	return &noopSummary{labels: options.Labels}
 }
 
 // SummaryExt implements the Meter interface
-func (r *noopMeter) SummaryExt(name string, window time.Duration, quantiles []float64, opts ...Option) Summary {
+func (r *noopMeter) SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) Summary {
-	options := Options{}
+	return &noopSummary{labels: labels}
-	for _, o := range opts {
-		o(&options)
-	}
-	return &noopSummary{labels: options.Labels}
 }
 
 // Histogram implements the Meter interface
-func (r *noopMeter) Histogram(name string, opts ...Option) Histogram {
+func (r *noopMeter) Histogram(name string, labels ...string) Histogram {
-	options := Options{}
+	return &noopHistogram{labels: labels}
-	for _, o := range opts {
-		o(&options)
-	}
-	return &noopHistogram{labels: options.Labels}
 }
 
 // Set implements the Meter interface
@@ -111,11 +87,9 @@ type noopCounter struct {
 }
 
 func (r *noopCounter) Add(int) {
-
 }
 
 func (r *noopCounter) Dec() {
-
 }
 
 func (r *noopCounter) Get() uint64 {
@@ -123,11 +97,9 @@ func (r *noopCounter) Get() uint64 {
 }
 
 func (r *noopCounter) Inc() {
-
 }
 
 func (r *noopCounter) Set(uint64) {
-
 }
 
 type noopFloatCounter struct {
@@ -135,7 +107,6 @@ type noopFloatCounter struct {
 }
 
 func (r *noopFloatCounter) Add(float64) {
-
 }
 
 func (r *noopFloatCounter) Get() float64 {
@@ -143,11 +114,9 @@ func (r *noopFloatCounter) Get() float64 {
 }
 
 func (r *noopFloatCounter) Set(float64) {
-
 }
 
 func (r *noopFloatCounter) Sub(float64) {
-
 }
 
 type noopGauge struct {
@@ -163,11 +132,9 @@ type noopSummary struct {
 }
 
 func (r *noopSummary) Update(float64) {
-
 }
 
 func (r *noopSummary) UpdateDuration(time.Time) {
-
 }
 
 type noopHistogram struct {
@@ -175,15 +142,12 @@ type noopHistogram struct {
 }
 
 func (r *noopHistogram) Reset() {
-
 }
 
 func (r *noopHistogram) Update(float64) {
-
 }
 
 func (r *noopHistogram) UpdateDuration(time.Time) {
-
 }
 
-//func (r *noopHistogram) VisitNonZeroBuckets(f func(vmrange string, count uint64)) {}
+// func (r *noopHistogram) VisitNonZeroBuckets(f func(vmrange string, count uint64)) {}

meter/options.go

@@ -90,7 +90,7 @@ func Logger(l logger.Logger) Option {
 
 func Labels(ls ...string) Option {
 	return func(o *Options) {
-		o.Labels = ls
+		o.Labels = append(o.Labels, ls...)
 	}
 }
 

meter/wrapper/wrapper.go

@@ -11,18 +11,25 @@ import (
 )
 
 var (
-	ClientRequestDurationSeconds        = "client_request_duration_seconds"
+	ClientRequestDurationSeconds     = "client_request_duration_seconds"
-	ClientRequestLatencyMicroseconds    = "client_request_latency_microseconds"
+	ClientRequestLatencyMicroseconds = "client_request_latency_microseconds"
-	ClientRequestTotal                  = "client_request_total"
+	ClientRequestTotal               = "client_request_total"
-	ServerRequestDurationSeconds        = "server_request_duration_seconds"
+	ClientRequestInflight            = "client_request_inflight"
-	ServerRequestLatencyMicroseconds    = "server_request_latency_microseconds"
+
-	ServerRequestTotal                  = "server_request_total"
+	ServerRequestDurationSeconds     = "server_request_duration_seconds"
-	PublishMessageDurationSeconds       = "publish_message_duration_seconds"
+	ServerRequestLatencyMicroseconds = "server_request_latency_microseconds"
-	PublishMessageLatencyMicroseconds   = "publish_message_latency_microseconds"
+	ServerRequestTotal               = "server_request_total"
-	PublishMessageTotal                 = "publish_message_total"
+	ServerRequestInflight            = "server_request_inflight"
+
+	PublishMessageDurationSeconds     = "publish_message_duration_seconds"
+	PublishMessageLatencyMicroseconds = "publish_message_latency_microseconds"
+	PublishMessageTotal               = "publish_message_total"
+	PublishMessageInflight            = "publish_message_inflight"
+
 	SubscribeMessageDurationSeconds     = "subscribe_message_duration_seconds"
 	SubscribeMessageLatencyMicroseconds = "subscribe_message_latency_microseconds"
 	SubscribeMessageTotal               = "subscribe_message_total"
+	SubscribeMessageInflight            = "subscribe_message_inflight"
 
 	labelSuccess  = "success"
 	labelFailure  = "failure"
@@ -116,22 +123,25 @@ func (w *wrapper) CallFunc(ctx context.Context, addr string, req client.Request,
 			return w.callFunc(ctx, addr, req, rsp, opts)
 		}
 	}
+
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
 	ts := time.Now()
 	err := w.callFunc(ctx, addr, req, rsp, opts)
 	te := time.Since(ts)
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Dec()
 
-	lopts := w.opts.lopts
+	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-	lopts = append(lopts, meter.Labels(labelEndpoint, endpoint))
+	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
-
-	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, lopts...).Update(float64(te.Seconds()))
-	w.opts.Meter.Histogram(ClientRequestDurationSeconds, lopts...).Update(float64(te.Seconds()))
 
 	if err == nil {
-		lopts = append(lopts, meter.Labels(labelStatus, labelSuccess))
+		labels = append(labels, labelStatus, labelSuccess)
 	} else {
-		lopts = append(lopts, meter.Labels(labelStatus, labelFailure))
+		labels = append(labels, labelStatus, labelFailure)
 	}
-	w.opts.Meter.Counter(ClientRequestTotal, lopts...).Inc()
+	w.opts.Meter.Counter(ClientRequestTotal, labels...).Inc()
 
 	return err
 }
@@ -144,22 +154,24 @@ func (w *wrapper) Call(ctx context.Context, req client.Request, rsp interface{},
 		}
 	}
 
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
 	ts := time.Now()
 	err := w.Client.Call(ctx, req, rsp, opts...)
 	te := time.Since(ts)
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Dec()
 
-	lopts := w.opts.lopts
+	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-	lopts = append(lopts, meter.Labels(labelEndpoint, endpoint))
+	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
-
-	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, lopts...).Update(float64(te.Seconds()))
-	w.opts.Meter.Histogram(ClientRequestDurationSeconds, lopts...).Update(float64(te.Seconds()))
 
 	if err == nil {
-		lopts = append(lopts, meter.Labels(labelStatus, labelSuccess))
+		labels = append(labels, labelStatus, labelSuccess)
 	} else {
-		lopts = append(lopts, meter.Labels(labelStatus, labelFailure))
+		labels = append(labels, labelStatus, labelFailure)
 	}
-	w.opts.Meter.Counter(ClientRequestTotal, lopts...).Inc()
+	w.opts.Meter.Counter(ClientRequestTotal, labels...).Inc()
 
 	return err
 }
@@ -172,22 +184,24 @@ func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client
 		}
 	}
 
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Inc()
 	ts := time.Now()
 	stream, err := w.Client.Stream(ctx, req, opts...)
 	te := time.Since(ts)
+	w.opts.Meter.Counter(ClientRequestInflight, labels...).Dec()
 
-	lopts := w.opts.lopts
+	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-	lopts = append(lopts, meter.Labels(labelEndpoint, endpoint))
+	w.opts.Meter.Histogram(ClientRequestDurationSeconds, labels...).Update(te.Seconds())
-
-	w.opts.Meter.Summary(ClientRequestLatencyMicroseconds, lopts...).Update(float64(te.Seconds()))
-	w.opts.Meter.Histogram(ClientRequestDurationSeconds, lopts...).Update(float64(te.Seconds()))
 
 	if err == nil {
-		lopts = append(lopts, meter.Labels(labelStatus, labelSuccess))
+		labels = append(labels, labelStatus, labelSuccess)
 	} else {
-		lopts = append(lopts, meter.Labels(labelStatus, labelFailure))
+		labels = append(labels, labelStatus, labelFailure)
 	}
-	w.opts.Meter.Counter(ClientRequestTotal, lopts...).Inc()
+	w.opts.Meter.Counter(ClientRequestTotal, labels...).Inc()
 
 	return stream, err
 }
@@ -195,22 +209,24 @@ func (w *wrapper) Stream(ctx context.Context, req client.Request, opts ...client
 func (w *wrapper) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
 	endpoint := p.Topic()
 
+	labels := make([]string, 0, 4)
+	labels = append(labels, labelEndpoint, endpoint)
+
+	w.opts.Meter.Counter(PublishMessageInflight, labels...).Inc()
 	ts := time.Now()
 	err := w.Client.Publish(ctx, p, opts...)
 	te := time.Since(ts)
+	w.opts.Meter.Counter(PublishMessageInflight, labels...).Dec()
 
-	lopts := w.opts.lopts
+	w.opts.Meter.Summary(PublishMessageLatencyMicroseconds, labels...).Update(te.Seconds())
-	lopts = append(lopts, meter.Labels(labelEndpoint, endpoint))
+	w.opts.Meter.Histogram(PublishMessageDurationSeconds, labels...).Update(te.Seconds())
-
-	w.opts.Meter.Summary(PublishMessageLatencyMicroseconds, lopts...).Update(float64(te.Seconds()))
-	w.opts.Meter.Histogram(PublishMessageDurationSeconds, lopts...).Update(float64(te.Seconds()))
 
 	if err == nil {
-		lopts = append(lopts, meter.Labels(labelStatus, labelSuccess))
+		labels = append(labels, labelStatus, labelSuccess)
 	} else {
-		lopts = append(lopts, meter.Labels(labelStatus, labelFailure))
+		labels = append(labels, labelStatus, labelFailure)
 	}
-	w.opts.Meter.Counter(PublishMessageTotal, lopts...).Inc()
+	w.opts.Meter.Counter(PublishMessageTotal, labels...).Inc()
 
 	return err
 }
@@ -231,22 +247,24 @@ func (w *wrapper) HandlerFunc(fn server.HandlerFunc) server.HandlerFunc {
 			}
 		}
 
+		labels := make([]string, 0, 4)
+		labels = append(labels, labelEndpoint, endpoint)
+
+		w.opts.Meter.Counter(ServerRequestInflight, labels...).Inc()
 		ts := time.Now()
 		err := fn(ctx, req, rsp)
 		te := time.Since(ts)
+		w.opts.Meter.Counter(ServerRequestInflight, labels...).Dec()
 
-		lopts := w.opts.lopts
+		w.opts.Meter.Summary(ServerRequestLatencyMicroseconds, labels...).Update(te.Seconds())
-		lopts = append(lopts, meter.Labels(labelEndpoint, endpoint))
+		w.opts.Meter.Histogram(ServerRequestDurationSeconds, labels...).Update(te.Seconds())
-
-		w.opts.Meter.Summary(ServerRequestLatencyMicroseconds, lopts...).Update(float64(te.Seconds()))
-		w.opts.Meter.Histogram(ServerRequestDurationSeconds, lopts...).Update(float64(te.Seconds()))
 
 		if err == nil {
-			lopts = append(lopts, meter.Labels(labelStatus, labelSuccess))
+			labels = append(labels, labelStatus, labelSuccess)
 		} else {
-			lopts = append(lopts, meter.Labels(labelStatus, labelFailure))
+			labels = append(labels, labelStatus, labelFailure)
 		}
-		w.opts.Meter.Counter(ServerRequestTotal, lopts...).Inc()
+		w.opts.Meter.Counter(ServerRequestTotal, labels...).Inc()
 
 		return err
 	}
@@ -263,22 +281,24 @@ func (w *wrapper) SubscriberFunc(fn server.SubscriberFunc) server.SubscriberFunc
 	return func(ctx context.Context, msg server.Message) error {
 		endpoint := msg.Topic()
 
+		labels := make([]string, 0, 4)
+		labels = append(labels, labelEndpoint, endpoint)
+
+		w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Inc()
 		ts := time.Now()
 		err := fn(ctx, msg)
 		te := time.Since(ts)
+		w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Dec()
 
-		lopts := w.opts.lopts
+		w.opts.Meter.Summary(SubscribeMessageLatencyMicroseconds, labels...).Update(te.Seconds())
-		lopts = append(lopts, meter.Labels(labelEndpoint, endpoint))
+		w.opts.Meter.Histogram(SubscribeMessageDurationSeconds, labels...).Update(te.Seconds())
-
-		w.opts.Meter.Summary(SubscribeMessageLatencyMicroseconds, lopts...).Update(float64(te.Seconds()))
-		w.opts.Meter.Histogram(SubscribeMessageDurationSeconds, lopts...).Update(float64(te.Seconds()))
 
 		if err == nil {
-			lopts = append(lopts, meter.Labels(labelStatus, labelSuccess))
+			labels = append(labels, labelStatus, labelSuccess)
 		} else {
-			lopts = append(lopts, meter.Labels(labelStatus, labelFailure))
+			labels = append(labels, labelStatus, labelFailure)
 		}
-		w.opts.Meter.Counter(SubscribeMessageTotal, lopts...).Inc()
+		w.opts.Meter.Counter(SubscribeMessageTotal, labels...).Inc()
 
 		return err
 	}

network/transport/memory.go

@@ -31,18 +31,18 @@ type memoryClient struct {
 }
 
 type memoryListener struct {
-	topts Options
-	ctx   context.Context
 	lopts ListenOptions
+	ctx   context.Context
 	exit  chan bool
 	conn  chan *memorySocket
 	addr  string
+	topts Options
 	sync.RWMutex
 }
 
 type memoryTransport struct {
-	opts      Options
 	listeners map[string]*memoryListener
+	opts      Options
 	sync.RWMutex
 }
 

network/transport/memory_test.go

@@ -27,9 +27,9 @@ func TestMemoryTransport(t *testing.T) {
 				if len(os.Getenv("INTEGRATION_TESTS")) == 0 {
 					t.Logf("Server Received %s", string(m.Body))
 				}
-				if err := sock.Send(&Message{
+				if cerr := sock.Send(&Message{
 					Body: []byte(`pong`),
-				}); err != nil {
+				}); cerr != nil {
 					return
 				}
 			}
@@ -60,7 +60,6 @@ func TestMemoryTransport(t *testing.T) {
 			t.Logf("Client Received %s", string(m.Body))
 		}
 	}
-
 }
 
 func TestListener(t *testing.T) {

network/tunnel/broker/broker.go

@@ -12,16 +12,16 @@ import (
 )
 
 type tunBroker struct {
-	opts   broker.Options
 	tunnel tunnel.Tunnel
+	opts   broker.Options
 }
 
 type tunSubscriber struct {
-	opts     broker.SubscribeOptions
 	listener tunnel.Listener
 	handler  broker.Handler
 	closed   chan bool
 	topic    string
+	opts     broker.SubscribeOptions
 }
 
 type tunEvent struct {
@@ -30,8 +30,10 @@ type tunEvent struct {
 }
 
 // used to access tunnel from options context
-type tunnelKey struct{}
+type (
-type tunnelAddr struct{}
+	tunnelKey  struct{}
+	tunnelAddr struct{}
+)
 
 func (t *tunBroker) Init(opts ...broker.Option) error {
 	for _, o := range opts {

network/tunnel/options.go

@@ -34,8 +34,8 @@ type Options struct {
 	Token string
 	// Name holds the tunnel name
 	Name string
-	// Id holds the tunnel id
+	// ID holds the tunnel id
-	Id string
+	ID string
 	// Address holds the tunnel address
 	Address string
 	// Nodes holds the tunnel nodes
@@ -68,10 +68,10 @@ type ListenOptions struct {
 	Timeout time.Duration
 }
 
-// Id sets the tunnel id
+// ID sets the tunnel id
-func Id(id string) Option {
+func ID(id string) Option {
 	return func(o *Options) {
-		o.Id = id
+		o.ID = id
 	}
 }
 
@@ -164,7 +164,7 @@ func DialWait(b bool) DialOption {
 // NewOptions returns router default options with filled values
 func NewOptions(opts ...Option) Options {
 	options := Options{
-		Id:      uuid.New().String(),
+		ID:      uuid.New().String(),
 		Address: DefaultAddress,
 		Token:   DefaultToken,
 		Logger:  logger.DefaultLogger,

network/tunnel/transport/transport.go

@@ -10,9 +10,8 @@ import (
 )
 
 type tunTransport struct {
+	tunnel  tunnel.Tunnel
 	options transport.Options
-
-	tunnel tunnel.Tunnel
 }
 
 type tunnelKey struct{}
@@ -88,7 +87,7 @@ func NewTransport(opts ...transport.Option) transport.Transport {
 	}
 
 	// initialise
-	//t.Init(opts...)
+	// t.Init(opts...)
 
 	return t
 }

network/tunnel/tunnel.go

@@ -9,10 +9,8 @@ import (
 	"github.com/unistack-org/micro/v3/network/transport"
 )
 
-var (
+// DefaultTunnel contains default tunnel implementation
-	// DefaultTunnel contains default tunnel implementation
+var DefaultTunnel Tunnel
-	DefaultTunnel Tunnel
-)
 
 const (
 	// Unicast send over one link

options.go

@@ -17,8 +17,6 @@ import (
 	"github.com/unistack-org/micro/v3/server"
 	"github.com/unistack-org/micro/v3/store"
 	"github.com/unistack-org/micro/v3/tracer"
-	//	"github.com/unistack-org/micro/v3/profiler"
-	//	"github.com/unistack-org/micro/v3/runtime"
 )
 
 // Options for micro service
@@ -78,8 +76,8 @@ func NewOptions(opts ...Option) Options {
 		Meters:    []meter.Meter{meter.DefaultMeter},
 		Configs:   []config.Config{config.DefaultConfig},
 		Stores:    []store.Store{store.DefaultStore},
-		//Runtime   runtime.Runtime
+		// Runtime   runtime.Runtime
-		//Profile   profile.Profile
+		// Profile   profile.Profile
 	}
 
 	for _, o := range opts {

profiler/http/http.go

@@ -16,10 +16,8 @@ type httpProfile struct {
 	running bool
 }
 
-var (
+// DefaultAddress for http profiler
-	// DefaultAddress for http profiler
+var DefaultAddress = ":6060"
-	DefaultAddress = ":6060"
-)
 
 // Start the profiler
 func (h *httpProfile) Start() error {

profiler/profile.go

@@ -11,10 +11,8 @@ type Profiler interface {
 	String() string
 }
 
-var (
+// DefaultProfiler holds the default profiler
-	// DefaultProfiler holds the default profiler
+var DefaultProfiler Profiler = NewProfiler()
-	DefaultProfiler Profiler = NewProfiler()
-)
 
 // Options holds the options for profiler
 type Options struct {

proxy/proxy.go

@@ -7,10 +7,8 @@ import (
 	"github.com/unistack-org/micro/v3/server"
 )
 
-var (
+// DefaultEndpoint holds default proxy address
-	// DefaultEndpoint holds default proxy address
+var DefaultEndpoint = "localhost:9090"
-	DefaultEndpoint = "localhost:9090"
-)
 
 // Proxy can be used as a proxy server for micro services
 type Proxy interface {

register/extractor.go

@@ -3,7 +3,6 @@ package register
 import (
 	"fmt"
 	"reflect"
-	"strings"
 	"unicode"
 	"unicode/utf8"
 
@@ -11,12 +10,12 @@ import (
 )
 
 // ExtractValue from reflect.Type from specified depth
-func ExtractValue(v reflect.Type, d int) *Value {
+func ExtractValue(v reflect.Type, d int) string {
 	if d == 3 {
-		return nil
+		return ""
 	}
 	if v == nil {
-		return nil
+		return ""
 	}
 
 	if v.Kind() == reflect.Ptr {
@@ -25,7 +24,7 @@ func ExtractValue(v reflect.Type, d int) *Value {
 
 	// slices and maps don't have a defined name
 	if (v.Kind() == reflect.Slice || v.Kind() == reflect.Map) || len(v.Name()) == 0 {
-		return nil
+		return ""
 	}
 
 	// get the rune character
@@ -33,58 +32,10 @@ func ExtractValue(v reflect.Type, d int) *Value {
 
 	// crude check for is unexported field
 	if unicode.IsLower(a) {
-		return nil
+		return ""
 	}
 
-	arg := &Value{
+	return v.Name()
-		Name: v.Name(),
-		Type: v.Name(),
-	}
-
-	switch v.Kind() {
-	case reflect.Struct:
-		for i := 0; i < v.NumField(); i++ {
-			f := v.Field(i)
-			val := ExtractValue(f.Type, d+1)
-			if val == nil {
-				continue
-			}
-
-			// if we can find a json tag use it
-			if tags := f.Tag.Get("json"); len(tags) > 0 {
-				parts := strings.Split(tags, ",")
-				if parts[0] == "-" || parts[0] == "omitempty" {
-					continue
-				}
-				val.Name = parts[0]
-			}
-
-			// if there's no name default it
-			if len(val.Name) == 0 {
-				val.Name = v.Field(i).Name
-			}
-
-			arg.Values = append(arg.Values, val)
-		}
-	case reflect.Slice:
-		p := v.Elem()
-		if p.Kind() == reflect.Ptr {
-			p = p.Elem()
-		}
-		arg.Type = "[]" + p.Name()
-	case reflect.Map:
-		p := v.Elem()
-		if p.Kind() == reflect.Ptr {
-			p = p.Elem()
-		}
-		key := v.Key()
-		if key.Kind() == reflect.Ptr {
-			key = key.Elem()
-		}
-		arg.Type = fmt.Sprintf("map[%s]%s", key.Name(), p.Name())
-	}
-
-	return arg
 }
 
 // ExtractEndpoint extract *Endpoint from reflect.Method
@@ -116,7 +67,7 @@ func ExtractEndpoint(method reflect.Method) *Endpoint {
 
 	request := ExtractValue(reqType, 0)
 	response := ExtractValue(rspType, 0)
-	if request == nil || response == nil {
+	if request == "" || response == "" {
 		return nil
 	}
 
@@ -135,7 +86,7 @@ func ExtractEndpoint(method reflect.Method) *Endpoint {
 }
 
 // ExtractSubValue exctact *Value from reflect.Type
-func ExtractSubValue(typ reflect.Type) *Value {
+func ExtractSubValue(typ reflect.Type) string {
 	var reqType reflect.Type
 	switch typ.NumIn() {
 	case 1:
@@ -145,7 +96,7 @@ func ExtractSubValue(typ reflect.Type) *Value {
 	case 3:
 		reqType = typ.In(2)
 	default:
-		return nil
+		return ""
 	}
 	return ExtractValue(reqType, 0)
 }

register/extractor_test.go

@@ -36,28 +36,21 @@ func TestExtractEndpoint(t *testing.T) {
 		t.Fatalf("Expected handler Test, got %s", endpoints[0].Name)
 	}
 
-	if endpoints[0].Request == nil {
+	if endpoints[0].Request == "" {
 		t.Fatal("Expected non nil Request")
 	}
 
-	if endpoints[0].Response == nil {
+	if endpoints[0].Response == "" {
 		t.Fatal("Expected non nil Request")
 	}
 
-	if endpoints[0].Request.Name != "TestRequest" {
+	if endpoints[0].Request != "TestRequest" {
-		t.Fatalf("Expected TestRequest got %s", endpoints[0].Request.Name)
+		t.Fatalf("Expected TestRequest got %s", endpoints[0].Request)
 	}
 
-	if endpoints[0].Response.Name != "TestResponse" {
+	if endpoints[0].Response != "TestResponse" {
-		t.Fatalf("Expected TestResponse got %s", endpoints[0].Response.Name)
+		t.Fatalf("Expected TestResponse got %s", endpoints[0].Response)
-	}
-
-	if endpoints[0].Request.Type != "TestRequest" {
-		t.Fatalf("Expected TestRequest type got %s", endpoints[0].Request.Type)
-	}
-
-	if endpoints[0].Response.Type != "TestResponse" {
-		t.Fatalf("Expected TestResponse type got %s", endpoints[0].Response.Type)
 	}
 
+	t.Logf("XXX %#+v\n", endpoints[0])
 }

register/memory.go

@@ -30,10 +30,9 @@ type record struct {
 }
 
 type memory struct {
-	opts Options
-	// records is a KV map with domain name as the key and a services map as the value
 	records  map[string]services
 	watchers map[string]*watcher
+	opts     Options
 	sync.RWMutex
 }
 
@@ -65,7 +64,7 @@ func (m *memory) ttlPrune() {
 					for id, n := range record.Nodes {
 						if n.TTL != 0 && time.Since(n.LastSeen) > n.TTL {
 							if m.opts.Logger.V(logger.DebugLevel) {
-								m.opts.Logger.Debugf(m.opts.Context, "Register TTL expired for node %s of service %s", n.Id, service)
+								m.opts.Logger.Debugf(m.opts.Context, "Register TTL expired for node %s of service %s", n.ID, service)
 							}
 							delete(m.records[domain][service][version].Nodes, id)
 						}
@@ -162,7 +161,7 @@ func (m *memory) Register(ctx context.Context, s *Service, opts ...RegisterOptio
 
 	for _, n := range s.Nodes {
 		// check if already exists
-		if _, ok := srvs[s.Name][s.Version].Nodes[n.Id]; ok {
+		if _, ok := srvs[s.Name][s.Version].Nodes[n.ID]; ok {
 			continue
 		}
 
@@ -177,9 +176,9 @@ func (m *memory) Register(ctx context.Context, s *Service, opts ...RegisterOptio
 		metadata["domain"] = options.Domain
 
 		// add the node
-		srvs[s.Name][s.Version].Nodes[n.Id] = &node{
+		srvs[s.Name][s.Version].Nodes[n.ID] = &node{
 			Node: &Node{
-				Id:       n.Id,
+				ID:       n.ID,
 				Address:  n.Address,
 				Metadata: metadata,
 			},
@@ -201,8 +200,8 @@ func (m *memory) Register(ctx context.Context, s *Service, opts ...RegisterOptio
 			if m.opts.Logger.V(logger.DebugLevel) {
 				m.opts.Logger.Debugf(m.opts.Context, "Updated registration for service: %s, version: %s", s.Name, s.Version)
 			}
-			srvs[s.Name][s.Version].Nodes[n.Id].TTL = options.TTL
+			srvs[s.Name][s.Version].Nodes[n.ID].TTL = options.TTL
-			srvs[s.Name][s.Version].Nodes[n.Id].LastSeen = time.Now()
+			srvs[s.Name][s.Version].Nodes[n.ID].LastSeen = time.Now()
 		}
 	}
 
@@ -242,11 +241,11 @@ func (m *memory) Deregister(ctx context.Context, s *Service, opts ...DeregisterO
 
 	// deregister all of the service nodes from this version
 	for _, n := range s.Nodes {
-		if _, ok := version.Nodes[n.Id]; ok {
+		if _, ok := version.Nodes[n.ID]; ok {
 			if m.opts.Logger.V(logger.DebugLevel) {
 				m.opts.Logger.Debugf(m.opts.Context, "Register removed node from service: %s, version: %s", s.Name, s.Version)
 			}
-			delete(version.Nodes, n.Id)
+			delete(version.Nodes, n.ID)
 		}
 	}
 
@@ -458,7 +457,7 @@ func serviceToRecord(s *Service, ttl time.Duration) *record {
 
 	nodes := make(map[string]*node, len(s.Nodes))
 	for _, n := range s.Nodes {
-		nodes[n.Id] = &node{
+		nodes[n.ID] = &node{
 			Node:     n,
 			TTL:      ttl,
 			LastSeen: time.Now(),
@@ -490,40 +489,31 @@ func recordToService(r *record, domain string) *Service {
 
 	endpoints := make([]*Endpoint, len(r.Endpoints))
 	for i, e := range r.Endpoints {
-		request := new(Value)
+		md := make(map[string]string, len(e.Metadata))
-		if e.Request != nil {
-			*request = *e.Request
-		}
-		response := new(Value)
-		if e.Response != nil {
-			*response = *e.Response
-		}
-
-		metadata := make(map[string]string, len(e.Metadata))
 		for k, v := range e.Metadata {
-			metadata[k] = v
+			md[k] = v
 		}
 
 		endpoints[i] = &Endpoint{
 			Name:     e.Name,
-			Request:  request,
+			Request:  e.Request,
-			Response: response,
+			Response: e.Response,
-			Metadata: metadata,
+			Metadata: md,
 		}
 	}
 
 	nodes := make([]*Node, len(r.Nodes))
 	i := 0
 	for _, n := range r.Nodes {
-		metadata := make(map[string]string, len(n.Metadata))
+		md := make(map[string]string, len(n.Metadata))
 		for k, v := range n.Metadata {
-			metadata[k] = v
+			md[k] = v
 		}
 
 		nodes[i] = &Node{
-			Id:       n.Id,
+			ID:       n.ID,
 			Address:  n.Address,
-			Metadata: metadata,
+			Metadata: md,
 		}
 		i++
 	}

register/memory_test.go

@@ -8,72 +8,70 @@ import (
 	"time"
 )
 
-var (
+var testData = map[string][]*Service{
-	testData = map[string][]*Service{
+	"foo": {
-		"foo": {
+		{
-			{
+			Name:    "foo",
-				Name:    "foo",
+			Version: "1.0.0",
-				Version: "1.0.0",
+			Nodes: []*Node{
-				Nodes: []*Node{
+				{
-					{
+					ID:      "foo-1.0.0-123",
-						Id:      "foo-1.0.0-123",
+					Address: "localhost:9999",
-						Address: "localhost:9999",
-					},
-					{
-						Id:      "foo-1.0.0-321",
-						Address: "localhost:9999",
-					},
 				},
-			},
+				{
-			{
+					ID:      "foo-1.0.0-321",
-				Name:    "foo",
+					Address: "localhost:9999",
-				Version: "1.0.1",
-				Nodes: []*Node{
-					{
-						Id:      "foo-1.0.1-321",
-						Address: "localhost:6666",
-					},
-				},
-			},
-			{
-				Name:    "foo",
-				Version: "1.0.3",
-				Nodes: []*Node{
-					{
-						Id:      "foo-1.0.3-345",
-						Address: "localhost:8888",
-					},
 				},
 			},
 		},
-		"bar": {
+		{
-			{
+			Name:    "foo",
-				Name:    "bar",
+			Version: "1.0.1",
-				Version: "default",
+			Nodes: []*Node{
-				Nodes: []*Node{
+				{
-					{
+					ID:      "foo-1.0.1-321",
-						Id:      "bar-1.0.0-123",
+					Address: "localhost:6666",
-						Address: "localhost:9999",
-					},
-					{
-						Id:      "bar-1.0.0-321",
-						Address: "localhost:9999",
-					},
-				},
-			},
-			{
-				Name:    "bar",
-				Version: "latest",
-				Nodes: []*Node{
-					{
-						Id:      "bar-1.0.1-321",
-						Address: "localhost:6666",
-					},
 				},
 			},
 		},
-	}
+		{
-)
+			Name:    "foo",
+			Version: "1.0.3",
+			Nodes: []*Node{
+				{
+					ID:      "foo-1.0.3-345",
+					Address: "localhost:8888",
+				},
+			},
+		},
+	},
+	"bar": {
+		{
+			Name:    "bar",
+			Version: "default",
+			Nodes: []*Node{
+				{
+					ID:      "bar-1.0.0-123",
+					Address: "localhost:9999",
+				},
+				{
+					ID:      "bar-1.0.0-321",
+					Address: "localhost:9999",
+				},
+			},
+		},
+		{
+			Name:    "bar",
+			Version: "latest",
+			Nodes: []*Node{
+				{
+					ID:      "bar-1.0.1-321",
+					Address: "localhost:6666",
+				},
+			},
+		},
+	},
+}
 
 //nolint:gocyclo
 func TestMemoryRegistry(t *testing.T) {

register/options.go

@@ -44,6 +44,7 @@ func NewOptions(opts ...Option) Options {
 	return options
 }
 
+// nolint: golint
 // RegisterOptions holds options for register method
 type RegisterOptions struct {
 	Context  context.Context
@@ -196,6 +197,7 @@ func TLSConfig(t *tls.Config) Option {
 	}
 }
 
+// nolint: golint
 // RegisterAttempts specifies register atempts count
 func RegisterAttempts(t int) RegisterOption {
 	return func(o *RegisterOptions) {
@@ -203,6 +205,7 @@ func RegisterAttempts(t int) RegisterOption {
 	}
 }
 
+// nolint: golint
 // RegisterTTL specifies register ttl
 func RegisterTTL(t time.Duration) RegisterOption {
 	return func(o *RegisterOptions) {
@@ -210,6 +213,7 @@ func RegisterTTL(t time.Duration) RegisterOption {
 	}
 }
 
+// nolint: golint
 // RegisterContext sets the register context
 func RegisterContext(ctx context.Context) RegisterOption {
 	return func(o *RegisterOptions) {
@@ -217,6 +221,7 @@ func RegisterContext(ctx context.Context) RegisterOption {
 	}
 }
 
+// nolint: golint
 // RegisterDomain secifies register domain
 func RegisterDomain(d string) RegisterOption {
 	return func(o *RegisterOptions) {

register/register.go

@@ -53,29 +53,23 @@ type Service struct {
 // Node holds node register info
 type Node struct {
 	Metadata metadata.Metadata `json:"metadata"`
-	Id       string            `json:"id"`
+	ID       string            `json:"id"`
 	Address  string            `json:"address"`
 }
 
 // Endpoint holds endpoint register info
 type Endpoint struct {
-	Request  *Value            `json:"request"`
+	Request  string            `json:"request"`
-	Response *Value            `json:"response"`
+	Response string            `json:"response"`
 	Metadata metadata.Metadata `json:"metadata"`
 	Name     string            `json:"name"`
 }
 
-// Value holds additional kv stuff
-type Value struct {
-	Name   string   `json:"name"`
-	Type   string   `json:"type"`
-	Values []*Value `json:"values"`
-}
-
 // Option func signature
 type Option func(*Options)
 
 // RegisterOption option is used to register service
+// nolint: golint
 type RegisterOption func(*RegisterOptions)
 
 // WatchOption option is used to watch service changes

register/watcher.go

@@ -52,8 +52,8 @@ type Event struct {
 	Timestamp time.Time
 	// Service is register service
 	Service *Service
-	// Id is register id
+	// ID is register id
-	Id string
+	ID string
 	// Type defines type of event
 	Type EventType
 }

router/watcher.go

@@ -5,10 +5,8 @@ import (
 	"time"
 )
 
-var (
+// ErrWatcherStopped is returned when routing table watcher has been stopped
-	// ErrWatcherStopped is returned when routing table watcher has been stopped
+var ErrWatcherStopped = errors.New("watcher stopped")
-	ErrWatcherStopped = errors.New("watcher stopped")
-)
 
 // EventType defines routing table event
 type EventType int
@@ -38,12 +36,12 @@ func (t EventType) String() string {
 
 // Event is returned by a call to Next on the watcher.
 type Event struct {
-	// Route is table route
-	Route Route
 	// Timestamp is event timestamp
 	Timestamp time.Time
 	// Id of the event
 	Id string
+	// Route is table route
+	Route Route
 	// Type defines type of event
 	Type EventType
 }

runtime/runtime.go

@@ -8,10 +8,8 @@ import (
 	"github.com/unistack-org/micro/v3/metadata"
 )
 
-var (
+// ErrAlreadyExists error
-	// ErrAlreadyExists error
+var ErrAlreadyExists = errors.New("already exists")
-	ErrAlreadyExists = errors.New("already exists")
-)
 
 // Runtime is a service runtime manager
 type Runtime interface {

selector/selector.go

@@ -5,10 +5,8 @@ import (
 	"errors"
 )
 
-var (
+// ErrNoneAvailable is returned by select when no routes were provided to select from
-	// ErrNoneAvailable is returned by select when no routes were provided to select from
+var ErrNoneAvailable = errors.New("none available")
-	ErrNoneAvailable = errors.New("none available")
-)
 
 // Selector selects a route from a pool
 type Selector interface {

server/handler.go

@@ -13,7 +13,7 @@ type rpcHandler struct {
 	endpoints []*register.Endpoint
 }
 
-func newRpcHandler(handler interface{}, opts ...HandlerOption) Handler {
+func newRPCHandler(handler interface{}, opts ...HandlerOption) Handler {
 	options := NewHandlerOptions(opts...)
 
 	typ := reflect.TypeOf(handler)

server/health/health.go

@@ -5,17 +5,12 @@ import (
 
 	"github.com/unistack-org/micro/v3/codec"
 	"github.com/unistack-org/micro/v3/errors"
-	"github.com/unistack-org/micro/v3/server"
 )
 
-var (
+var _ HealthServer = &Handler{}
-	// guard to fail early
-	_ HealthServer = &handler{}
-)
 
-type handler struct {
+type Handler struct {
-	server server.Server
+	opts Options
-	opts   Options
 }
 
 type CheckFunc func(context.Context) error
@@ -23,10 +18,10 @@ type CheckFunc func(context.Context) error
 type Option func(*Options)
 
 type Options struct {
-	LiveChecks  []CheckFunc
-	ReadyChecks []CheckFunc
 	Version     string
 	Name        string
+	LiveChecks  []CheckFunc
+	ReadyChecks []CheckFunc
 }
 
 func LiveChecks(fns ...CheckFunc) Option {
@@ -53,15 +48,15 @@ func Version(version string) Option {
 	}
 }
 
-func NewHandler(opts ...Option) *handler {
+func NewHandler(opts ...Option) *Handler {
 	options := Options{}
 	for _, o := range opts {
 		o(&options)
 	}
-	return &handler{opts: options}
+	return &Handler{opts: options}
 }
 
-func (h *handler) Live(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
+func (h *Handler) Live(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
 	var err error
 	for _, fn := range h.opts.LiveChecks {
 		if err = fn(ctx); err != nil {
@@ -71,7 +66,7 @@ func (h *handler) Live(ctx context.Context, req *codec.Frame, rsp *codec.Frame)
 	return nil
 }
 
-func (h *handler) Ready(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
+func (h *Handler) Ready(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
 	var err error
 	for _, fn := range h.opts.ReadyChecks {
 		if err = fn(ctx); err != nil {
@@ -81,7 +76,7 @@ func (h *handler) Ready(ctx context.Context, req *codec.Frame, rsp *codec.Frame)
 	return nil
 }
 
-func (h *handler) Version(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
+func (h *Handler) Version(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
 	rsp.Data = []byte(h.opts.Version)
 	return nil
 }

server/noop.go

@@ -6,9 +6,6 @@ import (
 	"sync"
 	"time"
 
-	//	cjson "github.com/unistack-org/micro-codec-json"
-	//	cjsonrpc "github.com/unistack-org/micro-codec-jsonrpc"
-	//	cproto "github.com/unistack-org/micro-codec-proto"
 	//	cprotorpc "github.com/unistack-org/micro-codec-protorpc"
 	"github.com/unistack-org/micro/v3/broker"
 	"github.com/unistack-org/micro/v3/codec"
@@ -16,29 +13,23 @@ import (
 	"github.com/unistack-org/micro/v3/register"
 )
 
-var (
+// DefaultCodecs will be used to encode/decode
-	// DefaultCodecs will be used to encode/decode
+var DefaultCodecs = map[string]codec.Codec{
-	DefaultCodecs = map[string]codec.Codec{
+	"application/octet-stream": codec.NewCodec(),
-		//"application/json":         cjson.NewCodec,
+}
-		//"application/json-rpc":     cjsonrpc.NewCodec,
-		//"application/protobuf":     cproto.NewCodec,
-		//"application/proto-rpc":    cprotorpc.NewCodec,
-		"application/octet-stream": codec.NewCodec(),
-	}
-)
 
 const (
 	defaultContentType = "application/json"
 )
 
 type noopServer struct {
-	opts        Options
 	h           Handler
+	wg          *sync.WaitGroup
 	rsvc        *register.Service
 	handlers    map[string]Handler
 	subscribers map[*subscriber][]broker.Subscriber
 	exit        chan chan error
-	wg          *sync.WaitGroup
+	opts        Options
 	sync.RWMutex
 	registered bool
 	started    bool
@@ -103,7 +94,7 @@ func (n *noopServer) Subscribe(sb Subscriber) error {
 }
 
 func (n *noopServer) NewHandler(h interface{}, opts ...HandlerOption) Handler {
-	return newRpcHandler(h, opts...)
+	return newRPCHandler(h, opts...)
 }
 
 func (n *noopServer) NewSubscriber(topic string, sb interface{}, opts ...SubscriberOption) Subscriber {
@@ -158,23 +149,16 @@ func (n *noopServer) Register() error {
 	}
 
 	n.RLock()
-	// Maps are ordered randomly, sort the keys for consistency
+	handlerList := make([]string, 0, len(n.handlers))
-	var handlerList []string
+	for n := range n.handlers {
-	for n, e := range n.handlers {
+		handlerList = append(handlerList, n)
-		// Only advertise non internal handlers
-		if !e.Options().Internal {
-			handlerList = append(handlerList, n)
-		}
 	}
 
 	sort.Strings(handlerList)
 
-	var subscriberList []*subscriber
+	subscriberList := make([]*subscriber, 0, len(n.subscribers))
 	for e := range n.subscribers {
-		// Only advertise non internal subscribers
+		subscriberList = append(subscriberList, e)
-		if !e.Options().Internal {
-			subscriberList = append(subscriberList, e)
-		}
 	}
 	sort.Slice(subscriberList, func(i, j int) bool {
 		return subscriberList[i].topic > subscriberList[j].topic
@@ -190,7 +174,7 @@ func (n *noopServer) Register() error {
 	n.RUnlock()
 
 	service.Nodes[0].Metadata["protocol"] = "noop"
-	service.Nodes[0].Metadata["transport"] = "noop"
+	service.Nodes[0].Metadata["transport"] = service.Nodes[0].Metadata["protocol"]
 	service.Endpoints = endpoints
 
 	n.RLock()
@@ -199,7 +183,7 @@ func (n *noopServer) Register() error {
 
 	if !registered {
 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Infof(n.opts.Context, "register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].Id)
+			config.Logger.Infof(n.opts.Context, "register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].ID)
 		}
 	}
 
@@ -262,7 +246,7 @@ func (n *noopServer) Deregister() error {
 	}
 
 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Infof(n.opts.Context, "deregistering node: %s", service.Nodes[0].Id)
+		config.Logger.Infof(n.opts.Context, "deregistering node: %s", service.Nodes[0].ID)
 	}
 
 	if err := DefaultDeregisterFunc(service, config); err != nil {
@@ -344,9 +328,10 @@ func (n *noopServer) Start() error {
 	}
 
 	// use RegisterCheck func before register
+	// nolint: nestif
 	if err := config.RegisterCheck(config.Context); err != nil {
 		if config.Logger.V(logger.ErrorLevel) {
-			config.Logger.Errorf(n.opts.Context, "server %s-%s register check error: %s", config.Name, config.Id, err)
+			config.Logger.Errorf(n.opts.Context, "server %s-%s register check error: %s", config.Name, config.ID, err)
 		}
 	} else {
 		// announce self to the world
@@ -378,25 +363,26 @@ func (n *noopServer) Start() error {
 				registered := n.registered
 				n.RUnlock()
 				rerr := config.RegisterCheck(config.Context)
+				// nolint: nestif
 				if rerr != nil && registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(n.opts.Context, "server %s-%s register check error: %s, deregister it", config.Name, config.Id, rerr)
+						config.Logger.Errorf(n.opts.Context, "server %s-%s register check error: %s, deregister it", config.Name, config.ID, rerr)
 					}
 					// deregister self in case of error
 					if err := n.Deregister(); err != nil {
 						if config.Logger.V(logger.ErrorLevel) {
-							config.Logger.Errorf(n.opts.Context, "server %s-%s deregister error: %s", config.Name, config.Id, err)
+							config.Logger.Errorf(n.opts.Context, "server %s-%s deregister error: %s", config.Name, config.ID, err)
 						}
 					}
 				} else if rerr != nil && !registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(n.opts.Context, "server %s-%s register check error: %s", config.Name, config.Id, rerr)
+						config.Logger.Errorf(n.opts.Context, "server %s-%s register check error: %s", config.Name, config.ID, rerr)
 					}
 					continue
 				}
 				if err := n.Register(); err != nil {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(n.opts.Context, "server %s-%s register error: %s", config.Name, config.Id, err)
+						config.Logger.Errorf(n.opts.Context, "server %s-%s register error: %s", config.Name, config.ID, err)
 					}
 				}
 			// wait for exit

server/options.go

@@ -57,8 +57,8 @@ type Options struct {
 	RegisterCheck func(context.Context) error
 	// Codecs map to handle content-type
 	Codecs map[string]codec.Codec
-	// Id holds the id of the server
+	// ID holds the id of the server
-	Id string
+	ID string
 	// Namespace for te server
 	Namespace string
 	// Name holds the server name
@@ -104,7 +104,7 @@ func NewOptions(opts ...Option) Options {
 		Address:          DefaultAddress,
 		Name:             DefaultName,
 		Version:          DefaultVersion,
-		Id:               DefaultId,
+		ID:               DefaultID,
 		Namespace:        DefaultNamespace,
 	}
 
@@ -143,10 +143,10 @@ func Meter(m meter.Meter) Option {
 	}
 }
 
-// Id unique server id
+// ID unique server id
-func Id(id string) Option {
+func ID(id string) Option {
 	return func(o *Options) {
-		o.Id = id
+		o.ID = id
 	}
 }
 
@@ -325,8 +325,6 @@ type HandlerOptions struct {
 	Context context.Context
 	// Metadata for hondler
 	Metadata map[string]metadata.Metadata
-	// Internal flag limits exporting to other nodes via register
-	Internal bool
 }
 
 // NewHandlerOptions creates new HandlerOptions
@@ -354,8 +352,6 @@ type SubscriberOptions struct {
 	Queue string
 	// AutoAck flag for auto ack messages after processing
 	AutoAck bool
-	// Internal flag limit exporting info via register
-	Internal bool
 	// BodyOnly flag specifies that message without headers
 	BodyOnly bool
 }
@@ -382,23 +378,6 @@ func EndpointMetadata(name string, md metadata.Metadata) HandlerOption {
 	}
 }
 
-// InternalHandler options specifies that a handler is not advertised
-// to the discovery system. In the future this may also limit request
-// to the internal network or authorised user.
-func InternalHandler(b bool) HandlerOption {
-	return func(o *HandlerOptions) {
-		o.Internal = b
-	}
-}
-
-// InternalSubscriber options specifies that a subscriber is not advertised
-// to the discovery system.
-func InternalSubscriber(b bool) SubscriberOption {
-	return func(o *SubscriberOptions) {
-		o.Internal = b
-	}
-}
-
 // DisableAutoAck will disable auto acking of messages
 // after they have been handled.
 func DisableAutoAck() SubscriberOption {

server/registry.go

@@ -72,7 +72,7 @@ func NewRegisterService(s Server) (*register.Service, error) {
 	}
 
 	node := &register.Node{
-		Id:      opts.Name + "-" + opts.Id,
+		ID:      opts.Name + "-" + opts.ID,
 		Address: net.JoinHostPort(addr, port),
 	}
 	node.Metadata = metadata.Copy(opts.Metadata)

server/server.go

@@ -11,10 +11,8 @@ import (
 	"github.com/unistack-org/micro/v3/register"
 )
 
-var (
+// DefaultServer default server
-	// DefaultServer default server
+var DefaultServer Server = NewServer()
-	DefaultServer Server = NewServer()
-)
 
 var (
 	// DefaultAddress will be used if no address passed
@@ -23,8 +21,8 @@ var (
 	DefaultName = "server"
 	// DefaultVersion will be used if no version passed
 	DefaultVersion = "latest"
-	// DefaultId will be used if no id passed
+	// DefaultID will be used if no id passed
-	DefaultId = uuid.New().String()
+	DefaultID = uuid.New().String()
 	// DefaultRegisterCheck holds func that run before register server
 	DefaultRegisterCheck = func(context.Context) error { return nil }
 	// DefaultRegisterInterval holds interval for register

server/subscriber.go

@@ -21,11 +21,9 @@ const (
 	subSig = "func(context.Context, interface{}) error"
 )
 
-var (
+// Precompute the reflect type for error. Can't use error directly
-	// Precompute the reflect type for error. Can't use error directly
+// because Typeof takes an empty interface value. This is annoying.
-	// because Typeof takes an empty interface value. This is annoying.
+var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
-	typeOfError = reflect.TypeOf((*error)(nil)).Elem()
-)
 
 type handler struct {
 	reqType reflect.Type
@@ -64,7 +62,8 @@ func ValidateSubscriber(sub Subscriber) error {
 	typ := reflect.TypeOf(sub.Subscriber())
 	var argType reflect.Type
 
-	if typ.Kind() == reflect.Func {
+	switch typ.Kind() {
+	case reflect.Func:
 		name := "Func"
 		switch typ.NumIn() {
 		case 2:
@@ -82,7 +81,7 @@ func ValidateSubscriber(sub Subscriber) error {
 		if returnType := typ.Out(0); returnType != typeOfError {
 			return fmt.Errorf("subscriber %v returns %v not error", name, returnType.String())
 		}
-	} else {
+	default:
 		hdlr := reflect.ValueOf(sub.Subscriber())
 		name := reflect.Indirect(hdlr).Type().Name()
 
@@ -276,14 +275,14 @@ func (n *noopServer) createSubHandler(sb *subscriber, opts Options) broker.Handl
 				if n.wg != nil {
 					defer n.wg.Done()
 				}
-				err := fn(ctx, &rpcMessage{
+				cerr := fn(ctx, &rpcMessage{
 					topic:       sb.topic,
 					contentType: ct,
 					payload:     req.Interface(),
 					header:      msg.Header,
 					body:        msg.Body,
 				})
-				results <- err
+				results <- cerr
 			}()
 		}
 		var errors []string

service.go

@@ -162,7 +162,6 @@ func (s *service) Broker(names ...string) broker.Broker {
 		idx = getNameIndex(names[0], s.opts.Brokers)
 	}
 	return s.opts.Brokers[idx]
-
 }
 
 func (s *service) Tracer(names ...string) tracer.Tracer {

store/memory.go

@@ -28,8 +28,8 @@ func (m *memoryStore) Disconnect(ctx context.Context) error {
 }
 
 type memoryStore struct {
-	opts  Options
 	store *cache.Cache
+	opts  Options
 }
 
 func (m *memoryStore) key(prefix, key string) string {

store/store.go

@@ -5,8 +5,6 @@ package store
 import (
 	"context"
 	"errors"
-
-	"github.com/unistack-org/micro/v3/metadata"
 )
 
 var (
@@ -42,12 +40,3 @@ type Store interface {
 	// String returns the name of the implementation.
 	String() string
 }
-
-// Value is an item stored or retrieved from a Store
-// may be used in store implementations to provide metadata
-type Value struct {
-	// Data holds underline struct
-	Data interface{} `json:"data"`
-	// Metadata associated with data for indexing
-	Metadata metadata.Metadata `json:"metadata"`
-}

sync/memory.go

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

sync/sync.go

@@ -5,10 +5,8 @@ import (
 	"errors"
 )
 
-var (
+// ErrLockTimeout error
-	// ErrLockTimeout error
+var ErrLockTimeout = errors.New("lock timeout")
-	ErrLockTimeout = errors.New("lock timeout")
-)
 
 // Sync is an interface for distributed synchronization
 type Sync interface {

tracer/noop.go

@@ -38,7 +38,6 @@ type noopSpan struct {
 }
 
 func (s *noopSpan) Finish(opts ...SpanOption) {
-
 }
 
 func (s *noopSpan) Context() context.Context {
@@ -50,7 +49,6 @@ func (s *noopSpan) Tracer() Tracer {
 }
 
 func (s *noopSpan) AddEvent(name string, opts ...EventOption) {
-
 }
 
 func (s *noopSpan) SetName(name string) {
@@ -58,7 +56,6 @@ func (s *noopSpan) SetName(name string) {
 }
 
 func (s *noopSpan) SetLabels(labels ...Label) {
-
 }
 
 // NewTracer returns new memory tracer

tracer/options.go

@@ -2,13 +2,11 @@ package tracer
 
 import "github.com/unistack-org/micro/v3/logger"
 
-type SpanOptions struct {
+type SpanOptions struct{}
-}
 
 type SpanOption func(o *SpanOptions)
 
-type EventOptions struct {
+type EventOptions struct{}
-}
 
 type EventOption func(o *EventOptions)
 

tracer/tracer.go

@@ -5,10 +5,8 @@ import (
 	"context"
 )
 
-var (
+// DefaultTracer is the global default tracer
-	// DefaultTracer is the global default tracer
+var DefaultTracer Tracer = NewTracer()
-	DefaultTracer Tracer = NewTracer()
-)
 
 // Tracer is an interface for distributed tracing
 type Tracer interface {

tracer/wrapper/wrapper.go

@@ -113,12 +113,14 @@ type tWrapper struct {
 	opts             Options
 }
 
-type ClientCallObserver func(context.Context, client.Request, interface{}, []client.CallOption, tracer.Span, error)
+type (
-type ClientStreamObserver func(context.Context, client.Request, []client.CallOption, client.Stream, tracer.Span, error)
+	ClientCallObserver       func(context.Context, client.Request, interface{}, []client.CallOption, tracer.Span, error)
-type ClientPublishObserver func(context.Context, client.Message, []client.PublishOption, tracer.Span, error)
+	ClientStreamObserver     func(context.Context, client.Request, []client.CallOption, client.Stream, tracer.Span, error)
-type ClientCallFuncObserver func(context.Context, string, client.Request, interface{}, client.CallOptions, tracer.Span, error)
+	ClientPublishObserver    func(context.Context, client.Message, []client.PublishOption, tracer.Span, error)
-type ServerHandlerObserver func(context.Context, server.Request, interface{}, tracer.Span, error)
+	ClientCallFuncObserver   func(context.Context, string, client.Request, interface{}, client.CallOptions, tracer.Span, error)
-type ServerSubscriberObserver func(context.Context, server.Message, tracer.Span, error)
+	ServerHandlerObserver    func(context.Context, server.Request, interface{}, tracer.Span, error)
+	ServerSubscriberObserver func(context.Context, server.Message, tracer.Span, error)
+)
 
 // Options struct
 type Options struct {

util/addr/addr.go

@@ -5,9 +5,7 @@ import (
 	"net"
 )
 
-var (
+var privateBlocks []*net.IPNet
-	privateBlocks []*net.IPNet
-)
 
 func init() {
 	for _, b := range []string{"10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "100.64.0.0/10", "fd00::/8"} {

util/addr/addr_test.go

@@ -54,7 +54,6 @@ func TestExtractor(t *testing.T) {
 			t.Errorf("Expected %s got %s", d.expect, addr)
 		}
 	}
-
 }
 
 func TestAppendPrivateBlocks(t *testing.T) {

util/buf/buf.go

@@ -4,20 +4,20 @@ import (
 	"bytes"
 )
 
-type buffer struct {
+type Buffer struct {
 	*bytes.Buffer
 }
 
 // Close reset buffer contents
-func (b *buffer) Close() error {
+func (b *Buffer) Close() error {
 	b.Buffer.Reset()
 	return nil
 }
 
 // New creates new buffer that satisfies Closer interface
-func New(b *bytes.Buffer) *buffer {
+func New(b *bytes.Buffer) *Buffer {
 	if b == nil {
 		b = bytes.NewBuffer(nil)
 	}
-	return &buffer{b}
+	return &Buffer{b}
 }

util/fn/fn.go

@@ -0,0 +1,15 @@
+package fn
+
+type Initer interface {
+	Init(opts ...interface{}) error
+}
+
+func Init(ifaces ...Initer) error {
+	var err error
+	for _, iface := range ifaces {
+		if err = iface.Init(); err != nil {
+			return err
+		}
+	}
+	return nil
+}

util/net/net.go

@@ -27,7 +27,6 @@ func HostPort(addr string, port interface{}) string {
 // Listen takes addr:portmin-portmax and binds to the first available port
 // Example: Listen("localhost:5000-6000", fn)
 func Listen(addr string, fn func(string) (net.Listener, error)) (net.Listener, error) {
-
 	if strings.Count(addr, ":") == 1 && strings.Count(addr, "-") == 0 {
 		return fn(addr)
 	}

util/net/net_test.go

@@ -22,5 +22,4 @@ func TestListen(t *testing.T) {
 	// TODO nats case test
 	// natsAddr := "_INBOX.bID2CMRvlNp0vt4tgNBHWf"
 	// Expect addr DO NOT has extra ":" at the end!
-
 }

util/pki/pki.go

@@ -8,9 +8,8 @@ import (
 	"crypto/rand"
 	"crypto/x509"
 	"encoding/pem"
-	"fmt"
-
 	"errors"
+	"fmt"
 )
 
 // GenerateKey returns an ed25519 key
@@ -46,14 +45,14 @@ func CA(opts ...CertOption) ([]byte, []byte, error) {
 		return nil, nil, err
 	}
 	cert, key := &bytes.Buffer{}, &bytes.Buffer{}
-	if err := pem.Encode(cert, &pem.Block{Type: "CERTIFICATE", Bytes: x509Cert}); err != nil {
+	if err = pem.Encode(cert, &pem.Block{Type: "CERTIFICATE", Bytes: x509Cert}); err != nil {
 		return nil, nil, err
 	}
 	x509Key, err := x509.MarshalPKCS8PrivateKey(options.Priv)
 	if err != nil {
 		return nil, nil, err
 	}
-	if err := pem.Encode(key, &pem.Block{Type: "PRIVATE KEY", Bytes: x509Key}); err != nil {
+	if err = pem.Encode(key, &pem.Block{Type: "PRIVATE KEY", Bytes: x509Key}); err != nil {
 		return nil, nil, err
 	}
 

util/qson/qson.go

@@ -63,9 +63,7 @@ func Unmarshal(dst interface{}, query string) error {
 // possible. Eg the example above would output:
 //   {"bar":{"one":{"two":2,"red":112}}}
 func ToJSON(query string) ([]byte, error) {
-	var (
+	var builder interface{} = make(map[string]interface{})
-		builder interface{} = make(map[string]interface{})
-	)
 	params := strings.Split(query, "&")
 	for _, part := range params {
 		tempMap, err := queryToMap(part)

util/qson/qson_test.go

@@ -32,9 +32,10 @@ type unmarshalT struct {
 	A string     `json:"a"`
 	B unmarshalB `json:"b"`
 }
+
 type unmarshalB struct {
-	C int    `json:"c"`
 	D string `json:"D"`
+	C int    `json:"c"`
 }
 
 func TestUnmarshal(t *testing.T) {

util/rand/rand.go

@@ -11,7 +11,7 @@ type Rand struct {
 }
 
 func (r *Rand) Int31() int32 {
-	rand.Read(r.buf[:4])
+	_, _ = rand.Read(r.buf[:4])
 	return int32(binary.BigEndian.Uint32(r.buf[:4]) & ^uint32(1<<31))
 }
 
@@ -54,7 +54,7 @@ func (r *Rand) Intn(n int) int {
 }
 
 func (r *Rand) Int63() int64 {
-	rand.Read(r.buf[:])
+	_, _ = rand.Read(r.buf[:])
 	return int64(binary.BigEndian.Uint64(r.buf[:]) & ^uint64(1<<63))
 }
 

util/reflect/path_test.go

@@ -5,7 +5,6 @@ import (
 )
 
 func TestPath(t *testing.T) {
-
 	type Nested2 struct {
 		Name string
 	}

util/reflect/reflect.go

@@ -12,6 +12,7 @@ import (
 var (
 	ErrInvalidStruct = errors.New("invalid struct specified")
 	ErrInvalidValue  = errors.New("invalid value specified")
+	ErrNotFound      = errors.New("struct field not found")
 )
 
 type Option func(*Options)
@@ -70,7 +71,11 @@ func Merge(dst interface{}, mp map[string]interface{}, opts ...Option) error {
 			tpart := strings.Split(tvalue, ",")
 			switch tname {
 			case "protobuf":
-				fname = tpart[3][5:]
+				for _, p := range tpart {
+					if idx := strings.Index(p, "name="); idx > 0 {
+						fname = p[idx:]
+					}
+				}
 			default:
 				fname = tpart[0]
 			}
@@ -231,13 +236,14 @@ func Merge(dst interface{}, mp map[string]interface{}, opts ...Option) error {
 		default:
 			err = ErrInvalidValue
 		}
+
+		if err != nil {
+			err = fmt.Errorf("%v key %v invalid val %v", err, fname, sval.Interface())
+		}
+
 	}
 
-	if err != nil {
+	return nil
-		err = fmt.Errorf("%v key %v invalid val %v", err, fname, sval.Interface())
-	}
-
-	return err
 }
 
 func mergeBool(dval reflect.Value, sval reflect.Value) error {
@@ -280,6 +286,8 @@ func mergeBool(dval reflect.Value, sval reflect.Value) error {
 		default:
 			return ErrInvalidValue
 		}
+	case reflect.Interface:
+		return mergeBool(dval, reflect.ValueOf(fmt.Sprintf("%v", sval.Interface())))
 	default:
 		return ErrInvalidValue
 	}
@@ -303,6 +311,8 @@ func mergeString(dval reflect.Value, sval reflect.Value) error {
 		}
 	case reflect.String:
 		dval.SetString(sval.String())
+	case reflect.Interface:
+		return mergeString(dval, reflect.ValueOf(fmt.Sprintf("%v", sval.Interface())))
 	default:
 		return ErrInvalidValue
 	}
@@ -330,6 +340,8 @@ func mergeInt(dval reflect.Value, sval reflect.Value) error {
 			return err
 		}
 		dval.SetInt(l)
+	case reflect.Interface:
+		return mergeInt(dval, reflect.ValueOf(fmt.Sprintf("%v", sval.Interface())))
 	default:
 		return ErrInvalidValue
 	}
@@ -357,6 +369,8 @@ func mergeUint(dval reflect.Value, sval reflect.Value) error {
 			return err
 		}
 		dval.SetUint(l)
+	case reflect.Interface:
+		return mergeUint(dval, reflect.ValueOf(fmt.Sprintf("%v", sval.Interface())))
 	default:
 		return ErrInvalidValue
 	}
@@ -384,6 +398,8 @@ func mergeFloat(dval reflect.Value, sval reflect.Value) error {
 			return err
 		}
 		dval.SetFloat(l)
+	case reflect.Interface:
+		return mergeFloat(dval, reflect.ValueOf(fmt.Sprintf("%v", sval.Interface())))
 	default:
 		return ErrInvalidValue
 	}

util/reflect/struct.go

@@ -7,20 +7,107 @@ import (
 	"reflect"
 	"regexp"
 	"strings"
+	"time"
 )
 
-var (
+// ErrInvalidParam specifies invalid url query params
-	// ErrInvalidParam specifies invalid url query params
+var ErrInvalidParam = errors.New("invalid url query param provided")
-	ErrInvalidParam = errors.New("invalid url query param provided")
-)
 
-var (
+var bracketSplitter = regexp.MustCompile(`\[|\]`)
-	bracketSplitter = regexp.MustCompile(`\[|\]`)
+
-)
+var timeKind = reflect.TypeOf(time.Time{}).Kind()
+
+type StructField struct {
+	Field reflect.StructField
+	Value reflect.Value
+}
+
+func StructFieldByTag(src interface{}, tkey string, tval string) (interface{}, error) {
+	sv := reflect.ValueOf(src)
+	if sv.Kind() == reflect.Ptr {
+		sv = sv.Elem()
+	}
+	if sv.Kind() != reflect.Struct {
+		return nil, ErrInvalidStruct
+	}
+
+	typ := sv.Type()
+	for idx := 0; idx < typ.NumField(); idx++ {
+		fld := typ.Field(idx)
+		val := sv.Field(idx)
+		if !val.CanSet() || len(fld.PkgPath) != 0 {
+			continue
+		}
+
+		if ts, ok := fld.Tag.Lookup(tkey); ok {
+			for _, p := range strings.Split(ts, ",") {
+				if p == tval {
+					if val.Kind() != reflect.Ptr && val.CanAddr() {
+						val = val.Addr()
+					}
+					return val.Interface(), nil
+				}
+			}
+		}
+
+		switch val.Kind() {
+		case reflect.Ptr:
+			if val = val.Elem(); val.Kind() == reflect.Struct {
+				if iface, err := StructFieldByTag(val.Interface(), tkey, tval); err == nil {
+					return iface, nil
+				}
+			}
+		case reflect.Struct:
+			if iface, err := StructFieldByTag(val.Interface(), tkey, tval); err == nil {
+				return iface, nil
+			}
+		}
+	}
+	return nil, ErrNotFound
+}
+
+func StructFieldByName(src interface{}, tkey string) (interface{}, error) {
+	sv := reflect.ValueOf(src)
+	if sv.Kind() == reflect.Ptr {
+		sv = sv.Elem()
+	}
+	if sv.Kind() != reflect.Struct {
+		return nil, ErrInvalidStruct
+	}
+
+	typ := sv.Type()
+	for idx := 0; idx < typ.NumField(); idx++ {
+		fld := typ.Field(idx)
+		val := sv.Field(idx)
+		if !val.CanSet() || len(fld.PkgPath) != 0 {
+			continue
+		}
+		if fld.Name == tkey {
+			if val.Kind() != reflect.Ptr && val.CanAddr() {
+				val = val.Addr()
+			}
+			return val.Interface(), nil
+		}
+
+		switch val.Kind() {
+		case reflect.Ptr:
+			if val = val.Elem(); val.Kind() == reflect.Struct {
+				if iface, err := StructFieldByName(val.Interface(), tkey); err == nil {
+					return iface, nil
+				}
+			}
+		case reflect.Struct:
+			if iface, err := StructFieldByName(val.Interface(), tkey); err == nil {
+				return iface, nil
+			}
+		}
+	}
+	return nil, ErrNotFound
+}
 
 // StructFields returns slice of struct fields
-func StructFields(src interface{}) ([]reflect.StructField, error) {
+func StructFields(src interface{}) ([]StructField, error) {
-	var fields []reflect.StructField
+	var fields []StructField
 
 	sv := reflect.ValueOf(src)
 	if sv.Kind() == reflect.Ptr {
@@ -37,14 +124,17 @@ func StructFields(src interface{}) ([]reflect.StructField, error) {
 		if !val.CanSet() || len(fld.PkgPath) != 0 {
 			continue
 		}
-		if val.Kind() == reflect.Struct {
+		switch val.Kind() {
+		case timeKind:
+			fields = append(fields, StructField{Field: fld, Value: val})
+		case reflect.Struct:
 			infields, err := StructFields(val.Interface())
 			if err != nil {
 				return nil, err
 			}
 			fields = append(fields, infields...)
-		} else {
+		default:
-			fields = append(fields, fld)
+			fields = append(fields, StructField{Field: fld, Value: val})
 		}
 	}
 
@@ -157,7 +247,7 @@ func StructURLValues(src interface{}, pref string, tags []string) (url.Values, e
 			case reflect.Slice:
 				for i := 0; i < val.Len(); i++ {
 					va := val.Index(i)
-					//if va.Type().Elem().Kind() != reflect.Ptr {
+					// if va.Type().Elem().Kind() != reflect.Ptr {
 					if va.Kind() != reflect.Ptr {
 						data.Set(t.name, fmt.Sprintf("%v", va.Interface()))
 						continue
@@ -193,9 +283,7 @@ func StructURLValues(src interface{}, pref string, tags []string) (url.Values, e
 
 // URLMap returns map of url query params
 func URLMap(query string) (map[string]interface{}, error) {
-	var (
+	var mp interface{} = make(map[string]interface{})
-		mp interface{} = make(map[string]interface{})
-	)
 
 	params := strings.Split(query, "&")
 

util/reflect/struct_test.go

@@ -5,11 +5,49 @@ import (
 	"testing"
 )
 
+func TestStructByTag(t *testing.T) {
+	type Str struct {
+		Name []string `json:"name" codec:"flatten"`
+	}
+
+	val := &Str{Name: []string{"first", "second"}}
+
+	iface, err := StructFieldByTag(val, "codec", "flatten")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if v, ok := iface.(*[]string); !ok {
+		t.Fatalf("not *[]string %v", iface)
+	} else if len(*v) != 2 {
+		t.Fatalf("invalid number %v", iface)
+	}
+}
+
+func TestStructByName(t *testing.T) {
+	type Str struct {
+		Name []string `json:"name" codec:"flatten"`
+	}
+
+	val := &Str{Name: []string{"first", "second"}}
+
+	iface, err := StructFieldByName(val, "Name")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if v, ok := iface.(*[]string); !ok {
+		t.Fatalf("not *[]string %v", iface)
+	} else if len(*v) != 2 {
+		t.Fatalf("invalid number %v", iface)
+	}
+}
+
 func TestStructURLValues(t *testing.T) {
 	type Str struct {
+		Str  *Str   `json:"str"`
 		Name string `json:"name"`
 		Args []int  `json:"args"`
-		Str  *Str   `json:"str"`
 	}
 
 	val := &Str{Name: "test_name", Args: []int{1, 2, 3}, Str: &Str{Name: "nested_name"}}
@@ -90,8 +128,8 @@ func TestIsZero(t *testing.T) {
 		Nested string
 	}
 	type testStr2 struct {
-		Name   string
 		Nested *testStr3
+		Name   string
 	}
 	vtest := &testStr2{
 		Name:   "test_name",
@@ -106,5 +144,5 @@ func TestIsZero(t *testing.T) {
 		t.Fatalf("non zero ret on zero struct: %#+v", vtest)
 	}
 
-	//t.Logf("XX %#+v\n", ok)
+	// t.Logf("XX %#+v\n", ok)
 }

util/register/util.go

@@ -5,11 +5,11 @@ import (
 )
 
 func addNodes(old, neu []*register.Node) []*register.Node {
-	nodes := make([]*register.Node, len(neu))
+	nodes := make([]*register.Node, 0, len(neu))
 	// add all new nodes
-	for i, n := range neu {
+	for _, n := range neu {
 		node := *n
-		nodes[i] = &node
+		nodes = append(nodes, &node)
 	}
 
 	// look at old nodes
@@ -19,7 +19,7 @@ func addNodes(old, neu []*register.Node) []*register.Node {
 		// check against new nodes
 		for _, n := range nodes {
 			// ids match then skip
-			if o.Id == n.Id {
+			if o.ID == n.ID {
 				exists = true
 				break
 			}
@@ -40,7 +40,7 @@ func delNodes(old, del []*register.Node) []*register.Node {
 	for _, o := range old {
 		var rem bool
 		for _, n := range del {
-			if o.Id == n.Id {
+			if o.ID == n.ID {
 				rem = true
 				break
 			}