You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2022/04/02 09:14:04 UTC
[iotdb] branch rel/0.13 updated (6ec9bf6 -> ca5fb17)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 6ec9bf6 [To rel/0.13] Update python client doc and code for NumpyTablet (#5389)
add ca5fb17 [IOTDB-2671][IOTDB-2672][IOTDB-2777] Modify the name of dropwizard, update the implementation of IoTDBReporter and fix NPE error. (#5358)
No new revisions were added by this update.
Summary of changes:
client-cpp/pom.xml | 4 +-
compile-tools/pom.xml | 6 +-
distribution/pom.xml | 2 +-
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 12 +-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 14 +-
example/client-cpp-example/pom.xml | 2 +-
example/trigger/pom.xml | 2 +-
example/udf/pom.xml | 2 +-
grafana-connector/pom.xml | 2 +-
integration/pom.xml | 13 +-
.../session/IoTDBSessionDisableMemControlIT.java | 0
.../session/IoTDBSessionVectorABDeviceIT.java | 0
.../session/IoTDBSessionVectorAggregationIT.java | 0
.../IoTDBSessionVectorAggregationWithUnSeqIT.java | 0
.../iotdb/session/IoTDBSessionVectorInsertIT.java | 0
.../java/org/apache/iotdb/session/SessionTest.java | 0
.../apache/iotdb/session/pool/SessionPoolTest.java | 0
.../apache/iotdb/session/template/TemplateUT.java | 0
jdbc/pom.xml | 2 +-
metrics/dropwizard-metrics/pom.xml | 1 -
.../iotdb/metrics/dropwizard/MetricName.java | 60 ++++--
.../reporter/DropwizardIoTDBReporter.java | 5 +-
.../reporter/DropwizardMetricsExporter.java | 169 ++++++-----------
.../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 | 23 ++-
.../{IoTDBJmxConfig.java => JmxConfig.java} | 6 +-
.../reporter/MicrometerIoTDBReporter.java | 4 +-
.../micrometer/reporter/MicrometerJmxReporter.java | 2 +-
.../org.apache.iotdb.metrics.reporter.Reporter | 3 +-
pom.xml | 8 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 3 +
.../iotdb/db/service/metrics/MetricsService.java | 4 +-
.../org.apache.iotdb.metrics.reporter.Reporter | 19 --
session/pom.xml | 13 --
43 files changed, 554 insertions(+), 383 deletions(-)
rename {session => integration}/src/test/java/org/apache/iotdb/session/IoTDBSessionDisableMemControlIT.java (100%)
rename {session => integration}/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorABDeviceIT.java (100%)
rename {session => integration}/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorAggregationIT.java (100%)
rename {session => integration}/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorAggregationWithUnSeqIT.java (100%)
rename {session => integration}/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorInsertIT.java (100%)
rename {session => integration}/src/test/java/org/apache/iotdb/session/SessionTest.java (100%)
rename {session => integration}/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java (100%)
rename {session => integration}/src/test/java/org/apache/iotdb/session/template/TemplateUT.java (100%)
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 (63%)
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