You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/10/25 05:43:11 UTC
[dubbo-go] branch 3.0 updated (84d4ef2 -> d35f7cb)
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a change to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git.
omit 84d4ef2 Merge branch '3.0' of https://github.com/apache/dubbo-go into 3.0
new d35f7cb Merge branch '3.0' of https://github.com/apache/dubbo-go into 3.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (84d4ef2)
\
N -- N -- N refs/heads/3.0 (d35f7cb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CONTRIBUTING.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[dubbo-go] 01/01: Merge branch '3.0' of
https://github.com/apache/dubbo-go into 3.0
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit d35f7cb6d8e65167b5501199d230a0e9ae9cbfd8
Merge: 1c38c03 b1a1617
Author: yuyu.zx <yu...@alipay.com>
AuthorDate: Mon Oct 25 13:42:12 2021 +0800
Merge branch '3.0' of https://github.com/apache/dubbo-go into 3.0
.gitignore | 3 +-
CONTRIBUTING.md | 4 +-
Makefile | 11 +-
.../available/cluster.go} | 22 +-
.../available/cluster_invoker.go} | 25 +-
.../available/cluster_invoker_test.go} | 14 +-
.../base/cluster_invoker.go} | 80 +-
.../base/cluster_invoker_test.go} | 33 +-
.../broadcast/cluster.go} | 24 +-
.../broadcast/cluster_invoker.go} | 23 +-
.../broadcast/cluster_invoker_test.go} | 18 +-
cluster/{ => cluster}/cluster.go | 3 +-
cluster/{ => cluster}/cluster_interceptor.go | 0
.../failback/cluster.go} | 24 +-
.../failback/cluster_invoker.go} | 40 +-
.../failback/cluster_test.go} | 31 +-
.../failfast/cluster.go} | 24 +-
.../failfast/cluster_invoker.go} | 27 +-
.../failfast/cluster_test.go} | 25 +-
.../failover/cluster.go} | 21 +-
.../failover/cluster_invoker.go} | 34 +-
.../failover/cluster_test.go} | 106 +-
.../failsafe/cluster.go} | 24 +-
.../failsafe/cluster_invoker.go} | 24 +-
.../failsafe/cluster_test.go} | 25 +-
.../forking/cluster.go} | 24 +-
.../forking/cluster_invoker.go} | 28 +-
.../forking/cluster_test.go} | 22 +-
.../interceptor_invoker.go | 45 +-
cluster/cluster/mock.go | 106 ++
.../zoneaware/cluster.go} | 19 +-
.../zoneaware/cluster_interceptor.go} | 12 +-
.../zoneaware/cluster_invoker.go} | 26 +-
.../zoneaware/cluster_invoker_test.go} | 34 +-
.../cluster_impl/{mock_cluster.go => import.go} | 29 +-
.../{base_directory.go => base/directory.go} | 26 +-
.../directory_test.go} | 16 +-
cluster/{ => directory}/directory.go | 2 +-
.../{static_directory.go => static/directory.go} | 29 +-
.../directory_test.go} | 6 +-
.../loadbalance/consistenthashing/loadbalance.go | 80 ++
.../loadbalance_test.go} | 12 +-
.../selector.go} | 80 +-
.../loadbalance.go} | 25 +-
.../loadbalance_test.go} | 6 +-
cluster/{ => loadbalance}/loadbalance.go | 2 +-
.../{random.go => random/loadbalance.go} | 25 +-
.../{random_test.go => random/loadbalance_test.go} | 28 +-
.../{round_robin.go => roundrobin/loadbalance.go} | 34 +-
.../loadbalance_test.go} | 6 +-
cluster/router/chain/chain.go | 3 +-
.../v3router/k8s_api/listener_handler_impl.go | 2 +
cluster/router/v3router/k8s_crd/client.go | 3 +
.../router/v3router/k8s_crd/listener_handler.go | 1 +
cluster/router/v3router/router_chain_test.go | 1 +
common/constant/cluster.go | 11 +-
common/constant/default.go | 3 +-
common/constant/env.go | 12 +-
common/constant/key.go | 121 ++-
common/constant/{cluster.go => loadbalance.go} | 7 +-
common/extension/cluster.go | 2 +-
common/extension/cluster_interceptor.go | 60 --
.../version.go => common/extension/config.go | 14 +-
common/extension/config_center_factory.go | 4 +-
common/extension/loadbalance.go | 8 +-
.../extension/metadata_service_exporter.go | 42 +-
common/extension/proxy_factory.go | 4 +-
common/extension/registry.go | 8 +-
common/extension/registry_directory.go | 6 +-
common/extension/service_discovery.go | 8 +-
common/logger/log.yml | 27 -
common/logger/logger.go | 78 +-
common/logger/logger_test.go | 137 ---
common/logger/logging.go | 10 +
common/metadata_info.go | 2 +-
common/proxy/proxy.go | 31 +-
common/proxy/proxy_factory/default.go | 9 +-
common/proxy/proxy_test.go | 1 +
common/url.go | 7 +-
common/yaml/yaml.go | 1 +
config/application_config.go | 90 +-
...c_config_test.go => application_config_test.go} | 10 +-
config/base_config.go | 312 ------
config/base_config_test.go | 303 ------
config/config_api.go | 545 ----------
config/config_api_test.go | 283 +++--
config/config_center_config.go | 248 +++--
config/config_center_config_test.go | 50 +-
config/config_loader.go | 410 +-------
config/config_loader_options.go | 181 ++--
...onfig_test.go => config_loader_options_test.go} | 15 +-
config/config_loader_test.go | 616 -----------
config/config_resolver.go | 69 ++
config/config_setter.go | 4 -
config/config_utils.go | 47 +
config/consumer_config.go | 242 +++--
config/{ => generic}/generic_service.go | 8 +-
config/graceful_shutdown.go | 103 +-
config/graceful_shutdown_config.go | 43 +-
config/graceful_shutdown_test.go | 184 ++--
config/instance/metadata_report_test.go | 14 +-
.../version.go => config/interfaces/config.go | 14 +-
config/logger_config.go | 172 +++
config/logger_config_test.go | 72 ++
config/metadata_report_config.go | 183 +++-
config/method_config.go | 44 +-
config/metric_config.go | 59 +-
config/metric_config_test.go | 8 +-
config/parsers/properties/properties.go | 88 ++
config/protocol_config.go | 64 +-
...port_config_test.go => protocol_config_test.go} | 45 +-
config/provider_config.go | 190 +++-
config/provider_config_test.go | 48 +-
config/reference_config.go | 343 +++---
config/reference_config_test.go | 777 +++++++-------
config/registry_config.go | 370 +++++--
config/registry_config_test.go | 38 +-
config/remote_config.go | 80 +-
config/root_config.go | 358 +++++++
config/router_config.go | 166 ++-
config/router_config_test.go | 10 +-
config/service.go | 40 +-
config/service_config.go | 396 ++++---
config/service_config_test.go | 215 ----
config/service_discovery_config.go | 38 +-
config/testdata/application.yaml | 35 +
config/testdata/config/app/application.yaml | 21 +
.../testdata/config/application/application.yaml | 4 +
config/testdata/config/center/apollo.yaml | 8 +
.../testdata/config/center/conf-application.yaml | 13 +
config/testdata/config/logger/empty_log.yaml | 11 +
config/testdata/config/logger/file_log.yaml | 44 +
config/testdata/config/logger/log.yaml | 36 +
.../config/properties/application.properties | 13 +
config/testdata/config/protocol/application.yaml | 7 +
.../config/protocol/empty_application.yaml | 7 +
config/testdata/config/provider/application.yaml | 17 +
.../provider/empty_registry_application.yaml | 8 +
.../config/provider/registry_application.yaml | 13 +
config/testdata/config/registry/application.yaml | 10 +
.../config/registry/empty_application.yaml | 2 +
config/testdata/consumer_config.yml | 2 +-
.../testdata/consumer_config_with_configcenter.yml | 2 +-
.../testdata/consumer_config_withoutProtocol.yml | 2 +-
config/testdata/provider_config.yml | 2 +-
.../testdata/provider_config_withoutProtocol.yml | 2 +-
config/uniform_router_config.go | 1 +
config_center/apollo/impl.go | 45 +-
config_center/apollo/impl_test.go | 109 +-
config_center/apollo/listener.go | 1 +
config_center/dynamic_configuration.go | 2 +
config_center/file/impl.go | 1 +
config_center/mock_dynamic_config.go | 1 +
config_center/nacos/client.go | 1 +
config_center/nacos/impl.go | 2 +
config_center/parser/configuration_parser.go | 2 +
config_center/zookeeper/impl.go | 13 +-
filter/accesslog/filter_test.go | 1 +
filter/active/filter_test.go | 1 +
filter/auth/consumer_sign_filter_test.go | 1 +
filter/auth/provider_auth_filter_test.go | 1 +
filter/echo/filter.go | 1 -
filter/filter_impl/import.go | 3 +-
filter/generic/filter_test.go | 2 +
filter/generic/generalizer/example.pb.go | 1 +
filter/generic/generalizer/gson.go | 1 +
filter/generic/generalizer/map.go | 2 +
filter/generic/generalizer/protobuf_json.go | 2 +
filter/generic/service_filter.go | 1 +
filter/generic/service_filter_test.go | 3 +
filter/gshutdown/filter.go | 4 +-
filter/gshutdown/filter_test.go | 10 +-
filter/hystrix/filter.go | 8 +-
filter/hystrix/filter_test.go | 2 +
filter/metrics/filter.go | 8 +-
filter/metrics/filter_test.go | 1 +
filter/seata/filter.go | 3 +-
filter/sentinel/filter_test.go | 3 +
filter/tps/filter_test.go | 1 +
filter/tps/limiter/method_service_test.go | 1 +
go.mod | 20 +-
go.sum | 249 ++++-
imports/imports.go | 69 ++
integrate_test.sh | 36 +-
.../mapping/dynamic/service_name_mapping_test.go | 61 --
metadata/mapping/memory/service_name_mapping.go | 5 +-
.../{dynamic => metadata}/service_name_mapping.go | 42 +-
metadata/mapping/mock_service_name_mapping.go | 8 +-
metadata/mapping/service_name_mapping.go | 8 +-
metadata/report/delegate/delegate_report.go | 10 +-
metadata/report/delegate/delegate_report_test.go | 1 +
metadata/report/etcd/report.go | 34 +
metadata/report/etcd/report_test.go | 31 +
metadata/report/nacos/report.go | 47 +
metadata/report/report.go | 10 +
metadata/report/zookeeper/report.go | 35 +
metadata/service/exporter/configurable/exporter.go | 55 +-
.../service/exporter/configurable/exporter_test.go | 97 +-
metadata/service/local/service.go | 3 +
metadata/service/remote/service_test.go | 14 +-
metrics/prometheus/reporter.go | 236 ++++-
protocol/dubbo/dubbo_codec.go | 1 +
protocol/dubbo/dubbo_invoker.go | 9 +-
protocol/dubbo/dubbo_invoker_test.go | 420 ++++----
protocol/dubbo/dubbo_protocol.go | 14 +-
protocol/dubbo/dubbo_protocol_test.go | 265 ++---
protocol/dubbo/hessian2/hessian_dubbo.go | 1 +
protocol/dubbo/hessian2/hessian_dubbo_test.go | 1 +
protocol/dubbo/hessian2/hessian_request.go | 1 +
protocol/dubbo/hessian2/hessian_request_test.go | 1 +
protocol/dubbo/hessian2/hessian_response.go | 1 +
protocol/dubbo/hessian2/hessian_response_test.go | 1 +
protocol/dubbo/hessian2/java_class.go | 1 +
protocol/dubbo/impl/codec.go | 1 +
protocol/dubbo/impl/hessian.go | 1 +
protocol/dubbo3/dubbo3_invoker.go | 25 +-
protocol/dubbo3/dubbo3_invoker_test.go | 3 +-
protocol/dubbo3/dubbo3_protocol.go | 35 +-
protocol/dubbo3/dubbo3_protocol_test.go | 3 +-
protocol/dubbo3/internal/client.go | 28 +-
protocol/dubbo3/internal/helloworld.pb.go | 127 +--
protocol/dubbo3/internal/server.go | 42 +-
protocol/grpc/client.go | 101 +-
protocol/grpc/codec.go | 1 +
protocol/grpc/grpc_invoker.go | 2 +
protocol/grpc/grpc_invoker_test.go | 2 +-
protocol/grpc/grpc_protocol_test.go | 50 +-
protocol/grpc/internal/helloworld/client.go | 1 +
protocol/grpc/internal/helloworld/helloworld.pb.go | 1 +
protocol/grpc/internal/multiprotos/first.pb.go | 1 +
protocol/grpc/internal/multiprotos/second.pb.go | 1 +
protocol/grpc/internal/routeguide/client.go | 1 +
protocol/grpc/internal/routeguide/routeguide.pb.go | 1 +
protocol/grpc/internal/routeguide/server.go | 1 +
protocol/grpc/server.go | 4 +-
protocol/invoker.go | 1 +
protocol/jsonrpc/http.go | 1 +
protocol/jsonrpc/http_test.go | 272 ++---
protocol/jsonrpc/jsonrpc_invoker_test.go | 103 +-
protocol/jsonrpc/jsonrpc_protocol.go | 10 +-
protocol/jsonrpc/jsonrpc_protocol_test.go | 4 +-
protocol/jsonrpc/server.go | 1 +
protocol/rest/client/client_impl/resty_client.go | 1 +
protocol/rest/config/reader/rest_config_reader.go | 11 +-
protocol/rest/rest_invoker_test.go | 394 +++----
protocol/rest/rest_protocol.go | 10 +-
protocol/rest/rest_protocol_test.go | 313 +++---
.../rest/server/server_impl/go_restful_server.go | 1 +
registry/base_registry.go | 7 +-
registry/directory/directory.go | 22 +-
registry/directory/directory_test.go | 6 +-
registry/etcdv3/registry_test.go | 91 +-
registry/etcdv3/service_discovery.go | 32 +-
registry/etcdv3/service_discovery_test.go | 109 +-
.../metadata_service_url_params_customizer_test.go | 1 +
registry/file/service_discovery.go | 6 +-
registry/file/service_discovery_test.go | 146 ++-
registry/kubernetes/registry_test.go | 66 +-
registry/nacos/listener.go | 9 +-
registry/nacos/registry.go | 21 +-
registry/nacos/registry_test.go | 1 +
registry/nacos/service_discovery.go | 59 +-
registry/nacos/service_discovery_test.go | 326 +++---
registry/protocol/protocol.go | 49 +-
registry/protocol/protocol_test.go | 16 +-
registry/service_instance.go | 1 +
.../servicediscovery/service_discovery_registry.go | 85 +-
.../service_discovery_registry_test.go | 392 +++----
registry/zookeeper/listener.go | 1 +
registry/zookeeper/registry.go | 2 +
registry/zookeeper/service_discovery.go | 47 +-
registry/zookeeper/service_discovery_test.go | 281 +++++
remoting/etcdv3/client.go | 1 +
remoting/etcdv3/listener.go | 3 +
remoting/etcdv3/listener_test.go | 2 +
remoting/getty/config.go | 82 +-
remoting/getty/getty_client.go | 52 +-
remoting/getty/getty_client_test.go | 22 +-
remoting/getty/getty_server.go | 35 +-
.../getty/getty_server_test.go | 24 +-
remoting/getty/listener.go | 2 +-
remoting/getty/pool.go | 4 +-
remoting/kubernetes/client.go | 20 +-
remoting/kubernetes/registry_controller.go | 54 +-
remoting/nacos/builder.go | 19 +-
remoting/nacos/builder_test.go | 2 +-
remoting/zookeeper/client.go | 1 +
.../curator_discovery/service_discovery.go | 2 +
remoting/zookeeper/listener.go | 3 +
samples | 1 -
test/integrate/dubbo/go-client/Dockerfile | 42 -
test/integrate/dubbo/go-client/client.go | 67 --
test/integrate/dubbo/go-client/client.yml | 59 --
test/integrate/dubbo/go-client/go.mod | 10 -
test/integrate/dubbo/go-client/go.sum | 1087 -------------------
test/integrate/dubbo/go-client/log.yml | 27 -
test/integrate/dubbo/go-client/user.go | 57 -
test/integrate/dubbo/go-server/Dockerfile | 41 -
test/integrate/dubbo/go-server/go.mod | 14 -
test/integrate/dubbo/go-server/go.sum | 1092 --------------------
test/integrate/dubbo/go-server/log.yml | 27 -
test/integrate/dubbo/go-server/server.go | 56 -
test/integrate/dubbo/go-server/server.yml | 55 -
test/integrate/dubbo/go-server/user.go | 67 --
304 files changed, 8084 insertions(+), 10166 deletions(-)
diff --cc CONTRIBUTING.md
index 98bb87a,a987223..70ba0a4
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@@ -26,12 -26,6 +26,12 @@@ The title format of the pull request `M
## 3. Code Style
- Please add an blank line at the end of every file.
++Please add a blank line at the end of every file.
+
- Please add an blank line at the sub-title and its content.
++Please add a blank line at the sub-title and its content.
+
+Please add s space between the Engilsh word/digit number and the Chinese character.
+
### 3.1 log
>- 1 when logging the function's input parameter, you should add '@' before input parameter name.