Fix service discovery related issues and add mesh proxy mode support

common/constant/env.go

@@ -19,8 +19,13 @@ package constant
 
 // nolint
 const (
-	ConfigFileEnvKey   = "DUBBO_GO_CONFIG_PATH" // key of environment variable dubbogo configure file path
-	AppLogConfFile     = "AppLogConfFile"
-	PodNameEnvKey      = "POD_NAME"
-	PodNamespaceEnvKey = "POD_NAMESPACE"
+	ConfigFileEnvKey     = "DUBBO_GO_CONFIG_PATH" // key of environment variable dubbogo configure file path
+	AppLogConfFile       = "AppLogConfFile"
+	PodNameEnvKey        = "POD_NAME"
+	PodNamespaceEnvKey   = "POD_NAMESPACE"
+	ClusterDomainKey     = "CLUSTER_DOMAIN"
+	DefaultClusterDomain = "cluster.local"
+	DefaultNamespace     = "default"
+	SVC                  = "svc"
+	DefaultMeshPort      = 80
 )

common/metadata_info.go

@@ -205,7 +205,7 @@ func (si *ServiceInfo) GetMethods() []string {
 		s := si.Params[constant.MethodsKey]
 		return strings.Split(s, ",")
 	}
-	methods := make([]string, 8)
+	methods := make([]string, 0)
 	for k, _ := range si.Params {
 		ms := strings.Index(k, ".")
 		if ms > 0 {

common/url.go

@@ -148,10 +148,10 @@ func WithMethods(methods []string) Option {
 	}
 }
 
-// WithParams sets params for URL
+// WithParams deep copy the params in the argument into params of the target URL
 func WithParams(params url.Values) Option {
 	return func(url *URL) {
-		url.params = params
+		url.SetParams(params)
 	}
 }
 
@@ -190,6 +190,13 @@ func WithPath(path string) Option {
 	}
 }
 
+// WithInterface sets interface param for URL
+func WithInterface(v string) Option {
+	return func(url *URL) {
+		url.SetParam(constant.InterfaceKey, v)
+	}
+}
+
 // WithLocation sets location for URL
 func WithLocation(location string) Option {
 	return func(url *URL) {
@@ -294,6 +301,13 @@ func (c *URL) Version() string {
 	return c.GetParam(constant.VersionKey, "")
 }
 
+func (c *URL) Address() string {
+	if c.Port == "" {
+		return c.Ip
+	}
+	return c.Ip + ":" + c.Port
+}
+
 // URLEqual judge @URL and @c is equal or not.
 func (c *URL) URLEqual(url *URL) bool {
 	tmpC := c.Clone()
@@ -515,6 +529,23 @@ func (c *URL) GetParam(s string, d string) string {
 	return r
 }
 
+// GetParamNoDefault gets value by key, return nil,false if no value found mapping to the key
+func (c *URL) GetParamNoDefault(s string) (string, bool) {
+	c.paramsLock.RLock()
+	defer c.paramsLock.RUnlock()
+
+	var r string
+	ok := true
+	if len(c.params) > 0 {
+		r = c.params.Get(s)
+	}
+	if len(r) == 0 {
+		ok = false
+	}
+
+	return r, ok
+}
+
 // GetParams gets values
 func (c *URL) GetParams() url.Values {
 	return c.params
@@ -693,7 +724,7 @@ func MergeURL(serviceURL *URL, referenceURL *URL) *URL {
 	// iterator the referenceURL if serviceURL not have the key ,merge in
 	// referenceURL usually will not changed. so change RangeParams to GetParams to avoid the string value copy.// Group get group
 	for key, value := range referenceURL.GetParams() {
-		if v := mergedURL.GetParam(key, ""); len(v) == 0 {
+		if _, ok := mergedURL.GetParamNoDefault(key); !ok {
 			if len(value) > 0 {
 				params[key] = value
 			}
@@ -704,7 +735,7 @@ func MergeURL(serviceURL *URL, referenceURL *URL) *URL {
 	methodConfigMergeFcn := mergeNormalParam(params, referenceURL, []string{constant.LoadbalanceKey, constant.ClusterKey, constant.RetriesKey, constant.TimeoutKey})
 
 	// remote timestamp
-	if v := serviceURL.GetParam(constant.TimestampKey, ""); len(v) > 0 {
+	if v, ok := serviceURL.GetParamNoDefault(constant.TimestampKey); !ok {
 		params[constant.RemoteTimestampKey] = []string{v}
 		params[constant.TimestampKey] = []string{referenceURL.GetParam(constant.TimestampKey, "")}
 	}

common/url_test.go

@@ -57,7 +57,7 @@ func TestNewURLWithOptions(t *testing.T) {
 	assert.Equal(t, loopbackAddress, u.Ip)
 	assert.Equal(t, "8080", u.Port)
 	assert.Equal(t, methods, u.Methods)
-	assert.Equal(t, params, u.params)
+	assert.Equal(t, 2, len(u.params))
 }
 
 func TestURL(t *testing.T) {

config/consumer_config.go

@@ -52,6 +52,7 @@ type ConsumerConfig struct {
 	TracingKey                     string                      `yaml:"tracing-key" json:"tracing-key" property:"tracing-key"`
 	FilterConf                     interface{}                 `yaml:"filter-conf" json:"filter-conf,omitempty" property:"filter-conf"`
 	MaxWaitTimeForServiceDiscovery string                      `default:"3s" yaml:"max-wait-time-for-service-discovery" json:"max-wait-time-for-service-discovery,omitempty" property:"max-wait-time-for-service-discovery"`
+	MeshEnabled                    bool                        `yaml:"mesh-enabled" json:"mesh-enabled,omitempty" property:"mesh-enabled"`
 	rootConfig                     *RootConfig
 }
 
@@ -239,6 +240,11 @@ func (ccb *ConsumerConfigBuilder) SetFilterConf(filterConf interface{}) *Consume
 	return ccb
 }
 
+func (ccb *ConsumerConfigBuilder) SetMeshEnabled(meshEnabled bool) *ConsumerConfigBuilder {
+	ccb.consumerConfig.MeshEnabled = meshEnabled
+	return ccb
+}
+
 func (ccb *ConsumerConfigBuilder) SetRootConfig(rootConfig *RootConfig) *ConsumerConfigBuilder {
 	ccb.consumerConfig.rootConfig = rootConfig
 	return ccb

config/reference_config.go

@@ -19,14 +19,17 @@ package config
 
 import (
 	"fmt"
+	constant2 "github.com/dubbogo/triple/pkg/common/constant"
 	"net/url"
+	"os"
 	"strconv"
 	"time"
 )
 
 import (
 	"github.com/creasty/defaults"
 
+	"github.com/dubbogo/gost/log/logger"
 	gxstrings "github.com/dubbogo/gost/strings"
 )
 
@@ -43,34 +46,34 @@ import (
 
 // ReferenceConfig is the configuration of service consumer
 type ReferenceConfig struct {
-	pxy            *proxy.Proxy
-	id             string
-	InterfaceName  string            `yaml:"interface"  json:"interface,omitempty" property:"interface"`
-	Check          *bool             `yaml:"check"  json:"check,omitempty" property:"check"`
-	URL            string            `yaml:"url"  json:"url,omitempty" property:"url"`
-	Filter         string            `yaml:"filter" json:"filter,omitempty" property:"filter"`
-	Protocol       string            `yaml:"protocol"  json:"protocol,omitempty" property:"protocol"`
-	RegistryIDs    []string          `yaml:"registry-ids"  json:"registry-ids,omitempty"  property:"registry-ids"`
-	Cluster        string            `yaml:"cluster"  json:"cluster,omitempty" property:"cluster"`
-	Loadbalance    string            `yaml:"loadbalance"  json:"loadbalance,omitempty" property:"loadbalance"`
-	Retries        string            `yaml:"retries"  json:"retries,omitempty" property:"retries"`
-	Group          string            `yaml:"group"  json:"group,omitempty" property:"group"`
-	Version        string            `yaml:"version"  json:"version,omitempty" property:"version"`
-	Serialization  string            `yaml:"serialization" json:"serialization" property:"serialization"`
-	ProvidedBy     string            `yaml:"provided_by"  json:"provided_by,omitempty" property:"provided_by"`
-	Methods        []*MethodConfig   `yaml:"methods"  json:"methods,omitempty" property:"methods"`
-	Async          bool              `yaml:"async"  json:"async,omitempty" property:"async"`
-	Params         map[string]string `yaml:"params"  json:"params,omitempty" property:"params"`
-	invoker        protocol.Invoker
-	urls           []*common.URL
-	Generic        string `yaml:"generic"  json:"generic,omitempty" property:"generic"`
-	Sticky         bool   `yaml:"sticky"   json:"sticky,omitempty" property:"sticky"`
-	RequestTimeout string `yaml:"timeout"  json:"timeout,omitempty" property:"timeout"`
-	ForceTag       bool   `yaml:"force.tag"  json:"force.tag,omitempty" property:"force.tag"`
-	TracingKey     string `yaml:"tracing-key" json:"tracing-key,omitempty" propertiy:"tracing-key"`
-
-	rootConfig   *RootConfig
-	metaDataType string
+	pxy              *proxy.Proxy
+	id               string
+	InterfaceName    string            `yaml:"interface"  json:"interface,omitempty" property:"interface"`
+	Check            *bool             `yaml:"check"  json:"check,omitempty" property:"check"`
+	URL              string            `yaml:"url"  json:"url,omitempty" property:"url"`
+	Filter           string            `yaml:"filter" json:"filter,omitempty" property:"filter"`
+	Protocol         string            `yaml:"protocol"  json:"protocol,omitempty" property:"protocol"`
+	RegistryIDs      []string          `yaml:"registry-ids"  json:"registry-ids,omitempty"  property:"registry-ids"`
+	Cluster          string            `yaml:"cluster"  json:"cluster,omitempty" property:"cluster"`
+	Loadbalance      string            `yaml:"loadbalance"  json:"loadbalance,omitempty" property:"loadbalance"`
+	Retries          string            `yaml:"retries"  json:"retries,omitempty" property:"retries"`
+	Group            string            `yaml:"group"  json:"group,omitempty" property:"group"`
+	Version          string            `yaml:"version"  json:"version,omitempty" property:"version"`
+	Serialization    string            `yaml:"serialization" json:"serialization" property:"serialization"`
+	ProvidedBy       string            `yaml:"provided-by"  json:"provided-by,omitempty" property:"provided-by"`
+	Methods          []*MethodConfig   `yaml:"methods"  json:"methods,omitempty" property:"methods"`
+	Async            bool              `yaml:"async"  json:"async,omitempty" property:"async"`
+	Params           map[string]string `yaml:"params"  json:"params,omitempty" property:"params"`
+	invoker          protocol.Invoker
+	urls             []*common.URL
+	Generic          string `yaml:"generic"  json:"generic,omitempty" property:"generic"`
+	Sticky           bool   `yaml:"sticky"   json:"sticky,omitempty" property:"sticky"`
+	RequestTimeout   string `yaml:"timeout"  json:"timeout,omitempty" property:"timeout"`
+	ForceTag         bool   `yaml:"force.tag"  json:"force.tag,omitempty" property:"force.tag"`
+	TracingKey       string `yaml:"tracing-key" json:"tracing-key,omitempty" propertiy:"tracing-key"`
+	rootConfig       *RootConfig
+	metaDataType     string
+	MeshProviderPort int `yaml:"mesh-provider-port" json:"mesh-provider-port,omitempty" propertiy:"mesh-provider-port"`
 }
 
 func (rc *ReferenceConfig) Prefix() string {
@@ -120,6 +123,41 @@ func (rc *ReferenceConfig) Init(root *RootConfig) error {
 	return verify(rc)
 }
 
+func getEnv(key, fallback string) string {
+	if value, ok := os.LookupEnv(key); ok {
+		return value
+	}
+	return fallback
+}
+
+func updateOrCreateMeshURL(rc *ReferenceConfig) {
+	if rc.URL != "" {
+		logger.Infof("URL specified explicitly %v", rc.URL)
+	}
+
+	if !rc.rootConfig.Consumer.MeshEnabled {
+		return
+	}
+	if rc.Protocol != constant2.TRIPLE {
+		panic(fmt.Sprintf("Mesh mode enabled, Triple protocol expected but %v protocol found!", rc.Protocol))
+	}
+	if rc.ProvidedBy == "" {
+		panic(fmt.Sprintf("Mesh mode enabled, provided-by should not be empty!"))
+	}
+
+	podNamespace := getEnv(constant.PodNamespaceEnvKey, constant.DefaultNamespace)
+	clusterDomain := getEnv(constant.ClusterDomainKey, constant.DefaultClusterDomain)
+
+	var meshPort int
+	if rc.MeshProviderPort > 0 {
+		meshPort = rc.MeshProviderPort
+	} else {
+		meshPort = constant.DefaultMeshPort
+	}
+
+	rc.URL = "tri://" + rc.ProvidedBy + "." + podNamespace + constant.SVC + clusterDomain + ":" + strconv.Itoa(meshPort)
+}
+
 // Refer retrieves invokers from urls.
 func (rc *ReferenceConfig) Refer(srv interface{}) {
 	// If adaptive service is enabled,
@@ -144,6 +182,9 @@ func (rc *ReferenceConfig) Refer(srv interface{}) {
 	}
 	rc.postProcessConfig(cfgURL)
 
+	// if mesh-enabled is set
+	updateOrCreateMeshURL(rc)
+
 	// retrieving urls from config, and appending the urls to rc.urls
 	if rc.URL != "" { // use user-specific urls
 		/*
@@ -173,6 +214,7 @@ func (rc *ReferenceConfig) Refer(srv interface{}) {
 				// replace params of serviceURL with params of cfgUrl
 				// other stuff, e.g. IP, port, etc., are same as serviceURL
 				newURL := common.MergeURL(serviceURL, cfgURL)
+				newURL.AddParam("peer", "true")
 				rc.urls = append(rc.urls, newURL)
 			}
 		}