From 0d8a516ec956d849b223016666a5ea337ce229e5 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 17 Jul 2020 01:29:28 +0300 Subject: [PATCH] update go-micro and fix client/selector usage Signed-off-by: Vasiliy Tolstov --- go.mod | 2 +- go.sum | 7 +++---- gobreaker_test.go | 8 +++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 1229e0a..2bc1ce7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/micro/go-plugins/wrapper/breaker/gobreaker/v2 go 1.13 require ( - github.com/micro/go-micro/v2 v2.9.1-0.20200716123506-3627e47f04eb + github.com/micro/go-micro/v2 v2.9.1-0.20200716153311-f9bf56239306 github.com/sony/gobreaker v0.4.1 ) diff --git a/go.sum b/go.sum index b966e07..80847d7 100644 --- a/go.sum +++ b/go.sum @@ -53,6 +53,7 @@ github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkN github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/bwmarrin/discordgo v0.20.2 h1:nA7jiTtqUA9lT93WL2jPjUp8ZTEInRujBdx1C9gkr20= github.com/bwmarrin/discordgo v0.20.2/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q= github.com/caddyserver/certmagic v0.10.6/go.mod h1:Y8jcUBctgk/IhpAzlHKfimZNyXCkfGgRTC0orl8gROQ= @@ -259,10 +260,8 @@ github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4f github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/micro/cli/v2 v2.1.2 h1:43J1lChg/rZCC1rvdqZNFSQDrGT7qfMrtp6/ztpIkEM= github.com/micro/cli/v2 v2.1.2/go.mod h1:EguNh6DAoWKm9nmk+k/Rg0H3lQnDxqzu5x5srOtGtYg= -github.com/micro/go-micro/v2 v2.9.1-0.20200716123506-3627e47f04eb h1:+S2buLNVdGhMvp0NiGtfhmL8WKsa/fbsEpTL3GGavaI= -github.com/micro/go-micro/v2 v2.9.1-0.20200716123506-3627e47f04eb/go.mod h1:Szpx+Q9oZvNOoGc1cPweBt3PozVX4e/z3SC1hpxV4iw= -github.com/micro/go-micro/v2 v2.9.1 h1:+S9koIrNWARjpP6k2TZ7kt0uC9zUJtNXzIdZTZRms7Q= -github.com/micro/go-micro/v2 v2.9.1/go.mod h1:x55ZM3Puy0FyvvkR3e0ha0xsE9DFwfPSUMWAIbFY0SY= +github.com/micro/go-micro/v2 v2.9.1-0.20200716153311-f9bf56239306 h1:zm/cCJwRAySbM5DZdeqH4vf0F4Lvfe/XqC8AB9Vu5ow= +github.com/micro/go-micro/v2 v2.9.1-0.20200716153311-f9bf56239306/go.mod h1:JgTt07BfD2x4mcTm/qZi8HZnxopoBYJxfpIETI8MKq8= github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM= github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= diff --git a/gobreaker_test.go b/gobreaker_test.go index 3191fe1..2b207d9 100644 --- a/gobreaker_test.go +++ b/gobreaker_test.go @@ -5,20 +5,19 @@ import ( "testing" "github.com/micro/go-micro/v2/client" - "github.com/micro/go-micro/v2/client/selector" "github.com/micro/go-micro/v2/errors" "github.com/micro/go-micro/v2/registry/memory" + "github.com/micro/go-micro/v2/router" "github.com/sony/gobreaker" ) func TestBreaker(t *testing.T) { // setup r := memory.NewRegistry() - s := selector.NewSelector(selector.Registry(r)) c := client.NewClient( // set the selector - client.Selector(s), + client.Router(rrouter.NewRouter(router.Registry(registry))), // add the breaker wrapper client.Wrap(NewClientWrapper()), ) @@ -48,11 +47,10 @@ func TestBreaker(t *testing.T) { func TestCustomBreaker(t *testing.T) { // setup r := memory.NewRegistry() - s := selector.NewSelector(selector.Registry(r)) c := client.NewClient( // set the selector - client.Selector(s), + client.Router(rrouter.NewRouter(router.Registry(registry))), // add the breaker wrapper client.Wrap(NewCustomClientWrapper( gobreaker.Settings{},