You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by so...@apache.org on 2023/04/17 22:17:35 UTC

[dubbo-samples] branch master updated (71dedf4e -> 2203dcf1)

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

songxiaosheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git


    from 71dedf4e Change some legacy package usage (com.alibaba.dubbo) to the present one. (#810)
     new 26da9385 :recycle: refactor metrics demo to spring
     new ed1b6ed8 change version to 3.2.0-beta.6
     new 49136a5a :sparkles: support 3.2.0-beta.7-SNAPSHOT metrics
     new c6c121e7 Merge branch 'apache:master' into master
     new 785398c6 Merge branch 'master' of github.com:songxiaosheng/dubbo-samples
     new 346f9f0a :white_check_mark: make micrometer version newer
     new 26c919a8 :twisted_rightwards_arrows: merge master
     new 7f8cf2bd :recycle: refactor metrics demo to spring
     new c31baa75 :recycle: refact to spring project
     new 51ab4822 :recycle: refact to spring project
     new 13ba3771 :recycle: refact to spring project
     new 07bed3c5 :white_check_mark: metrics test update
     new 494e4196 Merge branch 'master' into master
     new 27e63790 merge
     new c525acb5 limit dubbo version
     new 7f77d2c3 :arrow_up: upgrade dubbo version to 3.2.0
     new 89377903 :arrow_up: upgrade dubbo version to 3.2.0
     new 4462115e Merge branch 'master' of github.com:songxiaosheng/dubbo-samples
     new df0b0add :arrow_down:  limit dep version
     new adfc127e :white_check_mark: fix metrics sample test
     new 2203dcf1 Merge pull request #819 from songxiaosheng/master

The 1377 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:
 .../case-versions.conf                             |  2 +-
 .../prometheus/consumer}/EmbeddedZooKeeper.java    |  3 +-
 .../prometheus/consumer/MetricsConsumer.java       | 16 ++----
 .../src/main/resources/application.yml             | 40 --------------
 .../src/main/resources/dubbo-demo-consumer.xml}    | 15 +++--
 .../prometheus/consumer/ConsumerMetricsIT.java     | 45 +++++++++------
 .../pom.xml                                        | 63 ---------------------
 .../prometheus/consumer/MetricsConsumer2.java      | 51 -----------------
 .../src/main/resources/application.yml             | 38 -------------
 .../src/main/resources/log4j.properties            | 25 ---------
 .../api/{DemoService.java => DemoService2.java}    |  2 +-
 .../prometheus/provider/EmbeddedZooKeeper.java     |  1 -
 .../prometheus/provider/MetricsProvider.java       | 10 ++--
 .../prometheus/provider/impl/DemoServiceImpl.java  |  1 -
 .../prometheus/provider/impl/DemoServiceImpl2.java | 20 ++++++-
 .../src/main/resources/application.yml             | 40 --------------
 .../src/main/resources}/dubbo-demo-provider.xml    | 17 ++++--
 .../prometheus/provider/ProviderMetricsIT.java     | 14 +++--
 .../pom.xml                                        | 64 ----------------------
 .../prometheus/provider/MetricsProvider2.java      | 30 ----------
 .../src/main/resources/application.yml             | 38 -------------
 .../src/main/resources/log4j.properties            | 25 ---------
 .../dubbo-samples-metrics-prometheus/pom.xml       | 23 +++-----
 .../case-versions.conf                             |  2 +-
 .../dubbo-samples-metrics-spring-boot/pom.xml      |  6 +-
 .../springboot/provider}/EmbeddedZooKeeper.java    |  2 +-
 .../springboot/provider/MetricsProvider.java       |  1 +
 27 files changed, 102 insertions(+), 492 deletions(-)
 copy {99-integration/dubbo-samples-empty-protection/src/main/java/org/apache/dubbo/samples => 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-consumer/src/main/java/org/apache/dubbo/samples/metrics/prometheus/consumer}/EmbeddedZooKeeper.java (98%)
 delete mode 100644 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-consumer/src/main/resources/application.yml
 copy 4-governance/{dubbo-samples-metrics/src/main/resources/spring/dubbo-demo-provider.xml => dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-consumer/src/main/resources/dubbo-demo-consumer.xml} (70%)
 delete mode 100644 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-consumer2/pom.xml
 delete mode 100644 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-consumer2/src/main/java/org/apache/dubbo/samples/metrics/prometheus/consumer/MetricsConsumer2.java
 delete mode 100644 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-consumer2/src/main/resources/application.yml
 delete mode 100644 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-consumer2/src/main/resources/log4j.properties
 copy 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-interface/src/main/java/org/apache/dubbo/samples/metrics/prometheus/api/{DemoService.java => DemoService2.java} (97%)
 rename 4-governance/dubbo-samples-metrics-prometheus/{dubbo-samples-metrics-prometheus-provider2 => dubbo-samples-metrics-prometheus-provider}/src/main/java/org/apache/dubbo/samples/metrics/prometheus/provider/impl/DemoServiceImpl2.java (91%)
 delete mode 100644 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-provider/src/main/resources/application.yml
 copy 4-governance/{dubbo-samples-metrics/src/main/resources/spring => dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-provider/src/main/resources}/dubbo-demo-provider.xml (67%)
 delete mode 100644 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-provider2/pom.xml
 delete mode 100644 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-provider2/src/main/java/org/apache/dubbo/samples/metrics/prometheus/provider/MetricsProvider2.java
 delete mode 100644 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-provider2/src/main/resources/application.yml
 delete mode 100644 4-governance/dubbo-samples-metrics-prometheus/dubbo-samples-metrics-prometheus-provider2/src/main/resources/log4j.properties
 copy {1-basic/dubbo-samples-annotation/src/main/java/org/apache/dubbo/samples/annotation => 4-governance/dubbo-samples-metrics-spring-boot/src/main/java/org/apache/dubbo/samples/metrics/springboot/provider}/EmbeddedZooKeeper.java (99%)


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org