Fix: merge config-enhance

.gitignore

@@ -29,7 +29,6 @@ remoting/zookeeper/zookeeper-4unittest/
 config_center/zookeeper/zookeeper-4unittest/
 registry/zookeeper/zookeeper-4unittest/
 metadata/report/zookeeper/zookeeper-4unittest/
-config_center/apollo/mockDubbog.properties.json
 
 # vim stuff
 *~

cluster/cluster_impl/available_cluster_invoker_test.go

@@ -26,6 +26,7 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/base_cluster_invoker.go

@@ -19,6 +19,7 @@ package cluster_impl
 
 import (
 	perrors "github.com/pkg/errors"
+
 	"go.uber.org/atomic"
 )
 

cluster/cluster_impl/broadcast_cluster_invoker_test.go

@@ -26,6 +26,7 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/failback_cluster_test.go

@@ -27,7 +27,9 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	perrors "github.com/pkg/errors"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/failfast_cluster_test.go

@@ -25,7 +25,9 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	perrors "github.com/pkg/errors"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/failover_cluster_test.go

@@ -26,6 +26,7 @@ import (
 
 import (
 	perrors "github.com/pkg/errors"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/failsafe_cluster_test.go

@@ -25,7 +25,9 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	perrors "github.com/pkg/errors"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/forking_cluster_test.go

@@ -28,6 +28,7 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/zone_aware_cluster_invoker_test.go

@@ -25,6 +25,7 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/router/chain/chain.go

@@ -24,6 +24,7 @@ import (
 
 import (
 	perrors "github.com/pkg/errors"
+
 	"go.uber.org/atomic"
 )
 
@@ -122,7 +123,7 @@ func NewRouterChain(url *common.URL) (*RouterChain, error) {
 
 	for key, routerFactory := range routerFactories {
 		if virtualServiceConfigByte == nil || destinationRuleConfigByte == nil {
-			logger.Warnf("virtual Service Config or destinationRule Confi Byte may be empty, pls check your CONF_VIRTUAL_SERVICE_FILE_PATH and CONF_DEST_RULE_FILE_PATH env is correctly point to your yaml file\n")
+			logger.Warnf("virtual Service ProtocolConfig or destinationRule Confi Byte may be empty, pls check your CONF_VIRTUAL_SERVICE_FILE_PATH and CONF_DEST_RULE_FILE_PATH env is correctly point to your yaml file\n")
 		}
 		r, err := routerFactory().NewPriorityRouter(virtualServiceConfigByte, destinationRuleConfigByte)
 		if r == nil || err != nil {

cluster/router/v3router/k8s_api/listener_handler_impl.go

@@ -21,7 +21,9 @@ import (
 	metav "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
+
 	"k8s.io/client-go/kubernetes/scheme"
+
 	"k8s.io/client-go/rest"
 )
 

cluster/router/v3router/k8s_crd/client.go

@@ -29,8 +29,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
+
 	"k8s.io/client-go/kubernetes/scheme"
+
 	"k8s.io/client-go/rest"
+
 	"k8s.io/client-go/tools/cache"
 )
 

cluster/router/v3router/k8s_crd/listener_handler.go

@@ -21,6 +21,7 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
+
 	"k8s.io/client-go/rest"
 )
 

cluster/router/v3router/router_chain_test.go

@@ -24,6 +24,7 @@ import (
 
 import (
 	"github.com/stretchr/testify/assert"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

common/constant/default.go

@@ -45,13 +45,14 @@ const (
 	DEFAULT_REST_CLIENT        = "resty"
 	DEFAULT_REST_SERVER        = "go-restful"
 	DEFAULT_PORT               = 20000
+	DEFAULT_METADATAPORT       = 20005
 	DEFAULT_SERIALIZATION      = HESSIAN2_SERIALIZATION
 )
 
 const (
 	DEFAULT_KEY               = "default"
 	PREFIX_DEFAULT_KEY        = "default."
-	DEFAULT_SERVICE_FILTERS   = EchoFilterKey + "," + TokenFilterKey + "," + AccessLogFilterKey + "," + TpsLimitFilterKey + "," + GenericServiceFilterKey + "," + ExecuteLimitFilterKey + "," + GracefulShutdownProviderFilterKey
+	DEFAULT_SERVICE_FILTERS   = EchoFilterKey + "," + MetricsFilterKey + "," + TokenFilterKey + "," + AccessLogFilterKey + "," + TpsLimitFilterKey + "," + GenericServiceFilterKey + "," + ExecuteLimitFilterKey + "," + GracefulShutdownProviderFilterKey
 	DEFAULT_REFERENCE_FILTERS = GracefulShutdownConsumerFilterKey
 	GENERIC_REFERENCE_FILTERS = GenericFilterKey
 	GENERIC                   = "$invoke"

common/constant/env.go

@@ -19,16 +19,8 @@ package constant
 
 // nolint
 const (
-	// CONF_CONSUMER_FILE_PATH ...
-	CONF_CONSUMER_FILE_PATH = "CONF_CONSUMER_FILE_PATH"
-	// CONF_PROVIDER_FILE_PATH ...
-	CONF_PROVIDER_FILE_PATH = "CONF_PROVIDER_FILE_PATH"
+	// CONFIG_FILE_ENV_KEY is key of environment variable dubbogo configure file path
+	CONFIG_FILE_ENV_KEY = "DUBBO_GO_CONFIG_PATH"
 	// APP_LOG_CONF_FILE ...
 	APP_LOG_CONF_FILE = "APP_LOG_CONF_FILE"
-	// CONF_ROUTER_FILE_PATH Specify Path variable of router config file
-	CONF_ROUTER_FILE_PATH = "CONF_ROUTER_FILE_PATH"
-	// CONF_VIRTUAL_SERVICE_FILE_PATH Specify path to Virtual service of uniform router config file
-	CONF_VIRTUAL_SERVICE_FILE_PATH = "CONF_VIRTUAL_SERVICE_FILE_PATH"
-	// CONF_DEST_RULE_FILE_PATH Specify path to destination rule of uniform router config file
-	CONF_DEST_RULE_FILE_PATH = "CONF_DEST_RULE_FILE_PATH"
 )

common/constant/key.go

@@ -49,10 +49,13 @@ const (
 	PORT_KEY                 = "port"
 	PROTOCOL_KEY             = "protocol"
 	PATH_SEPARATOR           = "/"
+	COMMA_SEPARATOR          = ","
 	// DUBBO_KEY                = "dubbo"
 	SSL_ENABLED_KEY = "ssl-enabled"
 	// PARAMS_TYPE_Key key used in pass through invoker factory, to define param type
-	PARAMS_TYPE_Key = "parameter-type-names"
+	PARAMS_TYPE_Key  = "parameter-type-names"
+	DEFAULT_Key      = "default"
+	METADATATYPE_KEY = "metadata-type"
 )
 
 const (
@@ -62,25 +65,26 @@ const (
 
 // Filter Keys
 const (
-	AccessLogFilterKey                = "accesslog"
-	ActiveFilterKey                   = "active"
-	AuthConsumerFilterKey             = "sign"
-	AuthProviderFilterKey             = "auth"
-	EchoFilterKey                     = "echo"
-	ExecuteLimitFilterKey             = "execute"
-	GenericFilterKey                  = "generic"
-	GenericServiceFilterKey           = "generic_service"
-	GracefulShutdownProviderFilterKey = "pshutdown"
-	GracefulShutdownConsumerFilterKey = "cshutdown"
-	HystrixConsumerFilterKey          = "hystrix_consumer"
-	HystrixProviderFilterKey          = "hystrix_provider"
-	MetricsFilterKey                  = "metrics"
-	SeataFilterKey                    = "seata"
-	SentinelProviderFilterKey         = "sentinel-provider"
-	SentinelConsumerFilterKey         = "sentinel-consumer"
-	TokenFilterKey                    = "token"
-	TpsLimitFilterKey                 = "tps"
-	TracingFilterKey                  = "tracing"
+	AccessLogFilterKey                   = "accesslog"
+	ActiveFilterKey                      = "active"
+	AuthConsumerFilterKey                = "sign"
+	AuthProviderFilterKey                = "auth"
+	EchoFilterKey                        = "echo"
+	ExecuteLimitFilterKey                = "execute"
+	GenericFilterKey                     = "generic"
+	GenericServiceFilterKey              = "generic_service"
+	GracefulShutdownProviderFilterKey    = "pshutdown"
+	GracefulShutdownConsumerFilterKey    = "cshutdown"
+	GracefulShutdownFilterShutdownConfig = "GracefulShutdownFilterShutdownConfig"
+	HystrixConsumerFilterKey             = "hystrix_consumer"
+	HystrixProviderFilterKey             = "hystrix_provider"
+	MetricsFilterKey                     = "metrics"
+	SeataFilterKey                       = "seata"
+	SentinelProviderFilterKey            = "sentinel-provider"
+	SentinelConsumerFilterKey            = "sentinel-consumer"
+	TokenFilterKey                       = "token"
+	TpsLimitFilterKey                    = "tps"
+	TracingFilterKey                     = "tracing"
 )
 
 const (
@@ -121,17 +125,19 @@ const (
 )
 
 const (
-	REGISTRY_KEY         = "registry"
-	REGISTRY_PROTOCOL    = "registry"
-	ROLE_KEY             = "registry.role"
-	REGISTRY_DEFAULT_KEY = "registry.default"
-	// Deprecated use CONFIG_TIMEOUT_KEY key
-	REGISTRY_TIMEOUT_KEY = "registry.timeout"
-	REGISTRY_LABEL_KEY   = "label"
-	PREFERRED_KEY        = "preferred"
-	ZONE_KEY             = "zone"
-	ZONE_FORCE_KEY       = "zone.force"
-	REGISTRY_TTL_KEY     = "registry.ttl"
+	REGISTRY_KEY              = "registry"
+	REGISTRY_PROTOCOL         = "registry"
+	SERVICE_REGISTRY_PROTOCOL = "service-discovery-registry"
+	ROLE_KEY                  = "registry.role"
+	REGISTRY_DEFAULT_KEY      = "registry.default"
+	REGISTRY_TIMEOUT_KEY      = "registry.timeout"
+	REGISTRY_LABEL_KEY        = "label"
+	PREFERRED_KEY             = "preferred"
+	ZONE_KEY                  = "zone"
+	ZONE_FORCE_KEY            = "zone.force"
+	REGISTRY_TTL_KEY          = "registry.ttl"
+	SIMPLIFIED_KEY            = "simplified"
+	NAMESPACE_KEY             = "namespace"
 )
 
 const (
@@ -170,19 +176,22 @@ const (
 )
 
 const (
-	RegistryConfigPrefix       = "dubbo.registries."
-	SingleRegistryConfigPrefix = "dubbo.registry."
-	ReferenceConfigPrefix      = "dubbo.reference."
-	ServiceConfigPrefix        = "dubbo.service."
-	ConfigBasePrefix           = "dubbo.base."
-	RemotePrefix               = "dubbo.remote."
-	ServiceDiscPrefix          = "dubbo.service-discovery."
-	ProtocolConfigPrefix       = "dubbo.protocols."
-	ProviderConfigPrefix       = "dubbo.provider."
-	ConsumerConfigPrefix       = "dubbo.consumer."
-	ShutdownConfigPrefix       = "dubbo.shutdown."
-	MetadataReportPrefix       = "dubbo.metadata-report."
-	RouterConfigPrefix         = "dubbo.router."
+	RegistryConfigPrefix       = "dubbo.registries"
+	ApplicationConfigPrefix    = "dubbo.application"
+	ConfigCenterPrefix         = "dubbo.config-center"
+	SingleRegistryConfigPrefix = "dubbo.registry"
+	ReferenceConfigPrefix      = "dubbo.reference"
+	ServiceConfigPrefix        = "dubbo.service"
+	ConfigBasePrefix           = "dubbo.base"
+	RemotePrefix               = "dubbo.remote"
+	ServiceDiscPrefix          = "dubbo.service-discovery"
+	ProtocolConfigPrefix       = "dubbo.protocols"
+	ProviderConfigPrefix       = "dubbo.provider"
+	ConsumerConfigPrefix       = "dubbo.consumer"
+	ShutdownConfigPrefix       = "dubbo.shutdown"
+	MetadataReportPrefix       = "dubbo.metadata-report"
+	RouterConfigPrefix         = "dubbo.router"
+	LoggerConfigPrefix         = "dubbo.logger"
 )
 
 const (

common/extension/config.go

@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package extension
+
+var (
+	configs = map[string]Config{}
+)
+
+type Config interface {
+	Prefix() string
+}
+
+func SetConfig(c Config) {
+	configs[c.Prefix()] = c
+}

common/extension/config_center_factory.go

@@ -18,6 +18,7 @@
 package extension
 
 import (
+	"dubbo.apache.org/dubbo-go/v3/common/logger"
 	"dubbo.apache.org/dubbo-go/v3/config_center"
 )
 
@@ -31,7 +32,8 @@ func SetConfigCenterFactory(name string, v func() config_center.DynamicConfigura
 // GetConfigCenterFactory finds the DynamicConfigurationFactory with @name
 func GetConfigCenterFactory(name string) config_center.DynamicConfigurationFactory {
 	if configCenterFactories[name] == nil {
-		panic("config center for " + name + " is not existing, make sure you have import the package.")
+		logger.Warn("config center for " + name + " is not existing, make sure you have import the package.")
+		return nil
 	}
 	return configCenterFactories[name]()
 }

common/extension/proxy_factory.go

@@ -18,6 +18,7 @@
 package extension
 
 import (
+	"dubbo.apache.org/dubbo-go/v3/common/logger"
 	"dubbo.apache.org/dubbo-go/v3/common/proxy"
 )
 
@@ -34,7 +35,8 @@ func GetProxyFactory(name string) proxy.ProxyFactory {
 		name = "default"
 	}
 	if proxyFactories[name] == nil {
-		panic("proxy factory for " + name + " is not existing, make sure you have import the package.")
+		logger.Warn("proxy factory for " + name + " is not existing, make sure you have import the package.")
+		return nil
 	}
 	return proxyFactories[name]()
 }

common/extension/registry.go

@@ -22,17 +22,17 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/registry"
 )
 
-var registrys = make(map[string]func(config *common.URL) (registry.Registry, error))
+var registries = make(map[string]func(config *common.URL) (registry.Registry, error))
 
 // SetRegistry sets the registry extension with @name
 func SetRegistry(name string, v func(_ *common.URL) (registry.Registry, error)) {
-	registrys[name] = v
+	registries[name] = v
 }
 
 // GetRegistry finds the registry extension with @name
 func GetRegistry(name string, config *common.URL) (registry.Registry, error) {
-	if registrys[name] == nil {
+	if registries[name] == nil {
 		panic("registry for " + name + " does not exist. please make sure that you have imported the package dubbo.apache.org/dubbo-go/v3/registry/" + name + ".")
 	}
-	return registrys[name](config)
+	return registries[name](config)
 }