You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by la...@apache.org on 2021/11/09 13:19:25 UTC
[dubbo-go-samples] branch master updated: Fix/nacos grop (#293)
This is an automated email from the ASF dual-hosted git repository.
laurence 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 3e93c35 Fix/nacos grop (#293)
3e93c35 is described below
commit 3e93c35f571fc39c84b131f4281f385d5ab3174e
Author: Laurence <45...@users.noreply.github.com>
AuthorDate: Tue Nov 9 21:19:18 2021 +0800
Fix/nacos grop (#293)
* Fix: nacos registry and config center group
* Fix: add .run
* Fix: bug
* Fix: integrate test
* Fix: integrate test
---
...nt.run.xml => api-config-center-client.run.xml} | 0
...er.run.xml => api-config-center-server.run.xml} | 0
.../configcenter/nacos/go-client/cmd/client.go | 4 +-
.../configcenter/nacos/go-server/cmd/server.go | 7 +---
.../configcenter/zookeeper/go-client/cmd/client.go | 6 +--
.../configcenter/zookeeper/go-server/cmd/server.go | 6 +--
config-api/rpc/README.md | 6 +--
config-api/rpc/triple/go-client/cmd/client.go | 3 +-
config-api/rpc/triple/go-server/cmd/server.go | 6 +--
config-api/subModule/registry/main.go | 2 +-
configcenter/apollo/README.md | 21 +++++-----
configcenter/apollo/README_zh.md | 22 +++++------
configcenter/nacos/go-client/conf/dubbogo.yml | 7 ++--
configcenter/nacos/go-server/conf/dubbogo.yml | 9 ++---
context/dubbo/go-client/conf/dubbogo.yml | 3 --
context/dubbo/go-server/conf/dubbogo.yml | 4 --
context/triple/go-client/conf/dubbogo.yml | 2 -
context/triple/go-server/conf/dubbogo.yml | 4 --
direct/go-server/conf/dubbogo.yml | 1 -
filter/custom/go-client/conf/dubbogo.yml | 2 -
filter/custom/go-server/conf/dubbogo.yml | 3 --
filter/tpslimit/go-client/conf/dubbogo.yml | 3 --
filter/tpslimit/go-server/conf/dubbogo.yml | 3 --
generic/default/go-client/cmd/client.go | 4 +-
generic/default/go-server/conf/dubbogo.yml | 3 +-
go.mod | 8 ++--
go.sum | 24 +++++------
helloworld/go-client/conf/dubbogo.yml | 2 -
helloworld/go-server/conf/dubbogo.yml | 4 --
.../nacos/tests/integration/main_test.go | 7 +---
.../zookeeper/tests/integration/main_test.go | 5 +--
.../rpc/triple/tests/integration/main_test.go | 4 +-
.../custom/tests/integration/myfilter.go} | 46 ++++++++++------------
.../generic/default/tests/integration/main_test.go | 5 ++-
logger/custom/conf/dubbogo.yml | 2 -
logger/default/conf/dubbogo.yml | 4 --
logger/level/conf/dubbogo.yml | 4 --
logger/rolling/conf/dubbogo.yml | 4 --
metrics/go-server/conf/dubbogo.yml | 2 -
registry/etcd/go-client/conf/dubbogo.yml | 5 ---
registry/etcd/go-server/conf/dubbogo.yml | 3 --
registry/nacos/go-client/conf/dubbogo.yml | 31 ++-------------
registry/nacos/go-server/conf/dubbogo.yml | 32 ++++++---------
.../nacos/go-client/conf/dubbogo.yml | 2 -
.../nacos/go-server/conf/dubbogo.yml | 3 --
.../zookeeper/go-server/conf/dubbogo.yml | 3 --
registry/zookeeper/go-client/conf/dubbogo.yml | 2 -
registry/zookeeper/go-server/conf/dubbogo.yml | 3 --
route/meshroute/go-server/conf/dubbogo.yml | 1 -
rpc/dubbo/go-client/conf/dubbogo.yml | 15 +++----
rpc/dubbo/go-server/conf/dubbogo.yml | 5 ---
rpc/grpc/go-client/conf/dubbogo.yml | 2 -
rpc/grpc/go-server/conf/dubbogo.yml | 3 --
rpc/jsonrpc/go-client/conf/dubbogo.yml | 3 --
rpc/jsonrpc/go-server/conf/dubbogo.yml | 8 ----
rpc/triple/README.md | 1 -
rpc/triple/README_zh.md | 1 -
.../codec-extension/go-client/conf/dubbogo.yml | 2 -
.../codec-extension/go-server/conf/dubbogo.yml | 3 --
rpc/triple/hessian2/README.md | 2 -
rpc/triple/hessian2/README_zh.md | 2 -
rpc/triple/hessian2/go-server/conf/dubbogo.yml | 28 ++++++-------
rpc/triple/msgpack/go-server/conf/dubbogo.yml | 7 +---
.../pb/dubbogo-grpc/go-client/conf/dubbogo.yml | 1 -
.../pb/dubbogo-grpc/go-server/conf/dubbogo.yml | 2 -
.../pb/dubbogo-java/go-client/conf/dubbogo.yml | 1 -
.../pb/dubbogo-java/go-server/conf/dubbogo.yml | 2 -
start_integrate_test.sh | 4 ++
tracing/dubbo/go-server/conf/dubbogo.yml | 3 --
tracing/grpc/go-client/conf/dubbogo.yml | 3 --
tracing/grpc/go-server/conf/dubbogo.yml | 3 --
tracing/jsonrpc/go-client/conf/dubbogo.yml | 4 +-
tracing/jsonrpc/go-server/conf/dubbogo.yml | 5 +--
73 files changed, 128 insertions(+), 319 deletions(-)
diff --git a/.run/config-api-client.run.xml b/.run/api-config-center-client.run.xml
similarity index 100%
rename from .run/config-api-client.run.xml
rename to .run/api-config-center-client.run.xml
diff --git a/.run/config-api-server.run.xml b/.run/api-config-center-server.run.xml
similarity index 100%
rename from .run/config-api-server.run.xml
rename to .run/api-config-center-server.run.xml
diff --git a/config-api/configcenter/nacos/go-client/cmd/client.go b/config-api/configcenter/nacos/go-client/cmd/client.go
index 23e956d..cef0439 100644
--- a/config-api/configcenter/nacos/go-client/cmd/client.go
+++ b/config-api/configcenter/nacos/go-client/cmd/client.go
@@ -66,11 +66,11 @@ func main() {
rootConfig := config.NewRootConfigBuilder().
SetConfigCenter(config.NewConfigCenterConfigBuilder().
SetProtocol("nacos").SetAddress("127.0.0.1:8848").
- SetDataID("dubbo-go-samples-configcenter-nacos-client").
+ SetDataID("dubbo-go-samples-configcenter-nacos-client").SetGroup("dubbo").
Build()).
Build()
- if err := rootConfig.Init(); err != nil {
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
panic(err)
}
diff --git a/config-api/configcenter/nacos/go-server/cmd/server.go b/config-api/configcenter/nacos/go-server/cmd/server.go
index 7a09a45..d79f42b 100644
--- a/config-api/configcenter/nacos/go-server/cmd/server.go
+++ b/config-api/configcenter/nacos/go-server/cmd/server.go
@@ -44,11 +44,8 @@ dubbo:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
GreeterProvider:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java`
type GreeterProvider struct {
@@ -81,11 +78,11 @@ func main() {
rootConfig := config.NewRootConfigBuilder().
SetConfigCenter(config.NewConfigCenterConfigBuilder().
SetProtocol("nacos").SetAddress("127.0.0.1:8848").
- SetDataID("dubbo-go-samples-configcenter-nacos-server").
+ SetDataID("dubbo-go-samples-configcenter-nacos-server").SetGroup("dubbo").
Build()).
Build()
- if err := rootConfig.Init(); err != nil {
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
panic(err)
}
select {}
diff --git a/config-api/configcenter/zookeeper/go-client/cmd/client.go b/config-api/configcenter/zookeeper/go-client/cmd/client.go
index d0acd81..f614449 100644
--- a/config-api/configcenter/zookeeper/go-client/cmd/client.go
+++ b/config-api/configcenter/zookeeper/go-client/cmd/client.go
@@ -36,11 +36,8 @@ dubbo:
registries:
demoZK:
protocol: nacos
- timeout: 3s
address: 127.0.0.1:8848
consumer:
- registry-ids:
- - demoZK
references:
GreeterClientImpl:
protocol: tri
@@ -71,10 +68,9 @@ func main() {
Build()).
Build()
- if err := rootConfig.Init(); err != nil {
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
panic(err)
}
-
logger.Info("start to test dubbo")
req := &api.HelloRequest{
Name: "laurence",
diff --git a/config-api/configcenter/zookeeper/go-server/cmd/server.go b/config-api/configcenter/zookeeper/go-server/cmd/server.go
index d53f40a..f705927 100644
--- a/config-api/configcenter/zookeeper/go-server/cmd/server.go
+++ b/config-api/configcenter/zookeeper/go-server/cmd/server.go
@@ -37,18 +37,14 @@ dubbo:
registries:
demoZK:
protocol: nacos
- timeout: 3s
address: 127.0.0.1:8848
protocols:
triple:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
GreeterProvider:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java`
type GreeterProvider struct {
@@ -85,7 +81,7 @@ func main() {
Build()).
Build()
- if err := rootConfig.Init(); err != nil {
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
panic(err)
}
select {}
diff --git a/config-api/rpc/README.md b/config-api/rpc/README.md
index 95f46ff..d8963a1 100644
--- a/config-api/rpc/README.md
+++ b/config-api/rpc/README.md
@@ -37,7 +37,7 @@ rootConfig := config.NewRootConfig(
)
// 服务启动
-if err := rootConfig.Init(); err != nil {
+if err := config.Load(config.WithRootConfig(rootConfig)); err != nil{
panic(err)
}
select {}
@@ -63,7 +63,7 @@ rootConfig := config.NewRootConfig(
config.WithRootConsumerConfig(consumerConfig),
)
-if err := rootConfig.Init(); err != nil {
- panic(err)
+if err := config.Load(config.WithRootConfig(rootConfig)); err != nil{
+ panic(err)
}
```
\ No newline at end of file
diff --git a/config-api/rpc/triple/go-client/cmd/client.go b/config-api/rpc/triple/go-client/cmd/client.go
index 196b67d..96956bf 100644
--- a/config-api/rpc/triple/go-client/cmd/client.go
+++ b/config-api/rpc/triple/go-client/cmd/client.go
@@ -39,7 +39,6 @@ func main() {
rootConfig := config.NewRootConfigBuilder().
SetConsumer(config.NewConsumerConfigBuilder().
- SetRegistryIDs("zkRegistryKey").
AddReference("GreeterClientImpl", config.NewReferenceConfigBuilder().
SetInterface("com.apache.dubbo.sample.basic.IGreeter").
SetProtocol("tri").
@@ -48,7 +47,7 @@ func main() {
AddRegistry("zkRegistryKey", config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")).
Build()
- if err := rootConfig.Init(); err != nil {
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
panic(err)
}
diff --git a/config-api/rpc/triple/go-server/cmd/server.go b/config-api/rpc/triple/go-server/cmd/server.go
index 4b8e025..86c1f9a 100644
--- a/config-api/rpc/triple/go-server/cmd/server.go
+++ b/config-api/rpc/triple/go-server/cmd/server.go
@@ -46,10 +46,8 @@ func main() {
rootConfig := config.NewRootConfigBuilder().
SetProvider(config.NewProviderConfigBuilder().
- SetRegistryIDs("zk").
AddService("GreeterProvider", config.NewServiceConfigBuilder().
SetInterface("com.apache.dubbo.sample.basic.IGreeter").
- SetProtocolIDs("tripleKey").
Build()).
Build()).
AddRegistry("zk", config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")).
@@ -59,9 +57,9 @@ func main() {
Build()).
Build()
- if err := rootConfig.Init(); err != nil {
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
panic(err)
}
- rootConfig.Start()
+
select {}
}
diff --git a/config-api/subModule/registry/main.go b/config-api/subModule/registry/main.go
index 9bc5405..e48debd 100644
--- a/config-api/subModule/registry/main.go
+++ b/config-api/subModule/registry/main.go
@@ -38,7 +38,7 @@ func main() {
ivkURL, err := common.NewURL("mock://localhost:8080",
common.WithPath("com.alibaba.dubbogo.HelloService"),
- common.WithParamsValue(constant.RoleKey, strconv.Itoa(common.PROVIDER)),
+ common.WithParamsValue(constant.RegistryRoleKey, strconv.Itoa(common.PROVIDER)),
common.WithMethods([]string{"GetUser", "SayHello"}),
)
if err != nil {
diff --git a/configcenter/apollo/README.md b/configcenter/apollo/README.md
index 7451b31..2a756ea 100644
--- a/configcenter/apollo/README.md
+++ b/configcenter/apollo/README.md
@@ -12,23 +12,20 @@
```yaml
dubbo:
application:
- name: "demo-server"
- version: "2.0"
+ name: demo-server
+ version: 2.0
registries:
- "demoZK":
- protocol: "zookeeper"
- timeout: "3s"
- address: "127.0.0.1:2181"
+ demoZK:
+ protocol: zookeeper
+ timeout: 3s
+ address: 127.0.0.1:2181
protocols:
- "triple":
- name: "tri"
+ triple:
+ name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
- "greeterImpl":
- protocol-ids: "triple"
+ greeterImpl:
interface: "com.apache.dubbo.sample.basic.IGreeter" # must be compatible with grpc or dubbo-java
```
diff --git a/configcenter/apollo/README_zh.md b/configcenter/apollo/README_zh.md
index 12165de..cdbedea 100644
--- a/configcenter/apollo/README_zh.md
+++ b/configcenter/apollo/README_zh.md
@@ -13,24 +13,20 @@
```yaml
dubbo:
application:
- name: "demo-server"
- version: "2.0"
+ name: demo-server
+ version: 2.0"
registries:
- "demoZK":
- protocol: "zookeeper"
- timeout: "3s"
- address: "127.0.0.1:2181"
+ demoZK:
+ protocol: zookeeper
+ address: 127.0.0.1:2181
protocols:
- "triple":
- name: "tri"
+ triple:
+ name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
- "greeterImpl":
- protocol-ids: "triple"
- interface: "com.apache.dubbo.sample.basic.IGreeter" # must be compatible with grpc or dubbo-java
+ greeterImpl:
+ interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
```
3. 启动go-server
diff --git a/configcenter/nacos/go-client/conf/dubbogo.yml b/configcenter/nacos/go-client/conf/dubbogo.yml
index 9fb5f07..6c48c71 100644
--- a/configcenter/nacos/go-client/conf/dubbogo.yml
+++ b/configcenter/nacos/go-client/conf/dubbogo.yml
@@ -2,7 +2,10 @@ dubbo:
config-center:
protocol: nacos
address: 127.0.0.1:8848
- data-id: "dubbo-go-samples-configcenter-nacos-client"
+ data-id: dubbo-go-samples-configcenter-nacos-client
+ group: myGroup # default is DEFAULT_GROUP
+# namespace: 9fb00abb-278d-42fc-96bf-e0151601e4a1 # default is public
+
## set in config center, group is 'dubbo', dataid is 'dubbo-go-samples-configcenter-nacos-client', namespace is default
#dubbo:
@@ -12,8 +15,6 @@ dubbo:
# timeout: 3s
# address: 127.0.0.1:2181
# consumer:
-# registry-ids:
-# - demoZK
# references:
# GreeterClientImpl:
# protocol: tri
diff --git a/configcenter/nacos/go-server/conf/dubbogo.yml b/configcenter/nacos/go-server/conf/dubbogo.yml
index 058514c..018acfe 100644
--- a/configcenter/nacos/go-server/conf/dubbogo.yml
+++ b/configcenter/nacos/go-server/conf/dubbogo.yml
@@ -2,7 +2,9 @@ dubbo:
config-center:
protocol: nacos
address: 127.0.0.1:8848
- data-id: "dubbo-go-samples-configcenter-nacos-server"
+ data-id: dubbo-go-samples-configcenter-nacos-server
+ group: myGroup # nacos group, default is DEFAULT_GROUP
+# namespace: 9fb00abb-278d-42fc-96bf-e0151601e4a1 # nacos namespaceID, default is public namespace
## set in config center, group is 'dubbo', dataid is 'dubbo-go-samples-configcenter-nacos-server', namespace is default
#dubbo:
@@ -13,12 +15,9 @@ dubbo:
# address: 127.0.0.1:2181
# protocols:
# triple:
-# name: "tri"
+# name: tri
# port: 20000
# provider:
-# registry-ids:
-# - demoZK
# services:
# GreeterProvider:
-# protocol: triple
# interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/context/dubbo/go-client/conf/dubbogo.yml b/context/dubbo/go-client/conf/dubbogo.yml
index 9f67a58..cc67b57 100644
--- a/context/dubbo/go-client/conf/dubbogo.yml
+++ b/context/dubbo/go-client/conf/dubbogo.yml
@@ -2,7 +2,6 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
protocols:
dubbo:
@@ -29,8 +28,6 @@ dubbo:
max-msg-len: 1024000
session-name: client
consumer:
- registry-ids:
- - demoZK
references:
UserProvider:
protocol: dubbo
diff --git a/context/dubbo/go-server/conf/dubbogo.yml b/context/dubbo/go-server/conf/dubbogo.yml
index 1652ef8..6c0a243 100644
--- a/context/dubbo/go-server/conf/dubbogo.yml
+++ b/context/dubbo/go-server/conf/dubbogo.yml
@@ -2,7 +2,6 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
protocols:
dubbo:
@@ -25,9 +24,6 @@ dubbo:
max-msg-len: 1024000
session-name: server
provider:
- registry-ids:
- - demoZK
services:
UserProvider:
- protocol: dubbo
interface: org.apache.dubbo.UserProvider
\ No newline at end of file
diff --git a/context/triple/go-client/conf/dubbogo.yml b/context/triple/go-client/conf/dubbogo.yml
index cf11a84..a005269 100644
--- a/context/triple/go-client/conf/dubbogo.yml
+++ b/context/triple/go-client/conf/dubbogo.yml
@@ -5,8 +5,6 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry-ids:
- - demoZK
references:
GreeterClientImpl:
protocol: tri
diff --git a/context/triple/go-server/conf/dubbogo.yml b/context/triple/go-server/conf/dubbogo.yml
index 6987904..1f1bb4a 100644
--- a/context/triple/go-server/conf/dubbogo.yml
+++ b/context/triple/go-server/conf/dubbogo.yml
@@ -2,16 +2,12 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
protocols:
triple:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
GreeterProvider:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/direct/go-server/conf/dubbogo.yml b/direct/go-server/conf/dubbogo.yml
index a0f9819..feb4b1e 100644
--- a/direct/go-server/conf/dubbogo.yml
+++ b/direct/go-server/conf/dubbogo.yml
@@ -6,5 +6,4 @@ dubbo:
provider:
services:
GreeterProvider:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ 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 813db82..f912dfb 100644
--- a/filter/custom/go-client/conf/dubbogo.yml
+++ b/filter/custom/go-client/conf/dubbogo.yml
@@ -11,8 +11,6 @@ dubbo:
check: true
request_timeout: 3s
connect_timeout: 3s
- registry-ids:
- - demoZK
references:
GreeterClientImpl:
protocol: tri
diff --git a/filter/custom/go-server/conf/dubbogo.yml b/filter/custom/go-server/conf/dubbogo.yml
index 6f8af7b..83f685f 100644
--- a/filter/custom/go-server/conf/dubbogo.yml
+++ b/filter/custom/go-server/conf/dubbogo.yml
@@ -9,12 +9,9 @@ dubbo:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
GreeterProvider:
filter: myServerFilter
- protocol-ids: tripleProtocol
interface: org.apache.dubbo.UserProvider
loadbalance: random
warmup: 100
diff --git a/filter/tpslimit/go-client/conf/dubbogo.yml b/filter/tpslimit/go-client/conf/dubbogo.yml
index df5c47d..78e76bb 100644
--- a/filter/tpslimit/go-client/conf/dubbogo.yml
+++ b/filter/tpslimit/go-client/conf/dubbogo.yml
@@ -7,11 +7,8 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- check: true
request_timeout: 3s
connect_timeout: 3s
- registry-ids:
- - demoZK
references:
UserProvider:
retries: 0
diff --git a/filter/tpslimit/go-server/conf/dubbogo.yml b/filter/tpslimit/go-server/conf/dubbogo.yml
index fc48fa9..83da28c 100644
--- a/filter/tpslimit/go-server/conf/dubbogo.yml
+++ b/filter/tpslimit/go-server/conf/dubbogo.yml
@@ -12,11 +12,8 @@ dubbo:
name: dubbo
port: 20000
provider:
- registry-ids:
- - demoZK
services:
UserProvider:
- protocol: dubbo
interface: org.apache.dubbo.UserProvider
cluster: failover
loadbalance: random # load balancing strategy, such as random, roundrobin, leastactive or consistenthash.
diff --git a/generic/default/go-client/cmd/client.go b/generic/default/go-client/cmd/client.go
index 7495f10..1061bac 100644
--- a/generic/default/go-client/cmd/client.go
+++ b/generic/default/go-client/cmd/client.go
@@ -255,7 +255,9 @@ func newRefConf(iface, protocol string) config.ReferenceConfig {
rootConfig := config.NewRootConfigBuilder().
AddRegistry("zk", registryConfig).
Build()
- _ = rootConfig.Init()
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
+ panic(err)
+ }
_ = refConf.Init(rootConfig)
refConf.GenericLoad(appName)
diff --git a/generic/default/go-server/conf/dubbogo.yml b/generic/default/go-server/conf/dubbogo.yml
index af51a43..7514f8e 100644
--- a/generic/default/go-server/conf/dubbogo.yml
+++ b/generic/default/go-server/conf/dubbogo.yml
@@ -15,9 +15,8 @@ dubbo:
registry-ids: zk
services:
UserProvider:
- protocol-ids: dubbo
+ serialization: hessian2
interface: org.apache.dubbo.samples.UserProvider
UserProviderTriple:
- protocol-ids: triple
serialization: hessian2
interface: org.apache.dubbo.samples.UserProviderTriple
\ No newline at end of file
diff --git a/go.mod b/go.mod
index d065f3b..920840a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,11 @@
module github.com/apache/dubbo-go-samples
require (
- dubbo.apache.org/dubbo-go/v3 v3.0.0-rc3.0.20211107100213-fc341e3ac2f8
+ dubbo.apache.org/dubbo-go/v3 v3.0.0-rc3.0.20211109121610-2ebc38bed562
github.com/apache/dubbo-go-hessian2 v1.9.4-0.20210917102639-74a8ece5f3cb
github.com/dubbogo/gost v1.11.19
- github.com/dubbogo/grpc-go v1.42.3-triple
- github.com/dubbogo/triple v1.1.1
+ github.com/dubbogo/grpc-go v1.42.4-triple
+ github.com/dubbogo/triple v1.1.2
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
@@ -15,7 +15,7 @@ require (
github.com/stretchr/testify v1.7.0
github.com/uber/jaeger-client-go v2.22.1+incompatible
github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
- google.golang.org/grpc v1.41.0
+ google.golang.org/grpc v1.42.0
google.golang.org/protobuf v1.27.1
)
diff --git a/go.sum b/go.sum
index 1944fc1..c789454 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-rc3.0.20211107100213-fc341e3ac2f8 h1:M7Mjiw2WTnNQIoE+8KHzm0d31cjCH4lskRMdbthoQBY=
-dubbo.apache.org/dubbo-go/v3 v3.0.0-rc3.0.20211107100213-fc341e3ac2f8/go.mod h1:QWRXyWpFMKFA1wVzLoeYyH1wuXt68x+x9xD9zV4rneo=
+dubbo.apache.org/dubbo-go/v3 v3.0.0-rc3.0.20211109121610-2ebc38bed562 h1:+vuEbhMZtBSGsQ+iP0lJIwBO94ZINqNEELopDWyqaa4=
+dubbo.apache.org/dubbo-go/v3 v3.0.0-rc3.0.20211109121610-2ebc38bed562/go.mod h1:0d5jvZPxUJTLL4FlnL11yydXwX0lAthj+VAopu+kZqE=
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=
@@ -181,13 +181,13 @@ github.com/dubbogo/gost v1.11.12/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZT
github.com/dubbogo/gost v1.11.18/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI=
github.com/dubbogo/gost v1.11.19 h1:R1rZ3TNJKV9W5XHLMv+GDO2Wy6UDnwGQtVWbsWYvo0A=
github.com/dubbogo/gost v1.11.19/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI=
-github.com/dubbogo/grpc-go v1.42.3-triple h1:R5vP7eqmNOPCPRHh1rGd7jsfLqpCq/0OuErEjHkKnK4=
-github.com/dubbogo/grpc-go v1.42.3-triple/go.mod h1:wmUhwCdh3lowLGd5xth6T6w8KZaBQ87HJMQ/vrdvT+U=
+github.com/dubbogo/grpc-go v1.42.4-triple h1:ysiabUrEGcaeXgnjSBT0bB1M7EexSJFiO0Mebg/Iqa4=
+github.com/dubbogo/grpc-go v1.42.4-triple/go.mod h1:F1T9hnUvYGW4JLK1QNriavpOkhusU677ovPzLkk6zHM=
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.1 h1:ZxanibOS9sodSzlLo+DiH+BvuLObt59tSyOgBYUMYUc=
-github.com/dubbogo/triple v1.1.1/go.mod h1:n63kMaad4uSwn0/andbDugrxp0k1A+SkpqtjV/lDQVE=
+github.com/dubbogo/triple v1.1.2 h1:7lmQ0uNvcIYlMj5gNwPQadFx8w8UDEtcYl4DL6X+idM=
+github.com/dubbogo/triple v1.1.2/go.mod h1:x+H41M5yP1ULnJu4b+o8VrgsIKdTPslTum2yUqA9N1I=
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=
@@ -269,8 +269,8 @@ github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/j
github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
github.com/go-playground/validator/v10 v10.9.0 h1:NgTtmN58D0m8+UuxtYmGztBJB7VnPgjj221I1QHci2A=
github.com/go-playground/validator/v10 v10.9.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-resty/resty/v2 v2.3.0 h1:JOOeAvjSlapTT92p8xiS19Zxev1neGikoHsXJeOq8So=
-github.com/go-resty/resty/v2 v2.3.0/go.mod h1:UpN9CgLZNsv4e9XG50UU8xdI0F43UQ4HmxLBDwaroHU=
+github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
+github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -489,8 +489,8 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/knadh/koanf v1.3.0 h1:nNmG4HGbpJUv7eUV1skDvHzzFS+35Q3b+OsYvoXyt2E=
-github.com/knadh/koanf v1.3.0/go.mod h1:HZ7HMLIGbrWJUfgtEzfHvzR/rX+eIqQlBNPRr4Vt42s=
+github.com/knadh/koanf v1.3.2 h1:0JKfmTLcvEmdJwjY16BMOVKpqThxRwj29CtQvZiCsAA=
+github.com/knadh/koanf v1.3.2/go.mod h1:HZ7HMLIGbrWJUfgtEzfHvzR/rX+eIqQlBNPRr4Vt42s=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -922,6 +922,7 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/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=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1180,8 +1181,9 @@ google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.41.0 h1:f+PlOh7QV4iIJkPrx5NQ7qaNGFQ3OTse67yaDHfju4E=
google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
+google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A=
+google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
diff --git a/helloworld/go-client/conf/dubbogo.yml b/helloworld/go-client/conf/dubbogo.yml
index cf11a84..a005269 100644
--- a/helloworld/go-client/conf/dubbogo.yml
+++ b/helloworld/go-client/conf/dubbogo.yml
@@ -5,8 +5,6 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry-ids:
- - demoZK
references:
GreeterClientImpl:
protocol: tri
diff --git a/helloworld/go-server/conf/dubbogo.yml b/helloworld/go-server/conf/dubbogo.yml
index 6987904..1f1bb4a 100644
--- a/helloworld/go-server/conf/dubbogo.yml
+++ b/helloworld/go-server/conf/dubbogo.yml
@@ -2,16 +2,12 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
protocols:
triple:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
GreeterProvider:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
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 8e0707b..c46e2b0 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
@@ -37,11 +37,8 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
consumer:
- registries:
- - demoZK
references:
GreeterClientImpl:
protocol: tri
@@ -70,13 +67,13 @@ func TestMain(m *testing.M) {
SetConfigCenter(config.NewConfigCenterConfigBuilder().
SetProtocol("nacos").SetAddress("127.0.0.1:8848").
SetDataID("dubbo-go-samples-configcenter-nacos-client").
+ SetGroup("dubbo").
Build()).
Build()
- if err := rootConfig.Init(); err != nil {
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
panic(err)
}
-
time.Sleep(3 * time.Second)
os.Exit(m.Run())
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 e096339..bc52963 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
@@ -37,11 +37,8 @@ dubbo:
registries:
demoZK:
protocol: nacos
- timeout: 3s
address: 127.0.0.1:8848
consumer:
- registries:
- - demoZK
references:
GreeterClientImpl:
protocol: tri
@@ -73,7 +70,7 @@ func TestMain(m *testing.M) {
Build()).
Build()
- if err := rootConfig.Init(); err != nil {
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
panic(err)
}
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 36c4f39..e061b77 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
@@ -37,7 +37,6 @@ func TestMain(m *testing.M) {
config.SetConsumerService(greeterProvider)
rootConfig := config.NewRootConfigBuilder().
SetConsumer(config.NewConsumerConfigBuilder().
- SetRegistryIDs("zkRegistryKey").
AddReference("GreeterClientImpl", config.NewReferenceConfigBuilder().
SetInterface("com.apache.dubbo.sample.basic.IGreeter").
SetProtocol("tri").
@@ -46,10 +45,9 @@ func TestMain(m *testing.M) {
AddRegistry("zkRegistryKey", config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")).
Build()
- if err := rootConfig.Init(); err != nil {
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
panic(err)
}
-
os.Exit(m.Run())
}
diff --git a/integrate_test/config-api/rpc/triple/tests/integration/main_test.go b/integrate_test/filter/custom/tests/integration/myfilter.go
similarity index 51%
copy from integrate_test/config-api/rpc/triple/tests/integration/main_test.go
copy to integrate_test/filter/custom/tests/integration/myfilter.go
index 36c4f39..5d47b5f 100644
--- a/integrate_test/config-api/rpc/triple/tests/integration/main_test.go
+++ b/integrate_test/filter/custom/tests/integration/myfilter.go
@@ -18,38 +18,32 @@
package integration
import (
- "os"
- "testing"
+ "context"
+ "fmt"
)
import (
- "dubbo.apache.org/dubbo-go/v3/config"
- _ "dubbo.apache.org/dubbo-go/v3/imports"
+ "dubbo.apache.org/dubbo-go/v3/common/extension"
+ "dubbo.apache.org/dubbo-go/v3/filter"
+ "dubbo.apache.org/dubbo-go/v3/protocol"
)
-import (
- "github.com/apache/dubbo-go-samples/api"
-)
-
-var greeterProvider = new(api.GreeterClientImpl)
-
-func TestMain(m *testing.M) {
- config.SetConsumerService(greeterProvider)
- rootConfig := config.NewRootConfigBuilder().
- SetConsumer(config.NewConsumerConfigBuilder().
- SetRegistryIDs("zkRegistryKey").
- AddReference("GreeterClientImpl", config.NewReferenceConfigBuilder().
- SetInterface("com.apache.dubbo.sample.basic.IGreeter").
- SetProtocol("tri").
- Build()).
- Build()).
- AddRegistry("zkRegistryKey", config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")).
- Build()
+func init() {
+ extension.SetFilter("myClientFilter", NewMyClientFilter)
+}
- if err := rootConfig.Init(); err != nil {
- panic(err)
- }
+func NewMyClientFilter() filter.Filter {
+ return &MyClientFilter{}
+}
- os.Exit(m.Run())
+type MyClientFilter struct {
+}
+func (f *MyClientFilter) Invoke(ctx context.Context, invoker protocol.Invoker, invocation protocol.Invocation) protocol.Result {
+ fmt.Println("MyClientFilter Invoke is called, method Name = ", invocation.MethodName())
+ return invoker.Invoke(ctx, invocation)
+}
+func (f *MyClientFilter) OnResponse(ctx context.Context, result protocol.Result, invoker protocol.Invoker, protocol protocol.Invocation) protocol.Result {
+ fmt.Println("MyClientFilter OnResponse is called")
+ return result
}
diff --git a/integrate_test/generic/default/tests/integration/main_test.go b/integrate_test/generic/default/tests/integration/main_test.go
index d9796c3..c41d543 100644
--- a/integrate_test/generic/default/tests/integration/main_test.go
+++ b/integrate_test/generic/default/tests/integration/main_test.go
@@ -69,7 +69,10 @@ func newRefConf(iface, protocol string) config.ReferenceConfig {
rootConfig := config.NewRootConfigBuilder().
AddRegistry("zk", registryConfig).
Build()
- _ = rootConfig.Init()
+
+ if err := config.Load(config.WithRootConfig(rootConfig)); err != nil {
+ panic(err)
+ }
_ = refConf.Init(rootConfig)
refConf.GenericLoad(appName)
diff --git a/logger/custom/conf/dubbogo.yml b/logger/custom/conf/dubbogo.yml
index b3ce624..e0885c2 100644
--- a/logger/custom/conf/dubbogo.yml
+++ b/logger/custom/conf/dubbogo.yml
@@ -9,8 +9,6 @@ dubbo:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
greeterImpl:
protocol: triple
diff --git a/logger/default/conf/dubbogo.yml b/logger/default/conf/dubbogo.yml
index 715d2e3..4e81299 100644
--- a/logger/default/conf/dubbogo.yml
+++ b/logger/default/conf/dubbogo.yml
@@ -2,16 +2,12 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
protocols:
triple:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
greeterImpl:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/logger/level/conf/dubbogo.yml b/logger/level/conf/dubbogo.yml
index 715d2e3..4e81299 100644
--- a/logger/level/conf/dubbogo.yml
+++ b/logger/level/conf/dubbogo.yml
@@ -2,16 +2,12 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
protocols:
triple:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
greeterImpl:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/logger/rolling/conf/dubbogo.yml b/logger/rolling/conf/dubbogo.yml
index 0d1ecef..41b3c33 100644
--- a/logger/rolling/conf/dubbogo.yml
+++ b/logger/rolling/conf/dubbogo.yml
@@ -2,18 +2,14 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
protocols:
triple:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
greeterImpl:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
logger:
lumberjack-config:
diff --git a/metrics/go-server/conf/dubbogo.yml b/metrics/go-server/conf/dubbogo.yml
index 925dbf2..5eb987e 100644
--- a/metrics/go-server/conf/dubbogo.yml
+++ b/metrics/go-server/conf/dubbogo.yml
@@ -14,9 +14,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry-ids: myzk
services:
GreeterProvider:
group: dubbo-go
- protocol-ids: triple
interface: com.apache.dubbo.HelloService # must be compatible with grpc or dubbo-java
diff --git a/registry/etcd/go-client/conf/dubbogo.yml b/registry/etcd/go-client/conf/dubbogo.yml
index 230d966..0d6ff2d 100644
--- a/registry/etcd/go-client/conf/dubbogo.yml
+++ b/registry/etcd/go-client/conf/dubbogo.yml
@@ -10,13 +10,8 @@ dubbo:
protocol: "etcdv3"
timeout: "3s"
address: "127.0.0.1:2379"
- protocols:
- dubbo:
- name: "dubbo"
- port: 20000
consumer:
references:
UserProvider:
- registry-ids: "etcd"
protocol: "dubbo"
interface: "org.apache.dubbo.UserProvider"
\ No newline at end of file
diff --git a/registry/etcd/go-server/conf/dubbogo.yml b/registry/etcd/go-server/conf/dubbogo.yml
index d5138a4..10a79b5 100644
--- a/registry/etcd/go-server/conf/dubbogo.yml
+++ b/registry/etcd/go-server/conf/dubbogo.yml
@@ -15,9 +15,6 @@ dubbo:
name: "dubbo"
port: 20000
provider:
- registry-ids:
- - etcd
services:
UserProvider:
- protocol: "dubbo"
interface: "org.apache.dubbo.UserProvider"
\ No newline at end of file
diff --git a/registry/nacos/go-client/conf/dubbogo.yml b/registry/nacos/go-client/conf/dubbogo.yml
index 5865a22..ae5d57b 100644
--- a/registry/nacos/go-client/conf/dubbogo.yml
+++ b/registry/nacos/go-client/conf/dubbogo.yml
@@ -2,36 +2,11 @@ dubbo:
registries:
demoNacos:
protocol: nacos
- timeout: 3s
address: 127.0.0.1:8848
- protocols:
- 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
+ group: myGroup
+# namespace: 9fb00abb-278d-42fc-96bf-e0151601e4a1
consumer:
- registry-ids:
- - demoNacos
references:
UserProvider:
protocol: dubbo
- interface: org.apache.dubbo.UserProvider
\ No newline at end of file
+ interface: org.apache.dubbo.UserProvider.Test
\ No newline at end of file
diff --git a/registry/nacos/go-server/conf/dubbogo.yml b/registry/nacos/go-server/conf/dubbogo.yml
index 4f61135..1d34a6c 100644
--- a/registry/nacos/go-server/conf/dubbogo.yml
+++ b/registry/nacos/go-server/conf/dubbogo.yml
@@ -1,33 +1,23 @@
dubbo:
+ application:
+ name: myApp # metadata: application=myApp; name=myApp
+ module: opensource #metadata: module=opensource
+ group: myAppGroup # no metadata record
+ organization: dubbo # metadata: organization=dubbo
+ owner: laurence # metadata: owner=laurence
+ version: myversion # metadata: app.version=myversion
+ environment: pro # metadata: environment=pro
registries:
demoNacos:
protocol: nacos
- timeout: 3s
address: 127.0.0.1:8848
+ group: myGroup # nacos group, default is DEFAULT_GROUP
+# namespace: 9fb00abb-278d-42fc-96bf-e0151601e4a1 # nacos namespaceID, should be created before. default is public
protocols:
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:
- registry-ids:
- - demoNacos
services:
UserProvider:
- protocol: dubbo
- interface: org.apache.dubbo.UserProvider
\ No newline at end of file
+ interface: org.apache.dubbo.UserProvider.Test
\ No newline at end of file
diff --git a/registry/servicediscovery/nacos/go-client/conf/dubbogo.yml b/registry/servicediscovery/nacos/go-client/conf/dubbogo.yml
index 4e74990..33f1b37 100644
--- a/registry/servicediscovery/nacos/go-client/conf/dubbogo.yml
+++ b/registry/servicediscovery/nacos/go-client/conf/dubbogo.yml
@@ -8,8 +8,6 @@ dubbo:
protocol: nacos
address: 127.0.0.1:8848
consumer:
- registry-ids:
- - demoZK
references:
GreeterClientImpl:
protocol: tri
diff --git a/registry/servicediscovery/nacos/go-server/conf/dubbogo.yml b/registry/servicediscovery/nacos/go-server/conf/dubbogo.yml
index 8b2afac..8262ef1 100644
--- a/registry/servicediscovery/nacos/go-server/conf/dubbogo.yml
+++ b/registry/servicediscovery/nacos/go-server/conf/dubbogo.yml
@@ -12,9 +12,6 @@ dubbo:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
GreeterProvider:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/registry/servicediscovery/zookeeper/go-server/conf/dubbogo.yml b/registry/servicediscovery/zookeeper/go-server/conf/dubbogo.yml
index e489e2b..71b2bdc 100644
--- a/registry/servicediscovery/zookeeper/go-server/conf/dubbogo.yml
+++ b/registry/servicediscovery/zookeeper/go-server/conf/dubbogo.yml
@@ -12,9 +12,6 @@ dubbo:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
GreeterProvider:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/registry/zookeeper/go-client/conf/dubbogo.yml b/registry/zookeeper/go-client/conf/dubbogo.yml
index cf11a84..a005269 100644
--- a/registry/zookeeper/go-client/conf/dubbogo.yml
+++ b/registry/zookeeper/go-client/conf/dubbogo.yml
@@ -5,8 +5,6 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry-ids:
- - demoZK
references:
GreeterClientImpl:
protocol: tri
diff --git a/registry/zookeeper/go-server/conf/dubbogo.yml b/registry/zookeeper/go-server/conf/dubbogo.yml
index 6987904..cce6e7e 100644
--- a/registry/zookeeper/go-server/conf/dubbogo.yml
+++ b/registry/zookeeper/go-server/conf/dubbogo.yml
@@ -9,9 +9,6 @@ dubbo:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
GreeterProvider:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/route/meshroute/go-server/conf/dubbogo.yml b/route/meshroute/go-server/conf/dubbogo.yml
index 2f3ce87..089df97 100644
--- a/route/meshroute/go-server/conf/dubbogo.yml
+++ b/route/meshroute/go-server/conf/dubbogo.yml
@@ -13,7 +13,6 @@ dubbo:
- demoZK
services:
GreeterProvider:
- protocol-ids: triple
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
params:
env-sign: zzz
diff --git a/rpc/dubbo/go-client/conf/dubbogo.yml b/rpc/dubbo/go-client/conf/dubbogo.yml
index 673f9d2..065447c 100644
--- a/rpc/dubbo/go-client/conf/dubbogo.yml
+++ b/rpc/dubbo/go-client/conf/dubbogo.yml
@@ -2,17 +2,14 @@
dubbo:
registries:
- "demoZK":
- protocol: "zookeeper"
- timeout: "3s"
- address: "127.0.0.1:2181"
+ demoZK:
+ protocol: zookeeper
+ address: 127.0.0.1:2181
consumer:
- registry-ids:
- - demoZK
references:
- "UserProvider":
- protocol: "dubbo"
- interface: "org.apache.dubbo.UserProvider"
+ UserProvider:
+ protocol: dubbo
+ interface: org.apache.dubbo.UserProvider
logger:
zap-config:
level: info
\ No newline at end of file
diff --git a/rpc/dubbo/go-server/conf/dubbogo.yml b/rpc/dubbo/go-server/conf/dubbogo.yml
index a72e579..45b4653 100644
--- a/rpc/dubbo/go-server/conf/dubbogo.yml
+++ b/rpc/dubbo/go-server/conf/dubbogo.yml
@@ -11,11 +11,8 @@ dubbo:
name: dubbo
port: 20000
provider:
- registry-ids:
- - demoZK
services:
UserProvider:
- protocol: dubbo
interface: org.apache.dubbo.UserProvider
loadbalance: random
warmup: 100
@@ -25,10 +22,8 @@ dubbo:
retries: 1
loadbalance: random
ComplexProvider:
- protocol: dubbo
interface: org.apache.dubbo.ComplexProvider
WrapperArrayClassProvider:
- protocol: dubbo
interface: org.apache.dubbo.WrapperArrayClassProvider
logger:
zap-config:
diff --git a/rpc/grpc/go-client/conf/dubbogo.yml b/rpc/grpc/go-client/conf/dubbogo.yml
index c198207..42feb44 100644
--- a/rpc/grpc/go-client/conf/dubbogo.yml
+++ b/rpc/grpc/go-client/conf/dubbogo.yml
@@ -7,8 +7,6 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry-ids:
- - demoZK
references:
GreeterClientImpl:
protocol: grpc
diff --git a/rpc/grpc/go-server/conf/dubbogo.yml b/rpc/grpc/go-server/conf/dubbogo.yml
index 2bbf070..5157d9e 100644
--- a/rpc/grpc/go-server/conf/dubbogo.yml
+++ b/rpc/grpc/go-server/conf/dubbogo.yml
@@ -11,11 +11,8 @@ dubbo:
name: grpc
port: 20000
provider:
- registry-ids:
- - demoZK
services:
GreeterProvider:
- protocol-ids: grpcProtocol
interface: org.apache.dubbo.UserProvider
logger:
zap-config:
diff --git a/rpc/jsonrpc/go-client/conf/dubbogo.yml b/rpc/jsonrpc/go-client/conf/dubbogo.yml
index 39e22bd..d3ff3a7 100644
--- a/rpc/jsonrpc/go-client/conf/dubbogo.yml
+++ b/rpc/jsonrpc/go-client/conf/dubbogo.yml
@@ -13,16 +13,13 @@ dubbo:
consumer:
references:
UserProvider:
- registry-ids: hangzhouzk
protocol: jsonrpc
interface: com.ikurento.user.UserProvider
UserProvider1:
- registry-ids: hangzhouzk
protocol: jsonrpc
version: 2.0
interface: com.ikurento.user.UserProvider
UserProvider2:
- registry-ids: hangzhouzk
protocol: jsonrpc
version: 2.0
group: as
diff --git a/rpc/jsonrpc/go-server/conf/dubbogo.yml b/rpc/jsonrpc/go-server/conf/dubbogo.yml
index 7b6661a..2674e76 100644
--- a/rpc/jsonrpc/go-server/conf/dubbogo.yml
+++ b/rpc/jsonrpc/go-server/conf/dubbogo.yml
@@ -16,21 +16,13 @@ dubbo:
ip: 127.0.0.1
port: 20001
provider:
- registry-ids:
- - hangzhouzk
services:
UserProvider:
- registry-ids: hangzhouzk
- protocol-ids: jsonrpc
interface: com.ikurento.user.UserProvider
UserProvider1:
- registry-ids: hangzhouzk
- protocol-ids: jsonrpc
interface: com.ikurento.user.UserProvider
version: 2.0
UserProvider2:
- registry-ids: hangzhouzk
- protocol-ids: jsonrpc
interface: com.ikurento.user.UserProvider
version: 2.0
group: as
diff --git a/rpc/triple/README.md b/rpc/triple/README.md
index 5a066a5..c28f42d 100644
--- a/rpc/triple/README.md
+++ b/rpc/triple/README.md
@@ -25,7 +25,6 @@ dubbo:
provider:
services:
MyProvider: # service provider type name
- protocol-ids: myProtocol # user defined protocol key，as above myProtocol defined
interface: org.apache.dubbogo.MyProvider # user defined interface name
# serialization: hessian2 # serialization that can be choosed：pb/hessian2/custome
# pb serialization by default
diff --git a/rpc/triple/README_zh.md b/rpc/triple/README_zh.md
index c0e88fe..eaebc32 100644
--- a/rpc/triple/README_zh.md
+++ b/rpc/triple/README_zh.md
@@ -24,7 +24,6 @@ dubbo:
provider:
services:
MyProvider: # 服务提供者结构类名
- protocol-ids: myProtocol # 自定义的协议 Key，与上方 myProtocol 对应
interface: org.apache.dubbogo.MyProvider # 用户自定义的接口名
# serialization: hessian2 可选字段，可以指定序列化类型：pb/hessian2/自定义
# 默认使用 pb 序列化
diff --git a/rpc/triple/codec-extension/go-client/conf/dubbogo.yml b/rpc/triple/codec-extension/go-client/conf/dubbogo.yml
index b1002ed..dd780f3 100644
--- a/rpc/triple/codec-extension/go-client/conf/dubbogo.yml
+++ b/rpc/triple/codec-extension/go-client/conf/dubbogo.yml
@@ -4,8 +4,6 @@ dubbo:
protocol: zookeeper
address: 127.0.0.1:2181
consumer:
- registry-ids:
- - registryKey
references:
UserProvider:
protocol: tri
diff --git a/rpc/triple/codec-extension/go-server/conf/dubbogo.yml b/rpc/triple/codec-extension/go-server/conf/dubbogo.yml
index 9151e00..7a1ba29 100644
--- a/rpc/triple/codec-extension/go-server/conf/dubbogo.yml
+++ b/rpc/triple/codec-extension/go-server/conf/dubbogo.yml
@@ -8,10 +8,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry-ids:
- - registryKey
services:
UserProvider:
- protocol-ids: tripleKey
serialization: json
interface: com.apache.dubbogo.samples.rpc.extension.UserProvider # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/rpc/triple/hessian2/README.md b/rpc/triple/hessian2/README.md
index 31b05b6..9c79fcb 100644
--- a/rpc/triple/hessian2/README.md
+++ b/rpc/triple/hessian2/README.md
@@ -11,8 +11,6 @@ PB serialization is used by default. To use Hessian2+PB, please specify the seri
# service config
services:
"UserProvider":
- registry-ids: "demoZK"
- protocol-ids: "tri" # tri is dubbo-go3.0 protocol
serialization: "hessian2" # hessian2 is serialization type
interface: "org.apache.dubbo.UserProvider"
```
diff --git a/rpc/triple/hessian2/README_zh.md b/rpc/triple/hessian2/README_zh.md
index cbca22c..3e5a6a3 100644
--- a/rpc/triple/hessian2/README_zh.md
+++ b/rpc/triple/hessian2/README_zh.md
@@ -11,8 +11,6 @@ https://github.com/dubbogo/triple/blob/master/internal/codec/proto/triple_wrappe
# service config
services:
"UserProvider":
- registry-ids: "demoZK"
- protocol-ids: "tri" # tri is dubbo-go3.0 protocol
serialization: "hessian2" # hessian2 is serialization type
interface: "org.apache.dubbo.UserProvider"
```
diff --git a/rpc/triple/hessian2/go-server/conf/dubbogo.yml b/rpc/triple/hessian2/go-server/conf/dubbogo.yml
index cd7bcf4..dddfc58 100644
--- a/rpc/triple/hessian2/go-server/conf/dubbogo.yml
+++ b/rpc/triple/hessian2/go-server/conf/dubbogo.yml
@@ -1,22 +1,18 @@
dubbo:
registries:
- "demoZK":
- protocol: "zookeeper"
- timeout: "3s"
- address: "127.0.0.1:2181"
+ demoZK:
+ protocol: zookeeper
+ timeout: 3s
+ address: 127.0.0.1:2181
protocols:
- "triple":
- name: "tri"
+ triple:
+ name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
- "UserProvider":
- protocol-ids: "triple"
- serialization: "hessian2"
- interface: "com.apache.dubbo.sample.basic.IGreeter" # must be compatible with grpc or dubbo-java
- "ComplexProvider":
- protocol-ids: "triple"
- serialization: "hessian2"
- interface: "com.apache.dubbo.sample.basic.ComplexProvider" # must be compatible with grpc or dubbo-java
\ No newline at end of file
+ UserProvider:
+ serialization: hessian2
+ interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
+ ComplexProvider:
+ serialization: hessian2
+ interface: com.apache.dubbo.sample.basic.ComplexProvider # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/rpc/triple/msgpack/go-server/conf/dubbogo.yml b/rpc/triple/msgpack/go-server/conf/dubbogo.yml
index 33f8ea1..04c66ab 100644
--- a/rpc/triple/msgpack/go-server/conf/dubbogo.yml
+++ b/rpc/triple/msgpack/go-server/conf/dubbogo.yml
@@ -1,18 +1,15 @@
dubbo:
registries:
- "demoZK":
+ demoZK:
protocol: zookeeper
timeout: 3s
address: 127.0.0.1:2181
protocols:
- "triple":
+ triple:
name: tri
port: 20000
provider:
- registry-ids:
- - demoZK
services:
UserProvider:
- protocol-ids: triple
serialization: msgpack
interface: com.apache.dubbo.sample.basic.IGreeter # must be compatible with grpc or dubbo-java
\ No newline at end of file
diff --git a/rpc/triple/pb/dubbogo-grpc/go-client/conf/dubbogo.yml b/rpc/triple/pb/dubbogo-grpc/go-client/conf/dubbogo.yml
index eb6b3b5..aef6529 100644
--- a/rpc/triple/pb/dubbogo-grpc/go-client/conf/dubbogo.yml
+++ b/rpc/triple/pb/dubbogo-grpc/go-client/conf/dubbogo.yml
@@ -3,7 +3,6 @@ dubbo:
zk:
address: zookeeper://127.0.0.1:2181
consumer:
- registry-ids: zk
references:
GreeterClientImpl:
protocol: tri
diff --git a/rpc/triple/pb/dubbogo-grpc/go-server/conf/dubbogo.yml b/rpc/triple/pb/dubbogo-grpc/go-server/conf/dubbogo.yml
index cac5762..40b3b18 100644
--- a/rpc/triple/pb/dubbogo-grpc/go-server/conf/dubbogo.yml
+++ b/rpc/triple/pb/dubbogo-grpc/go-server/conf/dubbogo.yml
@@ -7,10 +7,8 @@ dubbo:
name: tri
port: 20000
provider:
- registry-ids: zk
services:
# you may refer to `Reference()` method defined in `protobuf/triple/helloworld.pb.go`
GreeterProvider:
- protocol-ids: triple
# interface is for registry
interface: org.apache.dubbo.demo.Greeter
\ No newline at end of file
diff --git a/rpc/triple/pb/dubbogo-java/go-client/conf/dubbogo.yml b/rpc/triple/pb/dubbogo-java/go-client/conf/dubbogo.yml
index 638731f..90b91fa 100644
--- a/rpc/triple/pb/dubbogo-java/go-client/conf/dubbogo.yml
+++ b/rpc/triple/pb/dubbogo-java/go-client/conf/dubbogo.yml
@@ -3,7 +3,6 @@ dubbo:
zk:
address: zookeeper://127.0.0.1:2181
consumer:
- registry-ids: zk
references:
GreeterClientImpl:
protocol: tri
diff --git a/rpc/triple/pb/dubbogo-java/go-server/conf/dubbogo.yml b/rpc/triple/pb/dubbogo-java/go-server/conf/dubbogo.yml
index 3303aee..efde882 100644
--- a/rpc/triple/pb/dubbogo-java/go-server/conf/dubbogo.yml
+++ b/rpc/triple/pb/dubbogo-java/go-server/conf/dubbogo.yml
@@ -7,9 +7,7 @@ dubbo:
name: tri
port: 20001
provider:
- registry-ids: zk
services:
GreeterProvider:
- protocol-ids: triple
# interface is for registry
interface: org.apache.dubbo.demo.IGreeter
\ No newline at end of file
diff --git a/start_integrate_test.sh b/start_integrate_test.sh
index 0155aac..de0034c 100755
--- a/start_integrate_test.sh
+++ b/start_integrate_test.sh
@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
# game
array+=("game/go-server-game")
array+=("game/go-server-gate")
@@ -30,6 +31,9 @@ array+=("helloworld")
# direct
array+=("direct")
+# filer
+array+=("filter/custom")
+
# context
array+=("context/dubbo")
diff --git a/tracing/dubbo/go-server/conf/dubbogo.yml b/tracing/dubbo/go-server/conf/dubbogo.yml
index 0d082e3..3bda7da 100644
--- a/tracing/dubbo/go-server/conf/dubbogo.yml
+++ b/tracing/dubbo/go-server/conf/dubbogo.yml
@@ -12,11 +12,8 @@ dubbo:
port: 20000
provider:
filter: tracing
- registry-ids:
- - demoZK
services:
UserProvider:
- protocol-ids: dubbo
interface: org.apache.dubbo.UserProvider
loadbalance: random
warmup: 100
diff --git a/tracing/grpc/go-client/conf/dubbogo.yml b/tracing/grpc/go-client/conf/dubbogo.yml
index f433527..22f2065 100644
--- a/tracing/grpc/go-client/conf/dubbogo.yml
+++ b/tracing/grpc/go-client/conf/dubbogo.yml
@@ -4,12 +4,9 @@ dubbo:
registries:
demoZK:
protocol: zookeeper
- timeout: 3s
address: 127.0.0.1:2181
consumer:
filter: tracing
- registry-ids:
- - demoZK
references:
GreeterClientImpl:
protocol: grpc
diff --git a/tracing/grpc/go-server/conf/dubbogo.yml b/tracing/grpc/go-server/conf/dubbogo.yml
index 9dc2c55..38bde2d 100644
--- a/tracing/grpc/go-server/conf/dubbogo.yml
+++ b/tracing/grpc/go-server/conf/dubbogo.yml
@@ -12,11 +12,8 @@ dubbo:
port: 20000
provider:
filter: tracing
- registry-ids:
- - demoZK
services:
GreeterProvider:
- protocol: grpcProtocol
interface: org.apache.dubbo.UserProvider
loadbalance: random
warmup: 100
diff --git a/tracing/jsonrpc/go-client/conf/dubbogo.yml b/tracing/jsonrpc/go-client/conf/dubbogo.yml
index 3e179f2..56006f5 100644
--- a/tracing/jsonrpc/go-client/conf/dubbogo.yml
+++ b/tracing/jsonrpc/go-client/conf/dubbogo.yml
@@ -8,11 +8,9 @@ dubbo:
address: 127.0.0.1:2181
consumer:
filter: tracing
- registry-ids:
- - demoZK
references:
UserProvider:
- protocol-ids: jsonrpc
+ protocol: jsonrpc
interface: org.apache.dubbo.UserProvider
cluster: failover
\ No newline at end of file
diff --git a/tracing/jsonrpc/go-server/conf/dubbogo.yml b/tracing/jsonrpc/go-server/conf/dubbogo.yml
index 26625fd..2cec3a7 100644
--- a/tracing/jsonrpc/go-server/conf/dubbogo.yml
+++ b/tracing/jsonrpc/go-server/conf/dubbogo.yml
@@ -2,7 +2,7 @@
dubbo:
registries:
- "demoZK":
+ demoZK:
protocol: zookeeper
timeout: 3s
address: 127.0.0.1:2181
@@ -13,11 +13,8 @@ dubbo:
port: 20001
provider:
filter: tracing
- registry-ids:
- - demoZK
services:
UserProvider:
- protocol-ids: jsonrpc
interface: org.apache.dubbo.UserProvider
cluster: failover
\ No newline at end of file