Fix: merge 3.0

common/constant/env.go

@@ -19,11 +19,8 @@ package constant
 
 // nolint
 const (
-	// ConfigFileEnvKey is key of environment variable dubbogo configure file path
-	ConfigFileEnvKey = "DUBBO_GO_CONFIG_PATH"
-	// AppLogConfFile ...
-	AppLogConfFile = "AppLogConfFile"
-
+	ConfigFileEnvKey   = "DUBBO_GO_CONFIG_PATH" // key of environment variable dubbogo configure file path
+	AppLogConfFile     = "AppLogConfFile"
 	PodNameEnvKey      = "POD_NAME"
 	PodNamespaceEnvKey = "POD_NAMESPACE"
 )

common/constant/key.go

@@ -295,20 +295,15 @@ const (
 
 // Use for router module
 const (
-	// TagRouterRuleSuffix Specify tag router suffix
-	TagRouterRuleSuffix = ".tag-router"
-	// ConditionRouterRuleSuffix Specify condition router suffix
-	ConditionRouterRuleSuffix = ".condition-router"
-	// MeshRouteSuffix Specify mesh router suffix
-	MeshRouteSuffix = ".MESHAPPRULE"
-	// ForceUseTag is the tag in attachment
-	ForceUseTag = "dubbo.force.tag"
-	Tagkey      = "dubbo.tag"
-	// AttachmentKey in context in invoker
-	AttachmentKey        = DubboCtxKey("attachment")
-	TagRouterFactoryKey  = "tag"
-	V3RouterFactoryKey   = "v3router"
-	MeshRouterFactoryKey = "mesh"
+	TagRouterRuleSuffix       = ".tag-router"
+	ConditionRouterRuleSuffix = ".condition-router"       // Specify condition router suffix
+	MeshRouteSuffix           = ".MESHAPPRULE"            // Specify mesh router suffix
+	ForceUseTag               = "dubbo.force.tag"         // the tag in attachment
+	Tagkey                    = "dubbo.tag"               // key of tag
+	AttachmentKey             = DubboCtxKey("attachment") // key in context in invoker
+	TagRouterFactoryKey       = "tag"
+	V3RouterFactoryKey        = "v3router"
+	MeshRouterFactoryKey      = "mesh"
 )
 
 // Auth filter

go.mod

@@ -16,9 +16,9 @@ require (
 	github.com/creasty/defaults v1.5.2
 	github.com/dubbogo/go-zookeeper v1.0.4-0.20211212162352-f9d2183d89d5
 	github.com/dubbogo/gost v1.11.25
-	github.com/dubbogo/grpc-go v1.42.8
-	github.com/dubbogo/triple v1.1.8-rc2
-	github.com/emicklei/go-restful/v3 v3.7.3
+	github.com/dubbogo/grpc-go v1.42.9
+	github.com/dubbogo/triple v1.1.8
+	github.com/emicklei/go-restful/v3 v3.7.4
 	github.com/envoyproxy/go-control-plane v0.10.0
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/ghodss/yaml v1.0.0
@@ -51,7 +51,7 @@ require (
 	go.uber.org/zap v1.21.0
 	google.golang.org/genproto v0.0.0-20211104193956-4c6863e31247
 	google.golang.org/grpc v1.45.0
-	google.golang.org/protobuf v1.27.1
+	google.golang.org/protobuf v1.28.0
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/apimachinery v0.22.4
 	k8s.io/client-go v0.16.9