[iotdb] branch rel/0.13 updated: [IOTDB-2999][Metric] remove useless config and fix default value error. (#5658)

[ro...@apache.org]

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

rong pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.13 by this push:
     new 5c725ba33b [IOTDB-2999][Metric] remove useless config and fix default value error. (#5658)
5c725ba33b is described below

commit 5c725ba33b3ffda93290e5d55c3868991521123d
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Mon Apr 25 15:48:09 2022 +0800

    [IOTDB-2999][Metric] remove useless config and fix default value error. (#5658)
---
 .../apache/iotdb/metrics/config/MetricConfig.java    | 20 ++++++++++----------
 .../iotdb/db/service/metrics/MetricsService.java     |  4 +---
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java b/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
index 268bb31347..b99eb3137d 100644
--- a/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
+++ b/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
@@ -51,9 +51,9 @@ public class MetricConfig {
   private IoTDBReporterConfig ioTDBReporterConfig = new IoTDBReporterConfig();
 
   public static class IoTDBReporterConfig {
-    /** The host of iotdb */
+    /** The host of iotdb that store metric value */
     private String host = "127.0.0.1";
-    /** The port of iotdb */
+    /** The port of iotdb that store metric value */
     private Integer port = 6667;
     /** The username of iotdb */
     private String username = "root";
@@ -135,10 +135,10 @@ public class MetricConfig {
     }
   }
 
-  /** the host of Instance */
-  private String InstanceHost = "127.0.0.1";
-  /** the port of Instance */
-  private Integer InstancePort = 8086;
+  /** the host of iotdb instance that is monitored */
+  private String instanceHost = "127.0.0.1";
+  /** the port of iotdb instance that is monitored */
+  private Integer instancePort = 6667;
 
   public void copy(MetricConfig newMetricConfig) {
     enableMetric = newMetricConfig.getEnableMetric();
@@ -207,19 +207,19 @@ public class MetricConfig {
   }
 
   public String getInstanceHost() {
-    return InstanceHost;
+    return instanceHost;
   }
 
   public void setInstanceHost(String instanceHost) {
-    InstanceHost = instanceHost;
+    this.instanceHost = instanceHost;
   }
 
   public Integer getInstancePort() {
-    return InstancePort;
+    return instancePort;
   }
 
   public void setInstancePort(Integer instancePort) {
-    InstancePort = instancePort;
+    this.instancePort = instancePort;
   }
 
   @Override
diff --git a/server/src/main/java/org/apache/iotdb/db/service/metrics/MetricsService.java b/server/src/main/java/org/apache/iotdb/db/service/metrics/MetricsService.java
index 9387aaaf75..cdc758a27b 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/metrics/MetricsService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/metrics/MetricsService.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.iotdb.db.service.metrics;
 
 import org.apache.iotdb.db.conf.IoTDBConstant;
@@ -27,8 +28,6 @@ import org.apache.iotdb.db.service.JMXService;
 import org.apache.iotdb.db.service.ServiceType;
 import org.apache.iotdb.db.utils.FileUtils;
 import org.apache.iotdb.metrics.MetricService;
-import org.apache.iotdb.metrics.config.MetricConfig;
-import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
 import org.apache.iotdb.metrics.config.ReloadLevel;
 import org.apache.iotdb.metrics.utils.MetricLevel;
 
@@ -40,7 +39,6 @@ import java.util.stream.Stream;
 
 public class MetricsService extends MetricService implements MetricsServiceMBean, IService {
   private static final Logger logger = LoggerFactory.getLogger(MetricsService.class);
-  private final MetricConfig metricConfig = MetricConfigDescriptor.getInstance().getMetricConfig();
   private final String mbeanName =
       String.format(
           "%s:%s=%s", IoTDBConstant.IOTDB_PACKAGE, IoTDBConstant.JMX_TYPE, getID().getJmxName());