You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/08/24 02:56:55 UTC
[iotdb] branch rel/0.13 updated (cafc7f3dde -> 531ddf5e27)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from cafc7f3dde [To rel/0.13] Improve the process of secondary (#6855)
add 531ddf5e27 [To rel/0.13][IOTDB-4096] Optimize metric module and Fix inconsistency between dropwizard and micrometer. (#7072)
No new revisions were added by this update.
Summary of changes:
.../log/manage/PartitionedSnapshotLogManager.java | 5 +-
.../server/handlers/caller/ElectionHandler.java | 5 +-
.../cluster/utils/nodetool/ClusterMonitor.java | 8 +-
integration/src/test/resources/logback.xml | 2 +-
metrics/ReadMe.md | 102 ++---
metrics/dropwizard-metrics/pom.xml | 4 +-
.../dropwizard/DropwizardMetricManager.java | 387 ++--------------
.../dropwizard/DropwizardMetricNameTool.java | 66 +++
.../iotdb/metrics/dropwizard/MetricName.java | 170 -------
.../reporter/DropwizardIoTDBReporter.java | 34 +-
.../dropwizard/reporter/DropwizardJmxReporter.java | 14 +-
.../{MetricType.java => DropwizardMetricType.java} | 4 +-
.../reporter/DropwizardMetricsExporter.java | 83 ++--
.../reporter/DropwizardPrometheusReporter.java | 15 +-
.../metrics/dropwizard/reporter/IoTDBReporter.java | 33 +-
.../dropwizard/reporter/PrometheusTextWriter.java | 2 +-
...org.apache.iotdb.metrics.AbstractMetricManager} | 0
.../dropwizard/DropwizardMetricManagerTest.java | 331 --------------
.../main/assembly/resources/conf/iotdb-metric.yml | 4 +
.../iotdb/metrics/AbstractMetricManager.java | 490 +++++++++++++++++++++
.../iotdb/metrics/AbstractMetricService.java | 262 +++++++++++
.../iotdb/metrics/DoNothingMetricService.java | 8 +-
.../org/apache/iotdb/metrics/MetricManager.java | 166 -------
.../org/apache/iotdb/metrics/MetricService.java | 167 -------
.../apache/iotdb/metrics/config/MetricConfig.java | 63 ++-
.../metrics/config/MetricConfigDescriptor.java | 120 ++---
.../iotdb/metrics/config/MetricConstant.java | 6 +
.../apache/iotdb/metrics/config/ReloadLevel.java | 5 +
.../apache/iotdb/metrics/impl/DoNothingGauge.java | 8 +-
.../iotdb/metrics/impl/DoNothingMetricManager.java | 111 +----
.../iotdb/metrics/predefined/IMetricSet.java | 11 +-
.../{utils => predefined}/PredefinedMetric.java | 2 +-
.../predefined/jvm/JvmClassLoaderMetrics.java | 6 +-
.../metrics/predefined/jvm/JvmCompileMetrics.java | 6 +-
.../iotdb/metrics/predefined/jvm/JvmGcMetrics.java | 7 +-
.../metrics/predefined/jvm/JvmMemoryMetrics.java | 7 +-
.../iotdb/metrics/predefined/jvm/JvmMetrics.java | 6 +-
.../metrics/predefined/jvm/JvmThreadMetrics.java | 6 +-
.../{utils => predefined/jvm}/JvmUtils.java | 4 +-
.../metrics/predefined/logback/LogbackMetrics.java | 11 +-
.../iotdb/metrics/reporter/CompositeReporter.java | 31 +-
.../apache/iotdb/metrics/reporter/Reporter.java | 12 +-
.../org/apache/iotdb/metrics/type/Counter.java | 7 +-
.../java/org/apache/iotdb/metrics/type/Gauge.java | 9 +-
.../org/apache/iotdb/metrics/type/Histogram.java | 3 +-
.../iotdb/metrics/type/HistogramSnapshot.java | 26 +-
.../org/apache/iotdb/metrics/type/IMetric.java | 1 +
.../java/org/apache/iotdb/metrics/type/Rate.java | 11 +-
.../java/org/apache/iotdb/metrics/type/Timer.java | 6 +-
.../iotdb/metrics/utils/IoTDBMetricsUtils.java | 16 +-
.../org/apache/iotdb/metrics/utils/MetricInfo.java | 191 ++++++++
.../apache/iotdb/metrics/utils/MetricLevel.java | 2 +-
.../utils/{OutPutFormat.java => MetricType.java} | 9 +-
.../iotdb/metrics/config/MetricConfigTest.java | 33 +-
.../interface/src/test/resources/iotdb-metric.yml | 34 +-
metrics/micrometer-metrics/pom.xml | 6 +-
.../iotdb/metrics/micrometer/MetricName.java | 66 ---
.../micrometer/MicrometerMetricManager.java | 435 +++---------------
.../micrometer/reporter/IoTDBMeterRegistry.java | 2 +-
.../reporter/MicrometerIoTDBReporter.java | 6 +-
.../micrometer/reporter/MicrometerJmxReporter.java | 6 +-
.../reporter/MicrometerPrometheusReporter.java | 9 +-
.../metrics/micrometer/type/MicrometerRate.java | 2 +-
.../metrics/micrometer/type/MicrometerTimer.java | 2 +-
...org.apache.iotdb.metrics.AbstractMetricManager} | 0
.../micrometer/MicrometerMetricManagerTest.java | 83 ----
pom.xml | 3 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 8 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 5 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 5 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 8 +-
.../compaction/CompactionMetricsManager.java | 29 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 8 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 5 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 14 +-
.../engine/storagegroup/TsFileProcessorInfo.java | 11 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 5 +-
.../org/apache/iotdb/db/metadata/MManager.java | 17 +-
.../db/query/pool/RawQueryReadTaskPoolManager.java | 8 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 6 +-
.../{MetricsService.java => MetricService.java} | 16 +-
...csServiceMBean.java => MetricServiceMBean.java} | 2 +-
.../db/service/metrics/predefined/FileMetrics.java | 6 +-
.../service/metrics/predefined/ProcessMetrics.java | 14 +-
.../service/metrics/predefined/SystemMetrics.java | 12 +-
.../db/service/thrift/ProcessorWithMetrics.java | 5 +-
.../thrift/handler/RPCServiceThriftHandler.java | 8 +-
.../db/service/thrift/impl/TSServiceImpl.java | 8 +-
.../apache/iotdb/db/metric/MetricServiceTest.java | 276 ++++++++++++
server/src/test/resources/logback.xml | 2 +-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 4 +-
91 files changed, 1931 insertions(+), 2303 deletions(-)
create mode 100644 metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/DropwizardMetricNameTool.java
delete mode 100644 metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/MetricName.java
rename metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/reporter/{MetricType.java => DropwizardMetricType.java} (93%)
rename metrics/dropwizard-metrics/src/main/resources/META-INF/services/{org.apache.iotdb.metrics.MetricManager => org.apache.iotdb.metrics.AbstractMetricManager} (100%)
delete mode 100644 metrics/dropwizard-metrics/src/test/java/org/apache/iotdb/metrics/dropwizard/DropwizardMetricManagerTest.java
create mode 100644 metrics/interface/src/main/java/org/apache/iotdb/metrics/AbstractMetricManager.java
create mode 100644 metrics/interface/src/main/java/org/apache/iotdb/metrics/AbstractMetricService.java
delete mode 100644 metrics/interface/src/main/java/org/apache/iotdb/metrics/MetricManager.java
delete mode 100644 metrics/interface/src/main/java/org/apache/iotdb/metrics/MetricService.java
rename metrics/interface/src/main/java/org/apache/iotdb/metrics/{utils => predefined}/PredefinedMetric.java (95%)
rename metrics/interface/src/main/java/org/apache/iotdb/metrics/{utils => predefined/jvm}/JvmUtils.java (95%)
create mode 100644 metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/MetricInfo.java
copy metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/{OutPutFormat.java => MetricType.java} (92%)
delete mode 100644 metrics/micrometer-metrics/src/main/java/org/apache/iotdb/metrics/micrometer/MetricName.java
rename metrics/micrometer-metrics/src/main/resources/META-INF/services/{org.apache.iotdb.metrics.MetricManager => org.apache.iotdb.metrics.AbstractMetricManager} (100%)
delete mode 100644 metrics/micrometer-metrics/src/test/java/org/apache/iotdb/metrics/micrometer/MicrometerMetricManagerTest.java
rename server/src/main/java/org/apache/iotdb/db/service/metrics/{MetricsService.java => MetricService.java} (90%)
rename server/src/main/java/org/apache/iotdb/db/service/metrics/{MetricsServiceMBean.java => MetricServiceMBean.java} (96%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/metric/MetricServiceTest.java