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 0045a96 Fix: add zh and en triple readme and some features (#265)
0045a96 is described below
commit 0045a96db2a181814985b9964782a3d798d0ae17
Author: Laurence <[email protected]>
AuthorDate: Sat Oct 2 16:31:02 2021 +0800
Fix: add zh and en triple readme and some features (#265)
* fix: add triple readme
* fix: change config api
* fix: liscence
* remote tabs in README.md
---
.images/samples-rpc-triple-client.png | Bin 0 -> 461382 bytes
.images/samples-rpc-triple-server.png | Bin 0 -> 466250 bytes
.run/direct-client.run.xml | 14 ++
.run/direct-server.run.xml | 14 ++
.run/dubbo-go-server.run.xml | 2 +-
...bo-go-server.run.xml => grpc-go-client.run.xml} | 6 +-
...bo-go-server.run.xml => grpc-go-server.run.xml} | 6 +-
.run/triple-codec-extension-client.run.xml | 14 ++
.run/triple-codec-extension-server.run.xml | 14 ++
.run/triple/triple-msgpack-client.run.xml | 8 +-
.run/triple/triple-msgpack-server.run.xml | 8 +-
README.md | 2 -
.../configcenter/nacos/go-client/cmd/client.go | 24 ++-
.../configcenter/nacos/go-server/cmd/server.go | 25 +--
.../configcenter/zookeeper/go-client/cmd/client.go | 29 ++--
.../configcenter/zookeeper/go-server/cmd/server.go | 25 ++-
config-api/rpc/triple/go-client/cmd/client.go | 26 ++-
config-api/rpc/triple/go-server/cmd/server.go | 35 ++--
configcenter/apollo/README.md | 4 +-
configcenter/apollo/README_zh.md | 4 +-
configcenter/nacos/go-client/conf/dubbogo.yml | 2 +-
configcenter/nacos/go-server/conf/dubbogo.yml | 2 +-
configcenter/zookeeper/go-client/conf/dubbogo.yml | 2 +-
configcenter/zookeeper/go-server/conf/dubbogo.yml | 2 +-
context/dubbo/go-client/conf/dubbogo.yml | 2 +-
context/dubbo/go-server/conf/dubbogo.yml | 2 +-
context/triple/go-client/conf/dubbogo.yml | 2 +-
context/triple/go-server/conf/dubbogo.yml | 2 +-
direct/README.md | 4 +-
direct/README_zh.md | 4 +-
generic/README.md | 8 +-
generic/README_zh.md | 8 +-
generic/default/go-client/cmd/client.go | 6 +-
generic/default/go-server/conf/dubbogo.yml | 2 +-
go.mod | 6 +-
go.sum | 180 +++++++++++++++++++--
helloworld/go-client/conf/dubbogo.yml | 2 +-
helloworld/go-server/conf/dubbogo.yml | 2 +-
.../nacos/tests/integration/main_test.go | 26 ++-
.../zookeeper/tests/integration/main_test.go | 27 ++--
.../rpc/triple/tests/integration/main_test.go | 27 ++--
.../generic/default/tests/integration/main_test.go | 6 +-
logger/default/cmd/main.go | 3 +-
logger/default/conf/dubbogo.yml | 2 +-
logger/level/cmd/main.go | 3 +-
logger/level/conf/dubbogo.yml | 2 +-
logger/rolling/cmd/main.go | 3 +-
logger/rolling/conf/dubbogo.yml | 2 +-
registry/etcd/go-client/conf/dubbogo.yml | 2 +-
registry/etcd/go-server/conf/dubbogo.yml | 2 +-
registry/nacos/go-client/conf/dubbogo.yml | 2 +-
registry/nacos/go-server/conf/dubbogo.yml | 2 +-
registry/zookeeper/go-client/conf/dubbogo.yml | 2 +-
registry/zookeeper/go-server/conf/dubbogo.yml | 2 +-
rpc/dubbo/go-client/cmd/client.go | 38 ++---
rpc/dubbo/go-client/conf/dubbogo.yml | 7 +-
rpc/dubbo/go-client/conf/log.yml | 27 ----
rpc/dubbo/go-server/conf/dubbogo.yml | 5 +-
rpc/dubbo/go-server/conf/log.yml | 27 ----
rpc/dubbo/go-server/pkg/user_provider.go | 2 +-
rpc/grpc/go-client/conf/dubbogo.yml | 7 +-
rpc/grpc/go-server/conf/dubbogo.yml | 7 +-
rpc/jsonrpc/go-client/cmd/client.go | 90 +++++------
rpc/jsonrpc/go-client/conf/dubbogo.yml | 11 +-
rpc/jsonrpc/go-server/conf/dubbogo.yml | 13 +-
rpc/triple/README.md | 93 ++++++++++-
rpc/triple/README_zh.md | 90 ++++++++++-
.../codec-extension/go-client/conf/dubbogo.yml | 2 +-
.../codec-extension/go-server/conf/dubbogo.yml | 2 +-
rpc/triple/hessian2/README.md | 2 +-
rpc/triple/hessian2/README_zh.md | 2 +-
rpc/triple/hessian2/go-client/conf/dubbogo.yml | 2 +-
rpc/triple/hessian2/go-server/conf/dubbogo.yml | 2 +-
rpc/triple/msgpack/go-client/conf/dubbogo.yml | 2 +-
rpc/triple/msgpack/go-server/conf/dubbogo.yml | 2 +-
.../pb/dubbogo-grpc/go-client/conf/dubbogo.yml | 2 +-
.../pb/dubbogo-grpc/go-server/conf/dubbogo.yml | 2 +-
.../pb/dubbogo-java/go-client/conf/dubbogo.yml | 4 +-
.../pb/dubbogo-java/go-server/conf/dubbogo.yml | 2 +-
tracing/dubbo/go-client/cmd/client.go | 4 +-
tracing/dubbo/go-client/conf/dubbogo.yml | 2 +-
tracing/dubbo/go-client/pkg/user.go | 2 +-
tracing/dubbo/go-server/cmd/server.go | 6 +-
tracing/dubbo/go-server/conf/dubbogo.yml | 2 +-
tracing/dubbo/go-server/pkg/user.go | 6 +-
tracing/grpc/go-client/conf/dubbogo.yml | 2 +-
tracing/grpc/go-server/conf/dubbogo.yml | 2 +-
tracing/jsonrpc/go-client/conf/dubbogo.yml | 2 +-
tracing/jsonrpc/go-server/conf/dubbogo.yml | 2 +-
89 files changed, 694 insertions(+), 390 deletions(-)
diff --git a/.images/samples-rpc-triple-client.png
b/.images/samples-rpc-triple-client.png
new file mode 100644
index 0000000..586a767
Binary files /dev/null and b/.images/samples-rpc-triple-client.png differ
diff --git a/.images/samples-rpc-triple-server.png
b/.images/samples-rpc-triple-server.png
new file mode 100644
index 0000000..edcc7f6
Binary files /dev/null and b/.images/samples-rpc-triple-server.png differ
diff --git a/.run/direct-client.run.xml b/.run/direct-client.run.xml
new file mode 100644
index 0000000..1461592
--- /dev/null
+++ b/.run/direct-client.run.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="direct-client"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="direct">
+ <module name="dubbo-go-samples" />
+ <working_directory value="$PROJECT_DIR$" />
+ <envs>
+ <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/direct/go-client/conf/dubbogo.yml" />
+ </envs>
+ <kind value="PACKAGE" />
+ <package value="github.com/apache/dubbo-go-samples/direct/go-client/cmd" />
+ <directory value="$PROJECT_DIR$" />
+ <filePath value="$PROJECT_DIR$/helloworld/go-client/cmd/client.go" />
+ <method v="2" />
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/direct-server.run.xml b/.run/direct-server.run.xml
new file mode 100644
index 0000000..7bbb53e
--- /dev/null
+++ b/.run/direct-server.run.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="direct-server"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="direct">
+ <module name="dubbo-go-samples" />
+ <working_directory value="$PROJECT_DIR$" />
+ <envs>
+ <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/direct/go-server/conf/dubbogo.yml" />
+ </envs>
+ <kind value="PACKAGE" />
+ <package value="github.com/apache/dubbo-go-samples/direct/go-server/cmd" />
+ <directory value="$PROJECT_DIR$" />
+ <filePath value="$PROJECT_DIR$/helloworld/go-client/cmd/client.go" />
+ <method v="2" />
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/dubbo-go-server.run.xml b/.run/dubbo-go-server.run.xml
index be199fe..de21fc3 100644
--- a/.run/dubbo-go-server.run.xml
+++ b/.run/dubbo-go-server.run.xml
@@ -3,7 +3,7 @@
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
- <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/rpc/dubbo/go-client/conf/dubbogo.yml" />
+ <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/rpc/dubbo/go-server/conf/dubbogo.yml" />
</envs>
<kind value="PACKAGE" />
<package
value="github.com/apache/dubbo-go-samples/rpc/dubbo/go-server/cmd" />
diff --git a/.run/dubbo-go-server.run.xml b/.run/grpc-go-client.run.xml
similarity index 59%
copy from .run/dubbo-go-server.run.xml
copy to .run/grpc-go-client.run.xml
index be199fe..2d139d4 100644
--- a/.run/dubbo-go-server.run.xml
+++ b/.run/grpc-go-client.run.xml
@@ -1,12 +1,12 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="dubbo-go-server"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="rpc/dubbo">
+ <configuration default="false" name="grpc-go-client"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="rpc/grpc">
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
- <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/rpc/dubbo/go-client/conf/dubbogo.yml" />
+ <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/rpc/grpc/go-client/conf/dubbogo.yml" />
</envs>
<kind value="PACKAGE" />
- <package
value="github.com/apache/dubbo-go-samples/rpc/dubbo/go-server/cmd" />
+ <package value="github.com/apache/dubbo-go-samples/rpc/grpc/go-client/cmd"
/>
<directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/rpc/dubbo/go-client/cmd/client.go" />
<method v="2" />
diff --git a/.run/dubbo-go-server.run.xml b/.run/grpc-go-server.run.xml
similarity index 59%
copy from .run/dubbo-go-server.run.xml
copy to .run/grpc-go-server.run.xml
index be199fe..4932422 100644
--- a/.run/dubbo-go-server.run.xml
+++ b/.run/grpc-go-server.run.xml
@@ -1,12 +1,12 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="dubbo-go-server"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="rpc/dubbo">
+ <configuration default="false" name="grpc-go-server"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="rpc/grpc">
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
- <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/rpc/dubbo/go-client/conf/dubbogo.yml" />
+ <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/rpc/grpc/go-server/conf/dubbogo.yml" />
</envs>
<kind value="PACKAGE" />
- <package
value="github.com/apache/dubbo-go-samples/rpc/dubbo/go-server/cmd" />
+ <package value="github.com/apache/dubbo-go-samples/rpc/grpc/go-server/cmd"
/>
<directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/rpc/dubbo/go-client/cmd/client.go" />
<method v="2" />
diff --git a/.run/triple-codec-extension-client.run.xml
b/.run/triple-codec-extension-client.run.xml
new file mode 100644
index 0000000..6650ba0
--- /dev/null
+++ b/.run/triple-codec-extension-client.run.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="triple-codec-extension-client"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="rpc/triple">
+ <module name="dubbo-go-samples" />
+ <working_directory value="$PROJECT_DIR$" />
+ <envs>
+ <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/rpc/triple/codec-extension/go-client/conf/dubbogo.yml" />
+ </envs>
+ <kind value="PACKAGE" />
+ <package
value="github.com/apache/dubbo-go-samples/rpc/triple/codec-extension/go-client/cmd"
/>
+ <directory
value="github.com/apache/dubbo-go-samples/general/dubbo3/api/dubbogo-grpc/server/dubbogo-server/cmd"
/>
+ <filePath value="$PROJECT_DIR$" />
+ <method v="2" />
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/triple-codec-extension-server.run.xml
b/.run/triple-codec-extension-server.run.xml
new file mode 100644
index 0000000..8e50513
--- /dev/null
+++ b/.run/triple-codec-extension-server.run.xml
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="triple-codec-extension-server"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="rpc/triple">
+ <module name="dubbo-go-samples" />
+ <working_directory value="$PROJECT_DIR$" />
+ <envs>
+ <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/rpc/triple/codec-extension/go-server/conf/dubbogo.yml" />
+ </envs>
+ <kind value="PACKAGE" />
+ <package
value="github.com/apache/dubbo-go-samples/rpc/triple/codec-extension/go-server/cmd"
/>
+ <directory
value="github.com/apache/dubbo-go-samples/general/dubbo3/api/dubbogo-grpc/server/dubbogo-server/cmd"
/>
+ <filePath value="$PROJECT_DIR$" />
+ <method v="2" />
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/triple/triple-msgpack-client.run.xml
b/.run/triple/triple-msgpack-client.run.xml
index c120b23..fc9e9da 100644
--- a/.run/triple/triple-msgpack-client.run.xml
+++ b/.run/triple/triple-msgpack-client.run.xml
@@ -1,14 +1,14 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="triple-msgpack-client"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="triple">
+ <configuration default="false" name="triple-msgpack-client"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="rpc/triple">
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
- <env name="CONF_CONSUMER_FILE_PATH"
value="$PROJECT_DIR$/rpc/dubbo3/msgpack/go-client/conf/dubbogo.yml" />
+ <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/rpc/triple/msgpack/go-client/conf/dubbogo.yml" />
</envs>
<kind value="PACKAGE" />
- <filePath value="$PROJECT_DIR$/rpc/dubbo3/msgpack/go-client/cmd/client.go"
/>
- <package
value="github.com/apache/dubbo-go-samples/rpc/dubbo3/msgpack/go-client/cmd" />
+ <package
value="github.com/apache/dubbo-go-samples/rpc/triple/msgpack/go-client/cmd" />
<directory value="$PROJECT_DIR$" />
+ <filePath value="$PROJECT_DIR$/rpc/dubbo3/msgpack/go-client/cmd/client.go"
/>
<method v="2" />
</configuration>
</component>
\ No newline at end of file
diff --git a/.run/triple/triple-msgpack-server.run.xml
b/.run/triple/triple-msgpack-server.run.xml
index ffdc266..8d0906f 100644
--- a/.run/triple/triple-msgpack-server.run.xml
+++ b/.run/triple/triple-msgpack-server.run.xml
@@ -1,14 +1,14 @@
<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="triple-msgpack-server"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="triple">
+ <configuration default="false" name="triple-msgpack-server"
type="GoApplicationRunConfiguration" factoryName="Go Application"
folderName="rpc/triple">
<module name="dubbo-go-samples" />
<working_directory value="$PROJECT_DIR$" />
<envs>
- <env name="CONF_PROVIDER_FILE_PATH"
value="$PROJECT_DIR$/rpc/dubbo3/msgpack/go-server/conf/dubbogo.yml" />
+ <env name="DUBBO_GO_CONFIG_PATH"
value="$PROJECT_DIR$/rpc/triple/msgpack/go-server/conf/dubbogo.yml" />
</envs>
<kind value="PACKAGE" />
- <filePath value="$PROJECT_DIR$/rpc/dubbo3/msgpack/go-server/cmd/server.go"
/>
- <package
value="github.com/apache/dubbo-go-samples/rpc/dubbo3/msgpack/go-server/cmd" />
+ <package
value="github.com/apache/dubbo-go-samples/rpc/triple/msgpack/go-server/cmd" />
<directory value="$PROJECT_DIR$" />
+ <filePath value="$PROJECT_DIR$/rpc/dubbo3/msgpack/go-server/cmd/server.go"
/>
<method v="2" />
</configuration>
</component>
\ No newline at end of file
diff --git a/README.md b/README.md
index 16500ee..0e65acf 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,6 @@
* rpc: dubbo directory display dubbo protocol communication
* generic: A generic invocation example
* helloworld: A 101 example
-* multi_registry: A multi-registry example
-* registry: uses of different registres, including kubernetes, nacos, etcd and
service-discovery
* router: router examples, including condition and tag
* seata: A seata example
* shop: Shop sample
diff --git a/config-api/configcenter/nacos/go-client/cmd/client.go
b/config-api/configcenter/nacos/go-client/cmd/client.go
index 722d4bd..e8f23e9 100644
--- a/config-api/configcenter/nacos/go-client/cmd/client.go
+++ b/config-api/configcenter/nacos/go-client/cmd/client.go
@@ -40,7 +40,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry:
+ registries:
- demoZK
references:
GreeterClientImpl:
@@ -51,9 +51,10 @@ var grpcGreeterImpl = new(api.GreeterClientImpl)
// There is no need to export DUBBO_GO_CONFIG_PATH, as you are using config
api to set config
func main() {
- dynamicConfig, err := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("nacos"),
-
config.WithConfigCenterAddress("127.0.0.1:8848")).GetDynamicConfiguration()
+ dynamicConfig, err := config.NewConfigCenterConfigBuilder().
+ SetProtocol("nacos").
+ SetAddress("127.0.0.1:8848").
+ Build().GetDynamicConfiguration()
if err != nil {
panic(err)
}
@@ -63,15 +64,12 @@ func main() {
config.SetConsumerService(grpcGreeterImpl)
- centerConfig := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("nacos"),
- config.WithConfigCenterAddress("localhost:8848"),
-
config.WithConfigCenterDataID("dubbo-go-samples-configcenter-nacos-client"),
- )
-
- rootConfig := config.NewRootConfig(
- config.WithRootCenterConfig(centerConfig),
- )
+ rootConfig := config.NewRootConfigBuilder().
+ SetConfigCenter(config.NewConfigCenterConfigBuilder().
+ SetProtocol("nacos").SetAddress("127.0.0.1:8848").
+ SetDataID("dubbo-go-samples-configcenter-nacos-client").
+ Build()).
+ Build()
if err := rootConfig.Init(); 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 59f9db1..02a2485 100644
--- a/config-api/configcenter/nacos/go-server/cmd/server.go
+++ b/config-api/configcenter/nacos/go-server/cmd/server.go
@@ -44,7 +44,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
GreeterProvider:
@@ -62,27 +62,28 @@ func (s *GreeterProvider) SayHello(ctx context.Context, in
*api.HelloRequest) (*
// There is no need to export DUBBO_GO_CONFIG_PATH, as you are using config
api to set config
func main() {
- dynamicConfig, err := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("nacos"),
-
config.WithConfigCenterAddress("127.0.0.1:8848")).GetDynamicConfiguration()
+ dynamicConfig, err := config.NewConfigCenterConfigBuilder().
+ SetProtocol("nacos").
+ SetAddress("127.0.0.1:8848").
+ Build().GetDynamicConfiguration()
+
if err != nil {
panic(err)
}
+
if err :=
dynamicConfig.PublishConfig("dubbo-go-samples-configcenter-nacos-server",
"dubbo", configCenterNacosServerConfig); err != nil {
panic(err)
}
time.Sleep(time.Second * 10)
config.SetProviderService(&GreeterProvider{})
- centerConfig := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("nacos"),
- config.WithConfigCenterAddress("127.0.0.1:8848"),
-
config.WithConfigCenterDataID("dubbo-go-samples-configcenter-nacos-server"),
- )
- rootConfig := config.NewRootConfig(
- config.WithRootCenterConfig(centerConfig),
- )
+ rootConfig := config.NewRootConfigBuilder().
+ SetConfigCenter(config.NewConfigCenterConfigBuilder().
+ SetProtocol("nacos").SetAddress("127.0.0.1:8848").
+ SetDataID("dubbo-go-samples-configcenter-nacos-server").
+ Build()).
+ Build()
if err := rootConfig.Init(); err != nil {
panic(err)
diff --git a/config-api/configcenter/zookeeper/go-client/cmd/client.go
b/config-api/configcenter/zookeeper/go-client/cmd/client.go
index 1ea2906..2d35b0a 100644
--- a/config-api/configcenter/zookeeper/go-client/cmd/client.go
+++ b/config-api/configcenter/zookeeper/go-client/cmd/client.go
@@ -40,7 +40,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:8848
consumer:
- registry:
+ registries:
- demoZK
references:
GreeterClientImpl:
@@ -51,28 +51,23 @@ var grpcGreeterImpl = new(api.GreeterClientImpl)
// There is no need to export DUBBO_GO_CONFIG_PATH, as you are using config
api to set config
func main() {
- dynamicConfig, err := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("zookeeper"),
-
config.WithConfigCenterAddress("127.0.0.1:2181")).GetDynamicConfiguration()
- if err != nil {
- panic(err)
- }
+ dynamicConfig, err := config.NewConfigCenterConfigBuilder().
+ SetProtocol("zookeeper").
+ SetAddress("127.0.0.1:2181").
+ Build().GetDynamicConfiguration()
+
if err :=
dynamicConfig.PublishConfig("dubbo-go-samples-configcenter-zookeeper-client",
"dubbogo", configCenterZKClientConfig); err != nil {
panic(err)
}
config.SetConsumerService(grpcGreeterImpl)
- centerConfig := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("zookeeper"),
- config.WithConfigCenterAddress("localhost:2181"),
-
config.WithConfigCenterDataID("dubbo-go-samples-configcenter-zookeeper-client"),
- config.WithConfigCenterGroup("dubbogo"),
- )
-
- rootConfig := config.NewRootConfig(
- config.WithRootCenterConfig(centerConfig),
- )
+ rootConfig := config.NewRootConfigBuilder().
+ SetConfigCenter(config.NewConfigCenterConfigBuilder().
+ SetProtocol("nacos").SetAddress("127.0.0.1:2182").
+
SetDataID("dubbo-go-samples-configcenter-zookeeper-client").
+ Build()).
+ Build()
if err := rootConfig.Init(); err != nil {
panic(err)
diff --git a/config-api/configcenter/zookeeper/go-server/cmd/server.go
b/config-api/configcenter/zookeeper/go-server/cmd/server.go
index 6c0b79e..744f94d 100644
--- a/config-api/configcenter/zookeeper/go-server/cmd/server.go
+++ b/config-api/configcenter/zookeeper/go-server/cmd/server.go
@@ -44,7 +44,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
GreeterProvider:
@@ -62,9 +62,10 @@ func (s *GreeterProvider) SayHello(ctx context.Context, in
*api.HelloRequest) (*
// There is no need to export DUBBO_GO_CONFIG_PATH, as you are using config
api to set config
func main() {
- dynamicConfig, err := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("zookeeper"),
-
config.WithConfigCenterAddress("127.0.0.1:2181")).GetDynamicConfiguration()
+ dynamicConfig, err := config.NewConfigCenterConfigBuilder().
+ SetProtocol("zookeeper").
+ SetAddress("127.0.0.1:2181").
+ Build().GetDynamicConfiguration()
if err != nil {
panic(err)
}
@@ -75,16 +76,14 @@ func main() {
time.Sleep(time.Second * 10)
config.SetProviderService(&GreeterProvider{})
- centerConfig := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("zookeeper"),
- config.WithConfigCenterAddress("127.0.0.1:2181"),
-
config.WithConfigCenterDataID("dubbo-go-samples-configcenter-zookeeper-server"),
- config.WithConfigCenterGroup("dubbogo"),
- )
- rootConfig := config.NewRootConfig(
- config.WithRootCenterConfig(centerConfig),
- )
+ rootConfig := config.NewRootConfigBuilder().
+ SetConfigCenter(config.NewConfigCenterConfigBuilder().
+ SetProtocol("zookeeper").SetAddress("127.0.0.1:2181").
+
SetDataID("dubbo-go-samples-configcenter-zookeeper-server").
+ SetGroup("dubbogo").
+ Build()).
+ Build()
if err := rootConfig.Init(); err != nil {
panic(err)
diff --git a/config-api/rpc/triple/go-client/cmd/client.go
b/config-api/rpc/triple/go-client/cmd/client.go
index 5b6e3d0..34f7bb1 100644
--- a/config-api/rpc/triple/go-client/cmd/client.go
+++ b/config-api/rpc/triple/go-client/cmd/client.go
@@ -38,22 +38,16 @@ var tripleGreeterImpl = new(api.GreeterClientImpl)
func main() {
config.SetConsumerService(tripleGreeterImpl)
- referenceConfig := config.NewReferenceConfig(
-
config.WithReferenceInterface("com.apache.dubbo.sample.basic.IGreeter"),
- config.WithReferenceProtocolName("tri"),
- config.WithReferenceRegistry("zkRegistryKey"),
- )
-
- consumerConfig := config.NewConsumerConfig(
- config.WithConsumerReferenceConfig("GreeterClientImpl",
referenceConfig),
- )
-
- registryConfig :=
config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")
-
- rootConfig := config.NewRootConfig(
- config.WithRootRegistryConfig("zkRegistryKey", registryConfig),
- config.WithRootConsumerConfig(consumerConfig),
- )
+ rootConfig := config.NewRootConfigBuilder().
+ SetConsumer(config.NewConsumerConfigBuilder().
+ SetRegistries("zkRegistryKey").
+ AddReference("GreeterClientImpl",
config.NewReferenceConfigBuilder().
+
SetInterface("com.apache.dubbo.sample.basic.IGreeter").
+ SetProtocol("tri").
+ Build()).
+ Build()).
+ AddRegistry("zkRegistryKey",
config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")).
+ Build()
if err := rootConfig.Init(); 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 5538618..1ab5ba8 100644
--- a/config-api/rpc/triple/go-server/cmd/server.go
+++ b/config-api/rpc/triple/go-server/cmd/server.go
@@ -44,28 +44,21 @@ func (s *GreeterProvider) SayHello(ctx context.Context, in
*api.HelloRequest) (*
func main() {
config.SetProviderService(&GreeterProvider{})
- serviceConfig := config.NewServiceConfig(
-
config.WithServiceInterface("com.apache.dubbo.sample.basic.IGreeter"),
- config.WithServiceProtocolKeys("tripleKey"),
- )
+ rootConfig := config.NewRootConfigBuilder().
+ SetProvider(config.NewProviderConfigBuilder().
+ SetRegistries("zk").
+ AddService("GreeterProvider",
config.NewServiceConfigBuilder().
+
SetInterface("com.apache.dubbo.sample.basic.IGreeter").
+ SetProtocols("tripleKey").
+ Build()).
+ Build()).
+ AddRegistry("zk",
config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")).
+ AddProtocol("tripleKey", config.NewProtocolConfigBuilder().
+ SetName("tri").
+ SetPort("20000").
+ Build()).
+ Build()
- protocolConfig := config.NewProtocolConfig(
- config.WithProtocolName("tri"),
- config.WithProtocolPort("20000"),
- )
-
- providerConfig := config.NewProviderConfig(
- config.WithProviderRegistryKeys("zk"),
- config.WithProviderService("GreeterProvider", serviceConfig),
- )
-
- registryConfig :=
config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")
-
- rootConfig := config.NewRootConfig(
- config.WithRootProviderConfig(providerConfig),
- config.WithRootRegistryConfig("zk", registryConfig),
- config.WithRootProtocolConfig("tripleKey", protocolConfig),
- )
if err := rootConfig.Init(); err != nil {
panic(err)
}
diff --git a/configcenter/apollo/README.md b/configcenter/apollo/README.md
index 7ff6697..6f7932f 100644
--- a/configcenter/apollo/README.md
+++ b/configcenter/apollo/README.md
@@ -24,7 +24,7 @@ dubbo:
name: "tri"
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
"greeterImpl":
@@ -48,7 +48,7 @@ dubbo:
timeout: "3s"
address: "127.0.0.1:2181"
consumer:
- registry:
+ registries:
- demoZK
references:
"greeterImpl":
diff --git a/configcenter/apollo/README_zh.md b/configcenter/apollo/README_zh.md
index 6fd7a14..23dcd43 100644
--- a/configcenter/apollo/README_zh.md
+++ b/configcenter/apollo/README_zh.md
@@ -25,7 +25,7 @@ dubbo:
name: "tri"
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
"greeterImpl":
@@ -49,7 +49,7 @@ dubbo:
timeout: "3s"
address: "127.0.0.1:2181"
consumer:
- registry:
+ registries:
- demoZK
references:
"greeterImpl":
diff --git a/configcenter/nacos/go-client/conf/dubbogo.yml
b/configcenter/nacos/go-client/conf/dubbogo.yml
index 067d283..e1d0e53 100644
--- a/configcenter/nacos/go-client/conf/dubbogo.yml
+++ b/configcenter/nacos/go-client/conf/dubbogo.yml
@@ -12,7 +12,7 @@ dubbo:
# timeout: 3s
# address: 127.0.0.1:2181
# consumer:
-# registry:
+# registries:
# - demoZK
# references:
# GreeterClientImpl:
diff --git a/configcenter/nacos/go-server/conf/dubbogo.yml
b/configcenter/nacos/go-server/conf/dubbogo.yml
index ee4bb06..0adc62d 100644
--- a/configcenter/nacos/go-server/conf/dubbogo.yml
+++ b/configcenter/nacos/go-server/conf/dubbogo.yml
@@ -16,7 +16,7 @@ dubbo:
# name: "tri"
# port: 20000
# provider:
-# registry:
+# registries:
# - demoZK
# services:
# GreeterProvider:
diff --git a/configcenter/zookeeper/go-client/conf/dubbogo.yml
b/configcenter/zookeeper/go-client/conf/dubbogo.yml
index c45c99e..d7f6327 100644
--- a/configcenter/zookeeper/go-client/conf/dubbogo.yml
+++ b/configcenter/zookeeper/go-client/conf/dubbogo.yml
@@ -12,7 +12,7 @@ dubbo:
# timeout: 3s
# address: 127.0.0.1:2181
# consumer:
-# registry:
+# registries:
# - demoZK
# references:
# GreeterClientImpl:
diff --git a/configcenter/zookeeper/go-server/conf/dubbogo.yml
b/configcenter/zookeeper/go-server/conf/dubbogo.yml
index 374b8de..83c041c 100644
--- a/configcenter/zookeeper/go-server/conf/dubbogo.yml
+++ b/configcenter/zookeeper/go-server/conf/dubbogo.yml
@@ -16,7 +16,7 @@ dubbo:
# name: "tri"
# port: 20000
# provider:
-# registry:
+# registries:
# - demoZK
# services:
# GreeterProvider:
diff --git a/context/dubbo/go-client/conf/dubbogo.yml
b/context/dubbo/go-client/conf/dubbogo.yml
index 0b1b68c..7669198 100644
--- a/context/dubbo/go-client/conf/dubbogo.yml
+++ b/context/dubbo/go-client/conf/dubbogo.yml
@@ -29,7 +29,7 @@ dubbo:
max-msg-len: 1024000
session-name: client
consumer:
- registry:
+ registries:
- demoZK
references:
UserProvider:
diff --git a/context/dubbo/go-server/conf/dubbogo.yml
b/context/dubbo/go-server/conf/dubbogo.yml
index 2851dfa..534c108 100644
--- a/context/dubbo/go-server/conf/dubbogo.yml
+++ b/context/dubbo/go-server/conf/dubbogo.yml
@@ -25,7 +25,7 @@ dubbo:
max-msg-len: 1024000
session-name: server
provider:
- registry:
+ registries:
- demoZK
services:
UserProvider:
diff --git a/context/triple/go-client/conf/dubbogo.yml
b/context/triple/go-client/conf/dubbogo.yml
index 73cbdec..72d4176 100644
--- a/context/triple/go-client/conf/dubbogo.yml
+++ b/context/triple/go-client/conf/dubbogo.yml
@@ -5,7 +5,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry:
+ registries:
- demoZK
references:
GreeterClientImpl:
diff --git a/context/triple/go-server/conf/dubbogo.yml
b/context/triple/go-server/conf/dubbogo.yml
index becea99..1fb98a0 100644
--- a/context/triple/go-server/conf/dubbogo.yml
+++ b/context/triple/go-server/conf/dubbogo.yml
@@ -9,7 +9,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
GreeterProvider:
diff --git a/direct/README.md b/direct/README.md
index ae245d7..c31b648 100644
--- a/direct/README.md
+++ b/direct/README.md
@@ -33,7 +33,7 @@ Direct example code description:
```yaml
services:
"UserProvider":
- registry: "demoZk"
+ registries: "demoZk"
protocol : "dubbo"
interface : "org.apache.dubbo.UserProvider"
loadbalance: "random"
@@ -112,7 +112,7 @@ application:
environment: "dev"
references:
"UserProvider":
- registry: "demoZk"
+ registries: "demoZk"
protocol: "dubbo"
interface: "org.apache.dubbo.UserProvider"
cluster: "failover"
diff --git a/direct/README_zh.md b/direct/README_zh.md
index caf8ff2..d6a82ff 100644
--- a/direct/README_zh.md
+++ b/direct/README_zh.md
@@ -36,7 +36,7 @@
```yaml
services:
"UserProvider":
- registry: "demoZk"
+ registries: "demoZk"
protocol : "dubbo"
interface : "org.apache.dubbo.UserProvider"
loadbalance: "random"
@@ -115,7 +115,7 @@ application:
environment: "dev"
references:
"UserProvider":
- registry: "demoZk"
+ registries: "demoZk"
protocol: "dubbo"
interface: "org.apache.dubbo.UserProvider"
cluster: "failover"
diff --git a/generic/README.md b/generic/README.md
index 84f7cf5..1d548d8 100644
--- a/generic/README.md
+++ b/generic/README.md
@@ -10,10 +10,10 @@ The samples of generic invocation are parted by the way of
generalization：
Each sample contains 4 subfolders：
-- go-server：Dubbo-Go v3 server sample
-- go-client：Dubbo-Go v3 client sample
-- java-client：Dubbo v3 server sample
-- java-server：Dubbo v3 client sample
+- go-server：Dubbo-Go server sample
+- go-client：Dubbo-Go client sample
+- java-client：Dubbo server sample
+- java-server：Dubbo client sample
Providing java samples is convenient to test interoperability between Dubbo
and Dubbo-Go.
diff --git a/generic/README_zh.md b/generic/README_zh.md
index b3d72f7..4ec20b0 100644
--- a/generic/README_zh.md
+++ b/generic/README_zh.md
@@ -10,10 +10,10 @@
在每种泛化调用的例子中，又包含四种文件：
-- go-server：Dubbo-Go v3 server 例子
-- go-client：Dubbo-Go v3 client 例子
-- java-client：Dubbo v3 server 例子
-- java-server：Dubbo v3 client 例子
+- go-server：Dubbo-Go server 例子
+- go-client：Dubbo-Go client 例子
+- java-client：Dubbo server 例子
+- java-server：Dubbo client 例子
Dubbo Java 例子可以方便测试与 Dubbo-Go 的互通性，可以启动 java server 或 go client，或者 go server 和
java client 进行测试。
diff --git a/generic/default/go-client/cmd/client.go
b/generic/default/go-client/cmd/client.go
index 563d008..243477d 100644
--- a/generic/default/go-client/cmd/client.go
+++ b/generic/default/go-client/cmd/client.go
@@ -243,12 +243,14 @@ func newRefConf(iface, protocol string)
config.ReferenceConfig {
refConf := config.ReferenceConfig{
InterfaceName: iface,
Cluster: "failover",
- Registry: []string{"zk"},
+ Registries: []string{"zk"},
Protocol: protocol,
Generic: "true",
}
- rootConfig := config.NewRootConfig(config.WithRootRegistryConfig("zk",
registryConfig))
+ rootConfig := config.NewRootConfigBuilder().
+ AddRegistry("zk", registryConfig).
+ Build()
_ = rootConfig.Init()
_ = 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 9fb8757..cbd5f1c 100644
--- a/generic/default/go-server/conf/dubbogo.yml
+++ b/generic/default/go-server/conf/dubbogo.yml
@@ -12,7 +12,7 @@ dubbo:
name: tri
port: 20001
provider:
- registry: zk
+ registries: zk
services:
UserProvider:
protocol: dubbo
diff --git a/go.mod b/go.mod
index 112f52d..e776453 100644
--- a/go.mod
+++ b/go.mod
@@ -1,9 +1,9 @@
module github.com/apache/dubbo-go-samples
require (
- dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20210915060211-8d727d630e0e
+ dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20211002075540-f2948997d328
github.com/apache/dubbo-go-hessian2 v1.9.4-0.20210917102639-74a8ece5f3cb
- github.com/dubbogo/gost v1.11.16
+ github.com/dubbogo/gost v1.11.17
github.com/dubbogo/net v0.0.4
github.com/dubbogo/triple v1.0.6-0.20210909153707-3620c8d2d97c
github.com/golang/protobuf v1.5.2
@@ -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.38.0
+ google.golang.org/grpc v1.41.0
google.golang.org/protobuf v1.27.1
)
diff --git a/go.sum b/go.sum
index 249cdce..79e7a3e 100644
--- a/go.sum
+++ b/go.sum
@@ -6,14 +6,35 @@ cloud.google.com/go v0.44.1/go.mod
h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6A
cloud.google.com/go v0.44.2/go.mod
h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
cloud.google.com/go v0.45.1/go.mod
h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
cloud.google.com/go v0.46.3/go.mod
h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod
h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod
h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod
h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod
h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod
h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod
h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod
h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod
h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
cloud.google.com/go/bigquery v1.0.1/go.mod
h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod
h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod
h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod
h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod
h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod
h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
cloud.google.com/go/datastore v1.0.0/go.mod
h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod
h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
cloud.google.com/go/firestore v1.1.0/go.mod
h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
cloud.google.com/go/pubsub v1.0.1/go.mod
h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod
h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod
h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod
h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
cloud.google.com/go/storage v1.0.0/go.mod
h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod
h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod
h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod
h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod
h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
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-rc2.0.20210915060211-8d727d630e0e
h1:+aGq6bibw4z9OTQi5yqga5XN+Ekm6Ma8IjgZqrbD2YY=
-dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20210915060211-8d727d630e0e/go.mod
h1:qzYPQolHmB+cfNhO0fUGTCWbBRdEnvyssdF8zNIiPLQ=
+dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20211002075540-f2948997d328
h1:GZQ76MvqcgG2EYZIfsikJXgo/roz7cZxHmhYVhug6sc=
+dubbo.apache.org/dubbo-go/v3 v3.0.0-rc2.0.20211002075540-f2948997d328/go.mod
h1:YPBIbpi4KROTax5eu1hikmOaGlBuQvDApiFXxy49vh8=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod
h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
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=
@@ -75,6 +96,8 @@ github.com/aws/aws-sdk-go v1.25.37/go.mod
h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
github.com/aws/aws-sdk-go v1.27.0/go.mod
h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.30.27/go.mod
h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod
h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
+github.com/benbjohnson/clock v1.1.0
h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/benbjohnson/clock v1.1.0/go.mod
h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod
h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod
h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -94,12 +117,16 @@ github.com/cespare/xxhash v1.1.0
h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod
h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1
h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod
h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chzyer/logex v1.1.10/go.mod
h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod
h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod
h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod
h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod
h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod
h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
github.com/client9/misspell v0.3.4/go.mod
h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod
h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod
h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod
h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod
h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5
h1:xD/lrqdvwsc+O2bjSSi3YqY73Ke3LAiSCx49aCesA0E=
github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod
h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
@@ -154,12 +181,12 @@ github.com/dubbogo/go-zookeeper v1.0.3
h1:UkuY+rBsxdT7Bs63QAzp9z7XqQ53W1j8E5rwl8
github.com/dubbogo/go-zookeeper v1.0.3/go.mod
h1:fn6n2CAEer3novYgk9ULLwAjuV8/g4DdC2ENwRb6E+c=
github.com/dubbogo/gost v1.9.0/go.mod
h1:pPTjVyoJan3aPxBPNUX0ADkXjPibLo+/Ib0/fADXSG8=
github.com/dubbogo/gost v1.11.12/go.mod
h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI=
-github.com/dubbogo/gost v1.11.16
h1:fvOw8aKQ0BuUYuD+MaXAYFvT7tg2l7WAS5SL5gZJpFs=
github.com/dubbogo/gost v1.11.16/go.mod
h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI=
+github.com/dubbogo/gost v1.11.17
h1:Dwaoqv/G21nYsGkeQoLbCAOryRPl6B7pEsZSJcr55nE=
+github.com/dubbogo/gost v1.11.17/go.mod
h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI=
github.com/dubbogo/jsonparser v1.0.1/go.mod
h1:tYAtpctvSP/tWw4MeelsowSPgXQRVHHWbqL6ynps8jU=
github.com/dubbogo/net v0.0.4 h1:Rn9aMPZwOiRE22YhtxmDEE3H0Q3cfVRNhuEjNMelJ/8=
github.com/dubbogo/net v0.0.4/go.mod
h1:1CGOnM7X3he+qgGNqjeADuE5vKZQx/eMSeUkpU3ujIc=
-github.com/dubbogo/triple v1.0.6-0.20210904050749-5721796f3fd6/go.mod
h1:KbfU/uZDv+fJEqXYK3qI8m1iuBQ309QxiC0tvTf2pog=
github.com/dubbogo/triple v1.0.6-0.20210909153707-3620c8d2d97c
h1:/Qrdqo2JVrywDANk04DHrvdfREdIApAWZ6stbYZfNaM=
github.com/dubbogo/triple v1.0.6-0.20210909153707-3620c8d2d97c/go.mod
h1:KbfU/uZDv+fJEqXYK3qI8m1iuBQ309QxiC0tvTf2pog=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod
h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -182,6 +209,7 @@ github.com/envoyproxy/go-control-plane
v0.9.1-0.20191026205805-5f8ba28d4473/go.m
github.com/envoyproxy/go-control-plane v0.9.4/go.mod
h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/go-control-plane
v0.9.9-0.20201210154907-fd9021fe5dad/go.mod
h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/go-control-plane
v0.9.9-0.20210217033140-668b12f5399d/go.mod
h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane
v0.9.10-0.20210907150352-cf90f659a021/go.mod
h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod
h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/evanphx/json-patch v4.2.0+incompatible/go.mod
h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239
h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU=
@@ -211,6 +239,7 @@ github.com/go-co-op/gocron v0.1.1/go.mod
h1:Y9PWlYqDChf2Nbgg7kfS+ZsXHDTZbMZYPEQ0
github.com/go-errors/errors v1.0.1
h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
github.com/go-errors/errors v1.0.1/go.mod
h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod
h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod
h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod
h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/kit v0.8.0/go.mod
h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod
h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -261,10 +290,15 @@ github.com/golang/glog
v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod
h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod
h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod
h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod
h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod
h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod
h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.1.1/go.mod
h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod
h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.3.1/go.mod
h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod
h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod
h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod
h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
github.com/golang/mock v1.4.4/go.mod
h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod
h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -272,6 +306,7 @@ github.com/golang/protobuf v1.2.0/go.mod
h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
github.com/golang/protobuf v1.3.1/go.mod
h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2/go.mod
h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.3/go.mod
h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod
h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
github.com/golang/protobuf v1.3.5/go.mod
h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
github.com/golang/protobuf v1.4.0-rc.1/go.mod
h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod
h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -294,7 +329,9 @@ github.com/google/go-cmp v0.2.0/go.mod
h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
github.com/google/go-cmp v0.3.0/go.mod
h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod
h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.4/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod
h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -302,8 +339,14 @@ github.com/google/gofuzz
v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSN
github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
github.com/google/gofuzz v1.0.0/go.mod
h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/martian v2.1.0+incompatible/go.mod
h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod
h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod
h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod
h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod
h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod
h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod
h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod
h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod
h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/renameio v0.1.0/go.mod
h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.0.0/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.1/go.mod
h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -392,6 +435,7 @@ github.com/hashicorp/yamux
v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod
h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
github.com/hpcloud/tail v1.0.0/go.mod
h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hudl/fargo v1.3.0/go.mod
h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod
h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imdario/mergo v0.3.5/go.mod
h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/inconshreveable/mousetrap v1.0.0/go.mod
h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/influxdb1-client
v0.0.0-20191209144304-8bf82d3c094d/go.mod
h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
@@ -418,6 +462,7 @@ github.com/json-iterator/go v1.1.10/go.mod
h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/
github.com/json-iterator/go v1.1.11
h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
github.com/json-iterator/go v1.1.11/go.mod
h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod
h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod
h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/jtolds/gls v4.20.0+incompatible
h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod
h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod
h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@@ -487,8 +532,9 @@ github.com/mitchellh/iochan v1.0.0/go.mod
h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod
h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mitchellh/mapstructure v1.1.2/go.mod
h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mitchellh/mapstructure v1.3.2/go.mod
h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.1
h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
github.com/mitchellh/mapstructure v1.4.1/go.mod
h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.4.2
h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo=
+github.com/mitchellh/mapstructure v1.4.2/go.mod
h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/reflectwalk v1.0.0/go.mod
h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mitchellh/reflectwalk v1.0.2
h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod
h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
@@ -507,8 +553,9 @@ github.com/munnerz/goautoneg
v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod
h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod
h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod
h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/nacos-group/nacos-sdk-go v1.0.8
h1:8pEm05Cdav9sQgJSv5kyvlgfz0SzFUUGI3pWX6SiSnM=
github.com/nacos-group/nacos-sdk-go v1.0.8/go.mod
h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA=
+github.com/nacos-group/nacos-sdk-go v1.0.9
h1:sMvrp6tZj4LdhuHRsS4GCqASB81k3pjmT2ykDQQpwt0=
+github.com/nacos-group/nacos-sdk-go v1.0.9/go.mod
h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA=
github.com/natefinch/lumberjack v2.0.0+incompatible
h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM=
github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod
h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk=
github.com/nats-io/jwt v0.3.0/go.mod
h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
@@ -606,8 +653,9 @@ github.com/prometheus/common v0.7.0/go.mod
h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2
github.com/prometheus/common v0.9.1/go.mod
h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
github.com/prometheus/common v0.10.0/go.mod
h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
github.com/prometheus/common v0.15.0/go.mod
h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
-github.com/prometheus/common v0.26.0
h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ=
github.com/prometheus/common v0.26.0/go.mod
h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.28.0
h1:vGVfV9KrDTvWt5boZO0I19g2E3CsWfpPPKZM9dt3mEw=
+github.com/prometheus/common v0.28.0/go.mod
h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod
h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod
h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod
h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -715,7 +763,9 @@ github.com/urfave/cli v1.20.0/go.mod
h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb
github.com/urfave/cli v1.22.1/go.mod
h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2
h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod
h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/yuin/goldmark v1.1.25/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod
h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/zouyx/agollo/v3 v3.4.5
h1:7YCxzY9ZYaH9TuVUBvmI6Tk0mwMggikah+cfbYogcHQ=
@@ -747,12 +797,17 @@ go.opencensus.io v0.20.2/go.mod
h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod
h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.uber.org/atomic v1.3.2/go.mod
h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod
h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod
h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.6.0/go.mod
h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
go.uber.org/atomic v1.7.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.3.0/go.mod
h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
go.uber.org/multierr v1.5.0/go.mod
h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
@@ -763,8 +818,9 @@ go.uber.org/zap v1.10.0/go.mod
h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
-go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
+go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI=
+go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod
h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -785,6 +841,11 @@ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod
h1:CJ0aWSM057203Lf6IL
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod
h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod
h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod
h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod
h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod
h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod
h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod
h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod
h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod
h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod
h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod
h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -795,7 +856,10 @@ golang.org/x/lint
v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod
h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod
h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod
h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod
h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod
h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod
h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod
h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod
h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod
h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
@@ -805,6 +869,7 @@ golang.org/x/mod
v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod
h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod
h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod
h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -824,30 +889,45 @@ golang.org/x/net
v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod
h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+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-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=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod
h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod
h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod
h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod
h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod
h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod
h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod
h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod
h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod
h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod
h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5
h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod
h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod
h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod
h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -882,18 +962,28 @@ golang.org/x/sys
v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -902,19 +992,22 @@ golang.org/x/sys
v0.0.0-20201223074533-0d417f636930/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod
h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod
h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod
h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod
h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod
h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -947,15 +1040,39 @@ golang.org/x/tools
v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod
h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod
h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod
h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod
h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod
h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod
h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod
h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod
h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod
h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod
h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod
h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod
h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20200928182047-19e03678916f/go.mod
h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
golang.org/x/tools v0.0.0-20201014170642-d1624618ad65/go.mod
h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod
h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.2/go.mod
h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
+golang.org/x/tools v0.1.5/go.mod
h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -967,11 +1084,24 @@ google.golang.org/api v0.7.0/go.mod
h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E
google.golang.org/api v0.8.0/go.mod
h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
google.golang.org/api v0.9.0/go.mod
h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
google.golang.org/api v0.13.0/go.mod
h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod
h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod
h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod
h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod
h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod
h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod
h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod
h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod
h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod
h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod
h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod
h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
google.golang.org/appengine v1.1.0/go.mod
h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.2.0/go.mod
h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.4.0/go.mod
h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod
h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.1/go.mod
h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod
h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod
h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod
h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod
h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod
h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -983,10 +1113,29 @@ google.golang.org/genproto
v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod
h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod
h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod
h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod
h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod
h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod
h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod
h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod
h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod
h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod
h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod
h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod
h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod
h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod
h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod
h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod
h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod
h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod
h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod
h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod
h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod
h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod
h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod
h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod
h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod
h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod
h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210106152847-07624b53cd92/go.mod
h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
h1:wtujag7C+4D6KMoulW9YauvK2lgdvCMS260jsqqBXr0=
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod
h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
@@ -1004,12 +1153,17 @@ google.golang.org/grpc v1.23.1/go.mod
h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
google.golang.org/grpc v1.25.1/go.mod
h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.26.0/go.mod
h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.27.0/go.mod
h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod
h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod
h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
google.golang.org/grpc v1.29.1/go.mod
h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod
h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod
h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.32.0/go.mod
h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.33.1/go.mod
h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.36.0/go.mod
h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
google.golang.org/grpc v1.38.0/go.mod
h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+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/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=
@@ -1071,6 +1225,8 @@ honnef.co/go/tools
v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod
h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod
h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod
h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod
h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod
h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.16.9/go.mod h1:Y7dZNHs1Xy0mSwSlzL9QShi6qkljnN41yR8oWCRTDe8=
k8s.io/apimachinery v0.16.9 h1:ESUZ4hMBUKF2kn2HBFL5zM/wQv4j/0uRbR7AjgqGJ4o=
k8s.io/apimachinery v0.16.9/go.mod
h1:Xk2vD2TRRpuWYLQNM6lT9R7DSFZUYG03SarNkbGrnKE=
@@ -1083,6 +1239,8 @@ k8s.io/klog v1.0.0/go.mod
h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod
h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod
h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
rsc.io/binaryregexp v0.2.0/go.mod
h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod
h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
diff --git a/helloworld/go-client/conf/dubbogo.yml
b/helloworld/go-client/conf/dubbogo.yml
index 73cbdec..72d4176 100644
--- a/helloworld/go-client/conf/dubbogo.yml
+++ b/helloworld/go-client/conf/dubbogo.yml
@@ -5,7 +5,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry:
+ registries:
- demoZK
references:
GreeterClientImpl:
diff --git a/helloworld/go-server/conf/dubbogo.yml
b/helloworld/go-server/conf/dubbogo.yml
index becea99..1fb98a0 100644
--- a/helloworld/go-server/conf/dubbogo.yml
+++ b/helloworld/go-server/conf/dubbogo.yml
@@ -9,7 +9,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
GreeterProvider:
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 178c12b..8e0707b 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
@@ -40,7 +40,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry:
+ registries:
- demoZK
references:
GreeterClientImpl:
@@ -50,12 +50,14 @@ dubbo:
var greeterProvider = new(dubbo3pb.GreeterClientImpl)
func TestMain(m *testing.M) {
- dynamicConfig, err := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("nacos"),
-
config.WithConfigCenterAddress("127.0.0.1:8848")).GetDynamicConfiguration()
+ dynamicConfig, err := config.NewConfigCenterConfigBuilder().
+ SetProtocol("nacos").
+ SetAddress("127.0.0.1:8848").
+ Build().GetDynamicConfiguration()
if err != nil {
panic(err)
}
+
if err :=
dynamicConfig.PublishConfig("dubbo-go-samples-configcenter-nacos-client",
"dubbo", configCenterNacosTestClientConfig); err != nil {
panic(err)
}
@@ -64,16 +66,12 @@ func TestMain(m *testing.M) {
time.Sleep(time.Second * 20)
- centerConfig := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("nacos"),
- config.WithConfigCenterAddress("127.0.0.1:8848"),
-
config.WithConfigCenterDataID("dubbo-go-samples-configcenter-nacos-client"),
- config.WithConfigCenterGroup("dubbo"),
- )
-
- rootConfig := config.NewRootConfig(
- config.WithRootCenterConfig(centerConfig),
- )
+ rootConfig := config.NewRootConfigBuilder().
+ SetConfigCenter(config.NewConfigCenterConfigBuilder().
+ SetProtocol("nacos").SetAddress("127.0.0.1:8848").
+ SetDataID("dubbo-go-samples-configcenter-nacos-client").
+ Build()).
+ Build()
if err := rootConfig.Init(); err != nil {
panic(err)
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 64794a5..e096339 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
@@ -40,7 +40,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:8848
consumer:
- registry:
+ registries:
- demoZK
references:
GreeterClientImpl:
@@ -50,12 +50,14 @@ dubbo:
var greeterProvider = new(dubbo3pb.GreeterClientImpl)
func TestMain(m *testing.M) {
- dynamicConfig, err := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("zookeeper"),
-
config.WithConfigCenterAddress("127.0.0.1:2181")).GetDynamicConfiguration()
+ dynamicConfig, err := config.NewConfigCenterConfigBuilder().
+ SetProtocol("zookeeper").
+ SetAddress("127.0.0.1:2181").
+ Build().GetDynamicConfiguration()
if err != nil {
panic(err)
}
+
if err :=
dynamicConfig.PublishConfig("dubbo-go-samples-configcenter-zookeeper-client",
"dubbogo", configCenterZKTestClientConfig); err != nil {
panic(err)
}
@@ -63,16 +65,13 @@ func TestMain(m *testing.M) {
config.SetConsumerService(greeterProvider)
time.Sleep(time.Second * 20)
- centerConfig := config.NewConfigCenterConfig(
- config.WithConfigCenterProtocol("zookeeper"),
- config.WithConfigCenterAddress("127.0.0.1:2181"),
-
config.WithConfigCenterDataID("dubbo-go-samples-configcenter-zookeeper-client"),
- config.WithConfigCenterGroup("dubbogo"),
- )
-
- rootConfig := config.NewRootConfig(
- config.WithRootCenterConfig(centerConfig),
- )
+ rootConfig := config.NewRootConfigBuilder().
+ SetConfigCenter(config.NewConfigCenterConfigBuilder().
+ SetProtocol("zookeeper").SetAddress("127.0.0.1:2181").
+
SetDataID("dubbo-go-samples-configcenter-zookeeper-client").
+ SetGroup("dubbogo").
+ Build()).
+ Build()
if err := rootConfig.Init(); 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 20d5da4..8fc172f 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
@@ -35,23 +35,16 @@ var greeterProvider = new(api.GreeterClientImpl)
func TestMain(m *testing.M) {
config.SetConsumerService(greeterProvider)
-
- referenceConfig := config.NewReferenceConfig(
-
config.WithReferenceInterface("com.apache.dubbo.sample.basic.IGreeter"),
- config.WithReferenceProtocolName("tri"),
- config.WithReferenceRegistry("zkRegistryKey"),
- )
-
- consumerConfig := config.NewConsumerConfig(
- config.WithConsumerReferenceConfig("GreeterClientImpl",
referenceConfig),
- )
-
- registryConfig :=
config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")
-
- rootConfig := config.NewRootConfig(
- config.WithRootRegistryConfig("zkRegistryKey", registryConfig),
- config.WithRootConsumerConfig(consumerConfig),
- )
+ rootConfig := config.NewRootConfigBuilder().
+ SetConsumer(config.NewConsumerConfigBuilder().
+ SetRegistries("zkRegistryKey").
+ AddReference("GreeterClientImpl",
config.NewReferenceConfigBuilder().
+
SetInterface("com.apache.dubbo.sample.basic.IGreeter").
+ SetProtocol("tri").
+ Build()).
+ Build()).
+ AddRegistry("zkRegistryKey",
config.NewRegistryConfigWithProtocolDefaultPort("zookeeper")).
+ Build()
if err := rootConfig.Init(); err != nil {
panic(err)
diff --git a/integrate_test/generic/default/tests/integration/main_test.go
b/integrate_test/generic/default/tests/integration/main_test.go
index 783744d..2abfdf6 100644
--- a/integrate_test/generic/default/tests/integration/main_test.go
+++ b/integrate_test/generic/default/tests/integration/main_test.go
@@ -61,12 +61,14 @@ func newRefConf(iface, protocol string)
config.ReferenceConfig {
refConf := config.ReferenceConfig{
InterfaceName: iface,
Cluster: "failover",
- Registry: []string{"zk"},
+ Registries: []string{"zk"},
Protocol: protocol,
Generic: "true",
}
- rootConfig := config.NewRootConfig(config.WithRootRegistryConfig("zk",
registryConfig))
+ rootConfig := config.NewRootConfigBuilder().
+ AddRegistry("zk", registryConfig).
+ Build()
_ = rootConfig.Init()
_ = refConf.Init(rootConfig)
refConf.GenericLoad(appName)
diff --git a/logger/default/cmd/main.go b/logger/default/cmd/main.go
index 3e6eefd..3013b6c 100644
--- a/logger/default/cmd/main.go
+++ b/logger/default/cmd/main.go
@@ -39,7 +39,8 @@ type GreeterProvider struct {
func main() {
config.SetProviderService(&GreeterProvider{})
config.Load()
- ctx, _ := context.WithTimeout(context.Background(), time.Second*3)
+ ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
+ defer cancel()
for {
select {
case <-ctx.Done():
diff --git a/logger/default/conf/dubbogo.yml b/logger/default/conf/dubbogo.yml
index adfa82d..97595d4 100644
--- a/logger/default/conf/dubbogo.yml
+++ b/logger/default/conf/dubbogo.yml
@@ -9,7 +9,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
greeterImpl:
diff --git a/logger/level/cmd/main.go b/logger/level/cmd/main.go
index 395035c..74c05aa 100644
--- a/logger/level/cmd/main.go
+++ b/logger/level/cmd/main.go
@@ -39,7 +39,8 @@ type GreeterProvider struct {
func main() {
config.SetProviderService(&GreeterProvider{})
config.Load()
- ctx, _ := context.WithTimeout(context.Background(), time.Second*3)
+ ctx, cancel := context.WithTimeout(context.Background(), time.Second*3)
+ defer cancel()
logger.SetLoggerLevel("warn")
for {
select {
diff --git a/logger/level/conf/dubbogo.yml b/logger/level/conf/dubbogo.yml
index adfa82d..97595d4 100644
--- a/logger/level/conf/dubbogo.yml
+++ b/logger/level/conf/dubbogo.yml
@@ -9,7 +9,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
greeterImpl:
diff --git a/logger/rolling/cmd/main.go b/logger/rolling/cmd/main.go
index 6bf5ee5..5094414 100644
--- a/logger/rolling/cmd/main.go
+++ b/logger/rolling/cmd/main.go
@@ -39,7 +39,8 @@ type GreeterProvider struct {
func main() {
config.SetProviderService(&GreeterProvider{})
config.Load()
- ctx, _ := context.WithTimeout(context.Background(), time.Second*20)
+ ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
+ defer cancel()
for {
select {
case <-ctx.Done():
diff --git a/logger/rolling/conf/dubbogo.yml b/logger/rolling/conf/dubbogo.yml
index cbd4623..476f1ec 100644
--- a/logger/rolling/conf/dubbogo.yml
+++ b/logger/rolling/conf/dubbogo.yml
@@ -9,7 +9,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
greeterImpl:
diff --git a/registry/etcd/go-client/conf/dubbogo.yml
b/registry/etcd/go-client/conf/dubbogo.yml
index 52c8b74..4269a15 100644
--- a/registry/etcd/go-client/conf/dubbogo.yml
+++ b/registry/etcd/go-client/conf/dubbogo.yml
@@ -17,6 +17,6 @@ dubbo:
consumer:
references:
UserProvider:
- registry: "etcd"
+ registries: "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 844bbd0..da1c485 100644
--- a/registry/etcd/go-server/conf/dubbogo.yml
+++ b/registry/etcd/go-server/conf/dubbogo.yml
@@ -15,7 +15,7 @@ dubbo:
name: "dubbo"
port: 20000
provider:
- registry:
+ registries:
- etcd
services:
UserProvider:
diff --git a/registry/nacos/go-client/conf/dubbogo.yml
b/registry/nacos/go-client/conf/dubbogo.yml
index 52e77b5..6f3adc0 100644
--- a/registry/nacos/go-client/conf/dubbogo.yml
+++ b/registry/nacos/go-client/conf/dubbogo.yml
@@ -29,7 +29,7 @@ dubbo:
max-msg-len: 1024000
session-name: client
consumer:
- registry:
+ registries:
- demoNacos
references:
UserProvider:
diff --git a/registry/nacos/go-server/conf/dubbogo.yml
b/registry/nacos/go-server/conf/dubbogo.yml
index 0f03aad..db0b230 100644
--- a/registry/nacos/go-server/conf/dubbogo.yml
+++ b/registry/nacos/go-server/conf/dubbogo.yml
@@ -25,7 +25,7 @@ dubbo:
max-msg-len: 1024000
session-name: server
provider:
- registry:
+ registries:
- demoNacos
services:
UserProvider:
diff --git a/registry/zookeeper/go-client/conf/dubbogo.yml
b/registry/zookeeper/go-client/conf/dubbogo.yml
index 73cbdec..72d4176 100644
--- a/registry/zookeeper/go-client/conf/dubbogo.yml
+++ b/registry/zookeeper/go-client/conf/dubbogo.yml
@@ -5,7 +5,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry:
+ registries:
- demoZK
references:
GreeterClientImpl:
diff --git a/registry/zookeeper/go-server/conf/dubbogo.yml
b/registry/zookeeper/go-server/conf/dubbogo.yml
index becea99..1fb98a0 100644
--- a/registry/zookeeper/go-server/conf/dubbogo.yml
+++ b/registry/zookeeper/go-server/conf/dubbogo.yml
@@ -9,7 +9,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
GreeterProvider:
diff --git a/rpc/dubbo/go-client/cmd/client.go
b/rpc/dubbo/go-client/cmd/client.go
index 99ae57a..832d8ed 100644
--- a/rpc/dubbo/go-client/cmd/client.go
+++ b/rpc/dubbo/go-client/cmd/client.go
@@ -35,7 +35,7 @@ import (
)
var (
- userProvider = new(pkg.UserProvider)
+ userProvider = &pkg.UserProvider{}
)
// need to setup environment variable "DUBBO_GO_CONFIG_PATH" to
"conf/dubbogo.yml" before run
@@ -50,71 +50,71 @@ func main() {
time.Sleep(6 * time.Second)
- logger.Info("\n\ntest")
+ logger.Infof("\n\ntest")
test()
}
func test() {
- logger.Info("\n\n\necho")
+ logger.Infof("\n\n\necho")
res, err := userProvider.Echo(context.TODO(), "OK")
if err != nil {
panic(err)
}
- logger.Info("res: %v\n", res)
+ logger.Infof("res: %v\n", res)
- logger.Info("\n\n\nstart to test dubbo")
+ logger.Infof("\n\n\nstart to test dubbo")
reqUser := &pkg.User{}
reqUser.ID = "003"
user, err := userProvider.GetUser(context.TODO(), reqUser)
if err != nil {
panic(err)
}
- logger.Info("response result: %v", user)
+ logger.Infof("response result: %v", user)
- logger.Info("\n\n\nstart to test dubbo - enum")
+ logger.Infof("\n\n\nstart to test dubbo - enum")
gender, err := userProvider.GetGender(1)
if err != nil {
- logger.Info("error: %v", err)
+ logger.Infof("error: %v", err)
} else {
- logger.Info("response result: %v", gender)
+ logger.Infof("response result: %v", gender)
}
- logger.Info("\n\n\nstart to test dubbo - GetUser0")
+ logger.Infof("\n\n\nstart to test dubbo - GetUser0")
ret, err := userProvider.GetUser0("003", "Moorse")
if err != nil {
panic(err)
}
- logger.Info("response result: %v", ret)
+ logger.Infof("response result: %v", ret)
- logger.Info("\n\n\nstart to test dubbo - GetUsers")
+ logger.Infof("\n\n\nstart to test dubbo - GetUsers")
ret1, err := userProvider.GetUsers([]string{"002", "003"})
if err != nil {
panic(err)
}
- logger.Info("response result: %v", ret1)
+ logger.Infof("response result: %v", ret1)
- logger.Info("\n\n\nstart to test dubbo - getUser")
+ logger.Infof("\n\n\nstart to test dubbo - getUser")
user = &pkg.User{}
var i int32 = 1
user, err = userProvider.GetUser2(context.TODO(), i)
if err != nil {
panic(err)
}
- logger.Info("response result: %v", user)
+ logger.Infof("response result: %v", user)
- logger.Info("\n\n\nstart to test dubbo - getErr")
+ logger.Infof("\n\n\nstart to test dubbo - getErr")
reqUser.ID = "003"
user, err = userProvider.GetErr(context.TODO(), reqUser)
if err == nil {
panic("err is nil")
}
- logger.Info("getErr - error: %v", err)
+ logger.Infof("getErr - error: %v", err)
- logger.Info("\n\n\nstart to test dubbo illegal method")
+ logger.Infof("\n\n\nstart to test dubbo illegal method")
reqUser.ID = "003"
user, err = userProvider.GetUser1(context.TODO(), reqUser)
if err == nil {
panic("err is nil")
}
- logger.Info("error: %v", err)
+ logger.Infof("error: %v", err)
}
diff --git a/rpc/dubbo/go-client/conf/dubbogo.yml
b/rpc/dubbo/go-client/conf/dubbogo.yml
index e1e64cd..76d0051 100644
--- a/rpc/dubbo/go-client/conf/dubbogo.yml
+++ b/rpc/dubbo/go-client/conf/dubbogo.yml
@@ -7,9 +7,12 @@ dubbo:
timeout: "3s"
address: "127.0.0.1:2181"
consumer:
- registry:
+ registries:
- demoZK
references:
"UserProvider":
protocol: "dubbo"
- interface: "org.apache.dubbo.UserProvider"
\ No newline at end of file
+ interface: "org.apache.dubbo.UserProvider"
+ logger:
+ zap-config:
+ level: info
\ No newline at end of file
diff --git a/rpc/dubbo/go-client/conf/log.yml b/rpc/dubbo/go-client/conf/log.yml
deleted file mode 100644
index 8c3f700..0000000
--- a/rpc/dubbo/go-client/conf/log.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-level: "info"
-development: true
-disableCaller: false
-disableStacktrace: false
-sampling:
-encoding: "console"
-
-# encoder
-encoderConfig:
- messageKey: "message"
- levelKey: "level"
- timeKey: "time"
- nameKey: "logger"
- callerKey: "caller"
- stacktraceKey: "stacktrace"
- lineEnding: ""
- levelEncoder: "capital"
- timeEncoder: "iso8601"
- durationEncoder: "seconds"
- callerEncoder: "short"
- nameEncoder: ""
-
-outputPaths:
- - "stderr"
-errorOutputPaths:
- - "stderr"
-initialFields:
diff --git a/rpc/dubbo/go-server/conf/dubbogo.yml
b/rpc/dubbo/go-server/conf/dubbogo.yml
index cd13362..d59df97 100644
--- a/rpc/dubbo/go-server/conf/dubbogo.yml
+++ b/rpc/dubbo/go-server/conf/dubbogo.yml
@@ -11,7 +11,7 @@ dubbo:
name: dubbo
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
UserProvider:
@@ -30,3 +30,6 @@ dubbo:
WrapperArrayClassProvider:
protocol: dubbo
interface: org.apache.dubbo.WrapperArrayClassProvider
+ logger:
+ zap-config:
+ level: info
diff --git a/rpc/dubbo/go-server/conf/log.yml b/rpc/dubbo/go-server/conf/log.yml
deleted file mode 100644
index 8c3f700..0000000
--- a/rpc/dubbo/go-server/conf/log.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-level: "info"
-development: true
-disableCaller: false
-disableStacktrace: false
-sampling:
-encoding: "console"
-
-# encoder
-encoderConfig:
- messageKey: "message"
- levelKey: "level"
- timeKey: "time"
- nameKey: "logger"
- callerKey: "caller"
- stacktraceKey: "stacktrace"
- lineEnding: ""
- levelEncoder: "capital"
- timeEncoder: "iso8601"
- durationEncoder: "seconds"
- callerEncoder: "short"
- nameEncoder: ""
-
-outputPaths:
- - "stderr"
-errorOutputPaths:
- - "stderr"
-initialFields:
diff --git a/rpc/dubbo/go-server/pkg/user_provider.go
b/rpc/dubbo/go-server/pkg/user_provider.go
index 4f95253..d6eee89 100644
--- a/rpc/dubbo/go-server/pkg/user_provider.go
+++ b/rpc/dubbo/go-server/pkg/user_provider.go
@@ -35,7 +35,7 @@ import (
)
func init() {
- config.SetProviderService(new(UserProvider))
+ config.SetProviderService(&UserProvider{})
}
type UserProvider struct {
diff --git a/rpc/grpc/go-client/conf/dubbogo.yml
b/rpc/grpc/go-client/conf/dubbogo.yml
index 9da90e2..439568b 100644
--- a/rpc/grpc/go-client/conf/dubbogo.yml
+++ b/rpc/grpc/go-client/conf/dubbogo.yml
@@ -7,9 +7,12 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry:
+ registries:
- demoZK
references:
GreeterClientImpl:
protocol: grpc
- interface: org.apache.dubbo.UserProvider
\ No newline at end of file
+ interface: org.apache.dubbo.UserProvider
+ logger:
+ zap-config:
+ level: info
\ No newline at end of file
diff --git a/rpc/grpc/go-server/conf/dubbogo.yml
b/rpc/grpc/go-server/conf/dubbogo.yml
index 0079a5c..4914719 100644
--- a/rpc/grpc/go-server/conf/dubbogo.yml
+++ b/rpc/grpc/go-server/conf/dubbogo.yml
@@ -11,9 +11,12 @@ dubbo:
name: grpc
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
GreeterProvider:
protocol: grpcProtocol
- interface: org.apache.dubbo.UserProvider
\ No newline at end of file
+ interface: org.apache.dubbo.UserProvider
+ logger:
+ zap-config:
+ level: info
\ No newline at end of file
diff --git a/rpc/jsonrpc/go-client/cmd/client.go
b/rpc/jsonrpc/go-client/cmd/client.go
index 3ede53c..470bdcb 100644
--- a/rpc/jsonrpc/go-client/cmd/client.go
+++ b/rpc/jsonrpc/go-client/cmd/client.go
@@ -56,14 +56,12 @@ func main() {
config.Load()
- logger.Info("\n\ntest")
+ logger.Infof("\n\ntest")
test()
- logger.Info("\n\ntest1")
+ logger.Infof("\n\ntest1")
test1()
- logger.Info("\n\ntest2")
+ logger.Infof("\n\ntest2")
test2()
-
- initSignal()
}
func initSignal() {
@@ -91,152 +89,152 @@ func initSignal() {
}
func test() {
- logger.Info("\n\n\necho")
+ logger.Infof("\n\n\necho")
res, err := userProvider.Echo(context.TODO(), "OK")
if err != nil {
- logger.Info("echo - error: %v", err)
+ logger.Infof("echo - error: %v", err)
} else {
- logger.Info("res: %v", res)
+ logger.Infof("res: %v", res)
}
time.Sleep(3e9)
- logger.Info("\n\n\nstart to test jsonrpc")
+ logger.Infof("\n\n\nstart to test jsonrpc")
user, err := userProvider.GetUser(context.TODO(), "A003")
if err != nil {
panic(err)
}
- logger.Info("response result: %v", user)
+ logger.Infof("response result: %v", user)
- logger.Info("\n\n\nstart to test jsonrpc - GetUser0")
+ logger.Infof("\n\n\nstart to test jsonrpc - GetUser0")
ret, err := userProvider.GetUser0("A003", "Moorse")
if err != nil {
panic(err)
}
- logger.Info("response result: %v", ret)
+ logger.Infof("response result: %v", ret)
- logger.Info("\n\n\nstart to test jsonrpc - GetUsers")
+ logger.Infof("\n\n\nstart to test jsonrpc - GetUsers")
ret1, err := userProvider.GetUsers([]interface{}{[]interface{}{"A002",
"A003"}})
if err != nil {
panic(err)
}
- logger.Info("response result: %v", ret1)
+ logger.Infof("response result: %v", ret1)
- logger.Info("\n\n\nstart to test jsonrpc - getUser")
+ logger.Infof("\n\n\nstart to test jsonrpc - getUser")
rep2, err := userProvider.GetUser2(context.TODO(), "1")
if err != nil {
panic(err)
}
- logger.Info("response result: %v", rep2)
+ logger.Infof("response result: %v", rep2)
- logger.Info("\n\n\nstart to test jsonrpc - GetUser3")
+ logger.Infof("\n\n\nstart to test jsonrpc - GetUser3")
err = userProvider.GetUser3()
if err != nil {
panic(err)
}
- logger.Info("succ!")
+ logger.Infof("succ!")
- logger.Info("\n\n\nstart to test jsonrpc illegal method")
+ logger.Infof("\n\n\nstart to test jsonrpc illegal method")
rep3, err := userProvider.GetUser1(context.TODO(), "A003")
if err == nil {
panic("err is nil")
}
- logger.Info("response result: %v", rep3)
+ logger.Infof("response result: %v", rep3)
}
func test1() {
- logger.Info("\n\n\necho")
+ logger.Infof("\n\n\necho")
res, err := userProvider1.Echo(context.TODO(), "OK")
if err != nil {
- logger.Info("echo - error: %v", err)
+ logger.Infof("echo - error: %v", err)
} else {
- logger.Info("res: %v", res)
+ logger.Infof("res: %v", res)
}
time.Sleep(3e9)
- logger.Info("\n\n\nstart to test jsonrpc")
+ logger.Infof("\n\n\nstart to test jsonrpc")
user, err := userProvider1.GetUser(context.TODO(), "A003")
if err != nil {
panic(err)
}
- logger.Info("response result: %v", user)
+ logger.Infof("response result: %v", user)
- logger.Info("\n\n\nstart to test jsonrpc - GetUser0")
+ logger.Infof("\n\n\nstart to test jsonrpc - GetUser0")
ret, err := userProvider1.GetUser0("A003", "Moorse")
if err != nil {
panic(err)
}
- logger.Info("response result: %v", ret)
+ logger.Infof("response result: %v", ret)
- logger.Info("\n\n\nstart to test jsonrpc - getUser")
+ logger.Infof("\n\n\nstart to test jsonrpc - getUser")
user, err = userProvider1.GetUser2(context.TODO(), "1")
if err != nil {
panic(err)
}
- logger.Info("response result: %v", user)
+ logger.Infof("response result: %v", user)
- logger.Info("\n\n\nstart to test jsonrpc - GetUser3")
+ logger.Infof("\n\n\nstart to test jsonrpc - GetUser3")
err = userProvider1.GetUser3()
if err != nil {
panic(err)
}
- logger.Info("succ!")
+ logger.Infof("succ!")
- logger.Info("\n\n\nstart to test jsonrpc illegal method")
+ logger.Infof("\n\n\nstart to test jsonrpc illegal method")
user, err = userProvider1.GetUser1(context.TODO(), "A003")
if err == nil {
panic("err is nil")
}
- logger.Info("error: %v", err)
+ logger.Infof("error: %v", err)
}
func test2() {
- logger.Info("\n\n\necho")
+ logger.Infof("\n\n\necho")
res, err := userProvider2.Echo(context.TODO(), "OK")
if err != nil {
- logger.Info("echo - error: %v", err)
+ logger.Infof("echo - error: %v", err)
} else {
- logger.Info("res: %v", res)
+ logger.Infof("res: %v", res)
}
time.Sleep(3e9)
- logger.Info("\n\n\nstart to test jsonrpc")
+ logger.Infof("\n\n\nstart to test jsonrpc")
user, err := userProvider2.GetUser(context.TODO(), "A003")
if err != nil {
panic(err)
}
- logger.Info("response result: %v", user)
+ logger.Infof("response result: %v", user)
- logger.Info("\n\n\nstart to test jsonrpc - GetUser0")
+ logger.Infof("\n\n\nstart to test jsonrpc - GetUser0")
ret, err := userProvider2.GetUser0("A003", "Moorse")
if err != nil {
panic(err)
}
- logger.Info("response result: %v", ret)
+ logger.Infof("response result: %v", ret)
- logger.Info("\n\n\nstart to test jsonrpc - getUser")
+ logger.Infof("\n\n\nstart to test jsonrpc - getUser")
user, err = userProvider2.GetUser2(context.TODO(), "1")
if err != nil {
panic(err)
}
- logger.Info("response result: %v", user)
+ logger.Infof("response result: %v", user)
- logger.Info("\n\n\nstart to test jsonrpc - GetUser3")
+ logger.Infof("\n\n\nstart to test jsonrpc - GetUser3")
err = userProvider2.GetUser3()
if err != nil {
panic(err)
}
- logger.Info("succ!")
+ logger.Infof("succ!")
- logger.Info("\n\n\nstart to test jsonrpc illegal method")
+ logger.Infof("\n\n\nstart to test jsonrpc illegal method")
user, err = userProvider2.GetUser1(context.TODO(), "A003")
if err == nil {
panic("err is nil")
}
- logger.Info("error: %v", err)
+ logger.Infof("error: %v", err)
}
diff --git a/rpc/jsonrpc/go-client/conf/dubbogo.yml
b/rpc/jsonrpc/go-client/conf/dubbogo.yml
index f00ed85..3c44ea8 100644
--- a/rpc/jsonrpc/go-client/conf/dubbogo.yml
+++ b/rpc/jsonrpc/go-client/conf/dubbogo.yml
@@ -21,7 +21,7 @@ dubbo:
consumer:
references:
"com.ikurento.user.UserProvider":
- registry: "hangzhouzk"
+ registries: "hangzhouzk"
protocol: "jsonrpc"
interface: "com.ikurento.user.UserProvider"
cluster: "failover"
@@ -29,7 +29,7 @@ dubbo:
- name: "GetUser"
retries: 1
"com.ikurento.user.UserProvider1":
- registry: "hangzhouzk"
+ registries: "hangzhouzk"
protocol: "jsonrpc"
version: "2.0"
interface: "com.ikurento.user.UserProvider"
@@ -38,7 +38,7 @@ dubbo:
- name: "GetUser"
retries: 1
"com.ikurento.user.UserProvider2":
- registry: "hangzhouzk"
+ registries: "hangzhouzk"
protocol: "jsonrpc"
version: "2.0"
group: "as"
@@ -46,4 +46,7 @@ dubbo:
cluster: "failover"
methods:
- name: "GetUser"
- retries: 1
\ No newline at end of file
+ retries: 1
+ logger:
+ zap-config:
+ level: info
\ No newline at end of file
diff --git a/rpc/jsonrpc/go-server/conf/dubbogo.yml
b/rpc/jsonrpc/go-server/conf/dubbogo.yml
index c5a1fed..0443845 100644
--- a/rpc/jsonrpc/go-server/conf/dubbogo.yml
+++ b/rpc/jsonrpc/go-server/conf/dubbogo.yml
@@ -18,11 +18,11 @@ dubbo:
ip: "127.0.0.1"
port: 20001
provider:
- registry:
+ registries:
- hangzhouzk
services:
UserProvider:
- registry: "hangzhouzk"
+ registries: "hangzhouzk"
protocol: "jsonrpc"
interface: "com.ikurento.user.UserProvider"
loadbalance: "random"
@@ -33,7 +33,7 @@ dubbo:
retries: 1
loadbalance: "random"
UserProvider1:
- registry: "hangzhouzk"
+ registries: "hangzhouzk"
protocol: "jsonrpc"
interface: "com.ikurento.user.UserProvider"
loadbalance: "random"
@@ -45,7 +45,7 @@ dubbo:
retries: 1
loadbalance: "random"
UserProvider2:
- registry: "hangzhouzk"
+ registries: "hangzhouzk"
protocol: "jsonrpc"
interface: "com.ikurento.user.UserProvider"
loadbalance: "random"
@@ -56,4 +56,7 @@ dubbo:
methods:
- name: "GetUser"
retries: 1
- loadbalance: "random"
\ No newline at end of file
+ loadbalance: "random"
+ logger:
+ zap-config:
+ level: info
\ No newline at end of file
diff --git a/rpc/triple/README.md b/rpc/triple/README.md
index 922bb1e..c672d19 100644
--- a/rpc/triple/README.md
+++ b/rpc/triple/README.md
@@ -1,12 +1,89 @@
# Triple Samples
-Triple-go is a network protocol library released in version 3.0 based on the
existing Dubbo service management capabilities. You may refer to
[dubbogo/triple](https://github.com/dubbogo/triple) for more details.
+Triple is dubbo3.0 network protocol. You can refer to
[dubbogo/triple](https://github.com/dubbogo/triple) repo for more information.
Triple is extended from old Dubbogo framework, it supports pb serilization, and
can interact with dubbo-java 3.0 and gRPC. It also support unary RPC and
streaming RPC invocation. Triple is main protocol that Dubbo echology
recommends.
-## Contents
+## Samples content
-- [codec-extension](./codec-extension): TODO: ~~code-extension~~
-- [hessian2](./hessian2): A Triple sample using hessian2 serialization.
-- [msgpack](./msgpack): TODO: ~~msgpack introduction~~
-- [pb](./pb): Triple samples using ProtoBuf(PB) serialization.
- - [dubbogo-grpc](./pb/dubbogo-grpc): Samples for communication between
Dubbo-go using triple protocol and original gRPC(triple-go <-> grpc).
- - [dubbogo-java](./pb/dubbogo-java): Samples for communication between
Dubbo-go and Dubbo-java using Triple protocol(triple-go <-> triple-java).
+- [codec-extension](./codec-extension): user defined serialization sample
+- [hessian2](./hessian2): Hessian2 serialization sample
+- [msgpack](./msgpack): Msgpack serialization sample
+- [pb](./pb): ProtoBuf(PB) serialization sample
+ - [dubbogo-grpc](./pb/dubbogo-grpc): Triple and gRPC interactive samples
+ - [dubbogo-java](./pb/dubbogo-java): Triple-java and Triple-go interactive
samples
+
+## How to write configuration file
+
+- Server
+
+```yaml
+dubbo:
+ protocols: # dubbogo framework network protocol configuration
+ myProtocol: # user defined protocol Key
+ name: tri # protocol name, suppporting: tri/dubbo/grpc/jsonrpc
+ port: 20000 # port to export service
+
+ provider:
+ services:
+ MyProvider: # service provider type name
+ protocol: 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
+```
+
+- Client
+
+```yml
+dubbo:
+consumer:
+ references:
+ ClientImpl: # client struct type name
+ protocol: tri # protocol name，supporting:
tri/dubbo/grpc/jsonrpc，compatiable with server
+ interface: org.apache.dubbo.demo.Greeter # user defined interface name
+ # serialization: hessian2 # serialization that can be
choosed：pb/hessian2/custome
+ # pb serialization by default
+```
+
+## How to run
+
+We choose pb/dubbogo-grpc as an example, which is dubbogo-client invokes
dubbogo-server using triple protocol and pb seriazliation.
+
+Start zk server, listening on 127.0.0.1:2181. If you have installed docker
locally, you can choose to exec following commands to start all componnets that
dubbogo relies on: zk(2181), nacos(8848), etcd(2379).
+
+`docker-compose -f
{PATH_TO_SAMPLES_PROJECT}/integrate_test/dockercompose/docker-compose.yml up -d`
+
+### Run with Goland
+
+
+
+You can start client after server started.
+
+
+
+
+
+### Run with terminal
+
+- Server
+
+`cd rpc/triple/pb/dubbogo-grpc/go-server/cmd` # go to server samples
+
+`export DUBBO_GO_CONFIG_PATH="../conf/dubbogo.yml`# set env of dubbogo config
+
+`go run .` # start server
+
+- Server
+
+`cd rpc/triple/pb/dubbogo-grpc/go-server/cmd` # go to client samples
+
+`export DUBBO_GO_CONFIG_PATH="../conf/dubbogo.yml` # set env of dubbogo config
+
+`go run .` # start client
+
+
+
+### Success flag
+
+After you starting with one of above, you can see following info log if
success.
+
+`INFO cmd/client.go:108 Receive user = name:"Hello laurence"
id:"12345" age:21`
diff --git a/rpc/triple/README_zh.md b/rpc/triple/README_zh.md
index cfd5cf2..098ec2f 100644
--- a/rpc/triple/README_zh.md
+++ b/rpc/triple/README_zh.md
@@ -1,12 +1,88 @@
# Triple 示例
-Triple-go 是在已有 Dubbo 服务治理能力的基础上，3.0 版本发布的网络协议库。获取更多信息请查看
[dubbogo/triple](https://github.com/dubbogo/triple) 仓库。
+Triple-go 3.0 版本的网络协议库。获取更多信息请查看
[dubbogo/triple](https://github.com/dubbogo/triple) 仓库。Triple 协议是在已有 Dubbogo
框架的基础上的扩展的3.0新网络协议，支持了pb序列化，可与 Dubbo3.0 互通、与 gRPC 互通，支持普通 RPC 调用与流式 RPC 调用等功能，是
Dubbo 生态在云原生时代的主推协议。
-## 内容
+## Samples内容
-- [codec-extension](./codec-extension): TODO: ~~code-extension~~
-- [hessian2](./hessian2): TODO: ~~hessian2 introduction~~
-- [msgpack](./msgpack): TODO: ~~msgpack introduction~~
-- [pb](./pb): 使用 ProtoBuf(PB) 序列化方案的示例
+- [codec-extension](./codec-extension): 用户自定义序列化方式例子
+- [hessian2](./hessian2): Hessian2 序列化方式例子
+- [msgpack](./msgpack): Msgpack 序列化方式例子
+- [pb](./pb): 使用 ProtoBuf(PB) 序列化方案的例子
- [dubbogo-grpc](./pb/dubbogo-grpc): Triple 和 gRPC 互通案例
- - [dubbogo-java](./pb/dubbogo-java): Triple-java 和 Triple-go 互通案例
\ No newline at end of file
+ - [dubbogo-java](./pb/dubbogo-java): Triple-java 和 Triple-go 互通案例
+
+## 如何配置
+
+- 服务端
+
+```yaml
+dubbo:
+ protocols: # 框架协议配置
+ myProtocol: # 自定义一个协议 Key
+ name: tri # 协议名，支持tri/dubbo/grpc/jsonrpc
+ port: 20000 # 暴露端口
+ provider:
+ services:
+ MyProvider: # 服务提供者结构类名
+ protocol: myProtocol # 自定义的协议 Key，与上方 myProtocol 对应
+ interface: org.apache.dubbogo.MyProvider # 用户自定义的接口名
+ # serialization: hessian2 可选字段，可以指定序列化类型：pb/hessian2/自定义
+ # 默认使用 pb 序列化
+```
+
+- 客户端
+
+```yml
+dubbo:
+ consumer:
+ references:
+ ClientImpl: # 客户端结构类名
+ protocol: tri # 协议名，支持tri/dubbo/grpc/jsonrpc，需与服务端对应
+ interface: org.apache.dubbo.demo.Greeter # 用户自定义的接口名
+ # serialization: hessian2 可选字段，可以指定序列化类型：pb/hessian2/自定义
+ # 默认使用 pb 序列化，需要与服务端对应
+```
+
+## 运行示例：
+
+以 pb/dubbogo-grpc 下的 dubbogo-client 调用 dubbogo-server为例
+
+启动zk，监听127.0.0.1:2181端口。如本机已安装docker，可以直接执行下面的命令来启动所有运行samples的依赖组件：zk(2181),
nacos(8848), etcd(2379)。
+
+`docker-compose -f
{PATH_TO_SAMPLES_PROJECT}/integrate_test/dockercompose/docker-compose.yml up -d`
+
+### 通过 Goland 运行
+
+
+
+服务端启动完毕后，启动客户端
+
+
+
+
+
+### 通过命令行运行
+
+- 服务端
+
+`cd rpc/triple/pb/dubbogo-grpc/go-server/cmd` # 进入仓库目录
+
+`export DUBBO_GO_CONFIG_PATH="../conf/dubbogo.yml`# 设置配置文件环境变量
+
+`go run .` # 启动服务
+
+- 客户端
+
+`cd rpc/triple/pb/dubbogo-grpc/go-server/cmd` # 进入仓库目录
+
+`export DUBBO_GO_CONFIG_PATH="../conf/dubbogo.yml`# 设置配置文件环境变量
+
+`go run .` # 启动客户端发起调用
+
+
+
+### 调用成功
+
+通过上述任一方式启动，可看到客户端打印如下信息，调用成功：
+
+`INFO cmd/client.go:108 Receive user = name:"Hello laurence"
id:"12345" age:21`
diff --git a/rpc/triple/codec-extension/go-client/conf/dubbogo.yml
b/rpc/triple/codec-extension/go-client/conf/dubbogo.yml
index 5aaef86..ab47541 100644
--- a/rpc/triple/codec-extension/go-client/conf/dubbogo.yml
+++ b/rpc/triple/codec-extension/go-client/conf/dubbogo.yml
@@ -4,7 +4,7 @@ dubbo:
protocol: zookeeper
address: 127.0.0.1:2181
consumer:
- registry:
+ registries:
- registryKey
references:
UserProvider:
diff --git a/rpc/triple/codec-extension/go-server/conf/dubbogo.yml
b/rpc/triple/codec-extension/go-server/conf/dubbogo.yml
index 77d7c97..b813be5 100644
--- a/rpc/triple/codec-extension/go-server/conf/dubbogo.yml
+++ b/rpc/triple/codec-extension/go-server/conf/dubbogo.yml
@@ -8,7 +8,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry:
+ registries:
- registryKey
services:
UserProvider:
diff --git a/rpc/triple/hessian2/README.md b/rpc/triple/hessian2/README.md
index 17a37e5..0795f75 100644
--- a/rpc/triple/hessian2/README.md
+++ b/rpc/triple/hessian2/README.md
@@ -11,7 +11,7 @@ PB serialization is used by default. To use Hessian2+PB,
please specify the seri
# service config
services:
"UserProvider":
- registry: "demoZK"
+ registries: "demoZK"
protocol: "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 1fbbcd2..4bb1f07 100644
--- a/rpc/triple/hessian2/README_zh.md
+++ b/rpc/triple/hessian2/README_zh.md
@@ -11,7 +11,7 @@
https://github.com/dubbogo/triple/blob/master/internal/codec/proto/triple_wrappe
# service config
services:
"UserProvider":
- registry: "demoZK"
+ registries: "demoZK"
protocol: "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-client/conf/dubbogo.yml
b/rpc/triple/hessian2/go-client/conf/dubbogo.yml
index c1cfa67..9601668 100644
--- a/rpc/triple/hessian2/go-client/conf/dubbogo.yml
+++ b/rpc/triple/hessian2/go-client/conf/dubbogo.yml
@@ -5,7 +5,7 @@ dubbo:
timeout: "3s"
address: "127.0.0.1:2181"
consumer:
- registry:
+ registries:
- demoZK
references:
"ComplexProvider":
diff --git a/rpc/triple/hessian2/go-server/conf/dubbogo.yml
b/rpc/triple/hessian2/go-server/conf/dubbogo.yml
index b7c6359..8ef203f 100644
--- a/rpc/triple/hessian2/go-server/conf/dubbogo.yml
+++ b/rpc/triple/hessian2/go-server/conf/dubbogo.yml
@@ -9,7 +9,7 @@ dubbo:
name: "tri"
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
"UserProvider":
diff --git a/rpc/triple/msgpack/go-client/conf/dubbogo.yml
b/rpc/triple/msgpack/go-client/conf/dubbogo.yml
index 71ac0fd..6fe3e81 100644
--- a/rpc/triple/msgpack/go-client/conf/dubbogo.yml
+++ b/rpc/triple/msgpack/go-client/conf/dubbogo.yml
@@ -5,7 +5,7 @@ dubbo:
timeout: 3s
address: 127.0.0.1:2181
consumer:
- registry:
+ registries:
- demoZK
references:
UserProvider:
diff --git a/rpc/triple/msgpack/go-server/conf/dubbogo.yml
b/rpc/triple/msgpack/go-server/conf/dubbogo.yml
index a3d772e..cd019ad 100644
--- a/rpc/triple/msgpack/go-server/conf/dubbogo.yml
+++ b/rpc/triple/msgpack/go-server/conf/dubbogo.yml
@@ -9,7 +9,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry:
+ registries:
- demoZK
services:
UserProvider:
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 25c06cd..9d4a0e1 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,7 @@ dubbo:
zk:
address: zookeeper://127.0.0.1:2181
consumer:
- registry: zk
+ registries: 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 a6efc25..d5286cf 100644
--- a/rpc/triple/pb/dubbogo-grpc/go-server/conf/dubbogo.yml
+++ b/rpc/triple/pb/dubbogo-grpc/go-server/conf/dubbogo.yml
@@ -7,7 +7,7 @@ dubbo:
name: tri
port: 20000
provider:
- registry: zk
+ registries: zk
services:
# you may refer to `Reference()` method defined in
`protobuf/triple/helloworld.pb.go`
GreeterProvider:
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 ac9303d..6db139d 100644
--- a/rpc/triple/pb/dubbogo-java/go-client/conf/dubbogo.yml
+++ b/rpc/triple/pb/dubbogo-java/go-client/conf/dubbogo.yml
@@ -3,8 +3,8 @@ dubbo:
zk:
address: zookeeper://127.0.0.1:2181
consumer:
- registry: zk
+ registries: zk
references:
- greeterImpl:
+ GreeterClientImpl:
protocol: tri
interface: org.apache.dubbo.demo.IGreeter
\ No newline at end of file
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 1ae00b5..1b2fced 100644
--- a/rpc/triple/pb/dubbogo-java/go-server/conf/dubbogo.yml
+++ b/rpc/triple/pb/dubbogo-java/go-server/conf/dubbogo.yml
@@ -7,7 +7,7 @@ dubbo:
name: tri
port: 20001
provider:
- registry: zk
+ registries: zk
services:
GreeterProvider:
protocol: triple
diff --git a/tracing/dubbo/go-client/cmd/client.go
b/tracing/dubbo/go-client/cmd/client.go
index 9a33bff..e9611df 100644
--- a/tracing/dubbo/go-client/cmd/client.go
+++ b/tracing/dubbo/go-client/cmd/client.go
@@ -61,7 +61,9 @@ func main() {
//initJaeger()
initZipkin()
span, ctx := opentracing.StartSpanFromContext(context.Background(),
"Dubbogo-Client-Service")
- user, err := userProvider.GetUser(ctx, []interface{}{"A003"})
+ user, err := userProvider.GetUser(ctx, &pkg.User{
+ Name: "laurence",
+ })
span.Finish()
if err != nil {
panic(err)
diff --git a/tracing/dubbo/go-client/conf/dubbogo.yml
b/tracing/dubbo/go-client/conf/dubbogo.yml
index ab08480..6e92cd8 100644
--- a/tracing/dubbo/go-client/conf/dubbogo.yml
+++ b/tracing/dubbo/go-client/conf/dubbogo.yml
@@ -8,7 +8,7 @@ dubbo:
address: 127.0.0.1:2181
consumer:
filter: tracing
- registry:
+ registries:
- demoZK
references:
UserProvider:
diff --git a/tracing/dubbo/go-client/pkg/user.go
b/tracing/dubbo/go-client/pkg/user.go
index 1890be9..60601c9 100644
--- a/tracing/dubbo/go-client/pkg/user.go
+++ b/tracing/dubbo/go-client/pkg/user.go
@@ -42,7 +42,7 @@ func (User) JavaClassName() string {
}
type UserProvider struct {
- GetUser func(ctx context.Context, req []interface{}) (*User, error)
+ GetUser func(ctx context.Context, req *User) (*User, error)
}
func (u *UserProvider) Reference() string {
diff --git a/tracing/dubbo/go-server/cmd/server.go
b/tracing/dubbo/go-server/cmd/server.go
index 5e64187..d8735d5 100644
--- a/tracing/dubbo/go-server/cmd/server.go
+++ b/tracing/dubbo/go-server/cmd/server.go
@@ -52,9 +52,11 @@ var (
)
func main() {
- config.SetProviderService(new(pkg.UserProvider))
+ config.SetProviderService(&pkg.UserProvider{})
hessian.RegisterPOJO(&pkg.User{})
- config.Load()
+ if err := config.Load(); err != nil {
+ panic(err)
+ }
initSignal()
// initJaeger() and initZipkin() can only use one at the same time
//initJaeger()
diff --git a/tracing/dubbo/go-server/conf/dubbogo.yml
b/tracing/dubbo/go-server/conf/dubbogo.yml
index 1c8aadb..c24f531 100644
--- a/tracing/dubbo/go-server/conf/dubbogo.yml
+++ b/tracing/dubbo/go-server/conf/dubbogo.yml
@@ -12,7 +12,7 @@ dubbo:
port: 20000
provider:
filter: tracing
- registry:
+ registries:
- demoZK
services:
UserProvider:
diff --git a/tracing/dubbo/go-server/pkg/user.go
b/tracing/dubbo/go-server/pkg/user.go
index b86b51b..e92e09c 100644
--- a/tracing/dubbo/go-server/pkg/user.go
+++ b/tracing/dubbo/go-server/pkg/user.go
@@ -52,14 +52,10 @@ func (u User) JavaClassName() string {
type UserProvider struct {
}
-func (u *UserProvider) GetUser(ctx context.Context, req []interface{}) (*User,
error) {
+func (u *UserProvider) GetUser(ctx context.Context, req *User) (*User, error) {
span, ctx := opentracing.StartSpanFromContext(ctx, "User-Server-Span")
gxlog.CInfo("req:%#v", req)
user := &User{Id: "001", Name: "zhangsan-dubbogo", Age: 18, Time:
time.Now()}
span.Finish()
return user, nil
}
-
-func (u *UserProvider) Reference() string {
- return "UserProvider"
-}
diff --git a/tracing/grpc/go-client/conf/dubbogo.yml
b/tracing/grpc/go-client/conf/dubbogo.yml
index fdedaa6..6d1c73c 100644
--- a/tracing/grpc/go-client/conf/dubbogo.yml
+++ b/tracing/grpc/go-client/conf/dubbogo.yml
@@ -8,7 +8,7 @@ dubbo:
address: 127.0.0.1:2181
consumer:
filter: tracing
- registry:
+ registries:
- demoZK
references:
GreeterClientImpl:
diff --git a/tracing/grpc/go-server/conf/dubbogo.yml
b/tracing/grpc/go-server/conf/dubbogo.yml
index 2135e78..3254f60 100644
--- a/tracing/grpc/go-server/conf/dubbogo.yml
+++ b/tracing/grpc/go-server/conf/dubbogo.yml
@@ -12,7 +12,7 @@ dubbo:
port: 20000
provider:
filter: tracing
- registry:
+ registries:
- demoZK
services:
GreeterProvider:
diff --git a/tracing/jsonrpc/go-client/conf/dubbogo.yml
b/tracing/jsonrpc/go-client/conf/dubbogo.yml
index fc9b34c..64aef04 100644
--- a/tracing/jsonrpc/go-client/conf/dubbogo.yml
+++ b/tracing/jsonrpc/go-client/conf/dubbogo.yml
@@ -8,7 +8,7 @@ dubbo:
address: 127.0.0.1:2181
consumer:
filter: tracing
- registry:
+ registries:
- demoZK
references:
UserProvider:
diff --git a/tracing/jsonrpc/go-server/conf/dubbogo.yml
b/tracing/jsonrpc/go-server/conf/dubbogo.yml
index 0b55da3..e81a751 100644
--- a/tracing/jsonrpc/go-server/conf/dubbogo.yml
+++ b/tracing/jsonrpc/go-server/conf/dubbogo.yml
@@ -13,7 +13,7 @@ dubbo:
port: 20001
provider:
filter: tracing
- registry:
+ registries:
- demoZK
services:
UserProvider:
