From 0d894b609614f64ce487c9e89ce05dfbebf7303a Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Wed, 24 Aug 2022 15:11:06 +0800 Subject: [PATCH] feat:optimize pushgateway plugin. (#530) --- CHANGELOG.md | 1 + README-zh.md | 2 +- README.md | 2 +- pom.xml | 2 +- spring-cloud-tencent-coverage/pom.xml | 7 ++++++- spring-cloud-tencent-dependencies/pom.xml | 11 ++++++----- .../src/main/resources/bootstrap.yml | 6 +++--- .../src/main/resources/bootstrap.yml | 6 +++--- .../pom.xml | 14 +++++++------- .../stat/config/StatConfigModifier.java | 8 ++++++++ 10 files changed, 37 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64c7d8dd..dba3c3fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,3 +15,4 @@ - [Bugfix：BeanFactoryUtils returns all beans including beans defined in ancestor bean factories](https://github.com/Tencent/spring-cloud-tencent/pull/515) - [fix:fix only config file metadata can be used in routing bug.](https://github.com/Tencent/spring-cloud-tencent/pull/518) - [optimize：optimize config module code](https://github.com/Tencent/spring-cloud-tencent/pull/520) +- [feat:optimize pushgateway plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/530) diff --git a/README-zh.md b/README-zh.md index b115e8ac..c2c01f16 100644 --- a/README-zh.md +++ b/README-zh.md @@ -70,7 +70,7 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库，只需要 com.tencent.cloud spring-cloud-tencent-dependencies - ${version} + 1.7.0-Hoxton.SR12 pom import diff --git a/README.md b/README.md index 47a594ab..b5edf33e 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ For example: com.tencent.cloud spring-cloud-tencent-dependencies - ${version} + 1.7.0-Hoxton.SR12 pom import diff --git a/pom.xml b/pom.xml index bc0238fe..9cbaba44 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ - 1.8.0-Hoxton.SR12-SNAPSHOT + 1.7.1-Hoxton.SR12-SNAPSHOT Hoxton.SR12 diff --git a/spring-cloud-tencent-coverage/pom.xml b/spring-cloud-tencent-coverage/pom.xml index bdbe9ce6..d5704dee 100644 --- a/spring-cloud-tencent-coverage/pom.xml +++ b/spring-cloud-tencent-coverage/pom.xml @@ -78,7 +78,12 @@ com.tencent.cloud spring-cloud-tencent-gateway-plugin - + + + com.tencent.cloud + spring-cloud-tencent-pushgateway-plugin + + diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 46379fe3..aa284446 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,8 +70,8 @@ - 1.8.0-Hoxton.SR12-SNAPSHOT - 1.7.2 + 1.7.1-Hoxton.SR12-SNAPSHOT + 1.7.3 1.2.11 4.5.1 1.12.10 @@ -79,6 +79,7 @@ 3.16.1 1.69 31.0.1-jre + 0.11.0 3.2.0 @@ -260,9 +261,9 @@ - com.tencent.polaris - stat-pushgateway - ${polaris.version} + io.prometheus + simpleclient_pushgateway + ${prometheus.version} diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml index f2fbae18..bc5a699e 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml @@ -14,9 +14,9 @@ spring: stat: enabled: true port: 28082 - pushgateway: - enabled: true - address: 127.0.0.1:9091 + # pushgateway: + # enabled: true + # address: 127.0.0.1:9091 tencent: metadata: content: diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml index a471b124..faf40f44 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml @@ -18,9 +18,9 @@ spring: stat: enabled: true port: 28081 - pushgateway: - enabled: true - address: 127.0.0.1 +# pushgateway: +# enabled: true +# address: 127.0.0.1:9091 # consul: # port: 8500 # host: 127.0.0.1 diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/pom.xml b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/pom.xml index b6650d68..d1af8527 100644 --- a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/pom.xml +++ b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/pom.xml @@ -1,6 +1,6 @@ - spring-cloud-tencent-plugin-starters @@ -17,15 +17,15 @@ com.tencent.polaris stat-pushgateway - - com.tencent.cloud - spring-cloud-tencent-polaris-context - + + com.tencent.cloud + spring-cloud-tencent-polaris-context + org.springframework.boot spring-boot-starter-test test - + \ No newline at end of file diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/stat/config/StatConfigModifier.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/stat/config/StatConfigModifier.java index 6306f68d..8496f70b 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/stat/config/StatConfigModifier.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/stat/config/StatConfigModifier.java @@ -61,6 +61,14 @@ public class StatConfigModifier implements PolarisConfigModifier { configuration.getGlobal().getStatReporter() .setPluginConfig(DEFAULT_REPORTER_PROMETHEUS, prometheusHandlerConfig); } + else { + PrometheusHandlerConfig prometheusHandlerConfig = configuration.getGlobal().getStatReporter() + .getPluginConfig(DEFAULT_REPORTER_PROMETHEUS, PrometheusHandlerConfig.class); + // Set port to -1 to disable stat plugin. + prometheusHandlerConfig.setPort(-1); + configuration.getGlobal().getStatReporter() + .setPluginConfig(DEFAULT_REPORTER_PROMETHEUS, prometheusHandlerConfig); + } } @Override