fix:issue apache#2216

chuntaojun · Mar 5, 2023 · ced042d · ced042d
1 parent b492dba
commit ced042d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/common/url.go b/common/url.go
@@ -36,7 +36,9 @@ import (
 	gxset "github.com/dubbogo/gost/container/set"
 
 	"github.com/google/uuid"
+
 	"github.com/jinzhu/copier"
+
 	perrors "github.com/pkg/errors"
 )
 

diff --git a/config/metric_config.go b/config/metric_config.go
@@ -19,6 +19,7 @@ package config
 
 import (
 	"github.com/creasty/defaults"
+
 	"github.com/dubbogo/gost/log/logger"
 
 	"github.com/pkg/errors"

diff --git a/registry/polaris/registry.go b/registry/polaris/registry.go
@@ -255,12 +255,17 @@ func createRegisterParam(url *common.URL, serviceName string) *api.InstanceRegis
 
 	ver := url.GetParam("version", "")
 
+	protocolVal := protocolForDubboGO
+	if len(url.Protocol) != 0 {
+		protocolVal = url.Protocol
+	}
+
 	req := &api.InstanceRegisterRequest{
 		InstanceRegisterRequest: model.InstanceRegisterRequest{
 			Service:  serviceName,
 			Host:     url.Ip,
 			Port:     port,
-			Protocol: &protocolForDubboGO,
+			Protocol: &protocolVal,
 			Version:  &ver,
 			Metadata: metadata,
 		},

diff --git a/registry/polaris/service_discovery.go b/registry/polaris/service_discovery.go
@@ -317,17 +317,20 @@ func (polaris *polarisServiceDiscovery) String() string {
 
 func convertToRegisterInstance(namespace string, instance registry.ServiceInstance) *api.InstanceRegisterRequest {
 
-	health := instance.IsHealthy()
-	isolate := instance.IsEnable()
-	ttl := 5
+	var (
+		health      = instance.IsHealthy()
+		isolate     = instance.IsEnable()
+		ttl         = 5
+		protocolVal = protocolForDubboGO
+	)
 
 	return &api.InstanceRegisterRequest{
 		InstanceRegisterRequest: model.InstanceRegisterRequest{
 			Service:   instance.GetServiceName(),
 			Namespace: namespace,
 			Host:      instance.GetHost(),
 			Port:      instance.GetPort(),
-			Protocol:  &protocolForDubboGO,
+			Protocol:  &protocolVal,
 			Metadata:  instance.GetMetadata(),
 			Healthy:   &health,
 			Isolate:   &isolate,

diff --git a/remoting/zookeeper/listener.go b/remoting/zookeeper/listener.go
@@ -23,13 +23,18 @@ import (
 	"sync"
 	"time"
 )
+
 import (
 	"github.com/dubbogo/go-zookeeper/zk"
+
 	gxzookeeper "github.com/dubbogo/gost/database/kv/zk"
 	"github.com/dubbogo/gost/log/logger"
+
 	perrors "github.com/pkg/errors"
+
 	uatomic "go.uber.org/atomic"
 )
+
 import (
 	"dubbo.apache.org/dubbo-go/v3/common"
 	"dubbo.apache.org/dubbo-go/v3/common/constant"