This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch feature-triple in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
commit ac275cd23bf5c12fe9e1deb4cf9561d83a1557f8 Merge: 8682a2e2a 3764ba48a Author: chickenlj <[email protected]> AuthorDate: Wed Oct 11 17:23:01 2023 +0800 Merge branch 'main' into feature-triple # Conflicts: # go.mod # metrics/prometheus/reporter.go # metrics/rpc/util.go Makefile | 5 + common/constant/default.go | 2 +- common/constant/key.go | 31 +- common/constant/metric.go | 62 ++++ .../trace/version.go => common/constant/otel.go | 17 +- common/extension/metrics.go | 42 --- common/extension/metrics_test.go | 52 --- common/extension/otel_trace.go | 58 +++ common/host_util.go | 6 +- common/host_util_test.go | 4 + common/url.go | 3 + config/metric_config.go | 98 ++++-- config/metric_config_test.go | 2 +- config/otel_config.go | 115 ++++++ .../version_test.go => config/otel_config_test.go | 46 +-- config/reference_config.go | 38 +- config/reference_config_test.go | 7 + config/registry_config_test.go | 3 + config/root_config.go | 21 +- config/service_config.go | 9 +- config/service_config_test.go | 2 +- filter/metrics/filter.go | 42 +-- filter/metrics/filter_test.go | 43 +-- filter/otel/trace/attachment.go | 2 +- filter/otel/trace/filter.go | 13 +- go.mod | 41 ++- go.sum | 161 +++++++-- imports/imports.go | 4 + metrics/api.go | 391 +++++++++++++++------ metrics/app_info/collector.go | 3 +- metrics/common.go | 32 +- metrics/config_center/collector.go | 5 +- metrics/metadata/collector.go | 62 +--- metrics/metadata/metric_set.go | 43 +-- metrics/prometheus/api.go | 201 ----------- metrics/prometheus/constant.go | 59 ---- metrics/prometheus/metric_set.go | 133 ------- metrics/prometheus/model.go | 389 -------------------- metrics/prometheus/registry.go | 239 +++++++------ metrics/prometheus/registry_test.go | 192 ++++++++++ metrics/prometheus/reporter.go | 214 ----------- metrics/prometheus/reporter_test.go | 77 ---- metrics/prometheus/rt_vec.go | 200 +++++++++++ metrics/prometheus/rt_vec_test.go | 166 +++++++++ metrics/registry/collector.go | 72 ++-- metrics/registry/metric_set.go | 26 +- metrics/reporter.go | 20 +- metrics/rpc/collector.go | 161 +++++++++ metrics/rpc/event.go | 67 ++++ metrics/rpc/metric_set.go | 106 ++++++ metrics/{prometheus => rpc}/util.go | 36 +- metrics/util/aggregate/aggregator.go | 104 ++---- metrics/util/aggregate/aggregator_test.go | 4 +- otel/trace/exporter.go | 110 ++++++ otel/trace/jaeger/exporter.go | 70 ++++ otel/trace/otlp/exporter.go | 104 ++++++ otel/trace/stdout/exporter.go | 69 ++++ otel/trace/zipkin/exporter.go | 70 ++++ .../dubbo3/health/triple_health_v1/health.pb.go | 169 +++++---- .../dubbo3/health/triple_health_v1/health.proto | 2 +- .../health/triple_health_v1/health_triple.pb.go | 27 +- registry/nacos/listener.go | 31 ++ registry/nacos/registry.go | 119 +++++-- .../service_instances_changed_listener_impl.go | 43 ++- registry/servicediscovery/store/cache_manager.go | 198 +++++++++++ .../servicediscovery/store/cache_manager_test.go | 152 ++++++++ 66 files changed, 3084 insertions(+), 2011 deletions(-) diff --cc config/registry_config_test.go index 1223f6b2c,fdd3b2aa8..83be5ed58 --- a/config/registry_config_test.go +++ b/config/registry_config_test.go @@@ -43,9 -43,10 +43,10 @@@ func TestLoadRegistries(t *testing.T) Password: "pwd1", }, } - urls := loadRegistries(target, regs, common.CONSUMER) - t.Logf("loadRegistries() = urls:%v", urls) + urls := LoadRegistries(target, regs, common.CONSUMER) + t.Logf("LoadRegistries() = urls:%v", urls) assert.Equal(t, "127.0.0.2:2181,128.0.0.1:2181", urls[0].Location) + assert.Equal(t, "service-discovery-registry://127.0.0.2:2181,128.0.0.1:2181/shanghai_idc", urls[0].PrimitiveURL) } func TestLoadRegistries1(t *testing.T) { @@@ -61,9 -62,10 +62,10 @@@ Password: "pwd1", }, } - urls := loadRegistries(target, regs, common.CONSUMER) - t.Logf("loadRegistries() = urls:%v", urls) + urls := LoadRegistries(target, regs, common.CONSUMER) + t.Logf("LoadRegistries() = urls:%v", urls) assert.Equal(t, "127.0.0.2:2181", urls[0].Location) + assert.Equal(t, "service-discovery-registry://127.0.0.2:2181/shanghai_idc", urls[0].PrimitiveURL) } func TestRegistryTypeAll(t *testing.T) { @@@ -75,8 -77,9 +77,9 @@@ RegistryType: constant.RegistryTypeAll, }, } - urls := loadRegistries(target, regs, common.PROVIDER) + urls := LoadRegistries(target, regs, common.PROVIDER) assert.Equal(t, 2, len(urls)) + assert.Equal(t, "service-discovery-registry://127.0.0.2:2181", urls[0].PrimitiveURL) } func TestTranslateRegistryAddress(t *testing.T) {
