[iotdb] branch master updated (4f4b360 -> c6e47b9)

[ro...@apache.org]

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

rong pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 4f4b360  [IOTDB-2780] Config node ratis consensus protocol implementation (#5347)
     add c6e47b9  [IOTDB-2671][metrics] Improve the implementation of iotdbReporter (#5338)

No new revisions were added by this update.

Summary of changes:
 docs/UserGuide/Maintenance-Tools/Metric-Tool.md    |  12 +-
 docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md |  14 +-
 metrics/dropwizard-metrics/pom.xml                 |   1 -
 .../iotdb/metrics/dropwizard/MetricName.java       |  33 +++-
 .../reporter/DropwizardIoTDBReporter.java          |   5 +-
 .../reporter/DropwizardMetricsExporter.java        |  36 +---
 .../metrics/dropwizard/reporter/IoTDBReporter.java | 204 ++++++++++++---------
 .../org.apache.iotdb.metrics.reporter.Reporter     |   3 +-
 metrics/interface/pom.xml                          |   5 +
 .../main/assembly/resources/conf/iotdb-metric.yml  |  14 +-
 .../org/apache/iotdb/metrics/MetricService.java    |  22 ++-
 .../apache/iotdb/metrics/config/MetricConfig.java  | 133 ++++++++++++--
 .../iotdb/metrics/reporter/CompositeReporter.java  |  14 +-
 .../apache/iotdb/metrics/utils/MetricsUtils.java   |  33 ++--
 .../interface/src/test/resources/iotdb-metric.yml  |  14 +-
 .../micrometer/reporter}/IoTDBMeterRegistry.java   | 114 ++++++------
 .../micrometer/reporter}/IoTDBRegistryConfig.java  |   7 +-
 .../{IoTDBJmxConfig.java => JmxConfig.java}        |   6 +-
 .../reporter/MicrometerIoTDBReporter.java          |   4 +-
 .../micrometer/reporter/MicrometerJmxReporter.java |   2 +-
 .../org.apache.iotdb.metrics.reporter.Reporter     |   3 +-
 .../java/org/apache/iotdb/db/service/IoTDB.java    |   3 +
 .../iotdb/db/service/metrics/MetricsService.java   |   4 +-
 .../org.apache.iotdb.metrics.reporter.Reporter     |  19 --
 24 files changed, 440 insertions(+), 265 deletions(-)
 rename {server/src/main/java/org/apache/iotdb/db => metrics/dropwizard-metrics/src/main/java/org/apache/iotdb}/metrics/dropwizard/reporter/DropwizardIoTDBReporter.java (92%)
 rename {server/src/main/java/org/apache/iotdb/db => metrics/dropwizard-metrics/src/main/java/org/apache/iotdb}/metrics/dropwizard/reporter/IoTDBReporter.java (53%)
 rename server/src/main/java/org/apache/iotdb/db/metrics/metricsUtils.java => metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/MetricsUtils.java (69%)
 rename {server/src/main/java/org/apache/iotdb/db/metrics/micrometer/registry => metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter}/IoTDBMeterRegistry.java (60%)
 rename {server/src/main/java/org/apache/iotdb/db/metrics/micrometer/registry => metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter}/IoTDBRegistryConfig.java (85%)
 rename metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/reporter/{IoTDBJmxConfig.java => JmxConfig.java} (88%)
 rename {server/src/main/java/org/apache/iotdb/db => metrics/micrometer-metrics/src/main/java/org/apache/iotdb}/metrics/micrometer/reporter/MicrometerIoTDBReporter.java (93%)
 delete mode 100644 server/src/main/resources/META-INF/services/org.apache.iotdb.metrics.reporter.Reporter