You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by fa...@apache.org on 2021/09/27 15:34:37 UTC
[dubbo-go] 01/01: Merge remote-tracking branch 'apache/3.0' into
develop
This is an automated email from the ASF dual-hosted git repository.
fangyc pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit efe12a035b058a34174da06f9bbc83b91393e3ca
Merge: d49f62e c164f38
Author: fangyincheng <fa...@sina.com>
AuthorDate: Mon Sep 27 23:28:10 2021 +0800
Merge remote-tracking branch 'apache/3.0' into develop
.gitignore | 3 +-
Makefile | 11 +-
.../cluster_impl/available_cluster_invoker_test.go | 1 +
cluster/cluster_impl/base_cluster_invoker.go | 1 +
.../cluster_impl/broadcast_cluster_invoker_test.go | 1 +
cluster/cluster_impl/failback_cluster_test.go | 2 +
cluster/cluster_impl/failfast_cluster_test.go | 2 +
cluster/cluster_impl/failover_cluster_test.go | 1 +
cluster/cluster_impl/failsafe_cluster_test.go | 2 +
cluster/cluster_impl/forking_cluster_test.go | 1 +
.../zone_aware_cluster_invoker_test.go | 1 +
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/default.go | 3 +-
common/constant/env.go | 12 +-
common/constant/key.go | 97 +-
.../version.go => common/extension/config.go | 14 +-
common/extension/config_center_factory.go | 4 +-
common/extension/proxy_factory.go | 4 +-
common/extension/registry.go | 8 +-
common/extension/service_discovery.go | 8 +-
common/logger/log.yml | 27 -
common/logger/logger.go | 76 +-
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 | 5 +-
common/yaml/yaml.go | 1 +
config/application_config.go | 95 +-
...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 | 325 ++++--
config/config_center_config_test.go | 75 --
config/config_loader.go | 437 ++------
config/config_loader_options.go | 166 +--
config/config_loader_options_test.go | 63 ++
config/config_loader_test.go | 1115 ++++++++++----------
config/config_setter.go | 4 -
config/config_utils.go | 47 +
config/consumer_config.go | 291 +++--
config/dubbo_bootstrap.go | 110 ++
config/{ => generic}/generic_service.go | 8 +-
config/graceful_shutdown.go | 103 +-
config/graceful_shutdown_config.go | 6 +-
config/graceful_shutdown_test.go | 184 ++--
config/instance/metadata_report_test.go | 14 +-
.../version.go => config/interfaces/config.go | 14 +-
config/logger_config.go | 155 +++
config/logger_config_test.go | 72 ++
config/metadata_report_config.go | 115 +-
config/method_config.go | 44 +-
config/metric_config.go | 4 +
config/metric_config_test.go | 8 +-
config/protocol_config.go | 90 +-
...port_config_test.go => protocol_config_test.go} | 45 +-
config/provider_config.go | 145 ++-
config/provider_config_test.go | 48 +-
config/reference_config.go | 284 +++--
config/reference_config_test.go | 777 +++++++-------
config/registry_config.go | 281 +++--
config/registry_config_test.go | 38 +-
config/root_config.go | 280 +++++
config/router_config.go | 77 +-
config/router_config_test.go | 10 +-
config/service.go | 40 +-
config/service_config.go | 432 ++++++--
config/service_config_test.go | 215 ----
config/service_discovery_config.go | 6 +-
config/testdata/application.yaml | 35 +
config/testdata/config/app/application.yaml | 21 +
.../testdata/config/application/application.yaml | 4 +
.../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/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/uniform_router_config.go | 1 +
config_center/apollo/impl.go | 19 +-
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/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 | 14 +-
go.sum | 215 +++-
.../go-client/client.go => imports/imports.go | 58 +-
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 | 2 +
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 | 54 +-
.../service/exporter/configurable/exporter_test.go | 93 +-
metadata/service/remote/service_test.go | 14 +-
metrics/prometheus/reporter.go | 235 ++++-
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 | 2 +-
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 | 43 +-
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 | 5 +-
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 | 3 +-
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 | 2 +
registry/nacos/registry.go | 6 +-
registry/nacos/registry_test.go | 1 +
registry/nacos/service_discovery.go | 51 +-
registry/nacos/service_discovery_test.go | 326 +++---
registry/protocol/protocol.go | 49 +-
registry/protocol/protocol_test.go | 14 +-
.../servicediscovery/service_discovery_registry.go | 35 +-
.../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 +-
.../user.go => remoting/getty/getty_server_test.go | 46 +-
remoting/getty/pool.go | 4 +-
remoting/kubernetes/client.go | 20 +-
remoting/kubernetes/registry_controller.go | 54 +-
remoting/nacos/builder.go | 19 +-
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.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-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 --
242 files changed, 7337 insertions(+), 9134 deletions(-)