v3 refactor (#1868)

* Move to v3

Co-authored-by: Ben Toogood <bentoogood@gmail.com>

server/server.go

@@ -3,15 +3,11 @@ package server
 
 import (
 	"context"
-	"os"
-	"os/signal"
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/micro/go-micro/v2/codec"
-	"github.com/micro/go-micro/v2/logger"
-	"github.com/micro/go-micro/v2/registry"
-	signalutil "github.com/micro/go-micro/v2/util/signal"
+	"github.com/micro/go-micro/v3/codec"
+	"github.com/micro/go-micro/v3/registry"
 )
 
 // Server is a simple micro server abstraction
@@ -137,105 +133,11 @@ type Subscriber interface {
 type Option func(*Options)
 
 var (
-	DefaultAddress                 = ":0"
-	DefaultName                    = "go.micro.server"
-	DefaultVersion                 = "latest"
-	DefaultId                      = uuid.New().String()
-	DefaultServer           Server = newRpcServer()
-	DefaultRouter                  = newRpcRouter()
-	DefaultRegisterCheck           = func(context.Context) error { return nil }
-	DefaultRegisterInterval        = time.Second * 30
-	DefaultRegisterTTL             = time.Second * 90
-
-	// NewServer creates a new server
-	NewServer func(...Option) Server = newRpcServer
-	log                              = logger.NewHelper(logger.DefaultLogger).WithFields(map[string]interface{}{"service": "server"})
+	DefaultAddress          = ":0"
+	DefaultName             = "go.micro.server"
+	DefaultVersion          = "latest"
+	DefaultId               = uuid.New().String()
+	DefaultRegisterCheck    = func(context.Context) error { return nil }
+	DefaultRegisterInterval = time.Second * 30
+	DefaultRegisterTTL      = time.Second * 90
 )
-
-// DefaultOptions returns config options for the default service
-func DefaultOptions() Options {
-	return DefaultServer.Options()
-}
-
-// Init initialises the default server with options passed in
-func Init(opt ...Option) {
-	if DefaultServer == nil {
-		DefaultServer = newRpcServer(opt...)
-	}
-	DefaultServer.Init(opt...)
-}
-
-// NewRouter returns a new router
-func NewRouter() *router {
-	return newRpcRouter()
-}
-
-// NewSubscriber creates a new subscriber interface with the given topic
-// and handler using the default server
-func NewSubscriber(topic string, h interface{}, opts ...SubscriberOption) Subscriber {
-	return DefaultServer.NewSubscriber(topic, h, opts...)
-}
-
-// NewHandler creates a new handler interface using the default server
-// Handlers are required to be a public object with public
-// endpoints. Call to a service endpoint such as Foo.Bar expects
-// the type:
-//
-//	type Foo struct {}
-//	func (f *Foo) Bar(ctx, req, rsp) error {
-//		return nil
-//	}
-//
-func NewHandler(h interface{}, opts ...HandlerOption) Handler {
-	return DefaultServer.NewHandler(h, opts...)
-}
-
-// Handle registers a handler interface with the default server to
-// handle inbound requests
-func Handle(h Handler) error {
-	return DefaultServer.Handle(h)
-}
-
-// Subscribe registers a subscriber interface with the default server
-// which subscribes to specified topic with the broker
-func Subscribe(s Subscriber) error {
-	return DefaultServer.Subscribe(s)
-}
-
-// Run starts the default server and waits for a kill
-// signal before exiting. Also registers/deregisters the server
-func Run() error {
-	if err := Start(); err != nil {
-		return err
-	}
-
-	ch := make(chan os.Signal, 1)
-	signal.Notify(ch, signalutil.Shutdown()...)
-
-	if logger.V(logger.InfoLevel, log) {
-		log.Infof("Received signal %s", <-ch)
-	}
-	return Stop()
-}
-
-// Start starts the default server
-func Start() error {
-	config := DefaultServer.Options()
-	if logger.V(logger.InfoLevel, log) {
-		log.Infof("Starting server %s id %s", config.Name, config.Id)
-	}
-	return DefaultServer.Start()
-}
-
-// Stop stops the default server
-func Stop() error {
-	if logger.V(logger.InfoLevel, log) {
-		log.Infof("Stopping server")
-	}
-	return DefaultServer.Stop()
-}
-
-// String returns name of Server implementation
-func String() string {
-	return DefaultServer.String()
-}