update zook

Author: smx-Morgan

config/zookeeper/client/circuit_breaker.go

@@ -30,7 +30,7 @@ import (
 
 // WithCircuitBreaker sets the circuit breaker policy from zookeeper configuration center.
 func WithCircuitBreaker(dest, src string, zookeeperClient zookeeper.Client, opts utils.Options) []client.Option {
-	param, err := zookeeperClient.ClientConfigParam(&common.ConfigParamConfig{
+	param, err := zookeeperClient.ClientConfigParam(&zookeeper.ConfigParamConfig{
 		Category:          circuitBreakerConfigName,
 		ServerServiceName: dest,
 		ClientServiceName: src,
@@ -85,12 +85,12 @@ func initCircuitBreaker(path string, uniqueID int64, dest string, zookeeperClien
 	cb := circuitbreak.NewCBSuite(genServiceCBKeyWithRPCInfo)
 	lcb := common.ThreadSafeSet{}
 
-	onChangeCallback := func(restoreDefault bool, data string, parser common.ConfigParser) {
+	onChangeCallback := func(restoreDefault bool, data string, parser zookeeper.ConfigParser) {
 		set := common.Set{}
 		configs := map[string]circuitbreak.CBConfig{}
 
 		if !restoreDefault {
-			err := parser.Decode(common.JSON, data, &configs)
+			err := parser.Decode(data, &configs)
 			if err != nil {
 				klog.Warnf("[zookeeper] %s client zookeeper circuit breaker: unmarshal data %s failed: %s, skip...", path, data, err)
 				return

config/zookeeper/client/degradation.go

@@ -17,8 +17,6 @@ package client
 import (
 	"context"
 
-	common "github.com/cloudwego-contrib/cwgo-pkg/config/common"
-
 	"github.com/cloudwego-contrib/cwgo-pkg/config/zookeeper/pkg/degradation"
 	"github.com/cloudwego-contrib/cwgo-pkg/config/zookeeper/utils"
 	"github.com/cloudwego-contrib/cwgo-pkg/config/zookeeper/zookeeper"
@@ -27,7 +25,7 @@ import (
 )
 
 func WithDegradation(dest, src string, zookeeperClient zookeeper.Client, opts utils.Options) []client.Option {
-	param, err := zookeeperClient.ClientConfigParam(&common.ConfigParamConfig{
+	param, err := zookeeperClient.ClientConfigParam(&zookeeper.ConfigParamConfig{
 		Category:          degradationConfigName,
 		ServerServiceName: dest,
 		ClientServiceName: src,
@@ -55,10 +53,10 @@ func WithDegradation(dest, src string, zookeeperClient zookeeper.Client, opts ut
 
 func initDegradation(path string, uniqueID int64, dest string, zookeeperClient zookeeper.Client) *degradation.Container {
 	container := degradation.NewContainer()
-	onChangeCallback := func(restoreDefault bool, data string, parser common.ConfigParser) {
+	onChangeCallback := func(restoreDefault bool, data string, parser zookeeper.ConfigParser) {
 		config := &degradation.Config{}
 		if !restoreDefault {
-			err := parser.Decode(common.JSON, data, config)
+			err := parser.Decode(data, config)
 			if err != nil {
 				klog.Warnf("[zookeeper] %s server zookeeper degradation config: unmarshal data %s failed: %s, skip...", path, data, err)
 				return

config/zookeeper/client/retry.go

@@ -28,7 +28,7 @@ import (
 
 // WithRetryPolicy sets the retry policy from zookeeper configuration center.
 func WithRetryPolicy(dest, src string, zookeeperClient zookeeper.Client, opts utils.Options) []client.Option {
-	param, err := zookeeperClient.ClientConfigParam(&common.ConfigParamConfig{
+	param, err := zookeeperClient.ClientConfigParam(&zookeeper.ConfigParamConfig{
 		Category:          retryConfigName,
 		ServerServiceName: dest,
 		ClientServiceName: src,
@@ -59,11 +59,11 @@ func initRetryContainer(path string, uniqueID int64, dest string, zookeeperClien
 
 	ts := common.ThreadSafeSet{}
 
-	onChangeCallback := func(restoreDefault bool, data string, parser common.ConfigParser) {
+	onChangeCallback := func(restoreDefault bool, data string, parser zookeeper.ConfigParser) {
 		// the key is method name, wildcard "*" can match anything.
 		rcs := map[string]*retry.Policy{}
 		if !restoreDefault && data != "" {
-			err := parser.Decode(common.JSON, data, &rcs)
+			err := parser.Decode(data, &rcs)
 			if err != nil {
 				klog.Warnf("[zookeeper] %s client zookeeper retry: unmarshal data %s failed: %s, skip...", path, data, err)
 				return

config/zookeeper/client/rpc_timeout.go

@@ -17,8 +17,6 @@ package client
 import (
 	"context"
 
-	common "github.com/cloudwego-contrib/cwgo-pkg/config/common"
-
 	"github.com/cloudwego-contrib/cwgo-pkg/config/zookeeper/utils"
 	"github.com/cloudwego-contrib/cwgo-pkg/config/zookeeper/zookeeper"
 	"github.com/cloudwego/kitex/client"
@@ -29,7 +27,7 @@ import (
 
 // WithRPCTimeout sets the RPC timeout policy from zookeeper configuration center.
 func WithRPCTimeout(dest, src string, zookeeperClient zookeeper.Client, opts utils.Options) []client.Option {
-	param, err := zookeeperClient.ClientConfigParam(&common.ConfigParamConfig{
+	param, err := zookeeperClient.ClientConfigParam(&zookeeper.ConfigParamConfig{
 		Category:          rpcTimeoutConfigName,
 		ServerServiceName: dest,
 		ClientServiceName: src,
@@ -58,10 +56,10 @@ func WithRPCTimeout(dest, src string, zookeeperClient zookeeper.Client, opts uti
 func initRPCTimeoutContainer(path string, uniqueID int64, dest string, zookeeperClient zookeeper.Client) rpcinfo.TimeoutProvider {
 	rpcTimeoutContainer := rpctimeout.NewContainer()
 
-	onChangeCallback := func(restoreDefault bool, data string, parser common.ConfigParser) {
+	onChangeCallback := func(restoreDefault bool, data string, parser zookeeper.ConfigParser) {
 		configs := map[string]*rpctimeout.RPCTimeout{}
 		if !restoreDefault {
-			err := parser.Decode(common.JSON, data, &configs)
+			err := parser.Decode(data, &configs)
 			if err != nil {
 				klog.Warnf("[zookeeper] %s client zookeeper rpc timeout: unmarshal data %s failed: %s, skip...", path, data, err)
 				return

config/zookeeper/server/limiter.go

@@ -18,8 +18,6 @@ import (
 	"context"
 	"sync/atomic"
 
-	common "github.com/cloudwego-contrib/cwgo-pkg/config/common"
-
 	"github.com/cloudwego-contrib/cwgo-pkg/config/zookeeper/utils"
 	"github.com/cloudwego-contrib/cwgo-pkg/config/zookeeper/zookeeper"
 	"github.com/cloudwego/kitex/pkg/klog"
@@ -30,7 +28,7 @@ import (
 
 // WithLimiter sets the limiter config from zookeeper configuration center.
 func WithLimiter(dest string, zookeeperClient zookeeper.Client, opts utils.Options) server.Option {
-	param, err := zookeeperClient.ServerConfigParam(&common.ConfigParamConfig{
+	param, err := zookeeperClient.ServerConfigParam(&zookeeper.ConfigParamConfig{
 		Category:          limiterConfigName,
 		ServerServiceName: dest,
 	})
@@ -57,10 +55,10 @@ func initLimitOptions(path string, uniqueID int64, dest string, zookeeperClient
 		u.UpdateLimit(opt)
 		updater.Store(u)
 	}
-	onChangeCallback := func(restoreDefault bool, data string, parser common.ConfigParser) {
+	onChangeCallback := func(restoreDefault bool, data string, parser zookeeper.ConfigParser) {
 		lc := &limiter.LimiterConfig{}
 		if !restoreDefault && data != "" {
-			err := parser.Decode(common.JSON, data, lc)
+			err := parser.Decode(data, lc)
 			if err != nil {
 				klog.Warnf("[zookeeper] %s server zookeeper config: unmarshal data %s failed: %s, skip...", dest, data, err)
 				return

registry/nacos/nacoskitex/v2/registry/registry_test.go

@@ -190,7 +190,7 @@ func TestNacosMultipleInstancesWithDefaultNacosRegistry(t *testing.T) {
 		HealthyOnly: true,
 	})
 	if err != nil {
-		assert.Equal(t, "instance list is empty", err.Error())
+		assert.Equal(t, "instance list is empty!", err.Error())
 	} else {
 		assert.Equal(t, 0, len(res))
 	}