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/04/06 01:39:16 UTC
[dubbo] branch 3.2 updated: Optimize naming, remove duplicate words (#11969)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new 0ff44d3d75 Optimize naming, remove duplicate words (#11969)
0ff44d3d75 is described below
commit 0ff44d3d75d4a5e8e5b86924dde07254a9667b67
Author: wxbty <38...@users.noreply.github.com>
AuthorDate: Thu Apr 6 09:39:09 2023 +0800
Optimize naming, remove duplicate words (#11969)
* Optimize naming, remove duplicate words
* fix ci
* fix ci
---------
Co-authored-by: x-shadow-man <14...@qq.com>
---
.../dubbo/common/constants/MetricsConstants.java | 2 +-
.../org/apache/dubbo/config/MetricsConfig.java | 40 +++++++++++-----------
.../config/deploy/DefaultApplicationDeployer.java | 2 +-
.../src/main/resources/META-INF/dubbo.xsd | 8 ++---
.../configprops/SpringBootConfigPropsTest.java | 2 +-
.../metrics/SpringBootConfigMetricsTest.java | 8 ++---
.../spring/schema/DubboNamespaceHandlerTest.java | 2 +-
.../dubbo/config/spring/metrics-aggregation.xml | 2 +-
.../collector/MetadataMetricsCollector.java | 2 +-
.../prometheus/PrometheusMetricsReporterTest.java | 4 +--
.../PrometheusMetricsThreadPoolTest.java | 6 ++--
.../collector/RegistryMetricsCollector.java | 2 +-
12 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/MetricsConstants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/MetricsConstants.java
index b41e716bd2..afd0bedfe5 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/constants/MetricsConstants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/constants/MetricsConstants.java
@@ -44,7 +44,7 @@ public interface MetricsConstants {
String TAG_CHANGE_TYPE = "change.type";
- String ENABLE_JVM_METRICS_KEY = "enable.jvm.metrics";
+ String ENABLE_JVM_METRICS_KEY = "enable.jvm";
String AGGREGATION_COLLECTOR_KEY = "aggregation";
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/MetricsConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/MetricsConfig.java
index 7d0273039b..f01abbb896 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/MetricsConfig.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/MetricsConfig.java
@@ -39,22 +39,22 @@ public class MetricsConfig extends AbstractConfig {
/**
* Enable jvm metrics when collecting.
*/
- private Boolean enableJvmMetrics;
+ private Boolean enableJvm;
/**
* Enable threadpool metrics when collecting.
*/
- private Boolean enableThreadpoolMetrics;
+ private Boolean enableThreadpool;
/**
* Enable registry metrics.
*/
- private Boolean enableRegistryMetrics;
+ private Boolean enableRegistry;
/**
* Enable metadata metrics.
*/
- private Boolean enableMetadataMetrics;
+ private Boolean enableMetadata;
/**
* @deprecated After metrics config is refactored.
@@ -109,20 +109,20 @@ public class MetricsConfig extends AbstractConfig {
this.protocol = protocol;
}
- public Boolean getEnableJvmMetrics() {
- return enableJvmMetrics;
+ public Boolean getEnableJvm() {
+ return enableJvm;
}
- public void setEnableJvmMetrics(Boolean enableJvmMetrics) {
- this.enableJvmMetrics = enableJvmMetrics;
+ public void setEnableJvm(Boolean enableJvm) {
+ this.enableJvm = enableJvm;
}
- public Boolean getEnableRegistryMetrics() {
- return enableRegistryMetrics;
+ public Boolean getEnableRegistry() {
+ return enableRegistry;
}
- public void setEnableRegistryMetrics(Boolean enableRegistryMetrics) {
- this.enableRegistryMetrics = enableRegistryMetrics;
+ public void setEnableRegistry(Boolean enableRegistry) {
+ this.enableRegistry = enableRegistry;
}
public String getPort() {
@@ -173,19 +173,19 @@ public class MetricsConfig extends AbstractConfig {
this.exportServicePort = exportServicePort;
}
- public Boolean getEnableMetadataMetrics() {
- return enableMetadataMetrics;
+ public Boolean getEnableMetadata() {
+ return enableMetadata;
}
- public void setEnableMetadataMetrics(Boolean enableMetadataMetrics) {
- this.enableMetadataMetrics = enableMetadataMetrics;
+ public void setEnableMetadata(Boolean enableMetadata) {
+ this.enableMetadata = enableMetadata;
}
- public Boolean getEnableThreadpoolMetrics() {
- return enableThreadpoolMetrics;
+ public Boolean getEnableThreadpool() {
+ return enableThreadpool;
}
- public void setEnableThreadpoolMetrics(Boolean enableThreadpoolMetrics) {
- this.enableThreadpoolMetrics = enableThreadpoolMetrics;
+ public void setEnableThreadpool(Boolean enableThreadpool) {
+ this.enableThreadpool = enableThreadpool;
}
}
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
index 61c2c2f1b8..969575d1ef 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
@@ -387,7 +387,7 @@ public class DefaultApplicationDeployer extends AbstractDeployer<ApplicationMode
}
collector.setCollectEnabled(true);
collector.collectApplication(applicationModel);
- collector.setThreadpoolCollectEnabled(Optional.ofNullable(metricsConfig.getEnableThreadpoolMetrics()).orElse(true));
+ collector.setThreadpoolCollectEnabled(Optional.ofNullable(metricsConfig.getEnableThreadpool()).orElse(true));
MetricsReporterFactory metricsReporterFactory = getExtensionLoader(MetricsReporterFactory.class).getAdaptiveExtension();
MetricsReporter metricsReporter = metricsReporterFactory.createMetricsReporter(metricsConfig.toUrl());
metricsReporter.init();
diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
index 31913fa1c9..ca5a6ec455 100644
--- a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
+++ b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/dubbo.xsd
@@ -1057,25 +1057,25 @@
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="enable-jvm-metrics" type="xsd:boolean" default="false">
+ <xsd:attribute name="enable-jvm" type="xsd:boolean" default="false">
<xsd:annotation>
<xsd:documentation><![CDATA[ Enable jvm metrics when collecting. ]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="enable-threadpool-metrics" type="xsd:boolean" default="true">
+ <xsd:attribute name="enable-threadpool" type="xsd:boolean" default="true">
<xsd:annotation>
<xsd:documentation><![CDATA[ Enable threadpool metrics when collecting. ]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="enable-registry-metrics" type="xsd:boolean" default="true">
+ <xsd:attribute name="enable-registry" type="xsd:boolean" default="true">
<xsd:annotation>
<xsd:documentation><![CDATA[ Enable registry metrics when collecting. ]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="enable-metadata-metrics" type="xsd:boolean" default="true">
+ <xsd:attribute name="enable-metadata" type="xsd:boolean" default="true">
<xsd:annotation>
<xsd:documentation><![CDATA[ Enable metadata metrics when collecting. ]]></xsd:documentation>
</xsd:annotation>
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/configprops/SpringBootConfigPropsTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/configprops/SpringBootConfigPropsTest.java
index 2eaa56b828..5ef35dd5c2 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/configprops/SpringBootConfigPropsTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/boot/configprops/SpringBootConfigPropsTest.java
@@ -55,7 +55,7 @@ import static org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_PROMET
"dubbo.protocol.name=dubbo",
"dubbo.protocol.port=20880",
"dubbo.metrics.protocol=prometheus",
- "dubbo.metrics.enable-jvm-metrics=true",
+ "dubbo.metrics.enable-jvm=true",
"dubbo.metrics.prometheus.exporter.enabled=true",
"dubbo.metrics.prometheus.exporter.enable-http-service-discovery=true",
"dubbo.metrics.prometheus.exporter.http-service-discovery-url=localhost:8080",
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/metrics/SpringBootConfigMetricsTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/metrics/SpringBootConfigMetricsTest.java
index 089e691af2..c09cebe1ed 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/metrics/SpringBootConfigMetricsTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/metrics/SpringBootConfigMetricsTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.dubbo.config.spring.metrics;
-import static org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_PROMETHEUS;
-
import org.apache.dubbo.config.MetricsConfig;
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.config.context.ConfigManager;
@@ -31,6 +29,8 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import static org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_PROMETHEUS;
+
@SpringBootTest(
properties = {
"dubbo.application.NAME = dubbo-demo-application",
@@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration;
"dubbo.metrics.protocol=prometheus",
"dubbo.metrics.export-service-protocol=tri",
"dubbo.metrics.export-service-port=9999",
- "dubbo.metrics.enable-jvm-metrics=true",
+ "dubbo.metrics.enable-jvm=true",
"dubbo.metrics.prometheus.exporter.enabled=true",
"dubbo.metrics.prometheus.exporter.enable-http-service-discovery=true",
"dubbo.metrics.prometheus.exporter.http-service-discovery-url=localhost:8080",
@@ -80,7 +80,7 @@ public class SpringBootConfigMetricsTest {
MetricsConfig metricsConfig = configManager.getMetrics().get();
Assertions.assertEquals(PROTOCOL_PROMETHEUS, metricsConfig.getProtocol());
- Assertions.assertTrue(metricsConfig.getEnableJvmMetrics());
+ Assertions.assertTrue(metricsConfig.getEnableJvm());
Assertions.assertEquals("tri",metricsConfig.getExportServiceProtocol());
Assertions.assertEquals(9999, metricsConfig.getExportServicePort());
Assertions.assertTrue(metricsConfig.getPrometheus().getExporter().getEnabled());
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
index 2a5a16aef1..2109f15234 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
@@ -256,7 +256,7 @@ class DubboNamespaceHandlerTest {
MetricsConfig metricsBean = ctx.getBean(MetricsConfig.class);
MetricsConfig metrics = configManager.getMetrics().get();
- assertTrue(metrics.getEnableJvmMetrics());
+ assertTrue(metrics.getEnableJvm());
assertEquals(metrics.getAggregation().getEnabled(), true);
assertEquals(metrics.getAggregation().getBucketNum(), 5);
diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/metrics-aggregation.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/metrics-aggregation.xml
index 96835f7703..c97ac1ad65 100644
--- a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/metrics-aggregation.xml
+++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/metrics-aggregation.xml
@@ -24,7 +24,7 @@
<!-- current application configuration -->
<dubbo:application name="demo-consumer" />
- <dubbo:metrics enable-jvm-metrics="true">
+ <dubbo:metrics enable-jvm="true">
<dubbo:aggregation enabled="true" bucket-num="5" time-window-seconds="120" />
</dubbo:metrics>
diff --git a/dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/collector/MetadataMetricsCollector.java b/dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/collector/MetadataMetricsCollector.java
index f34d34002d..bad6bdfab0 100644
--- a/dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/collector/MetadataMetricsCollector.java
+++ b/dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/collector/MetadataMetricsCollector.java
@@ -63,7 +63,7 @@ public class MetadataMetricsCollector implements ApplicationMetricsCollector<App
public boolean isCollectEnabled() {
if (collectEnabled == null) {
ConfigManager configManager = applicationModel.getApplicationConfigManager();
- configManager.getMetrics().ifPresent(metricsConfig -> setCollectEnabled(metricsConfig.getEnableMetadataMetrics()));
+ configManager.getMetrics().ifPresent(metricsConfig -> setCollectEnabled(metricsConfig.getEnableMetadata()));
}
return Optional.ofNullable(collectEnabled).orElse(true);
}
diff --git a/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsReporterTest.java b/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsReporterTest.java
index 1c43927713..ebaf276001 100644
--- a/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsReporterTest.java
+++ b/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsReporterTest.java
@@ -68,7 +68,7 @@ class PrometheusMetricsReporterTest {
@Test
void testJvmMetrics() {
- metricsConfig.setEnableJvmMetrics(true);
+ metricsConfig.setEnableJvm(true);
String name = "metrics-test";
ApplicationModel.defaultModel().getApplicationConfigManager().setApplication(new ApplicationConfig(name));
@@ -94,7 +94,7 @@ class PrometheusMetricsReporterTest {
exporter.setEnabled(true);
prometheusConfig.setExporter(exporter);
metricsConfig.setPrometheus(prometheusConfig);
- metricsConfig.setEnableJvmMetrics(true);
+ metricsConfig.setEnableJvm(true);
ApplicationModel.defaultModel().getApplicationConfigManager().setApplication(new ApplicationConfig("metrics-test"));
PrometheusMetricsReporter reporter = new PrometheusMetricsReporter(metricsConfig.toUrl(), applicationModel);
diff --git a/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsThreadPoolTest.java b/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsThreadPoolTest.java
index db36ee8da9..867b47a518 100644
--- a/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsThreadPoolTest.java
+++ b/dubbo-metrics/dubbo-metrics-prometheus/src/test/java/org/apache/dubbo/metrics/prometheus/PrometheusMetricsThreadPoolTest.java
@@ -91,9 +91,9 @@ public class PrometheusMetricsThreadPoolTest {
prometheusConfig.setExporter(exporter);
metricsConfig.setPrometheus(prometheusConfig);
- metricsConfig.setEnableJvmMetrics(false);
+ metricsConfig.setEnableJvm(false);
metricsCollector.setCollectEnabled(true);
- metricsConfig.setEnableThreadpoolMetrics(true);
+ metricsConfig.setEnableThreadpool(true);
metricsCollector.collectApplication(applicationModel);
PrometheusMetricsReporter reporter = new PrometheusMetricsReporter(metricsConfig.toUrl(), applicationModel);
reporter.init();
@@ -103,7 +103,7 @@ public class PrometheusMetricsThreadPoolTest {
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
- if(metricsConfig.getEnableThreadpoolMetrics()) {
+ if(metricsConfig.getEnableThreadpool()) {
metricsCollector.registryDefaultSample();
}
try (CloseableHttpClient client = HttpClients.createDefault()) {
diff --git a/dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryMetricsCollector.java b/dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryMetricsCollector.java
index 84a1ee3d6d..c5fe2c9cb6 100644
--- a/dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryMetricsCollector.java
+++ b/dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryMetricsCollector.java
@@ -64,7 +64,7 @@ public class RegistryMetricsCollector implements ApplicationMetricsCollector<App
public boolean isCollectEnabled() {
if (collectEnabled == null) {
ConfigManager configManager = applicationModel.getApplicationConfigManager();
- configManager.getMetrics().ifPresent(metricsConfig -> setCollectEnabled(metricsConfig.getEnableRegistryMetrics()));
+ configManager.getMetrics().ifPresent(metricsConfig -> setCollectEnabled(metricsConfig.getEnableRegistry()));
}
return Optional.ofNullable(collectEnabled).orElse(true);
}