[IOTDB-2671][metrics] Improve the implementation of iotdbReporter

docs/UserGuide/Maintenance-Tools/Metric-Tool.md

@@ -231,11 +231,17 @@ metricLevel: IMPORTANT
 predefinedMetrics:
   - JVM
 
-# Period time of push, only used by IoTDB Reporter
-pushPeriodInSecond: 5
-
 # The http server's port for prometheus exporter to get metric data.
 prometheusExporterPort: 9091
+
+# The config of iotdb reporter
+ioTDBReporterConfig:
+  host: 127.0.0.1
+  port: 6667
+  username: root
+  password: root
+  database: _metric
+  pushPeriodInSecond: 15
 ```
 
 Then you can get metrics data as follows

docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md

@@ -232,11 +232,17 @@ metricLevel: IMPORTANT
 predefinedMetrics:
   - JVM
 
-# 数据推送时间，该参数只对 IoTDB Reporter 生效
-pushPeriodInSecond: 5
-
 # Prometheus Reporter 使用的端口
-prometheusExporterPort: 9091                            
+prometheusExporterPort: 9091
+
+# IoTDB Reporter相关的配置
+ioTDBReporterConfig:
+  host: 127.0.0.1
+  port: 6667
+  username: root
+  password: root
+  database: _metric
+  pushPeriodInSecond: 15
 ```
 
 然后按照下面的操作获取metrics数据

metrics/dropwizard-metrics/pom.xml

@@ -32,7 +32,6 @@
             <groupId>org.apache.iotdb</groupId>
             <artifactId>metrics-interface</artifactId>
             <version>0.14.0-SNAPSHOT</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>

metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/MetricName.java

@@ -28,12 +28,11 @@
 public class MetricName {
   private String name;
   private MetricLevel metricLevel;
-  private Map<String, String> tags;
+  private Map<String, String> tags = new LinkedHashMap<>();
   private static final String TAG_SEPARATOR = ".";
 
   public MetricName(String name, String... tags) {
     this.name = name;
-    this.tags = new HashMap<>();
     if (tags.length % 2 == 0) {
       for (int i = 0; i < tags.length; i += 2) {
         this.tags.put(tags[i], tags[i + 1]);
@@ -53,6 +52,30 @@ public MetricName(String name, MetricLevel metricLevel, String... tags) {
     this.metricLevel = metricLevel;
   }
 
+  /** Create metric name from flatString */
+  public MetricName(String flatString) {
+    int firstIndex = flatString.indexOf("{");
+    int lastIndex = flatString.indexOf("}");
+    if (firstIndex == -1 || lastIndex == -1) {
+      String sanitizeMetricName = flatString.replaceAll("[^a-zA-Z0-9:_\\]\\[]", "_");
+      this.name = sanitizeMetricName;
+    } else {
+      String[] labelsFlat = flatString.substring(firstIndex + 1, lastIndex).split("\\.");
+      String sanitizeMetricName =
+          flatString.substring(0, firstIndex).replaceAll("[^a-zA-Z0-9:_\\]\\[]", "_");
+      if (labelsFlat.length == 0) {
+        this.name = sanitizeMetricName;
+      } else {
+        this.name = sanitizeMetricName;
+        if (labelsFlat.length % 2 == 0) {
+          for (int i = 0; i < labelsFlat.length; i += 2) {
+            this.tags.put(labelsFlat[i], labelsFlat[i + 1]);
+          }
+        }
+      }
+    }
+  }
+
   /**
    * convert the metric name to flat string
    *
@@ -74,11 +97,7 @@ public String toFlatString() {
     return stringBuilder.toString();
   }
 
-  /**
-   * convert the metric name to string array.
-   *
-   * @return
-   */
+  /** convert the metric name to string array. */
   public String[] toStringArray() {
     List<String> allNames = new ArrayList<>();
     allNames.add(name);

server/src/main/java/org/apache/iotdb/db/metrics/dropwizard/reporter/DropwizardIoTDBReporter.java → metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/DropwizardIoTDBReporter.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.iotdb.db.metrics.dropwizard.reporter;
+package org.apache.iotdb.metrics.dropwizard.reporter;
 
 import org.apache.iotdb.metrics.MetricManager;
 import org.apache.iotdb.metrics.config.MetricConfig;
@@ -49,7 +49,8 @@ public boolean start() {
             .prefixedWith("dropwizard:")
             .filter(MetricFilter.ALL)
             .build();
-    ioTDBReporter.start(metricConfig.getPushPeriodInSecond(), TimeUnit.SECONDS);
+    ioTDBReporter.start(
+        metricConfig.getIoTDBReporterConfig().getPushPeriodInSecond(), TimeUnit.SECONDS);
     return true;
   }
 

metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/DropwizardMetricsExporter.java

@@ -57,7 +57,7 @@ public void scrape() throws IOException {
 
   /** Export Gauge as Prometheus Gauge */
   public void writeGauge(String dropwizardName, Gauge<?> gauge) throws IOException {
-    MetricName metricName = getMetricNameFromName(dropwizardName);
+    MetricName metricName = new MetricName(dropwizardName);
     String sanitizeName = metricName.getName();
     writer.writeHelp(sanitizeName, getHelpMessage(dropwizardName, gauge));
     writer.writeType(sanitizeName, MetricType.GAUGE);
@@ -77,7 +77,7 @@ public void writeGauge(String dropwizardName, Gauge<?> gauge) throws IOException
 
   /** Export counter as Prometheus Gauge */
   public void writeCounter(String dropwizardName, Counter counter) throws IOException {
-    MetricName metricName = getMetricNameFromName(dropwizardName);
+    MetricName metricName = new MetricName(dropwizardName);
     String sanitizeName = metricName.getName();
     writer.writeHelp(sanitizeName, getHelpMessage(dropwizardName, counter));
     writer.writeType(sanitizeName, MetricType.GAUGE);
@@ -87,7 +87,7 @@ public void writeCounter(String dropwizardName, Counter counter) throws IOExcept
   /** Export histogram snapshot as Prometheus SUMMARY */
   public void writeHistogram(String dropwizardName, Histogram histogram) throws IOException {
     writeSnapshotAndCount(
-        getMetricNameFromName(dropwizardName),
+        new MetricName(dropwizardName),
         histogram.getSnapshot(),
         histogram.getCount(),
         1.0,
@@ -125,42 +125,24 @@ private void writeSnapshotAndCount(
   /** Export Timer as Prometheus Summary */
   public void writeTimer(String dropwizardName, Timer timer) throws IOException {
     writeSnapshotAndCount(
-        getMetricNameFromName(dropwizardName),
+        new MetricName(dropwizardName),
         timer.getSnapshot(),
         timer.getCount(),
         1.0D / TimeUnit.SECONDS.toNanos(1L),
         getHelpMessage(dropwizardName, timer));
-    writeMetered(getMetricNameFromName(dropwizardName), timer);
+    writeMetered(new MetricName(dropwizardName), timer);
   }
 
   /** Export Meter as Prometheus Counter */
   public void writeMeter(String dropwizardName, Meter meter) throws IOException {
-    MetricName metricName = getMetricNameFromName(dropwizardName);
+    MetricName metricName = new MetricName(dropwizardName);
     String sanitizeName = metricName.getName() + "_total";
 
     writer.writeHelp(sanitizeName, getHelpMessage(dropwizardName, meter));
     writer.writeType(sanitizeName, MetricType.COUNTER);
     writer.writeSample(sanitizeName, metricName.getTags(), meter.getCount());
 
-    writeMetered(getMetricNameFromName(dropwizardName), meter);
-  }
-
-  /** Get metric name and tags from name */
-  private MetricName getMetricNameFromName(String dropwizardName) {
-    int firstIndex = dropwizardName.indexOf("{");
-    int lastIndex = dropwizardName.indexOf("}");
-    if (firstIndex == -1 || lastIndex == -1) {
-      String sanitizeMetricName = sanitizeMetricName(dropwizardName);
-      return new MetricName(sanitizeMetricName);
-    } else {
-      String[] labelsFlat = dropwizardName.substring(firstIndex + 1, lastIndex).split("\\.");
-      String sanitizeMetricName = sanitizeMetricName(dropwizardName.substring(0, firstIndex));
-      if (labelsFlat.length == 0) {
-        return new MetricName(sanitizeMetricName);
-      } else {
-        return new MetricName(sanitizeMetricName, labelsFlat);
-      }
-    }
+    writeMetered(new MetricName(dropwizardName), meter);
   }
 
   /** Export meter for multi type */
@@ -184,8 +166,4 @@ private static String getHelpMessage(String metricName, Metric metric) {
         "Generated from Dropwizard metric import (metric=%s, type=%s)",
         metricName, metric.getClass().getName());
   }
-
-  static String sanitizeMetricName(String dropwizardName) {
-    return dropwizardName.replaceAll("[^a-zA-Z0-9:_\\]\\[]", "_");
-  }
 }