Merge pull request #1144 from unistack-org/v2

fix import paths for v2 release

agent/input/discord/conn.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/micro/go-micro/agent/input"
+	"github.com/micro/go-micro/v2/agent/input"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/util/log"
 )
 
 type discordConn struct {

agent/input/discord/discord.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/micro/cli/v2"
-	"github.com/micro/go-micro/agent/input"
+	"github.com/micro/go-micro/v2/agent/input"
 )
 
 func init() {

agent/input/slack/conn.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/agent/input"
+	"github.com/micro/go-micro/v2/agent/input"
 	"github.com/nlopes/slack"
 )
 

agent/input/slack/slack.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/micro/cli/v2"
-	"github.com/micro/go-micro/agent/input"
+	"github.com/micro/go-micro/v2/agent/input"
 	"github.com/nlopes/slack"
 )
 

agent/input/telegram/conn.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 
 	"github.com/forestgiant/sliceutil"
-	"github.com/micro/go-micro/agent/input"
+	"github.com/micro/go-micro/v2/agent/input"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/util/log"
 	tgbotapi "gopkg.in/telegram-bot-api.v4"
 )
 

agent/input/telegram/telegram.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/micro/cli/v2"
-	"github.com/micro/go-micro/agent/input"
+	"github.com/micro/go-micro/v2/agent/input"
 	tgbotapi "gopkg.in/telegram-bot-api.v4"
 )
 

agent/proto/bot.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: github.com/micro/go-micro/agent/proto/bot.proto
+// source: github.com/micro/go-micro/v2/agent/proto/bot.proto
 
 package go_micro_bot
 
@@ -192,7 +192,7 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("github.com/micro/go-micro/agent/proto/bot.proto", fileDescriptor_018e8d5b14a89d12)
+	proto.RegisterFile("github.com/micro/go-micro/v2/agent/proto/bot.proto", fileDescriptor_018e8d5b14a89d12)
 }
 
 var fileDescriptor_018e8d5b14a89d12 = []byte{

agent/proto/bot.pb.micro.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: github.com/micro/go-micro/agent/proto/bot.proto
+// source: github.com/micro/go-micro/v2/agent/proto/bot.proto
 
 package go_micro_bot
 
@@ -11,8 +11,8 @@ import (
 
 import (
 	context "context"
-	client "github.com/micro/go-micro/client"
+	client "github.com/micro/go-micro/v2/client"
-	server "github.com/micro/go-micro/server"
+	server "github.com/micro/go-micro/v2/server"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

api/api.go

@@ -5,8 +5,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/server"
+	"github.com/micro/go-micro/v2/server"
 )
 
 // Endpoint is a mapping between an RPC method and HTTP endpoint

api/handler/api/api.go

@@ -4,13 +4,13 @@ package api
 import (
 	"net/http"
 
-	goapi "github.com/micro/go-micro/api"
+	goapi "github.com/micro/go-micro/v2/api"
-	"github.com/micro/go-micro/api/handler"
+	"github.com/micro/go-micro/v2/api/handler"
-	api "github.com/micro/go-micro/api/proto"
+	api "github.com/micro/go-micro/v2/api/proto"
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/errors"
+	"github.com/micro/go-micro/v2/errors"
-	"github.com/micro/go-micro/util/ctx"
+	"github.com/micro/go-micro/v2/util/ctx"
 )
 
 type apiHandler struct {

api/handler/api/util.go

@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"strings"
 
-	api "github.com/micro/go-micro/api/proto"
+	api "github.com/micro/go-micro/v2/api/proto"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 func requestToProto(r *http.Request) (*api.Request, error) {

api/handler/broker/broker.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/micro/go-micro/api/handler"
+	"github.com/micro/go-micro/v2/api/handler"
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/util/log"
 )
 
 const (

api/handler/cloudevents/cloudevents.go

@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/micro/go-micro/api/handler"
+	"github.com/micro/go-micro/v2/api/handler"
-	"github.com/micro/go-micro/util/ctx"
+	"github.com/micro/go-micro/v2/util/ctx"
 )
 
 type event struct {

api/handler/event/event.go

@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/micro/go-micro/api/handler"
+	"github.com/micro/go-micro/v2/api/handler"
-	proto "github.com/micro/go-micro/api/proto"
+	proto "github.com/micro/go-micro/v2/api/proto"
-	"github.com/micro/go-micro/util/ctx"
+	"github.com/micro/go-micro/v2/util/ctx"
 )
 
 type event struct {

api/handler/http/http.go

@@ -8,9 +8,9 @@ import (
 	"net/http/httputil"
 	"net/url"
 
-	"github.com/micro/go-micro/api"
+	"github.com/micro/go-micro/v2/api"
-	"github.com/micro/go-micro/api/handler"
+	"github.com/micro/go-micro/v2/api/handler"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
 )
 
 const (

api/handler/http/http_test.go

@@ -6,11 +6,11 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/micro/go-micro/api/handler"
+	"github.com/micro/go-micro/v2/api/handler"
-	"github.com/micro/go-micro/api/router"
+	"github.com/micro/go-micro/v2/api/router"
-	regRouter "github.com/micro/go-micro/api/router/registry"
+	regRouter "github.com/micro/go-micro/v2/api/router/registry"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/registry/memory"
+	"github.com/micro/go-micro/v2/registry/memory"
 )
 
 func testHttp(t *testing.T, path, service, ns string) {

api/handler/options.go

@@ -1,8 +1,8 @@
 package handler
 
 import (
-	"github.com/micro/go-micro"
+	"github.com/micro/go-micro/v2"
-	"github.com/micro/go-micro/api/router"
+	"github.com/micro/go-micro/v2/api/router"
 )
 
 type Options struct {

api/handler/registry/registry.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/micro/go-micro/api/handler"
+	"github.com/micro/go-micro/v2/api/handler"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 const (

api/handler/rpc/rpc.go

@@ -10,17 +10,17 @@ import (
 	"strings"
 
 	"github.com/joncalhoun/qson"
-	"github.com/micro/go-micro/api"
+	"github.com/micro/go-micro/v2/api"
-	"github.com/micro/go-micro/api/handler"
+	"github.com/micro/go-micro/v2/api/handler"
-	proto "github.com/micro/go-micro/api/internal/proto"
+	proto "github.com/micro/go-micro/v2/api/internal/proto"
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
-	"github.com/micro/go-micro/codec/jsonrpc"
+	"github.com/micro/go-micro/v2/codec/jsonrpc"
-	"github.com/micro/go-micro/codec/protorpc"
+	"github.com/micro/go-micro/v2/codec/protorpc"
-	"github.com/micro/go-micro/errors"
+	"github.com/micro/go-micro/v2/errors"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/util/ctx"
+	"github.com/micro/go-micro/v2/util/ctx"
 )
 
 const (

api/handler/rpc/rpc_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/golang/protobuf/proto"
-	go_api "github.com/micro/go-micro/api/proto"
+	go_api "github.com/micro/go-micro/v2/api/proto"
 )
 
 func TestRequestPayloadFromRequest(t *testing.T) {

api/handler/web/web.go

@@ -11,9 +11,9 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/micro/go-micro/api"
+	"github.com/micro/go-micro/v2/api"
-	"github.com/micro/go-micro/api/handler"
+	"github.com/micro/go-micro/v2/api/handler"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
 )
 
 const (

api/proto/api.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: github.com/micro/go-micro/api/proto/api.proto
+// source: github.com/micro/go-micro/v2/api/proto/api.proto
 
 package go_api
 
@@ -304,7 +304,7 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("github.com/micro/go-micro/api/proto/api.proto", fileDescriptor_7b6696ef87ec1943)
+	proto.RegisterFile("github.com/micro/go-micro/v2/api/proto/api.proto", fileDescriptor_7b6696ef87ec1943)
 }
 
 var fileDescriptor_7b6696ef87ec1943 = []byte{

api/proto/api.pb.micro.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: github.com/micro/go-micro/api/proto/api.proto
+// source: github.com/micro/go-micro/v2/api/proto/api.proto
 
 package go_api
 

api/resolver/grpc/grpc.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/micro/go-micro/api/resolver"
+	"github.com/micro/go-micro/v2/api/resolver"
 )
 
 type Resolver struct{}

api/resolver/host/host.go

@@ -4,7 +4,7 @@ package host
 import (
 	"net/http"
 
-	"github.com/micro/go-micro/api/resolver"
+	"github.com/micro/go-micro/v2/api/resolver"
 )
 
 type Resolver struct{}

api/resolver/micro/micro.go

@@ -4,7 +4,7 @@ package micro
 import (
 	"net/http"
 
-	"github.com/micro/go-micro/api/resolver"
+	"github.com/micro/go-micro/v2/api/resolver"
 )
 
 // default resolver for legacy purposes

api/resolver/path/path.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/micro/go-micro/api/resolver"
+	"github.com/micro/go-micro/v2/api/resolver"
 )
 
 type Resolver struct{}

api/resolver/vpath/vpath.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/micro/go-micro/api/resolver"
+	"github.com/micro/go-micro/v2/api/resolver"
 )
 
 type Resolver struct{}

api/router/options.go

@@ -1,9 +1,9 @@
 package router
 
 import (
-	"github.com/micro/go-micro/api/resolver"
+	"github.com/micro/go-micro/v2/api/resolver"
-	"github.com/micro/go-micro/api/resolver/micro"
+	"github.com/micro/go-micro/v2/api/resolver/micro"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 type Options struct {

api/router/registry/registry.go

@@ -11,10 +11,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/api"
+	"github.com/micro/go-micro/v2/api"
-	"github.com/micro/go-micro/api/router"
+	"github.com/micro/go-micro/v2/api/router"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/registry/cache"
+	"github.com/micro/go-micro/v2/registry/cache"
 )
 
 // router is the default router

api/router/registry/registry_test.go

@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/micro/go-micro/api"
+	"github.com/micro/go-micro/v2/api"
 )
 
 func TestSetNamespace(t *testing.T) {

api/router/router.go

@@ -4,7 +4,7 @@ package router
 import (
 	"net/http"
 
-	"github.com/micro/go-micro/api"
+	"github.com/micro/go-micro/v2/api"
 )
 
 // Router is used to determine an endpoint for a request

api/server/acme/autocert/autocert.go

@@ -5,7 +5,7 @@ package autocert
 import (
 	"net"
 
-	"github.com/micro/go-micro/api/server/acme"
+	"github.com/micro/go-micro/v2/api/server/acme"
 	"golang.org/x/crypto/acme/autocert"
 )
 

api/server/acme/certmagic/certmagic.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/mholt/certmagic"
 
-	"github.com/micro/go-micro/api/server/acme"
+	"github.com/micro/go-micro/v2/api/server/acme"
 )
 
 type certmagicProvider struct {

api/server/acme/certmagic/certmagic_test.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/go-acme/lego/v3/providers/dns/cloudflare"
 	"github.com/mholt/certmagic"
-	"github.com/micro/go-micro/api/server/acme"
+	"github.com/micro/go-micro/v2/api/server/acme"
-	cfstore "github.com/micro/go-micro/store/cloudflare"
+	cfstore "github.com/micro/go-micro/v2/store/cloudflare"
-	"github.com/micro/go-micro/sync/lock/memory"
+	"github.com/micro/go-micro/v2/sync/lock/memory"
 )
 
 func TestCertMagic(t *testing.T) {

api/server/acme/certmagic/storage.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/mholt/certmagic"
-	"github.com/micro/go-micro/store"
+	"github.com/micro/go-micro/v2/store"
-	"github.com/micro/go-micro/sync/lock"
+	"github.com/micro/go-micro/v2/sync/lock"
 )
 
 // File represents a "File" that will be stored in store.Store - the contents and last modified time

api/server/http/http.go

@@ -9,8 +9,8 @@ import (
 	"sync"
 
 	"github.com/gorilla/handlers"
-	"github.com/micro/go-micro/api/server"
+	"github.com/micro/go-micro/v2/api/server"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/util/log"
 )
 
 type httpServer struct {

api/server/options.go

@@ -3,7 +3,7 @@ package server
 import (
 	"crypto/tls"
 
-	"github.com/micro/go-micro/api/server/acme"
+	"github.com/micro/go-micro/v2/api/server/acme"
 )
 
 type Option func(o *Options)

broker/default.go

@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/codec/json"
+	"github.com/micro/go-micro/v2/codec/json"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/util/addr"
+	"github.com/micro/go-micro/v2/util/addr"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/util/log"
 	"github.com/nats-io/nats-server/v2/server"
 	nats "github.com/nats-io/nats.go"
 )

broker/memory/memory.go

@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
-	maddr "github.com/micro/go-micro/util/addr"
+	maddr "github.com/micro/go-micro/v2/util/addr"
-	mnet "github.com/micro/go-micro/util/net"
+	mnet "github.com/micro/go-micro/v2/util/net"
 )
 
 type memoryBroker struct {

broker/memory/memory_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
 )
 
 func TestMemoryBroker(t *testing.T) {

broker/nats/context.go

@@ -3,7 +3,7 @@ package nats
 import (
 	"context"
 
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
 )
 
 // setSubscribeOption returns a function to setup a context with given value

broker/nats/nats.go

@@ -11,11 +11,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
-	"github.com/micro/go-micro/codec/json"
+	"github.com/micro/go-micro/v2/codec/json"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/util/addr"
+	"github.com/micro/go-micro/v2/util/addr"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/util/log"
 	"github.com/nats-io/nats-server/v2/server"
 	nats "github.com/nats-io/nats.go"
 )

broker/nats/nats_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
 	nats "github.com/nats-io/nats.go"
 )
 

broker/nats/options.go

@@ -1,7 +1,7 @@
 package nats
 
 import (
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
 	nats "github.com/nats-io/nats.go"
 )
 

broker/options.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"crypto/tls"
 
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 type Options struct {

broker/service/proto/broker.pb.micro.go

@@ -11,8 +11,8 @@ import (
 
 import (
 	context "context"
-	client "github.com/micro/go-micro/client"
+	client "github.com/micro/go-micro/v2/client"
-	server "github.com/micro/go-micro/server"
+	server "github.com/micro/go-micro/v2/server"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

broker/service/service.go

@@ -5,10 +5,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
-	pb "github.com/micro/go-micro/broker/service/proto"
+	pb "github.com/micro/go-micro/v2/broker/service/proto"
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/util/log"
 )
 
 type serviceBroker struct {

broker/service/subscriber.go

@@ -1,9 +1,9 @@
 package service
 
 import (
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
-	pb "github.com/micro/go-micro/broker/service/proto"
+	pb "github.com/micro/go-micro/v2/broker/service/proto"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/util/log"
 )
 
 type serviceSub struct {

client/client.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 // Client is the interface used to make requests to services.

client/common_test.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 var (

client/grpc/codec.go

@@ -9,8 +9,8 @@ import (
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"
 	jsoniter "github.com/json-iterator/go"
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
-	"github.com/micro/go-micro/codec/bytes"
+	"github.com/micro/go-micro/v2/codec/bytes"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )

client/grpc/error.go

@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	"github.com/micro/go-micro/errors"
+	"github.com/micro/go-micro/v2/errors"
 	"google.golang.org/grpc/status"
 )
 

client/grpc/grpc.go

@@ -9,13 +9,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	raw "github.com/micro/go-micro/codec/bytes"
+	raw "github.com/micro/go-micro/v2/codec/bytes"
-	"github.com/micro/go-micro/errors"
+	"github.com/micro/go-micro/v2/errors"
-	"github.com/micro/go-micro/metadata"
+	"github.com/micro/go-micro/v2/metadata"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"

client/grpc/grpc_test.go

@@ -5,10 +5,10 @@ import (
 	"net"
 	"testing"
 
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/registry/memory"
+	"github.com/micro/go-micro/v2/registry/memory"
 	pgrpc "google.golang.org/grpc"
 	pb "google.golang.org/grpc/examples/helloworld/helloworld"
 )

client/grpc/message.go

@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
 )
 
 type grpcEvent struct {

client/grpc/options.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"crypto/tls"
 
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )

client/grpc/request.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type grpcRequest struct {

client/grpc/response.go

@@ -3,8 +3,8 @@ package grpc
 import (
 	"strings"
 
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
-	"github.com/micro/go-micro/codec/bytes"
+	"github.com/micro/go-micro/v2/codec/bytes"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )

client/grpc/stream.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"sync"
 
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
 	"google.golang.org/grpc"
 )
 

client/mucp/mucp.go

@@ -2,7 +2,7 @@
 package mucp
 
 import (
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
 )
 
 // NewClient returns a new micro client interface

client/options.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"time"
 
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/transport"
+	"github.com/micro/go-micro/v2/transport"
 )
 
 type Options struct {

client/options_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/micro/go-micro/transport"
+	"github.com/micro/go-micro/v2/transport"
 )
 
 func TestCallOptions(t *testing.T) {

client/retry.go

@@ -3,7 +3,7 @@ package client
 import (
 	"context"
 
-	"github.com/micro/go-micro/errors"
+	"github.com/micro/go-micro/v2/errors"
 )
 
 // note that returning either false or a non-nil error will result in the call not being retried

client/rpc_client.go

@@ -9,16 +9,16 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
-	raw "github.com/micro/go-micro/codec/bytes"
+	raw "github.com/micro/go-micro/v2/codec/bytes"
-	"github.com/micro/go-micro/errors"
+	"github.com/micro/go-micro/v2/errors"
-	"github.com/micro/go-micro/metadata"
+	"github.com/micro/go-micro/v2/metadata"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/transport"
+	"github.com/micro/go-micro/v2/transport"
-	"github.com/micro/go-micro/util/buf"
+	"github.com/micro/go-micro/v2/util/buf"
-	"github.com/micro/go-micro/util/pool"
+	"github.com/micro/go-micro/v2/util/pool"
 )
 
 type rpcClient struct {

client/rpc_client_test.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/errors"
+	"github.com/micro/go-micro/v2/errors"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/registry/memory"
+	"github.com/micro/go-micro/v2/registry/memory"
 )
 
 func newTestRegistry() registry.Registry {

client/rpc_codec.go

@@ -4,16 +4,16 @@ import (
 	"bytes"
 	errs "errors"
 
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
-	raw "github.com/micro/go-micro/codec/bytes"
+	raw "github.com/micro/go-micro/v2/codec/bytes"
-	"github.com/micro/go-micro/codec/grpc"
+	"github.com/micro/go-micro/v2/codec/grpc"
-	"github.com/micro/go-micro/codec/json"
+	"github.com/micro/go-micro/v2/codec/json"
-	"github.com/micro/go-micro/codec/jsonrpc"
+	"github.com/micro/go-micro/v2/codec/jsonrpc"
-	"github.com/micro/go-micro/codec/proto"
+	"github.com/micro/go-micro/v2/codec/proto"
-	"github.com/micro/go-micro/codec/protorpc"
+	"github.com/micro/go-micro/v2/codec/protorpc"
-	"github.com/micro/go-micro/errors"
+	"github.com/micro/go-micro/v2/errors"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/transport"
+	"github.com/micro/go-micro/v2/transport"
 )
 
 const (

client/rpc_request.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type rpcRequest struct {

client/rpc_response.go

@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
-	"github.com/micro/go-micro/transport"
+	"github.com/micro/go-micro/v2/transport"
 )
 
 type rpcResponse struct {

client/rpc_stream.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"sync"
 
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 // Implements the streamer interface

client/selector/common_test.go

@@ -1,7 +1,7 @@
 package selector
 
 import (
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 var (

client/selector/default.go

@@ -3,8 +3,8 @@ package selector
 import (
 	"time"
 
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/registry/cache"
+	"github.com/micro/go-micro/v2/registry/cache"
 )
 
 type registrySelector struct {

client/selector/default_test.go

@@ -3,7 +3,7 @@ package selector
 import (
 	"testing"
 
-	"github.com/micro/go-micro/registry/memory"
+	"github.com/micro/go-micro/v2/registry/memory"
 )
 
 func TestRegistrySelector(t *testing.T) {

client/selector/dns/dns.go

@@ -6,8 +6,8 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 type dnsSelector struct {

client/selector/filter.go

@@ -1,7 +1,7 @@
 package selector
 
 import (
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 // FilterEndpoint is an endpoint based Select Filter which will

client/selector/filter_test.go

@@ -3,7 +3,7 @@ package selector
 import (
 	"testing"
 
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 func TestFilterEndpoint(t *testing.T) {

client/selector/options.go

@@ -3,7 +3,7 @@ package selector
 import (
 	"context"
 
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 type Options struct {

client/selector/registry/options.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
 )
 
 // Set the registry cache ttl

client/selector/registry/registry.go

@@ -2,7 +2,7 @@
 package registry
 
 import (
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
 )
 
 // NewSelector returns a new registry selector

client/selector/router/router.go

@@ -7,11 +7,11 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/router"
+	"github.com/micro/go-micro/v2/router"
-	pb "github.com/micro/go-micro/router/service/proto"
+	pb "github.com/micro/go-micro/v2/router/service/proto"
 )
 
 type routerSelector struct {

client/selector/selector.go

@@ -4,7 +4,7 @@ package selector
 import (
 	"errors"
 
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 // Selector builds on the registry as a mechanism to pick nodes

client/selector/static/static.go

@@ -2,8 +2,8 @@
 package static
 
 import (
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 // staticSelector is a static selector

client/selector/strategy.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 func init() {

client/selector/strategy_test.go

@@ -3,7 +3,7 @@ package selector
 import (
 	"testing"
 
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 func TestStrategies(t *testing.T) {

client/service/proto/client.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: github.com/micro/go-micro/client/proto/client.proto
+// source: github.com/micro/go-micro/v2/client/proto/client.proto
 
 package go_micro_client
 
@@ -184,7 +184,7 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("github.com/micro/go-micro/client/proto/client.proto", fileDescriptor_d418333f021a3308)
+	proto.RegisterFile("github.com/micro/go-micro/v2/client/proto/client.proto", fileDescriptor_d418333f021a3308)
 }
 
 var fileDescriptor_d418333f021a3308 = []byte{

client/service/proto/client.pb.micro.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: github.com/micro/go-micro/client/proto/client.proto
+// source: github.com/micro/go-micro/v2/client/proto/client.proto
 
 package go_micro_client
 
@@ -11,8 +11,8 @@ import (
 
 import (
 	context "context"
-	client "github.com/micro/go-micro/client"
+	client "github.com/micro/go-micro/v2/client"
-	server "github.com/micro/go-micro/server"
+	server "github.com/micro/go-micro/v2/server"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

client/wrapper.go

@@ -3,7 +3,7 @@ package client
 import (
 	"context"
 
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
 )
 
 // CallFunc represents the individual call func

codec/bytes/bytes.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type Codec struct {

codec/grpc/grpc.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type Codec struct {

codec/json/json.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/golang/protobuf/proto"
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type Codec struct {

codec/jsonrpc/client.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"sync"
 
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type clientCodec struct {

codec/jsonrpc/jsonrpc.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type jsonCodec struct {

codec/jsonrpc/server.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type serverCodec struct {

codec/proto/proto.go

@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type Codec struct {

codec/protorpc/protorpc.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type flusher interface {

codec/text/text.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"io/ioutil"
 
-	"github.com/micro/go-micro/codec"
+	"github.com/micro/go-micro/v2/codec"
 )
 
 type Codec struct {

config/cmd/cmd.go

@@ -7,54 +7,54 @@ import (
 	"strings"
 	"time"
 
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/debug/trace"
+	"github.com/micro/go-micro/v2/debug/trace"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/runtime"
+	"github.com/micro/go-micro/v2/runtime"
-	"github.com/micro/go-micro/server"
+	"github.com/micro/go-micro/v2/server"
-	"github.com/micro/go-micro/store"
+	"github.com/micro/go-micro/v2/store"
-	"github.com/micro/go-micro/transport"
+	"github.com/micro/go-micro/v2/transport"
-	"github.com/micro/go-micro/util/log"
+	"github.com/micro/go-micro/v2/util/log"
 
 	// clients
-	cgrpc "github.com/micro/go-micro/client/grpc"
+	cgrpc "github.com/micro/go-micro/v2/client/grpc"
-	cmucp "github.com/micro/go-micro/client/mucp"
+	cmucp "github.com/micro/go-micro/v2/client/mucp"
 
 	// servers
 	"github.com/micro/cli/v2"
-	sgrpc "github.com/micro/go-micro/server/grpc"
+	sgrpc "github.com/micro/go-micro/v2/server/grpc"
-	smucp "github.com/micro/go-micro/server/mucp"
+	smucp "github.com/micro/go-micro/v2/server/mucp"
 
 	// brokers
-	"github.com/micro/go-micro/broker/memory"
+	"github.com/micro/go-micro/v2/broker/memory"
-	"github.com/micro/go-micro/broker/nats"
+	"github.com/micro/go-micro/v2/broker/nats"
-	brokerSrv "github.com/micro/go-micro/broker/service"
+	brokerSrv "github.com/micro/go-micro/v2/broker/service"
 
 	// registries
-	"github.com/micro/go-micro/registry/etcd"
+	"github.com/micro/go-micro/v2/registry/etcd"
-	kreg "github.com/micro/go-micro/registry/kubernetes"
+	kreg "github.com/micro/go-micro/v2/registry/kubernetes"
-	"github.com/micro/go-micro/registry/mdns"
+	"github.com/micro/go-micro/v2/registry/mdns"
-	rmem "github.com/micro/go-micro/registry/memory"
+	rmem "github.com/micro/go-micro/v2/registry/memory"
-	regSrv "github.com/micro/go-micro/registry/service"
+	regSrv "github.com/micro/go-micro/v2/registry/service"
 
 	// selectors
-	"github.com/micro/go-micro/client/selector/dns"
+	"github.com/micro/go-micro/v2/client/selector/dns"
-	"github.com/micro/go-micro/client/selector/router"
+	"github.com/micro/go-micro/v2/client/selector/router"
-	"github.com/micro/go-micro/client/selector/static"
+	"github.com/micro/go-micro/v2/client/selector/static"
 
 	// transports
-	thttp "github.com/micro/go-micro/transport/http"
+	thttp "github.com/micro/go-micro/v2/transport/http"
-	tmem "github.com/micro/go-micro/transport/memory"
+	tmem "github.com/micro/go-micro/v2/transport/memory"
 
 	// stores
-	memStore "github.com/micro/go-micro/store/memory"
+	memStore "github.com/micro/go-micro/v2/store/memory"
-	svcStore "github.com/micro/go-micro/store/service"
+	svcStore "github.com/micro/go-micro/v2/store/service"
 
 	// tracers
-	// jTracer "github.com/micro/go-micro/debug/trace/jaeger"
+	// jTracer "github.com/micro/go-micro/v2/debug/trace/jaeger"
-	memTracer "github.com/micro/go-micro/debug/trace/memory"
+	memTracer "github.com/micro/go-micro/v2/debug/trace/memory"
 )
 
 type Cmd interface {

config/cmd/options.go

@@ -3,15 +3,15 @@ package cmd
 import (
 	"context"
 
-	"github.com/micro/go-micro/broker"
+	"github.com/micro/go-micro/v2/broker"
-	"github.com/micro/go-micro/client"
+	"github.com/micro/go-micro/v2/client"
-	"github.com/micro/go-micro/client/selector"
+	"github.com/micro/go-micro/v2/client/selector"
-	"github.com/micro/go-micro/debug/trace"
+	"github.com/micro/go-micro/v2/debug/trace"
-	"github.com/micro/go-micro/registry"
+	"github.com/micro/go-micro/v2/registry"
-	"github.com/micro/go-micro/runtime"
+	"github.com/micro/go-micro/v2/runtime"
-	"github.com/micro/go-micro/server"
+	"github.com/micro/go-micro/v2/server"
-	"github.com/micro/go-micro/store"
+	"github.com/micro/go-micro/v2/store"
-	"github.com/micro/go-micro/transport"
+	"github.com/micro/go-micro/v2/transport"
 )
 
 type Options struct {

config/config.go

@@ -4,10 +4,10 @@ package config
 import (
 	"context"
 
-	"github.com/micro/go-micro/config/loader"
+	"github.com/micro/go-micro/v2/config/loader"
-	"github.com/micro/go-micro/config/reader"
+	"github.com/micro/go-micro/v2/config/reader"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
-	"github.com/micro/go-micro/config/source/file"
+	"github.com/micro/go-micro/v2/config/source/file"
 )
 
 // Config is an interface abstraction for dynamic configuration

config/default.go

@@ -5,11 +5,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/micro/go-micro/config/loader"
+	"github.com/micro/go-micro/v2/config/loader"
-	"github.com/micro/go-micro/config/loader/memory"
+	"github.com/micro/go-micro/v2/config/loader/memory"
-	"github.com/micro/go-micro/config/reader"
+	"github.com/micro/go-micro/v2/config/reader"
-	"github.com/micro/go-micro/config/reader/json"
+	"github.com/micro/go-micro/v2/config/reader/json"
-	"github.com/micro/go-micro/config/source"
+	"github.com/micro/go-micro/v2/config/source"
 )
 
 type config struct {