diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/nested/PrometheusConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/nested/PrometheusConfig.java index 70310a7bba..a35f779cce 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/nested/PrometheusConfig.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/nested/PrometheusConfig.java @@ -67,16 +67,6 @@ public class PrometheusConfig implements Serializable { */ private String httpServiceDiscoveryUrl; - /** - * When using pull method, which port to expose - */ - private Integer metricsPort; - - /** - * When using pull mode, which path to expose metrics - */ - private String metricsPath; - public Boolean getEnabled() { return enabled; } @@ -100,22 +90,6 @@ public class PrometheusConfig implements Serializable { public void setHttpServiceDiscoveryUrl(String httpServiceDiscoveryUrl) { this.httpServiceDiscoveryUrl = httpServiceDiscoveryUrl; } - - public Integer getMetricsPort() { - return metricsPort; - } - - public void setMetricsPort(Integer metricsPort) { - this.metricsPort = metricsPort; - } - - public String getMetricsPath() { - return metricsPath; - } - - public void setMetricsPath(String metricsPath) { - this.metricsPath = metricsPath; - } } public static class Pushgateway implements Serializable { diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MetricsConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MetricsConfigTest.java index 13a29b8966..578a632160 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MetricsConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MetricsConfigTest.java @@ -81,8 +81,6 @@ class MetricsConfigTest { exporter.setEnabled(true); exporter.setEnableHttpServiceDiscovery(true); exporter.setHttpServiceDiscoveryUrl("localhost:8080"); - exporter.setMetricsPath("/metrics"); - exporter.setMetricsPort(20888); prometheus.setExporter(exporter); pushgateway.setEnabled(true); @@ -98,8 +96,6 @@ class MetricsConfigTest { assertThat(metrics.getPrometheus().getExporter().getEnabled(), equalTo(true)); assertThat(metrics.getPrometheus().getExporter().getEnableHttpServiceDiscovery(), equalTo(true)); assertThat(metrics.getPrometheus().getExporter().getHttpServiceDiscoveryUrl(), equalTo("localhost:8080")); - assertThat(metrics.getPrometheus().getExporter().getMetricsPort(), equalTo(20888)); - assertThat(metrics.getPrometheus().getExporter().getMetricsPath(), equalTo("/metrics")); assertThat(metrics.getPrometheus().getPushgateway().getEnabled(), equalTo(true)); assertThat(metrics.getPrometheus().getPushgateway().getBaseUrl(), equalTo("localhost:9091")); assertThat(metrics.getPrometheus().getPushgateway().getUsername(), equalTo("username")); diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/nested/PrometheusConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/nested/PrometheusConfigTest.java index d78f2732f7..556fd6a083 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/nested/PrometheusConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/nested/PrometheusConfigTest.java @@ -31,15 +31,11 @@ class PrometheusConfigTest { exporter.setEnabled(true); exporter.setEnableHttpServiceDiscovery(true); exporter.setHttpServiceDiscoveryUrl("localhost:8080"); - exporter.setMetricsPath("/metrics"); - exporter.setMetricsPort(20888); prometheusConfig.setExporter(exporter); assertThat(prometheusConfig.getExporter().getEnabled(), equalTo(true)); assertThat(prometheusConfig.getExporter().getEnableHttpServiceDiscovery(), equalTo(true)); assertThat(prometheusConfig.getExporter().getHttpServiceDiscoveryUrl(), equalTo("localhost:8080")); - assertThat(prometheusConfig.getExporter().getMetricsPort(), equalTo(20888)); - assertThat(prometheusConfig.getExporter().getMetricsPath(), equalTo("/metrics")); } @Test @@ -62,4 +58,4 @@ class PrometheusConfigTest { assertThat(prometheusConfig.getPushgateway().getJob(), equalTo("job")); assertThat(prometheusConfig.getPushgateway().getPushInterval(), equalTo(30)); } -} \ No newline at end of file +} 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 141b5d5169..24b4cb2a3f 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 @@ -1123,16 +1123,6 @@ - - - - - - - - - - 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 5ef35dd5c2..cffb7e40c5 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 @@ -59,8 +59,6 @@ import static org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_PROMET "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", - "dubbo.metrics.prometheus.exporter.metrics-port=20888", - "dubbo.metrics.prometheus.exporter.metrics-path=/metrics", "dubbo.metrics.aggregation.enabled=true", "dubbo.metrics.aggregation.bucket-num=5", "dubbo.metrics.aggregation.time-window-seconds=120", @@ -112,8 +110,6 @@ class SpringBootConfigPropsTest { Assertions.assertTrue(metricsConfig.getPrometheus().getExporter().getEnabled()); Assertions.assertTrue(metricsConfig.getPrometheus().getExporter().getEnableHttpServiceDiscovery()); Assertions.assertEquals("localhost:8080", metricsConfig.getPrometheus().getExporter().getHttpServiceDiscoveryUrl()); - Assertions.assertEquals(20888, metricsConfig.getPrometheus().getExporter().getMetricsPort()); - Assertions.assertEquals("/metrics", metricsConfig.getPrometheus().getExporter().getMetricsPath()); Assertions.assertEquals(5, metricsConfig.getAggregation().getBucketNum()); Assertions.assertEquals(120, metricsConfig.getAggregation().getTimeWindowSeconds()); Assertions.assertTrue(metricsConfig.getAggregation().getEnabled()); 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 c09cebe1ed..3f667bd65e 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 @@ -45,8 +45,6 @@ import static org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_PROMET "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", - "dubbo.metrics.prometheus.exporter.metrics-port=20888", - "dubbo.metrics.prometheus.exporter.metrics-path=/metrics", "dubbo.metrics.aggregation.enabled=true", "dubbo.metrics.aggregation.bucket-num=5", "dubbo.metrics.aggregation.time-window-seconds=120", @@ -86,8 +84,6 @@ public class SpringBootConfigMetricsTest { Assertions.assertTrue(metricsConfig.getPrometheus().getExporter().getEnabled()); Assertions.assertTrue(metricsConfig.getPrometheus().getExporter().getEnableHttpServiceDiscovery()); Assertions.assertEquals("localhost:8080", metricsConfig.getPrometheus().getExporter().getHttpServiceDiscoveryUrl()); - Assertions.assertEquals(20888, metricsConfig.getPrometheus().getExporter().getMetricsPort()); - Assertions.assertEquals("/metrics", metricsConfig.getPrometheus().getExporter().getMetricsPath()); Assertions.assertEquals(5, metricsConfig.getAggregation().getBucketNum()); Assertions.assertEquals(120, metricsConfig.getAggregation().getTimeWindowSeconds()); Assertions.assertTrue(metricsConfig.getAggregation().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 2109f15234..d910996fd2 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 @@ -281,8 +281,6 @@ class DubboNamespaceHandlerTest { assertEquals(metrics.getPrometheus().getExporter().getEnabled(), true); assertEquals(metrics.getPrometheus().getExporter().getEnableHttpServiceDiscovery(), true); assertEquals(metrics.getPrometheus().getExporter().getHttpServiceDiscoveryUrl(), "localhost:8080"); - assertEquals(metrics.getPrometheus().getExporter().getMetricsPort(), 20888); - assertEquals(metrics.getPrometheus().getExporter().getMetricsPath(), "/metrics"); assertEquals(metrics.getPrometheus().getPushgateway().getEnabled(), true); assertEquals(metrics.getPrometheus().getPushgateway().getBaseUrl(), "localhost:9091"); assertEquals(metrics.getPrometheus().getPushgateway().getPushInterval(), 30); @@ -294,8 +292,6 @@ class DubboNamespaceHandlerTest { assertEquals(metricsBean.getPrometheus().getExporter().getEnabled(), true); assertEquals(metricsBean.getPrometheus().getExporter().getEnableHttpServiceDiscovery(), true); assertEquals(metricsBean.getPrometheus().getExporter().getHttpServiceDiscoveryUrl(), "localhost:8080"); - assertEquals(metricsBean.getPrometheus().getExporter().getMetricsPort(), 20888); - assertEquals(metricsBean.getPrometheus().getExporter().getMetricsPath(), "/metrics"); assertEquals(metricsBean.getPrometheus().getPushgateway().getEnabled(), true); assertEquals(metricsBean.getPrometheus().getPushgateway().getBaseUrl(), "localhost:9091"); assertEquals(metricsBean.getPrometheus().getPushgateway().getPushInterval(), 30); diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/metrics-prometheus.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/metrics-prometheus.xml index b90e844f30..b2a12a4a62 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/metrics-prometheus.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/metrics-prometheus.xml @@ -25,7 +25,7 @@ - + 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 ebaf276001..e6aae6745d 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 @@ -89,8 +89,6 @@ class PrometheusMetricsReporterTest { // NetUtils.getAvailablePort(); PrometheusConfig prometheusConfig = new PrometheusConfig(); PrometheusConfig.Exporter exporter = new PrometheusConfig.Exporter(); - exporter.setMetricsPort(port); - exporter.setMetricsPath("/metrics"); exporter.setEnabled(true); prometheusConfig.setExporter(exporter); metricsConfig.setPrometheus(prometheusConfig); 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 867b47a518..05ab7b1e8a 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 @@ -85,9 +85,7 @@ public class PrometheusMetricsThreadPoolTest { int port = 30899; PrometheusConfig prometheusConfig = new PrometheusConfig(); PrometheusConfig.Exporter exporter = new PrometheusConfig.Exporter(); - exporter.setMetricsPort(port); exporter.setEnabled(true); - exporter.setMetricsPath("/metrics"); prometheusConfig.setExporter(exporter); metricsConfig.setPrometheus(prometheusConfig);