You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/12/21 12:47:08 UTC
[dubbo-go-samples] branch master updated: fix: default read interface from pb (#308)
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 29cc6c2 fix: default read interface from pb (#308)
29cc6c2 is described below
commit 29cc6c26742be76c82ddc33c4f1b2cdf609f2d3a
Author: Laurence <45...@users.noreply.github.com>
AuthorDate: Tue Dec 21 20:47:03 2021 +0800
fix: default read interface from pb (#308)
* fix: default read interface from pb
* fix: fix dubbo context client config bug
* fix: config api samples
* fix: fmt
* fix: zk config api sleep
---
.../configcenter/nacos/go-client/cmd/client.go | 5 +----
.../configcenter/nacos/go-server/cmd/server.go | 3 +--
.../configcenter/zookeeper/go-client/cmd/client.go | 5 +----
.../configcenter/zookeeper/go-server/cmd/server.go | 5 +----
config-api/rpc/triple/go-client/cmd/client.go | 1 -
config-api/rpc/triple/go-server/cmd/server.go | 1 -
context/dubbo/go-client/cmd/client.go | 2 ++
context/dubbo/go-client/conf/dubbogo.yml | 20 -----------------
context/dubbo/go-server/conf/dubbogo.yml | 16 -------------
context/triple/go-client/conf/dubbogo.yml | 3 +--
context/triple/go-server/conf/dubbogo.yml | 2 +-
direct/go-client/conf/dubbogo.yml | 3 +--
direct/go-server/conf/dubbogo.yml | 2 +-
filter/custom/go-client/conf/dubbogo.yml | 3 +--
filter/custom/go-server/conf/dubbogo.yml | 2 --
go.mod | 5 ++---
go.sum | 26 ++++++++++------------
.../nacos/tests/integration/main_test.go | 14 ++++--------
.../zookeeper/tests/integration/main_test.go | 16 +++++--------
.../rpc/triple/tests/integration/main_test.go | 1 -
logger/custom/conf/dubbogo.yml | 6 ++---
logger/default/conf/dubbogo.yml | 4 ++--
logger/level/conf/dubbogo.yml | 4 ++--
logger/rolling/conf/dubbogo.yml | 4 ++--
metrics/go-client/conf/dubbogo.yml | 6 +----
metrics/go-server/conf/dubbogo.yml | 3 +--
start_integrate_test.sh | 12 +++++-----
27 files changed, 50 insertions(+), 124 deletions(-)
diff --git a/config-api/configcenter/nacos/go-client/cmd/client.go b/config-api/configcenter/nacos/go-client/cmd/client.go
index cef0439..ebf78cd 100644
--- a/config-api/configcenter/nacos/go-client/cmd/client.go
+++ b/config-api/configcenter/nacos/go-client/cmd/client.go
@@ -36,15 +36,12 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry-ids:
- - demoZK
references:
GreeterClientImpl:
protocol: tri
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java`
+`
var grpcGreeterImpl = new(api.GreeterClientImpl)
diff --git a/config-api/configcenter/nacos/go-server/cmd/server.go b/config-api/configcenter/nacos/go-server/cmd/server.go
index d79f42b..9bc875c 100644
--- a/config-api/configcenter/nacos/go-server/cmd/server.go
+++ b/config-api/configcenter/nacos/go-server/cmd/server.go
@@ -37,7 +37,6 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
protocols:
triple:
@@ -46,7 +45,7 @@ dubbo:
provider:
services:
GreeterProvider:
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java`
+ interface: "" # read interface from pb`
type GreeterProvider struct {
api.UnimplementedGreeterServer
diff --git a/config-api/configcenter/zookeeper/go-client/cmd/client.go b/config-api/configcenter/zookeeper/go-client/cmd/client.go
index f614449..f06775a 100644
--- a/config-api/configcenter/zookeeper/go-client/cmd/client.go
+++ b/config-api/configcenter/zookeeper/go-client/cmd/client.go
@@ -25,9 +25,6 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/imports"
-)
-
-import (
"github.com/apache/dubbo-go-samples/api"
)
@@ -41,7 +38,7 @@ dubbo:
references:
GreeterClientImpl:
protocol: tri
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java`
+`
var grpcGreeterImpl = new(api.GreeterClientImpl)
diff --git a/config-api/configcenter/zookeeper/go-server/cmd/server.go b/config-api/configcenter/zookeeper/go-server/cmd/server.go
index fe46478..c851324 100644
--- a/config-api/configcenter/zookeeper/go-server/cmd/server.go
+++ b/config-api/configcenter/zookeeper/go-server/cmd/server.go
@@ -19,7 +19,6 @@ package main
import (
"context"
- "time"
)
import (
@@ -45,7 +44,7 @@ dubbo:
provider:
services:
GreeterProvider:
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java`
+ interface: "" # read interface from pb`
type GreeterProvider struct {
api.UnimplementedGreeterServer
@@ -69,8 +68,6 @@ func main() {
panic(err)
}
- time.Sleep(time.Second * 10)
-
config.SetProviderService(&GreeterProvider{})
rootConfig := config.NewRootConfigBuilder().
diff --git a/config-api/rpc/triple/go-client/cmd/client.go b/config-api/rpc/triple/go-client/cmd/client.go
index 96956bf..0c707bf 100644
--- a/config-api/rpc/triple/go-client/cmd/client.go
+++ b/config-api/rpc/triple/go-client/cmd/client.go
@@ -40,7 +40,6 @@ func main() {
rootConfig := config.NewRootConfigBuilder().
SetConsumer(config.NewConsumerConfigBuilder().
AddReference("GreeterClientImpl", config.NewReferenceConfigBuilder().
- SetInterface("com.apache.dubbo.sample.basic.IGreeter").
SetProtocol("tri").
Build()).
Build()).
diff --git a/config-api/rpc/triple/go-server/cmd/server.go b/config-api/rpc/triple/go-server/cmd/server.go
index 86c1f9a..e1287bc 100644
--- a/config-api/rpc/triple/go-server/cmd/server.go
+++ b/config-api/rpc/triple/go-server/cmd/server.go
@@ -47,7 +47,6 @@ func main() {
rootConfig := config.NewRootConfigBuilder().
SetProvider(config.NewProviderConfigBuilder().
AddService("GreeterProvider", config.NewServiceConfigBuilder().
- SetInterface("com.apache.dubbo.sample.basic.IGreeter").
Build()).
Build()).
AddRegistry("zk", config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")).
diff --git a/context/dubbo/go-client/cmd/client.go b/context/dubbo/go-client/cmd/client.go
index 7409e94..ec5dbbe 100644
--- a/context/dubbo/go-client/cmd/client.go
+++ b/context/dubbo/go-client/cmd/client.go
@@ -26,7 +26,9 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/imports"
+
hessian "github.com/apache/dubbo-go-hessian2"
+
"github.com/dubbogo/gost/log"
)
diff --git a/context/dubbo/go-client/conf/dubbogo.yml b/context/dubbo/go-client/conf/dubbogo.yml
index cc67b57..69da223 100644
--- a/context/dubbo/go-client/conf/dubbogo.yml
+++ b/context/dubbo/go-client/conf/dubbogo.yml
@@ -7,26 +7,6 @@ dubbo:
dubbo:
name: dubbo
port: 20000
- # 在 params 中定义当前使用的协议特有的网络配置
- # 如该 sample 配置的是 dubbo 协议（底层使用 getty 通信库）的参数
- params:
- reconnect-interval: 2
- connection-number: 1
- heartbeat-period: 5s
- session-timeout: 180s
- pool-size: 64
- pool-ttl: 600
- compress-encoding: false
- tcp-no-delay: true
- tcp-keep-alive: true
- keep-alive-period: 120s
- tcp-r-buf-size: 262144
- tcp-w-buf-size: 65536
- tcp-read-timeout: 1s
- tcp-write-timeout: 5s
- wait-timeout: 1s
- max-msg-len: 1024000
- session-name: client
consumer:
references:
UserProvider:
diff --git a/context/dubbo/go-server/conf/dubbogo.yml b/context/dubbo/go-server/conf/dubbogo.yml
index 6c0a243..9cdb135 100644
--- a/context/dubbo/go-server/conf/dubbogo.yml
+++ b/context/dubbo/go-server/conf/dubbogo.yml
@@ -7,22 +7,6 @@ dubbo:
dubbo:
name: dubbo
port: 20000
- # 在 params 中定义当前使用的协议特有的网络配置
- # 如该 sample 配置的是 dubbo 协议（底层使用 getty 通信库）
- params:
- session-number: 700
- session-timeout: 180s
- compress-encoding: false
- tcp-no-delay: true
- tcp-keep-alive: true
- keep-alive-period: 120s
- tcp-r-buf-size: 262144
- tcp-w-buf-size: 65536
- tcp-read-timeout: 10s
- tcp-write-timeout: 5s
- wait-timeout: 1s
- max-msg-len: 1024000
- session-name: server
provider:
services:
UserProvider:
diff --git a/context/triple/go-client/conf/dubbogo.yml b/context/triple/go-client/conf/dubbogo.yml
index a005269..0cc9482 100644
--- a/context/triple/go-client/conf/dubbogo.yml
+++ b/context/triple/go-client/conf/dubbogo.yml
@@ -7,5 +7,4 @@ dubbo:
consumer:
references:
GreeterClientImpl:
- protocol: tri
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
+ protocol: tri
\ No newline at end of file
diff --git a/context/triple/go-server/conf/dubbogo.yml b/context/triple/go-server/conf/dubbogo.yml
index 1f1bb4a..17c98fb 100644
--- a/context/triple/go-server/conf/dubbogo.yml
+++ b/context/triple/go-server/conf/dubbogo.yml
@@ -10,4 +10,4 @@ dubbo:
provider:
services:
GreeterProvider:
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
+ interface: "" # read interface from pb
\ No newline at end of file
diff --git a/direct/go-client/conf/dubbogo.yml b/direct/go-client/conf/dubbogo.yml
index e6e6b8d..1b9a483 100644
--- a/direct/go-client/conf/dubbogo.yml
+++ b/direct/go-client/conf/dubbogo.yml
@@ -3,5 +3,4 @@ dubbo:
references:
GreeterClientImpl:
url: tri://localhost:20000
- protocol: tri
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
+ protocol: tri
\ No newline at end of file
diff --git a/direct/go-server/conf/dubbogo.yml b/direct/go-server/conf/dubbogo.yml
index feb4b1e..455b9b6 100644
--- a/direct/go-server/conf/dubbogo.yml
+++ b/direct/go-server/conf/dubbogo.yml
@@ -6,4 +6,4 @@ dubbo:
provider:
services:
GreeterProvider:
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
+ interface: "" # read interface from pb
\ No newline at end of file
diff --git a/filter/custom/go-client/conf/dubbogo.yml b/filter/custom/go-client/conf/dubbogo.yml
index f912dfb..96513a1 100644
--- a/filter/custom/go-client/conf/dubbogo.yml
+++ b/filter/custom/go-client/conf/dubbogo.yml
@@ -13,5 +13,4 @@ dubbo:
connect_timeout: 3s
references:
GreeterClientImpl:
- protocol: tri
- interface: org.apache.dubbo.UserProvider
\ No newline at end of file
+ protocol: tri
\ No newline at end of file
diff --git a/filter/custom/go-server/conf/dubbogo.yml b/filter/custom/go-server/conf/dubbogo.yml
index 83f685f..d7ec402 100644
--- a/filter/custom/go-server/conf/dubbogo.yml
+++ b/filter/custom/go-server/conf/dubbogo.yml
@@ -2,7 +2,6 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
protocols:
tripleProtocol:
@@ -12,7 +11,6 @@ dubbo:
services:
GreeterProvider:
filter: myServerFilter
- interface: org.apache.dubbo.UserProvider
loadbalance: random
warmup: 100
cluster: failover
diff --git a/go.mod b/go.mod
index da080d0..959f12d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,17 +1,16 @@
module github.com/apache/dubbo-go-samples
require (
- dubbo.apache.org/dubbo-go/v3 v3.0.0-rc4-1.0.20211205094359-7bb88bfc87a2
+ dubbo.apache.org/dubbo-go/v3 v3.0.0
github.com/apache/dubbo-go-hessian2 v1.10.1-0.20211218050057-7f38305d7307
github.com/dubbogo/gost v1.11.20-0.20211116110728-26777ca61b4a
github.com/dubbogo/grpc-go v1.42.6-triple
- github.com/dubbogo/triple v1.1.6-0.20211119123944-4ad68a0d048e
+ github.com/dubbogo/triple v1.1.6
github.com/golang/protobuf v1.5.2
github.com/opentracing/opentracing-go v1.2.0
github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5
github.com/openzipkin/zipkin-go v0.2.2
github.com/pkg/errors v0.9.1
- github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.7.0
github.com/uber/jaeger-client-go v2.29.1+incompatible
google.golang.org/grpc v1.42.0
diff --git a/go.sum b/go.sum
index 82efa1a..0ca6cda 100644
--- a/go.sum
+++ b/go.sum
@@ -34,8 +34,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
contrib.go.opencensus.io/exporter/prometheus v0.4.0 h1:0QfIkj9z/iVZgK31D9H9ohjjIDApI2GOPScCKwxedbs=
contrib.go.opencensus.io/exporter/prometheus v0.4.0/go.mod h1:o7cosnyfuPVK0tB8q0QmaQNhGnptITnPQB+z1+qeFB0=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-dubbo.apache.org/dubbo-go/v3 v3.0.0-rc4-1.0.20211205094359-7bb88bfc87a2 h1:NuBtPJGZMRcGjG3hRaH9nzLNU7sX3UEpBS3yfxa5UHw=
-dubbo.apache.org/dubbo-go/v3 v3.0.0-rc4-1.0.20211205094359-7bb88bfc87a2/go.mod h1:xEe1zM6a+3Q1ivVU4Yzkk4n8CILfSIKASV2SzAlsFHE=
+dubbo.apache.org/dubbo-go/v3 v3.0.0 h1:/P20p7RRU8sWfKC0BHfXjTI13KMerTa+xgcTWvVrczg=
+dubbo.apache.org/dubbo-go/v3 v3.0.0/go.mod h1:Vii+iZsz/UXevskMv3TiV4Sg9xrkTdHtbSYrG8T00gM=
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
@@ -68,8 +68,8 @@ github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9
github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA=
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 h1:rFw4nCn9iMW+Vajsk51NtYIcwSTkXr+JGrMd36kTDJw=
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
-github.com/agiledragon/gomonkey v0.0.0-20190517145658-8fa491f7b918 h1:a88Ln+jbIokfi6xoKtq10dbgp4VMg1CmHF1J42p8EyE=
-github.com/agiledragon/gomonkey v0.0.0-20190517145658-8fa491f7b918/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
+github.com/agiledragon/gomonkey v2.0.2+incompatible h1:eXKi9/piiC3cjJD1658mEE2o3NjkJ5vDLgYjCQu0Xlw=
+github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -195,8 +195,8 @@ github.com/dubbogo/grpc-go v1.42.6-triple/go.mod h1:F1T9hnUvYGW4JLK1QNriavpOkhus
github.com/dubbogo/jsonparser v1.0.1/go.mod h1:tYAtpctvSP/tWw4MeelsowSPgXQRVHHWbqL6ynps8jU=
github.com/dubbogo/net v0.0.4/go.mod h1:1CGOnM7X3he+qgGNqjeADuE5vKZQx/eMSeUkpU3ujIc=
github.com/dubbogo/triple v1.0.9/go.mod h1:1t9me4j4CTvNDcsMZy6/OGarbRyAUSY0tFXGXHCp7Iw=
-github.com/dubbogo/triple v1.1.6-0.20211119123944-4ad68a0d048e h1:GJDV0dOaKwSP/4i8eaDNJ/FpH3sW9czArA0MGj4BZ8Q=
-github.com/dubbogo/triple v1.1.6-0.20211119123944-4ad68a0d048e/go.mod h1:5lGslNo9Tq8KR8+tSSSJkhypNaREYZCKCk0Owx40Cx4=
+github.com/dubbogo/triple v1.1.6 h1:+OxaOm++o/ubuZw4TI5xDpswpC3DnwIGxeYO9m+oVAM=
+github.com/dubbogo/triple v1.1.6/go.mod h1:5lGslNo9Tq8KR8+tSSSJkhypNaREYZCKCk0Owx40Cx4=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -591,8 +591,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
@@ -667,8 +668,8 @@ github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6J
github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/polarismesh/polaris-go v1.0.0 h1:JIBANM5nfhu5knbg269kldQ58bSSV7a6AzTQk1OZwt8=
-github.com/polarismesh/polaris-go v1.0.0/go.mod h1:uzNFDShCN+UhBncwwNqNVhPpI1ZXYwPlb9N/aE+/vE0=
+github.com/polarismesh/polaris-go v1.0.1 h1:Zqr8ZtxsJQsxt0MGyC/fFsF861ogoJCz16yWFJ/t54Q=
+github.com/polarismesh/polaris-go v1.0.1/go.mod h1:3NOqn3QquPdEdY6YhPrsWGvBVCpKhPBGt0Hspq3yEqY=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
@@ -741,7 +742,6 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -774,9 +774,8 @@ github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3
github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -861,7 +860,6 @@ go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 h1:sHOAIxRGBp443oHZIPB+HsUGaksVCXVQENPxwTfQdH4=
go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.2.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
@@ -958,7 +956,6 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
@@ -976,6 +973,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211105192438-b53810dc28af h1:SMeNJG/vclJ5wyBBd4xupMsSJIHTd1coW9g7q6KOjmY=
golang.org/x/net v0.0.0-20211105192438-b53810dc28af/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
diff --git a/integrate_test/config-api/configcenter/nacos/tests/integration/main_test.go b/integrate_test/config-api/configcenter/nacos/tests/integration/main_test.go
index c46e2b0..d1da794 100644
--- a/integrate_test/config-api/configcenter/nacos/tests/integration/main_test.go
+++ b/integrate_test/config-api/configcenter/nacos/tests/integration/main_test.go
@@ -18,18 +18,12 @@
package integration
import (
- "os"
- "testing"
- "time"
-)
-
-import (
"dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/imports"
-)
-
-import (
dubbo3pb "github.com/apache/dubbo-go-samples/api"
+ "os"
+ "testing"
+ "time"
)
const configCenterNacosTestClientConfig = `## set in config center, group is 'dubbo', dataid is 'dubbo-go-samples-configcenter-nacos-client', namespace is default
@@ -42,7 +36,7 @@ dubbo:
references:
GreeterClientImpl:
protocol: tri
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java`
+ interface: "" # read interface from pb`
var greeterProvider = new(dubbo3pb.GreeterClientImpl)
diff --git a/integrate_test/config-api/configcenter/zookeeper/tests/integration/main_test.go b/integrate_test/config-api/configcenter/zookeeper/tests/integration/main_test.go
index 8620128..8e7982e 100644
--- a/integrate_test/config-api/configcenter/zookeeper/tests/integration/main_test.go
+++ b/integrate_test/config-api/configcenter/zookeeper/tests/integration/main_test.go
@@ -18,18 +18,12 @@
package integration
import (
- "os"
- "testing"
- "time"
-)
-
-import (
"dubbo.apache.org/dubbo-go/v3/config"
_ "dubbo.apache.org/dubbo-go/v3/imports"
-)
-
-import (
dubbo3pb "github.com/apache/dubbo-go-samples/api"
+ "os"
+ "testing"
+ "time"
)
const configCenterZKTestClientConfig = `## set in config center, group is 'dubbogo', dataid is 'dubbo-go-samples-configcenter-zookeeper-client', namespace is default
@@ -42,7 +36,7 @@ dubbo:
references:
GreeterClientImpl:
protocol: tri
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java`
+`
var greeterProvider = new(dubbo3pb.GreeterClientImpl)
@@ -60,7 +54,7 @@ func TestMain(m *testing.M) {
}
config.SetConsumerService(greeterProvider)
- time.Sleep(time.Second * 20)
+ time.Sleep(time.Second * 15)
rootConfig := config.NewRootConfigBuilder().
SetConfigCenter(config.NewConfigCenterConfigBuilder().
diff --git a/integrate_test/config-api/rpc/triple/tests/integration/main_test.go b/integrate_test/config-api/rpc/triple/tests/integration/main_test.go
index e061b77..30fbc89 100644
--- a/integrate_test/config-api/rpc/triple/tests/integration/main_test.go
+++ b/integrate_test/config-api/rpc/triple/tests/integration/main_test.go
@@ -38,7 +38,6 @@ func TestMain(m *testing.M) {
rootConfig := config.NewRootConfigBuilder().
SetConsumer(config.NewConsumerConfigBuilder().
AddReference("GreeterClientImpl", config.NewReferenceConfigBuilder().
- SetInterface("com.apache.dubbo.sample.basic.IGreeter").
SetProtocol("tri").
Build()).
Build()).
diff --git a/logger/custom/conf/dubbogo.yml b/logger/custom/conf/dubbogo.yml
index e0885c2..1782cce 100644
--- a/logger/custom/conf/dubbogo.yml
+++ b/logger/custom/conf/dubbogo.yml
@@ -2,7 +2,6 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
protocols:
triple:
@@ -10,6 +9,5 @@ dubbo:
port: 20000
provider:
services:
- greeterImpl:
- protocol: triple
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
+ GreeterProvider:
+ interface: "" # read interface name from pb
\ No newline at end of file
diff --git a/logger/default/conf/dubbogo.yml b/logger/default/conf/dubbogo.yml
index 4e81299..1782cce 100644
--- a/logger/default/conf/dubbogo.yml
+++ b/logger/default/conf/dubbogo.yml
@@ -9,5 +9,5 @@ dubbo:
port: 20000
provider:
services:
- greeterImpl:
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
+ GreeterProvider:
+ interface: "" # read interface name from pb
\ No newline at end of file
diff --git a/logger/level/conf/dubbogo.yml b/logger/level/conf/dubbogo.yml
index 4e81299..1782cce 100644
--- a/logger/level/conf/dubbogo.yml
+++ b/logger/level/conf/dubbogo.yml
@@ -9,5 +9,5 @@ dubbo:
port: 20000
provider:
services:
- greeterImpl:
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
+ GreeterProvider:
+ interface: "" # read interface name from pb
\ No newline at end of file
diff --git a/logger/rolling/conf/dubbogo.yml b/logger/rolling/conf/dubbogo.yml
index 41b3c33..a916c63 100644
--- a/logger/rolling/conf/dubbogo.yml
+++ b/logger/rolling/conf/dubbogo.yml
@@ -9,8 +9,8 @@ dubbo:
port: 20000
provider:
services:
- greeterImpl:
- interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
+ GreeterProvider:
+ interface: ""
logger:
lumberjack-config:
filename: logs.log
diff --git a/metrics/go-client/conf/dubbogo.yml b/metrics/go-client/conf/dubbogo.yml
index f79eb2e..55cb0aa 100644
--- a/metrics/go-client/conf/dubbogo.yml
+++ b/metrics/go-client/conf/dubbogo.yml
@@ -5,10 +5,6 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry-ids:
- - demoZK
references:
GreeterClientImpl:
- group: dubbo-go
- protocol: tri
- interface: com.apache.dubbo.HelloService # must be compatible with grpc or dubbo-java
+ group: dubbo-go
\ No newline at end of file
diff --git a/metrics/go-server/conf/dubbogo.yml b/metrics/go-server/conf/dubbogo.yml
index 5eb987e..f1fc660 100644
--- a/metrics/go-server/conf/dubbogo.yml
+++ b/metrics/go-server/conf/dubbogo.yml
@@ -16,5 +16,4 @@ dubbo:
provider:
services:
GreeterProvider:
- group: dubbo-go
- interface: com.apache.dubbo.HelloService # must be compatible with grpc or dubbo-java
+ group: dubbo-go
\ No newline at end of file
diff --git a/start_integrate_test.sh b/start_integrate_test.sh
index 4aa75f9..c022c6c 100755
--- a/start_integrate_test.sh
+++ b/start_integrate_test.sh
@@ -19,8 +19,13 @@
array+=("game/go-server-game")
array+=("game/go-server-gate")
+# config-api
+array=("config-api/rpc/triple")
+array+=("config-api/configcenter/nacos")
+array+=("config-api/configcenter/zookeeper")
+
# route
-array=("route/meshroute")
+array+=("route/meshroute")
# error
array+=("error/triple/hessian2")
@@ -42,11 +47,6 @@ array+=("filter/custom")
array+=("context/dubbo")
array+=("context/triple")
-# config-api
-array+=("config-api/rpc/triple")
-array+=("config-api/configcenter/nacos")
-array+=("config-api/configcenter/zookeeper")
-
# registry
array+=("registry/zookeeper")
array+=("registry/nacos")