diff --git a/client/rpc_client.go b/client/rpc_client.go index d8f24f1c..63d20d7b 100644 --- a/client/rpc_client.go +++ b/client/rpc_client.go @@ -10,7 +10,6 @@ import ( "github.com/google/uuid" "github.com/micro/go-micro/broker" - "github.com/micro/go-micro/util/pool" "github.com/micro/go-micro/client/selector" "github.com/micro/go-micro/codec" raw "github.com/micro/go-micro/codec/bytes" @@ -19,6 +18,7 @@ import ( "github.com/micro/go-micro/registry" "github.com/micro/go-micro/transport" "github.com/micro/go-micro/util/buf" + "github.com/micro/go-micro/util/pool" ) type rpcClient struct { diff --git a/config/cmd/cmd.go b/config/cmd/cmd.go index ad3fa35a..b8ef8abb 100644 --- a/config/cmd/cmd.go +++ b/config/cmd/cmd.go @@ -246,12 +246,12 @@ var ( } DefaultRuntimes = map[string]func(...runtime.Option) runtime.Runtime{ - "local": runtime.NewRuntime, + "local": runtime.NewRuntime, } DefaultStores = map[string]func(...store.Option) store.Store{ - "memory": memStore.NewStore, - "service": svcStore.NewStore, + "memory": memStore.NewStore, + "service": svcStore.NewStore, } // used for default selection as the fall back diff --git a/debug/trace/trace.go b/debug/trace/trace.go index 5cefad2e..229ce981 100644 --- a/debug/trace/trace.go +++ b/debug/trace/trace.go @@ -36,6 +36,11 @@ type Span struct { type spanKey struct{} +var ( + // Default tracer + DefaultTrace = NewTrace() +) + // FromContext returns a span from context func FromContext(ctx context.Context) (*Span, bool) { s, ok := ctx.Value(spanKey{}).(*Span)