You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2023/07/19 03:04:13 UTC

[dubbo-go] 01/02: Merge branch 'main' into feature-metrics

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch feature-metrics
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git

commit 96dcff56d4b7ff18ea47f34438173ae9a44c8c73
Merge: 1f4b1c86d 10336a56b
Author: chickenlj <ke...@gmail.com>
AuthorDate: Wed Jul 19 11:02:26 2023 +0800

    Merge branch 'main' into feature-metrics
    
    # Conflicts:
    #       go.mod
    #       go.sum

 CHANGELOG.md                                       |  46 ++
 common/extension/logger.go                         |   2 +
 common/extension/metrics_test.go                   |   7 +-
 config/logger_config_test.go                       |   3 +
 config/metric_config.go                            |   2 +-
 config/reference_config.go                         |   2 +-
 config/service.go                                  |   7 +-
 config_center/nacos/impl.go                        |   4 +-
 config_center/nacos/impl_test.go                   |   4 +-
 config_center/nacos/listener.go                    |   4 +-
 filter/metrics/filter.go                           |   2 +
 filter/metrics/filter_test.go                      |  10 +-
 go.mod                                             |  10 +-
 go.sum                                             | 514 +--------------------
 metadata/report/nacos/report.go                    |   2 +-
 metadata/report/nacos/report_test.go               |   4 +-
 metadata/report/zookeeper/report.go                |   1 +
 metrics/prometheus/api.go                          |   1 +
 metrics/prometheus/constant.go                     |  10 +-
 metrics/prometheus/metric_set.go                   |  17 +
 metrics/prometheus/model.go                        |  47 +-
 metrics/prometheus/reporter.go                     |   2 +
 metrics/prometheus/reporter_test.go                |   8 +-
 metrics/util/aggregate/aggregator.go               | 133 ++++++
 metrics/util/aggregate/aggregator_test.go          |  85 ++++
 metrics/util/aggregate/counter.go                  |  84 ++++
 metrics/util/aggregate/counter_test.go             |  99 ++++
 .../logger.go => metrics/util/aggregate/pane.go    |  43 +-
 metrics/util/aggregate/quantile.go                 |  86 ++++
 .../util/aggregate/quantile_test.go                |  57 ++-
 metrics/util/aggregate/sliding_window.go           |  97 ++++
 protocol/dubbo3/health/serverhealth.go             |  11 +-
 registry/nacos/listener.go                         |  25 +-
 registry/nacos/registry.go                         |   2 +-
 registry/nacos/registry_test.go                    |  12 +-
 registry/nacos/service_discovery.go                |   6 +-
 registry/nacos/service_discovery_test.go           |   8 +-
 registry/zookeeper/service_discovery_test.go       |   4 +-
 remoting/nacos/builder.go                          |   2 +-
 remoting/nacos/builder_test.go                     |   2 +-
 xds/client/controller/transport.go                 |   3 +-
 xds/client/controller/version/v2/loadreport.go     |   5 +-
 xds/client/controller/version/v3/client.go         |   5 +-
 xds/client/controller/version/v3/loadreport.go     |   5 +-
 xds/csds/csds.go                                   |   3 +-
 45 files changed, 870 insertions(+), 616 deletions(-)