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 2022/04/08 11:05:31 UTC
[dubbo-go] branch develop updated (e00cf8d6f -> 7bc593b23)
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
from e00cf8d6f Merge pull request #1806 from shenchao861129/master
add 6937c5f0a init xds client, balancer from grpc
add 193d021a2 xds server from grpc
add 6dd55e7f5 xds csds from grpc
add ad7a5303f xds bootstrap from grpc
add 226d8a9f1 Ftr: xds registry support
add 339db0885 Fix: init test client
add 24ae45363 Fix: init xds registry
add c8aed7297 Fix: init xds registry
add 2a1ec2455 Fix: conflict
add 55374e756 fix: support router
add c73695f88 add comments
add 9838ce989 Fix: delete unused file
add c24faa023 i This is a combination of 2 commits.
add 227b4ab24 Enhancement XDS ut. (#7)
add 67f6ed003 Fix: merge 3.0
add eb7230ab2 fix: grpc copyright
add 860212836 fix: xds comments
add aba60ca82 Fix: compatiable to go 1.15
add e41ea1821 fix: change cluster Id to ID
add 53a86dde9 fix: rename to host addr
add abd851a51 Fix: import formatter
add b84027f2e Merge pull request #1804 from dubbogo/xds
add 8ead2da10 fix: fix getting attachment issue for triple
add c7fb54a22 Merge pull request #1811 from justxuewei/fix/triple-attachment
add 08f7e4fe9 fix: some previous bugs
add d8b2baafb Merge pull request #1812 from LaurenceLiZhixin/metrics-bugs
add 5ecec59d7 fix: support xds adsz empty metadata
add 70d9ddad2 Merge pull request #1813 from LaurenceLiZhixin/supportAdszEmptyMetadata
add 7bc593b23 Add amap logo (#1819)
No new revisions were added by this update.
Summary of changes:
CHANGELOG.md | 4 +-
README.md | 5 +
README_CN.md | 5 +
cluster/cluster/adaptivesvc/cluster_invoker.go | 13 +-
cluster/router/{v3router => meshrouter}/factory.go | 16 +-
cluster/router/meshrouter/meshrouter.go | 187 ++++
common/constant/env.go | 6 +-
common/constant/key.go | 10 +-
common/constant/{serialization.go => xds.go} | 17 +-
common/logger/logger.go | 13 +-
common/url.go | 23 +-
config/config_loader_options.go | 2 +-
config/metric_config.go | 4 +-
config/reference_config.go | 5 +
filter/adaptivesvc/filter.go | 11 +-
filter/xds/cb/filter.go | 99 ++
go.mod | 6 +
go.sum | 5 +
imports/imports.go | 7 +-
integrate_test.sh | 2 +
protocol/dubbo3/dubbo3_invoker.go | 2 +-
protocol/invocation.go | 2 +
protocol/invocation/rpcinvocation.go | 43 +-
registry/directory/directory.go | 35 +-
registry/event_test.go | 2 +-
.../mocks/NotifyListener.go | 25 +-
registry/xds/registry.go | 177 ++++
remoting/listener.go | 4 +-
remoting/xds/client.go | 510 ++++++++++
remoting/xds/client_test.go | 764 +++++++++++++++
common/host_util.go => remoting/xds/common/addr.go | 25 +-
.../host_util.go => remoting/xds/common/cluster.go | 22 +-
common/host_util_test.go => remoting/xds/error.go | 13 +-
remoting/xds/ewatcher/ewatcher.go | 131 +++
remoting/xds/ewatcher/ewatcher_test.go | 193 ++++
.../xds/ewatcher/mocks/EWatcher.go | 46 +-
.../xds/mapping/debug.go | 44 +-
remoting/xds/mapping/debug_test.go | 68 ++
remoting/xds/mapping/handler.go | 156 +++
remoting/xds/mapping/handler_test.go | 129 +++
remoting/xds/mapping/metadata.go | 49 +
remoting/xds/mapping/mocks/InterfaceMapHandler.go | 78 ++
remoting/xds/xds_client_factory.go | 62 ++
test/xds/main.go | 121 +++
.../balancer/balancer.go | 22 +-
xds/balancer/cdsbalancer/cdsbalancer.go | 563 +++++++++++
xds/balancer/cdsbalancer/cluster_handler.go | 328 +++++++
.../balancer/cdsbalancer/logging.go | 25 +-
xds/balancer/clusterimpl/clusterimpl.go | 556 +++++++++++
xds/balancer/clusterimpl/config.go | 74 ++
xds/balancer/clusterimpl/config_test.go | 155 +++
.../balancer/clusterimpl/logging.go | 26 +-
xds/balancer/clusterimpl/picker.go | 201 ++++
.../clustermanager/balancerstateaggregator.go | 233 +++++
xds/balancer/clustermanager/clustermanager.go | 162 ++++
.../balancer/clustermanager/config.go | 42 +-
xds/balancer/clustermanager/picker.go | 79 ++
xds/balancer/clusterresolver/clusterresolver.go | 393 ++++++++
xds/balancer/clusterresolver/config.go | 197 ++++
xds/balancer/clusterresolver/configbuilder.go | 374 ++++++++
.../balancer/clusterresolver/logging.go | 26 +-
xds/balancer/clusterresolver/resource_resolver.go | 255 +++++
.../clusterresolver/resource_resolver_dns.go | 122 +++
.../clusterresolver/weightedtarget_config.go | 59 ++
xds/balancer/loadstore/load_store_wrapper.go | 127 +++
xds/balancer/orca/orca.go | 97 ++
xds/balancer/priority/balancer.go | 265 ++++++
xds/balancer/priority/balancer_child.go | 120 +++
xds/balancer/priority/balancer_priority.go | 370 ++++++++
xds/balancer/priority/config.go | 77 ++
xds/balancer/priority/config_test.go | 119 +++
xds/balancer/priority/ignore_resolve_now.go | 81 ++
.../balancer/priority/logging.go | 25 +-
.../balancer/priority/utils.go | 20 +-
.../balancer/priority/utils_test.go | 78 +-
.../balancer/ringhash/config.go | 49 +-
xds/balancer/ringhash/config_test.go | 75 ++
.../balancer/ringhash/logging.go | 25 +-
xds/balancer/ringhash/picker.go | 167 ++++
xds/balancer/ringhash/ring.go | 171 ++++
xds/balancer/ringhash/ring_test.go | 121 +++
xds/balancer/ringhash/ringhash.go | 447 +++++++++
.../mock.go => xds/balancer/ringhash/util.go | 36 +-
xds/client/attributes.go | 76 ++
xds/client/authority.go | 244 +++++
xds/client/bootstrap/bootstrap.go | 487 ++++++++++
xds/client/bootstrap/bootstrap_test.go | 1003 ++++++++++++++++++++
.../utils.go => xds/client/bootstrap/logging.go | 20 +-
.../client/bootstrap/template.go | 57 +-
xds/client/bootstrap/template_test.go | 105 ++
xds/client/client.go | 187 ++++
xds/client/controller.go | 49 +
xds/client/controller/controller.go | 218 +++++
xds/client/controller/loadreport.go | 155 +++
xds/client/controller/transport.go | 440 +++++++++
xds/client/controller/version/v2/client.go | 174 ++++
xds/client/controller/version/v2/loadreport.go | 164 ++++
xds/client/controller/version/v3/client.go | 176 ++++
xds/client/controller/version/v3/loadreport.go | 163 ++++
xds/client/controller/version/version.go | 142 +++
xds/client/dump.go | 68 ++
.../cluster.go => xds/client/load/reporter.go | 19 +-
xds/client/load/store.go | 433 +++++++++
xds/client/load/store_test.go | 454 +++++++++
xds/client/loadreport.go | 53 ++
.../client/logging.go | 26 +-
xds/client/mocks/XDSClient.go | 225 +++++
xds/client/pubsub/dump.go | 96 ++
xds/client/pubsub/interface.go | 47 +
xds/client/pubsub/pubsub.go | 190 ++++
xds/client/pubsub/update.go | 351 +++++++
xds/client/pubsub/watch.go | 244 +++++
xds/client/requests_counter.go | 112 +++
xds/client/resource/errors.go | 67 ++
xds/client/resource/filter_chain.go | 884 +++++++++++++++++
xds/client/resource/locality_id.go | 90 ++
xds/client/resource/matcher.go | 286 ++++++
xds/client/resource/matcher_path.go | 110 +++
xds/client/resource/name.go | 138 +++
xds/client/resource/type.go | 161 ++++
xds/client/resource/type_cds.go | 95 ++
xds/client/resource/type_eds.go | 85 ++
xds/client/resource/type_lds.go | 98 ++
xds/client/resource/type_rds.go | 267 ++++++
xds/client/resource/unmarshal.go | 189 ++++
xds/client/resource/unmarshal_cds.go | 475 +++++++++
xds/client/resource/unmarshal_eds.go | 143 +++
xds/client/resource/unmarshal_lds.go | 312 ++++++
xds/client/resource/unmarshal_rds.go | 455 +++++++++
xds/client/resource/version/version.go | 68 ++
xds/client/singleton.go | 208 ++++
xds/client/watchers.go | 111 +++
xds/clusterspecifier/cluster_specifier.go | 72 ++
xds/csds/csds.go | 230 +++++
xds/httpfilter/fault/fault.go | 315 ++++++
xds/httpfilter/httpfilter.go | 116 +++
xds/httpfilter/rbac/rbac.go | 231 +++++
xds/httpfilter/router/router.go | 125 +++
xds/internal/internal.go | 97 ++
.../resolver/logging.go | 25 +-
xds/resolver/serviceconfig.go | 453 +++++++++
xds/resolver/watch_service.go | 206 ++++
xds/resolver/xds_resolver.go | 327 +++++++
xds/server/conn_wrapper.go | 175 ++++
xds/server/listener_wrapper.go | 454 +++++++++
xds/server/rds_handler.go | 140 +++
xds/utils/backoff/backoff.go | 83 ++
xds/utils/balancer/stub/stub.go | 111 +++
xds/utils/balancergroup/balancergroup.go | 545 +++++++++++
.../utils/balancergroup/balancerstateaggregator.go | 45 +-
.../utils/balancerload/load.go | 40 +-
xds/utils/buffer/unbounded.go | 93 ++
xds/utils/credentials/xds/handshake_info.go | 330 +++++++
xds/utils/credentials/xds/handshake_info_test.go | 311 ++++++
.../utils/envconfig/envconfig.go | 38 +-
xds/utils/envconfig/xds.go | 102 ++
xds/utils/grpclog/grpclog.go | 140 +++
xds/utils/grpclog/prefixLogger.go | 83 ++
xds/utils/grpcrand/grpcrand.go | 72 ++
xds/utils/grpcsync/event.go | 66 ++
xds/utils/grpcutil/encode_duration.go | 68 ++
.../utils/grpcutil/encode_duration_test.go | 53 +-
.../constants.go => xds/utils/grpcutil/grpcutil.go | 11 +-
.../utils/grpcutil/metadata.go | 31 +-
xds/utils/grpcutil/method.go | 89 ++
xds/utils/grpcutil/method_test.go | 74 ++
common/host_util.go => xds/utils/grpcutil/regex.go | 24 +-
xds/utils/grpcutil/regex_test.go | 77 ++
xds/utils/hierarchy/hierarchy.go | 114 +++
xds/utils/hierarchy/hierarchy_test.go | 206 ++++
xds/utils/matcher/matcher_header.go | 249 +++++
xds/utils/matcher/matcher_header_test.go | 476 ++++++++++
common/host_util.go => xds/utils/matcher/regex.go | 24 +-
xds/utils/matcher/regex_test.go | 77 ++
xds/utils/matcher/string_matcher.go | 194 ++++
xds/utils/matcher/string_matcher_test.go | 323 +++++++
.../utils/metadata/metadata.go | 31 +-
xds/utils/pretty/pretty.go | 91 ++
xds/utils/rbac/matchers.go | 435 +++++++++
xds/utils/rbac/rbac_engine.go | 243 +++++
xds/utils/resolver/config_selector.go | 178 ++++
xds/utils/resolver/passthrough/passthrough.go | 64 ++
xds/utils/resolver/unix/unix.go | 83 ++
xds/utils/serviceconfig/serviceconfig.go | 190 ++++
xds/utils/serviceconfig/serviceconfig_test.go | 191 ++++
.../mock.go => xds/utils/transport/conn.go | 37 +-
xds/utils/transport/networktype/networktype.go | 51 +
xds/utils/wrr/edf.go | 98 ++
xds/utils/wrr/random.go | 87 ++
.../cluster_interceptor.go => xds/utils/wrr/wrr.go | 29 +-
xds/utils/xds_cache/timeoutCache.go | 150 +++
xds/xds_handshake_cluster.go | 48 +
192 files changed, 28532 insertions(+), 512 deletions(-)
copy cluster/router/{v3router => meshrouter}/factory.go (73%)
create mode 100644 cluster/router/meshrouter/meshrouter.go
copy common/constant/{serialization.go => xds.go} (71%)
create mode 100644 filter/xds/cb/filter.go
copy metadata/mapping/mock_service_name_mapping.go => registry/mocks/NotifyListener.go (59%)
create mode 100644 registry/xds/registry.go
create mode 100644 remoting/xds/client.go
create mode 100644 remoting/xds/client_test.go
copy common/host_util.go => remoting/xds/common/addr.go (69%)
copy common/host_util.go => remoting/xds/common/cluster.go (72%)
copy common/host_util_test.go => remoting/xds/error.go (74%)
create mode 100644 remoting/xds/ewatcher/ewatcher.go
create mode 100644 remoting/xds/ewatcher/ewatcher_test.go
copy protocol/dubbo/impl/hessian_test.go => remoting/xds/ewatcher/mocks/EWatcher.go (55%)
copy metadata/mapping/mock_service_name_mapping.go => remoting/xds/mapping/debug.go (50%)
create mode 100644 remoting/xds/mapping/debug_test.go
create mode 100644 remoting/xds/mapping/handler.go
create mode 100644 remoting/xds/mapping/handler_test.go
create mode 100644 remoting/xds/mapping/metadata.go
create mode 100644 remoting/xds/mapping/mocks/InterfaceMapHandler.go
create mode 100644 remoting/xds/xds_client_factory.go
create mode 100644 test/xds/main.go
copy cluster/cluster/cluster_interceptor.go => xds/balancer/balancer.go (53%)
create mode 100644 xds/balancer/cdsbalancer/cdsbalancer.go
create mode 100644 xds/balancer/cdsbalancer/cluster_handler.go
copy cluster/router/v3router/judger/url_label_match_judge_test.go => xds/balancer/cdsbalancer/logging.go (69%)
create mode 100644 xds/balancer/clusterimpl/clusterimpl.go
create mode 100644 xds/balancer/clusterimpl/config.go
create mode 100644 xds/balancer/clusterimpl/config_test.go
copy config/tracing_config_test.go => xds/balancer/clusterimpl/logging.go (67%)
create mode 100644 xds/balancer/clusterimpl/picker.go
create mode 100644 xds/balancer/clustermanager/balancerstateaggregator.go
create mode 100644 xds/balancer/clustermanager/clustermanager.go
copy registry/event_test.go => xds/balancer/clustermanager/config.go (56%)
create mode 100644 xds/balancer/clustermanager/picker.go
create mode 100644 xds/balancer/clusterresolver/clusterresolver.go
create mode 100644 xds/balancer/clusterresolver/config.go
create mode 100644 xds/balancer/clusterresolver/configbuilder.go
copy config/tracing_config_test.go => xds/balancer/clusterresolver/logging.go (67%)
create mode 100644 xds/balancer/clusterresolver/resource_resolver.go
create mode 100644 xds/balancer/clusterresolver/resource_resolver_dns.go
create mode 100644 xds/balancer/clusterresolver/weightedtarget_config.go
create mode 100644 xds/balancer/loadstore/load_store_wrapper.go
create mode 100644 xds/balancer/orca/orca.go
create mode 100644 xds/balancer/priority/balancer.go
create mode 100644 xds/balancer/priority/balancer_child.go
create mode 100644 xds/balancer/priority/balancer_priority.go
create mode 100644 xds/balancer/priority/config.go
create mode 100644 xds/balancer/priority/config_test.go
create mode 100644 xds/balancer/priority/ignore_resolve_now.go
copy cluster/router/v3router/judger/url_label_match_judge_test.go => xds/balancer/priority/logging.go (68%)
copy cluster/router/v3router/judger/url_label_match_judge.go => xds/balancer/priority/utils.go (80%)
copy cluster/router/v3router/judger/double_match_judger_test.go => xds/balancer/priority/utils_test.go (52%)
copy cluster/utils/adaptivesvc.go => xds/balancer/ringhash/config.go (52%)
create mode 100644 xds/balancer/ringhash/config_test.go
copy cluster/router/v3router/judger/url_label_match_judge_test.go => xds/balancer/ringhash/logging.go (68%)
create mode 100644 xds/balancer/ringhash/picker.go
create mode 100644 xds/balancer/ringhash/ring.go
create mode 100644 xds/balancer/ringhash/ring_test.go
create mode 100644 xds/balancer/ringhash/ringhash.go
copy metadata/definition/mock.go => xds/balancer/ringhash/util.go (57%)
create mode 100644 xds/client/attributes.go
create mode 100644 xds/client/authority.go
create mode 100644 xds/client/bootstrap/bootstrap.go
create mode 100644 xds/client/bootstrap/bootstrap_test.go
copy cluster/metrics/utils.go => xds/client/bootstrap/logging.go (74%)
copy cluster/router/v3router/judger/string_match_judger.go => xds/client/bootstrap/template.go (50%)
create mode 100644 xds/client/bootstrap/template_test.go
create mode 100644 xds/client/client.go
create mode 100644 xds/client/controller.go
create mode 100644 xds/client/controller/controller.go
create mode 100644 xds/client/controller/loadreport.go
create mode 100644 xds/client/controller/transport.go
create mode 100644 xds/client/controller/version/v2/client.go
create mode 100644 xds/client/controller/version/v2/loadreport.go
create mode 100644 xds/client/controller/version/v3/client.go
create mode 100644 xds/client/controller/version/v3/loadreport.go
create mode 100644 xds/client/controller/version/version.go
create mode 100644 xds/client/dump.go
copy cluster/cluster/cluster.go => xds/client/load/reporter.go (71%)
create mode 100644 xds/client/load/store.go
create mode 100644 xds/client/load/store_test.go
create mode 100644 xds/client/loadreport.go
copy config/tracing_config_test.go => xds/client/logging.go (69%)
create mode 100644 xds/client/mocks/XDSClient.go
create mode 100644 xds/client/pubsub/dump.go
create mode 100644 xds/client/pubsub/interface.go
create mode 100644 xds/client/pubsub/pubsub.go
create mode 100644 xds/client/pubsub/update.go
create mode 100644 xds/client/pubsub/watch.go
create mode 100644 xds/client/requests_counter.go
create mode 100644 xds/client/resource/errors.go
create mode 100644 xds/client/resource/filter_chain.go
create mode 100644 xds/client/resource/locality_id.go
create mode 100644 xds/client/resource/matcher.go
create mode 100644 xds/client/resource/matcher_path.go
create mode 100644 xds/client/resource/name.go
create mode 100644 xds/client/resource/type.go
create mode 100644 xds/client/resource/type_cds.go
create mode 100644 xds/client/resource/type_eds.go
create mode 100644 xds/client/resource/type_lds.go
create mode 100644 xds/client/resource/type_rds.go
create mode 100644 xds/client/resource/unmarshal.go
create mode 100644 xds/client/resource/unmarshal_cds.go
create mode 100644 xds/client/resource/unmarshal_eds.go
create mode 100644 xds/client/resource/unmarshal_lds.go
create mode 100644 xds/client/resource/unmarshal_rds.go
create mode 100644 xds/client/resource/version/version.go
create mode 100644 xds/client/singleton.go
create mode 100644 xds/client/watchers.go
create mode 100644 xds/clusterspecifier/cluster_specifier.go
create mode 100644 xds/csds/csds.go
create mode 100644 xds/httpfilter/fault/fault.go
create mode 100644 xds/httpfilter/httpfilter.go
create mode 100644 xds/httpfilter/rbac/rbac.go
create mode 100644 xds/httpfilter/router/router.go
create mode 100644 xds/internal/internal.go
copy cluster/router/v3router/judger/url_label_match_judge_test.go => xds/resolver/logging.go (68%)
create mode 100644 xds/resolver/serviceconfig.go
create mode 100644 xds/resolver/watch_service.go
create mode 100644 xds/resolver/xds_resolver.go
create mode 100644 xds/server/conn_wrapper.go
create mode 100644 xds/server/listener_wrapper.go
create mode 100644 xds/server/rds_handler.go
create mode 100644 xds/utils/backoff/backoff.go
create mode 100644 xds/utils/balancer/stub/stub.go
create mode 100644 xds/utils/balancergroup/balancergroup.go
copy cluster/router/v3router/judger/double_match_judger.go => xds/utils/balancergroup/balancerstateaggregator.go (57%)
copy common/extension/proxy_factory.go => xds/utils/balancerload/load.go (55%)
create mode 100644 xds/utils/buffer/unbounded.go
create mode 100644 xds/utils/credentials/xds/handshake_info.go
create mode 100644 xds/utils/credentials/xds/handshake_info_test.go
copy config/profiles_config.go => xds/utils/envconfig/envconfig.go (66%)
create mode 100644 xds/utils/envconfig/xds.go
create mode 100644 xds/utils/grpclog/grpclog.go
create mode 100644 xds/utils/grpclog/prefixLogger.go
create mode 100644 xds/utils/grpcrand/grpcrand.go
create mode 100644 xds/utils/grpcsync/event.go
create mode 100644 xds/utils/grpcutil/encode_duration.go
copy registry/servicediscovery/synthesizer/subscribed_urls_synthesizer_factory.go => xds/utils/grpcutil/encode_duration_test.go (55%)
copy cluster/metrics/constants.go => xds/utils/grpcutil/grpcutil.go (85%)
copy config/generic/generic_service.go => xds/utils/grpcutil/metadata.go (56%)
create mode 100644 xds/utils/grpcutil/method.go
create mode 100644 xds/utils/grpcutil/method_test.go
copy common/host_util.go => xds/utils/grpcutil/regex.go (70%)
create mode 100644 xds/utils/grpcutil/regex_test.go
create mode 100644 xds/utils/hierarchy/hierarchy.go
create mode 100644 xds/utils/hierarchy/hierarchy_test.go
create mode 100644 xds/utils/matcher/matcher_header.go
create mode 100644 xds/utils/matcher/matcher_header_test.go
copy common/host_util.go => xds/utils/matcher/regex.go (70%)
create mode 100644 xds/utils/matcher/regex_test.go
create mode 100644 xds/utils/matcher/string_matcher.go
create mode 100644 xds/utils/matcher/string_matcher_test.go
copy config/generic/generic_service.go => xds/utils/metadata/metadata.go (56%)
create mode 100644 xds/utils/pretty/pretty.go
create mode 100644 xds/utils/rbac/matchers.go
create mode 100644 xds/utils/rbac/rbac_engine.go
create mode 100644 xds/utils/resolver/config_selector.go
create mode 100644 xds/utils/resolver/passthrough/passthrough.go
create mode 100644 xds/utils/resolver/unix/unix.go
create mode 100644 xds/utils/serviceconfig/serviceconfig.go
create mode 100644 xds/utils/serviceconfig/serviceconfig_test.go
copy metadata/definition/mock.go => xds/utils/transport/conn.go (57%)
create mode 100644 xds/utils/transport/networktype/networktype.go
create mode 100644 xds/utils/wrr/edf.go
create mode 100644 xds/utils/wrr/random.go
copy cluster/cluster/cluster_interceptor.go => xds/utils/wrr/wrr.go (63%)
create mode 100644 xds/utils/xds_cache/timeoutCache.go
create mode 100644 xds/xds_handshake_cluster.go