fix etcd config

Author: smx-Morgan

config/etcd/client/circuit_breaker.go

@@ -31,7 +31,7 @@ import (
 
 // WithCircuitBreaker sets the circuit breaker policy from etcd configuration center.
 func WithCircuitBreaker(dest, src string, etcdClient etcd.Client, uniqueID int64, opts utils.Options) []client.Option {
-	param, err := etcdClient.ClientConfigParam(&common.ConfigParamConfig{
+	param, err := etcdClient.ClientConfigParam(&etcd.ConfigParamConfig{
 		Category:          circuitBreakerConfigName,
 		ServerServiceName: dest,
 		ClientServiceName: src,
@@ -85,12 +85,12 @@ func initCircuitBreaker(key, dest, src string,
 	cb := circuitbreak.NewCBSuite(genServiceCBKeyWithRPCInfo)
 	lcb := common.ThreadSafeSet{}
 
-	onChangeCallback := func(restoreDefault bool, data string, parser common.ConfigParser) {
+	onChangeCallback := func(restoreDefault bool, data string, parser etcd.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("[etcd] %s client etcd circuit breaker: unmarshal data %s failed: %s, skip...", key, data, err)
 				return

config/etcd/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/etcd/etcd"
 	"github.com/cloudwego-contrib/cwgo-pkg/config/etcd/pkg/degradation"
 	"github.com/cloudwego-contrib/cwgo-pkg/config/etcd/utils"
@@ -28,7 +26,7 @@ import (
 )
 
 func WithDegradation(dest, src string, etcdClient etcd.Client, uniqueID int64, opts utils.Options) []client.Option {
-	param, err := etcdClient.ClientConfigParam(&common.ConfigParamConfig{
+	param, err := etcdClient.ClientConfigParam(&etcd.ConfigParamConfig{
 		Category:          degradationConfigName,
 		ServerServiceName: dest,
 		ClientServiceName: src,
@@ -53,10 +51,10 @@ func WithDegradation(dest, src string, etcdClient etcd.Client, uniqueID int64, o
 
 func initDegradationOptions(key, dest string, uniqueID int64, etcdClient etcd.Client) *degradation.Container {
 	container := degradation.NewContainer()
-	onChangeCallback := func(restoreDefault bool, data string, parser common.ConfigParser) {
+	onChangeCallback := func(restoreDefault bool, data string, parser etcd.ConfigParser) {
 		config := &degradation.Config{}
 		if !restoreDefault {
-			err := parser.Decode(common.JSON, data, config)
+			err := parser.Decode(data, config)
 			if err != nil {
 				klog.Warnf("[etcd] %s server etcd degradation config: unmarshal data %s failed: %s, skip...", key, data, err)
 				return

config/etcd/client/retry.go

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

config/etcd/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/etcd/etcd"
 	"github.com/cloudwego-contrib/cwgo-pkg/config/etcd/utils"
 	"github.com/cloudwego/kitex/client"
@@ -29,7 +27,7 @@ import (
 
 // WithRPCTimeout sets the RPC timeout policy from etcd configuration center.
 func WithRPCTimeout(dest, src string, etcdClient etcd.Client, uniqueID int64, opts utils.Options) []client.Option {
-	param, err := etcdClient.ClientConfigParam(&common.ConfigParamConfig{
+	param, err := etcdClient.ClientConfigParam(&etcd.ConfigParamConfig{
 		Category:          rpcTimeoutConfigName,
 		ServerServiceName: dest,
 		ClientServiceName: src,
@@ -57,10 +55,10 @@ func initRPCTimeoutContainer(key, dest string,
 ) rpcinfo.TimeoutProvider {
 	rpcTimeoutContainer := rpctimeout.NewContainer()
 
-	onChangeCallback := func(restoreDefault bool, data string, parser common.ConfigParser) {
+	onChangeCallback := func(restoreDefault bool, data string, parser etcd.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("[etcd] %s client etcd rpc timeout: unmarshal data %s failed: %s, skip...", key, data, err)
 				return