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 2023/05/29 08:02:13 UTC

[dubbo] branch 3.3 updated (1f39543632 -> 30daba2d74)

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

albumenj pushed a change to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git


    from 1f39543632 Skip security and xds module  javadoc plugin (#12413)
     add 50798b99c7 clean code (#12403)
     add 1697a331c3 Display indicator data in KEY, VALUE format (#12273)
     add 25548c345b Fix NPE if name not match in PojoUtils (#12404)
     add 9eec5973fc update org.yaml:snakeyaml 1.33 to 2.0 (#12399)
     add c7bc74557c Update README.md (#12391)
     add 581defa2b4 Add alibaba RpcContext getInvocation compact (#12416)
     add 0f910b90e9 Enhance generic filter logs (#12417)
     add a557480f70 Prapare 3.2.2 release
     add 7a41c55a77 Merge branch 'apache-3.2' into 3.2.2-release
     add 2238da4bde Merge branch '3.2.2-release' into apache-3.2
     add 25772f5725 Bump version to 3.2.3-SNAPSHOT
     add e98748580d Skip scan object class (#12388)
     add cbb69a3fdf Prepare 3.1.10 release
     add a588955a56 Merge branch '3.1.10-release' into apache-3.1
     add 54238c2c61 Bump version to 3.1.11-SNAPSHOT
     add b1612b9269 Merge branch 'apache-3.1' into apache-3.2
     new 30daba2d74 Merge branch 'apache-3.2' into apache-3.3

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md                                          |   6 ++
 .../dubbo/common/constants/MetricsConstants.java   |   1 +
 .../org/apache/dubbo/common/utils/PojoUtils.java   |   7 +-
 .../apache/dubbo/common/utils/PojoUtilsTest.java   |  96 ++++++++++++++++----
 .../java/com/alibaba/dubbo/rpc/RpcContext.java     |   4 +
 .../config/deploy/DefaultApplicationDeployer.java  |  37 ++++++--
 dubbo-dependencies-bom/pom.xml                     |   2 +-
 .../dubbo/metrics/report/MetricsReporter.java      |   4 +
 .../sample/MetricThreadPoolExhaustedListener.java  |   2 +-
 .../sample/MetricsCountSampleConfigurer.java       |  22 +----
 .../collector/sample/MetricsCountSampler.java      |   2 -
 .../sample/SimpleMetricsCountSampler.java          |  21 +----
 .../metrics/report/DefaultMetricsReporter.java     | 100 +++++++++++++++++++++
 .../report/DefaultMetricsReporterFactory.java}     |  15 ++--
 ...apache.dubbo.metrics.collector.MetricsCollector |   1 +
 ...che.dubbo.metrics.report.MetricsReporterFactory |   1 +
 .../prometheus/PrometheusMetricsReporterCmd.java   |   2 +-
 .../PrometheusMetricsThreadPoolTest.java           |   2 +-
 dubbo-plugin/dubbo-qos/pom.xml                     |   6 +-
 .../command/impl/DefaultMetricsReporterCmd.java    |  69 +++++---------
 .../internal/org.apache.dubbo.qos.api.BaseCommand  |   1 +
 .../dubbo/qos/command/util/CommandHelperTest.java  |   2 +
 .../org/apache/dubbo/rpc/filter/GenericFilter.java |   5 +-
 23 files changed, 281 insertions(+), 127 deletions(-)
 create mode 100644 dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/report/DefaultMetricsReporter.java
 copy dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/report/AbstractMetricsReporterFactory.java => dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/report/DefaultMetricsReporterFactory.java} (73%)
 create mode 100644 dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.report.MetricsReporterFactory
 copy dubbo-metrics/dubbo-metrics-prometheus/src/main/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsReporterCmd.java => dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/DefaultMetricsReporterCmd.java (66%)


[dubbo] 01/01: Merge branch 'apache-3.2' into apache-3.3

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 30daba2d7467874f5bbd494dc1d6c5c3442ba039
Merge: 1f39543632 b1612b9269
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon May 29 16:01:02 2023 +0800

    Merge branch 'apache-3.2' into apache-3.3
    
    # Conflicts:
    #       dubbo-dependencies-bom/pom.xml
    #       dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
    #       dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
    #       dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector
    #       dubbo-plugin/dubbo-qos/pom.xml
    #       pom.xml

 README.md                                          |   6 ++
 .../dubbo/common/constants/MetricsConstants.java   |   1 +
 .../org/apache/dubbo/common/utils/PojoUtils.java   |   7 +-
 .../apache/dubbo/common/utils/PojoUtilsTest.java   |  96 ++++++++++++++++----
 .../java/com/alibaba/dubbo/rpc/RpcContext.java     |   4 +
 .../config/deploy/DefaultApplicationDeployer.java  |  37 ++++++--
 dubbo-dependencies-bom/pom.xml                     |   2 +-
 .../dubbo/metrics/report/MetricsReporter.java      |   4 +
 .../sample/MetricThreadPoolExhaustedListener.java  |   2 +-
 .../sample/MetricsCountSampleConfigurer.java       |  22 +----
 .../collector/sample/MetricsCountSampler.java      |   2 -
 .../sample/SimpleMetricsCountSampler.java          |  21 +----
 .../metrics/report/DefaultMetricsReporter.java     | 100 +++++++++++++++++++++
 .../report/DefaultMetricsReporterFactory.java}     |  23 ++---
 ...apache.dubbo.metrics.collector.MetricsCollector |   1 +
 ...che.dubbo.metrics.report.MetricsReporterFactory |   1 +
 .../prometheus/PrometheusMetricsReporterCmd.java   |   2 +-
 .../PrometheusMetricsThreadPoolTest.java           |   2 +-
 dubbo-plugin/dubbo-qos/pom.xml                     |   6 +-
 .../command/impl/DefaultMetricsReporterCmd.java    |  69 +++++---------
 .../internal/org.apache.dubbo.qos.api.BaseCommand  |   1 +
 .../dubbo/qos/command/util/CommandHelperTest.java  |   2 +
 .../org/apache/dubbo/rpc/filter/GenericFilter.java |   5 +-
 23 files changed, 286 insertions(+), 130 deletions(-)

diff --cc dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector
index e806704e86,d174a4291f..158704cf00
--- a/dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector
+++ b/dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector
@@@ -1,3 -1,3 +1,4 @@@
  default-collector=org.apache.dubbo.metrics.collector.DefaultMetricsCollector
  aggregateMetricsCollector=org.apache.dubbo.metrics.collector.AggregateMetricsCollector
 +configCenterMetricsCollector=org.apache.dubbo.metrics.collector.ConfigCenterMetricsCollector
+ histogramMetricsCollector=org.apache.dubbo.metrics.collector.HistogramMetricsCollector
diff --cc dubbo-plugin/dubbo-qos/pom.xml
index 1affb789b0,6463faf5c2..8bbcd0d435
--- a/dubbo-plugin/dubbo-qos/pom.xml
+++ b/dubbo-plugin/dubbo-qos/pom.xml
@@@ -75,11 -75,10 +75,15 @@@
              <artifactId>dubbo-qos-api</artifactId>
              <version>${project.version}</version>
          </dependency>
- 
 +        <dependency>
 +            <groupId>org.apache.dubbo</groupId>
 +            <artifactId>dubbo-native</artifactId>
 +            <version>${project.parent.version}</version>
 +        </dependency>
+         <dependency>
+             <groupId>org.apache.dubbo</groupId>
+             <artifactId>dubbo-metrics-default</artifactId>
+             <version>${project.version}</version>
+         </dependency>
      </dependencies>
  </project>