use zookeeper

boilerplate/cmd/press/main.go

@@ -14,7 +14,7 @@ import (
 	"github.com/ishumei/krpc/kserver"
 	"github.com/ishumei/krpc/objects"
 	"github.com/ishumei/krpc/protocols/arbiter/kitex_gen/com/shumei/service"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"go.uber.org/ratelimit"
 )
 
@@ -44,11 +44,11 @@ func main() {
 					}
 					return []string{}
 				}(),
-				Resolver: func() registry_zookeeper.Conf {
+				Resolver: func() zookeeper.Conf {
 					if err == nil {
 						return c.Registry
 					}
-					return registry_zookeeper.Conf{
+					return zookeeper.Conf{
 						Metabase:  *metabase,
 						TimeoutMs: 10000,
 					}

boilerplate/pkg/conf/conf.go

@@ -3,7 +3,7 @@ package conf
 import (
 	"github.com/creasty/defaults"
 	"github.com/ishumei/krpc/conf"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"github.com/samber/do"
 )
 
@@ -29,7 +29,7 @@ type Strategy struct {
 
 type Config struct {
 	Debug    bool
-	Registry registry_zookeeper.Conf
+	Registry zookeeper.Conf
 	Model    Model
 	Strategy Strategy
 }

boilerplate/pkg/handler/handler.go

@@ -16,7 +16,7 @@ import (
 	"github.com/ishumei/krpc/objects"
 	"github.com/ishumei/krpc/protocols/arbiter/kitex_gen/com/shumei/service"
 	"github.com/ishumei/krpc/protocols/arbiter/kitex_gen/com/shumei/service/predictor"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"github.com/jncornett/doublebuf"
 	"github.com/samber/do"
 	"github.com/samber/lo"
@@ -107,11 +107,11 @@ func (s *mirrorClients) Predict(ctx context.Context, request *service.PredictReq
 }
 
 func MustNew() *mirrorClients {
-	zkConn := do.MustInvoke[*registry_zookeeper.ZookeeperRegistry](kserver.Injector)
+	zkConn := do.MustInvoke[*zookeeper.ZookeeperRegistry](kserver.Injector)
 	sConf := do.MustInvoke[*kserver.FrameConfig](kserver.Injector)
 	childNodes, _, err := zkConn.Children(sConf.ServiceName)
 	lo.Must0(err)
-	localIp, err := registry_zookeeper.GetLocalIp("")
+	localIp, err := zookeeper.GetLocalIp("")
 	lo.Must0(err)
 	localIpPort := fmt.Sprintf("%s:%d", localIp, sConf.Port)
 	klog.Info("selfIpPort: ", localIpPort)

boilerplate/pkg/strategies/doc.go

@@ -8,7 +8,7 @@ import (
 	"github.com/ishumei/krpc/boilerplate/pkg/models"
 	"github.com/ishumei/krpc/kserver"
 	"github.com/ishumei/krpc/objects"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"github.com/samber/do"
 )
 
@@ -17,7 +17,7 @@ func Init() error {
 	if err != nil {
 		return err
 	}
-	zookeeperConn, err := do.Invoke[*registry_zookeeper.ZookeeperResolver](kserver.Injector)
+	zookeeperConn, err := do.Invoke[*zookeeper.ZookeeperResolver](kserver.Injector)
 	if err != nil {
 		return err
 	}

kclient/conf.go

@@ -2,7 +2,7 @@ package kclient
 
 import (
 	"github.com/cloudwego/kitex/pkg/connpool"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"github.com/samber/do"
 )
 
@@ -31,5 +31,5 @@ type ClientConf struct {
 
 type ResolverConf struct {
 	Hostports []string
-	Resolver  registry_zookeeper.Conf
+	Resolver  zookeeper.Conf
 }

kclient/kclient.go

@@ -7,7 +7,7 @@ import (
 	"github.com/cloudwego/kitex/pkg/discovery"
 	"github.com/cloudwego/kitex/pkg/klog"
 	"github.com/ishumei/krpc/logging"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"github.com/kitex-contrib/obs-opentelemetry/provider"
 	"github.com/samber/do"
 )
@@ -42,12 +42,12 @@ func MustNewKclient(c *SingleClientConf) *Kclient {
 		do.Override(Injector, func(i *do.Injector) (discovery.Resolver, error) {
 			logger, err := do.Invoke[*logging.Logger](logging.Injector)
 			if err == nil {
-				return registry_zookeeper.NewZookeeperResolverWithConf(
+				return zookeeper.NewZookeeperResolverWithConf(
 					c.ResolverConf.Resolver,
-					registry_zookeeper.WithLogger(logger),
+					zookeeper.WithLogger(logger),
 				)
 			} else {
-				return registry_zookeeper.NewZookeeperResolverWithConf(
+				return zookeeper.NewZookeeperResolverWithConf(
 					c.ResolverConf.Resolver,
 				)
 			}

kclient/multi.go

@@ -6,7 +6,7 @@ import (
 	"github.com/ishumei/krpc/conf"
 	"github.com/ishumei/krpc/logging"
 	"github.com/ishumei/krpc/objects"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"github.com/samber/do"
 )
 
@@ -27,12 +27,12 @@ func InjectClientFromMultiClientConf(c *MultiClientConf) {
 	do.Override(Injector, func(i *do.Injector) (discovery.Resolver, error) {
 		logger, err := do.Invoke[*logging.Logger](logging.Injector)
 		if err == nil {
-			return registry_zookeeper.NewZookeeperResolverWithConf(
+			return zookeeper.NewZookeeperResolverWithConf(
 				c.ResolverConf.Resolver,
-				registry_zookeeper.WithLogger(logger),
+				zookeeper.WithLogger(logger),
 			)
 		} else {
-			return registry_zookeeper.NewZookeeperResolverWithConf(
+			return zookeeper.NewZookeeperResolverWithConf(
 				c.ResolverConf.Resolver,
 			)
 		}

kserver/arbiter/arbiter.go

@@ -4,7 +4,7 @@ import (
 	"github.com/cloudwego/kitex/server"
 	"github.com/ishumei/krpc/kserver"
 	"github.com/ishumei/krpc/protocols/arbiter/kitex_gen/com/shumei/service"
-	arbiterpredictor "github.com/ishumei/krpc/protocols/arbiter/kitex_gen/com/shumei/service/predictor"
+	"github.com/ishumei/krpc/protocols/arbiter/kitex_gen/com/shumei/service/predictor"
 	"github.com/samber/do"
 )
 
@@ -15,10 +15,10 @@ type ArbiterService struct {
 func NewArbiterService(i *do.Injector) (*ArbiterService, error) {
 	opts := do.MustInvoke[*kserver.ServerOptions](kserver.Injector)
 
-	predictor := do.MustInvoke[service.Predictor](kserver.Injector)
+	p := do.MustInvoke[service.Predictor](kserver.Injector)
 
 	return &ArbiterService{
-		Kservice: kserver.MustNewKservice(i, arbiterpredictor.NewServer(predictor, server.WithSuite(opts))),
+		Kservice: kserver.MustNewKservice(i, predictor.NewServer(p, server.WithSuite(opts))),
 	}, nil
 }
 

kserver/conf.go

@@ -9,7 +9,7 @@ import (
 	"github.com/creasty/defaults"
 	"github.com/ishumei/krpc/conf"
 	"github.com/ishumei/krpc/logging"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"github.com/samber/do"
 )
 
@@ -67,7 +67,7 @@ type FrameConfig struct {
 	Addr          string
 	Port          int    `default:"8888"`
 	ServiceName   string `default:"server"`
-	Registry      registry_zookeeper.Conf
+	Registry      zookeeper.Conf
 	Http          HttpConfig
 	OpenTelemetry OpenTelemetry
 	Sentinel      Sentinel

kserver/example/audio/main.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ishumei/krpc/kserver"
 	"github.com/ishumei/krpc/kserver/audio"
-	re "github.com/ishumei/krpc/protocols/audio/kitex_gen/shumei/strategy/re"
+	"github.com/ishumei/krpc/protocols/audio/kitex_gen/shumei/strategy/re"
 	"github.com/samber/do"
 )
 

kserver/example/event/main.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ishumei/krpc/kserver"
 	"github.com/ishumei/krpc/kserver/event"
-	re "github.com/ishumei/krpc/protocols/event/kitex_gen/shumei/strategy/re"
+	"github.com/ishumei/krpc/protocols/event/kitex_gen/shumei/strategy/re"
 	"github.com/samber/do"
 )
 

kserver/example/image/main.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ishumei/krpc/kserver"
 	"github.com/ishumei/krpc/kserver/image"
-	re "github.com/ishumei/krpc/protocols/image/kitex_gen/shumei/strategy/re"
+	"github.com/ishumei/krpc/protocols/image/kitex_gen/shumei/strategy/re"
 	"github.com/samber/do"
 )
 

kserver/example/text/main.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/ishumei/krpc/kserver"
 	"github.com/ishumei/krpc/kserver/text"
-	re "github.com/ishumei/krpc/protocols/text/kitex_gen/shumei/strategy/re"
+	"github.com/ishumei/krpc/protocols/text/kitex_gen/shumei/strategy/re"
 	"github.com/samber/do"
 )
 

kserver/grace.go

@@ -6,7 +6,7 @@ import (
 	"syscall"
 
 	"github.com/cloudwego/kitex/pkg/klog"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"github.com/samber/do"
 )
 
@@ -26,7 +26,7 @@ func DefaultDeregisterSignal() {
 		sig := DeregisterSignal()
 		defer signal.Stop(sig)
 		for range sig {
-			err := do.MustInvoke[*registry_zookeeper.ZookeeperRegistry](Injector).Deregister(nil)
+			err := do.MustInvoke[*zookeeper.ZookeeperRegistry](Injector).Deregister(nil)
 			klog.Info("deregister service", err)
 		}
 		<-sig

kserver/registry.go

@@ -3,22 +3,22 @@ package kserver
 import (
 	"github.com/cloudwego/kitex/pkg/registry"
 	"github.com/ishumei/krpc/logging"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"github.com/samber/do"
 )
 
 func init() {
-	do.Provide(Injector, func(i *do.Injector) (*registry_zookeeper.ZookeeperRegistry, error) {
+	do.Provide(Injector, func(i *do.Injector) (*zookeeper.ZookeeperRegistry, error) {
 		f := do.MustInvoke[*FrameConfig](Injector)
 		c := f.Registry
 		logger := do.MustInvoke[*logging.Logger](logging.Injector)
-		return registry_zookeeper.NewZookeeperRegistryWithConf(
+		return zookeeper.NewZookeeperRegistryWithConf(
 			c,
 			f.Addr,
-			registry_zookeeper.WithLogger(logger),
+			zookeeper.WithLogger(logger),
 		)
 	})
 	do.Provide(Injector, func(i *do.Injector) (registry.Registry, error) {
-		return do.Invoke[*registry_zookeeper.ZookeeperRegistry](Injector)
+		return do.Invoke[*zookeeper.ZookeeperRegistry](Injector)
 	})
 }

kserver/resolver.go

@@ -3,20 +3,20 @@ package kserver
 import (
 	"github.com/cloudwego/kitex/pkg/discovery"
 	"github.com/ishumei/krpc/logging"
-	registry_zookeeper "github.com/ishumei/krpc/registry-zookeeper"
+	"github.com/ishumei/krpc/zookeeper"
 	"github.com/samber/do"
 )
 
 func init() {
-	do.Provide(Injector, func(i *do.Injector) (*registry_zookeeper.ZookeeperResolver, error) {
+	do.Provide(Injector, func(i *do.Injector) (*zookeeper.ZookeeperResolver, error) {
 		c := do.MustInvoke[*FrameConfig](Injector).Registry
 		logger := do.MustInvoke[*logging.Logger](logging.Injector)
-		return registry_zookeeper.NewZookeeperResolverWithConf(
+		return zookeeper.NewZookeeperResolverWithConf(
 			c,
-			registry_zookeeper.WithLogger(logger),
+			zookeeper.WithLogger(logger),
 		)
 	})
 	do.Provide(Injector, func(i *do.Injector) (discovery.Resolver, error) {
-		return do.Invoke[*registry_zookeeper.ZookeeperResolver](Injector)
+		return do.Invoke[*zookeeper.ZookeeperResolver](Injector)
 	})
 }

kserver/server_option.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/alibaba/sentinel-golang/api"
 	"github.com/alibaba/sentinel-golang/core/system"
-	sentinel "github.com/alibaba/sentinel-golang/pkg/adapters/kitex"
+	"github.com/alibaba/sentinel-golang/pkg/adapters/kitex"
 	"github.com/cloudwego/kitex/pkg/registry"
 	"github.com/cloudwego/kitex/pkg/rpcinfo"
 	"github.com/cloudwego/kitex/server"
@@ -54,7 +54,7 @@ func NewServerOptions(i *do.Injector) (*ServerOptions, error) {
 	if c.Sentinel.Enabled {
 		options = append(
 			options,
-			server.WithMiddleware(sentinel.SentinelServerMiddleware()),
+			server.WithMiddleware(kitex.SentinelServerMiddleware()),
 		)
 		lo.Must0(api.InitDefault())
 		_, err := system.LoadRules(c.Sentinel.ToSystemRules())

logging/logger_test.go

@@ -10,21 +10,21 @@ import (
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+	"go.opentelemetry.io/otel/sdk/trace"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
 
 func stdoutProvider(ctx context.Context) func() {
-	provider := sdktrace.NewTracerProvider()
+	provider := trace.NewTracerProvider()
 	otel.SetTracerProvider(provider)
 
 	exp, err := stdouttrace.New(stdouttrace.WithPrettyPrint())
 	if err != nil {
 		panic(err)
 	}
 
-	bsp := sdktrace.NewBatchSpanProcessor(exp)
+	bsp := trace.NewBatchSpanProcessor(exp)
 	provider.RegisterSpanProcessor(bsp)
 
 	return func() {

registry-zookeeper/conf.go → zookeeper/conf.go

@@ -1,4 +1,4 @@
-package registry_zookeeper
+package zookeeper
 
 const (
 	DefaultRegistrySeparater = ","

registry-zookeeper/const.go → zookeeper/const.go

@@ -1,4 +1,4 @@
-package registry_zookeeper
+package zookeeper
 
 const (
 	Separator = "/"

registry-zookeeper/entity.go → zookeeper/entity.go

@@ -1,4 +1,4 @@
-package registry_zookeeper
+package zookeeper
 
 import (
 	"os"

registry-zookeeper/entity_test.go → zookeeper/entity_test.go

@@ -1,4 +1,4 @@
-package registry_zookeeper
+package zookeeper
 
 import (
 	"reflect"