[ISSUE #2216] fix register instance protocol info to polaris when use tripe (#2238)
* fix:issue #2216
* fix:issue #2216
diff --git a/common/url.go b/common/url.go
index e0ef856..21a68f6 100644
--- a/common/url.go
+++ b/common/url.go
@@ -36,7 +36,9 @@
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
index 5099070..14d7b72 100644
--- a/config/metric_config.go
+++ b/config/metric_config.go
@@ -19,6 +19,7 @@
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
index 0533f77..d156e8a 100644
--- a/registry/polaris/registry.go
+++ b/registry/polaris/registry.go
@@ -260,7 +260,7 @@
Service: serviceName,
Host: url.Ip,
Port: port,
- Protocol: &protocolForDubboGO,
+ Protocol: &url.Protocol,
Version: &ver,
Metadata: metadata,
},
diff --git a/registry/polaris/service_discovery.go b/registry/polaris/service_discovery.go
index bb46087..4bd3e01 100644
--- a/registry/polaris/service_discovery.go
+++ b/registry/polaris/service_discovery.go
@@ -317,9 +317,12 @@
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 = string(constant.Dubbo)
+ )
return &api.InstanceRegisterRequest{
InstanceRegisterRequest: model.InstanceRegisterRequest{
@@ -327,7 +330,7 @@
Namespace: namespace,
Host: instance.GetHost(),
Port: instance.GetPort(),
- Protocol: &protocolForDubboGO,
+ Protocol: &protocolVal,
Metadata: instance.GetMetadata(),
Healthy: &health,
Isolate: &isolate,
diff --git a/registry/polaris/utils.go b/registry/polaris/utils.go
index 39b50a3..82e06c9 100644
--- a/registry/polaris/utils.go
+++ b/registry/polaris/utils.go
@@ -30,10 +30,6 @@
"dubbo.apache.org/dubbo-go/v3/registry"
)
-var (
- protocolForDubboGO string = "dubbo"
-)
-
type PolarisInstanceInfo struct {
instance registry.ServiceInstance
url *common.URL
diff --git a/remoting/zookeeper/listener.go b/remoting/zookeeper/listener.go
index 332accd..498fc33 100644
--- a/remoting/zookeeper/listener.go
+++ b/remoting/zookeeper/listener.go
@@ -23,13 +23,18 @@
"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"
