This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit 891357aa6cda15d2b9187cebefb6dae004c12335 Merge: efe12a0 669ab0a Author: yuyu.zx <[email protected]> AuthorDate: Sun Oct 31 19:38:56 2021 +0800 Merge branch '3.0' into develop CONTRIBUTING.md | 16 +- .../available/cluster.go} | 22 +- .../available/cluster_invoker.go} | 25 +- .../available/cluster_invoker_test.go} | 13 +- .../base/cluster_invoker.go} | 79 +-- .../base/cluster_invoker_test.go} | 33 +- .../broadcast/cluster.go} | 24 +- .../broadcast/cluster_invoker.go} | 23 +- .../broadcast/cluster_invoker_test.go} | 17 +- cluster/{ => cluster}/cluster.go | 3 +- cluster/{ => cluster}/cluster_interceptor.go | 0 .../failback/cluster.go} | 24 +- .../failback/cluster_invoker.go} | 40 +- .../failback/cluster_test.go} | 29 +- .../failfast/cluster.go} | 24 +- .../failfast/cluster_invoker.go} | 27 +- .../failfast/cluster_test.go} | 23 +- .../failover/cluster.go} | 21 +- .../failover/cluster_invoker.go} | 34 +- .../failover/cluster_test.go} | 107 +--- .../failsafe/cluster.go} | 24 +- .../failsafe/cluster_invoker.go} | 24 +- .../failsafe/cluster_test.go} | 23 +- .../forking/cluster.go} | 24 +- .../forking/cluster_invoker.go} | 28 +- .../forking/cluster_test.go} | 21 +- .../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} | 33 +- .../cluster_impl/{mock_cluster.go => import.go} | 29 +- .../{base_directory.go => base/directory.go} | 26 +- .../directory_test.go} | 18 +- cluster/{ => directory}/directory.go | 2 +- .../{static_directory.go => static/directory.go} | 32 +- .../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 | 25 +- cluster/router/router.go | 13 +- cluster/router/v3router/dubbo_rule.go | 61 --- cluster/router/v3router/factory.go | 9 +- .../v3router/k8s_api/listener_handler_impl.go | 2 +- cluster/router/v3router/k8s_crd/client.go | 2 +- cluster/router/v3router/router_chain.go | 217 ++++---- cluster/router/v3router/router_chain_test.go | 65 +-- cluster/router/v3router/uniform_route.go | 26 +- cluster/router/v3router/uniform_rule.go | 27 +- common/constant/cluster.go | 11 +- common/constant/key.go | 28 +- .../constant/loadbalance.go | 14 +- common/extension/cluster.go | 2 +- common/extension/cluster_interceptor.go | 60 --- common/extension/loadbalance.go | 8 +- .../extension/metadata_service_exporter.go | 34 +- common/extension/metrics.go | 8 +- common/extension/metrics_test.go | 4 +- common/extension/registry_directory.go | 6 +- common/extension/router_factory.go | 7 +- common/logger/logger.go | 4 +- common/url.go | 2 +- config/application_config.go | 71 ++- config/config_api_test.go | 156 ------ config/config_center_config.go | 207 +++---- .../config_center_config_test.go | 18 +- config/config_loader.go | 57 +- config/config_loader_options.go | 29 +- config/config_loader_options_test.go | 29 +- config/config_loader_test.go | 593 --------------------- config/config_resolver.go | 69 +++ config/consumer_config.go | 187 +++---- config/dubbo_bootstrap.go | 110 ---- config/graceful_shutdown.go | 2 +- config/graceful_shutdown_config.go | 37 ++ config/graceful_shutdown_test.go | 6 +- config/logger_config.go | 37 +- config/metadata_report_config.go | 87 ++- config/method_config.go | 9 - config/metric_config.go | 69 ++- config/parsers/properties/properties.go | 88 +++ config/protocol_config.go | 72 +-- config/provider_config.go | 131 +++-- config/provider_config_test.go | 10 +- config/reference_config.go | 215 ++++---- config/registry_config.go | 109 +++- config/remote_config.go | 80 ++- config/root_config.go | 382 +++++++------ config/router_config.go | 94 +++- config/service_config.go | 214 +++----- config/service_discovery_config.go | 34 +- config/testdata/application.yaml | 4 +- config/testdata/config/app/application.yaml | 2 +- config/testdata/config/center/apollo.yaml | 8 + .../config/properties/application.properties | 13 + config/testdata/config/provider/application.yaml | 4 +- .../config/provider/registry_application.yaml | 4 +- 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 | 21 +- config_center/apollo/impl.go | 28 +- config_center/apollo/impl_test.go | 2 +- config_center/mock_dynamic_config.go | 4 +- config_center/zookeeper/impl.go | 28 +- config_center/zookeeper/listener.go | 13 +- filter/filter_impl/import.go | 3 +- filter/metrics/filter.go | 8 +- filter/metrics/filter_test.go | 4 +- go.mod | 25 +- go.sum | 115 ++-- imports/imports.go | 31 +- metadata/report/delegate/delegate_report.go | 8 +- metadata/service/exporter/configurable/exporter.go | 41 +- .../service/exporter/configurable/exporter_test.go | 12 +- metadata/service/local/service.go | 3 + metrics/prometheus/reporter.go | 134 ++--- metrics/prometheus/reporter_test.go | 3 +- metrics/reporter.go | 25 +- protocol/dubbo3/common_test.go | 43 +- protocol/dubbo3/dubbo3_invoker_test.go | 1 + protocol/dubbo3/dubbo3_protocol.go | 10 +- protocol/dubbo3/dubbo3_protocol_test.go | 2 +- protocol/dubbo3/internal/helloworld.pb.go | 363 ++++++------- protocol/dubbo3/internal/helloworld.proto | 1 + protocol/dubbo3/internal/helloworld_triple.pb.go | 168 ++++++ protocol/dubbo3/internal/server.go | 31 +- protocol/grpc/grpc_protocol_test.go | 4 +- protocol/jsonrpc/jsonrpc_protocol_test.go | 1 - registry/directory/directory.go | 25 +- registry/nacos/listener.go | 7 +- registry/nacos/registry.go | 15 +- registry/nacos/service_discovery.go | 8 +- registry/protocol/protocol.go | 6 +- registry/protocol/protocol_test.go | 2 +- registry/service_instance.go | 1 + .../servicediscovery/service_discovery_registry.go | 52 -- remoting/getty/listener.go | 2 +- remoting/nacos/builder_test.go | 2 +- remoting/zookeeper/listener.go | 9 +- 151 files changed, 3114 insertions(+), 3409 deletions(-)
