This is an automated email from the ASF dual-hosted git repository.
justxuewei pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/3.0 by this push:
new a5ebff74b [ISSUE #2216] fix register instance protocol info to polaris
when use tripe (#2238)
a5ebff74b is described below
commit a5ebff74b6742ba7f90f25e7525dc29d02cd9252
Author: liaochuntao <[email protected]>
AuthorDate: Thu Mar 16 13:04:06 2023 +0800
[ISSUE #2216] fix register instance protocol info to polaris when use tripe
(#2238)
* fix:issue #2216
* fix:issue #2216
---
common/url.go | 2 ++
config/metric_config.go | 1 +
registry/polaris/registry.go | 2 +-
registry/polaris/service_discovery.go | 11 +++++++----
registry/polaris/utils.go | 4 ----
remoting/zookeeper/listener.go | 5 +++++
6 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/common/url.go b/common/url.go
index e0ef856f5..21a68f629 100644
--- 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
index 509907007..14d7b7271 100644
--- 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
index 0533f7729..d156e8ae0 100644
--- a/registry/polaris/registry.go
+++ b/registry/polaris/registry.go
@@ -260,7 +260,7 @@ func createRegisterParam(url *common.URL, serviceName
string) *api.InstanceRegis
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 bb460875a..4bd3e0144 100644
--- a/registry/polaris/service_discovery.go
+++ b/registry/polaris/service_discovery.go
@@ -317,9 +317,12 @@ 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 = string(constant.Dubbo)
+ )
return &api.InstanceRegisterRequest{
InstanceRegisterRequest: model.InstanceRegisterRequest{
@@ -327,7 +330,7 @@ func convertToRegisterInstance(namespace string, instance
registry.ServiceInstan
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 39b50a3c5..82e06c9c6 100644
--- a/registry/polaris/utils.go
+++ b/registry/polaris/utils.go
@@ -30,10 +30,6 @@ import (
"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 332accdf4..498fc3309 100644
--- 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"
