You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by jf...@apache.org on 2020/06/10 10:58:57 UTC
[incubator-iotdb] branch feature/improve-monitoring-metrics updated (da4273e -> 33cccd2)

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

jfeinauer pushed a change to branch feature/improve-monitoring-metrics
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from da4273e  IOTDB-23 Add Support for more Metrics in IoTDB.
     add 7ef7c40  IOTDB-23, IOTDB-756, IOTDB-757 Replaced current Metrics implementation with a new Implementation based on Micrometer and Bindings.
     add 33cccd2  IOTDB-23, IOTDB-756, IOTDB-757 Added fine-grained Configuration for Metrics Service.

No new revisions were added by this update.

Summary of changes:
 micrometer-registry-iotdb/pom.xml                  |  44 +++
 .../org/apache/iotdb/micrometer/IoTDBRegistry.java | 210 ++++++++++++++
 .../iotdb/micrometer/IoTDBRegistryConfig.java      |  61 ++++
 pom.xml                                            |   4 +-
 server/pom.xml                                     |   6 +
 .../resources/conf/iotdb-engine.properties         |  26 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  44 ++-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  26 +-
 .../apache/iotdb/db/metrics/server/JettyUtil.java  |  98 -------
 .../iotdb/db/metrics/server/MetricsSystem.java     |  77 -----
 .../iotdb/db/metrics/server/QueryServlet.java      |  51 ----
 .../iotdb/db/metrics/server/ServerArgument.java    | 315 ---------------------
 .../iotdb/db/metrics/server/SqlArgument.java       |  78 -----
 .../apache/iotdb/db/metrics/sink/ConsoleSink.java  |  46 ---
 .../iotdb/db/metrics/sink/MetricsServletSink.java  |  46 ---
 .../org/apache/iotdb/db/metrics/sink/Sink.java     |  25 --
 .../apache/iotdb/db/metrics/source/JvmSource.java  |  44 ---
 .../iotdb/db/metrics/source/MetricsSource.java     | 100 -------
 .../org/apache/iotdb/db/metrics/source/Source.java |  21 --
 .../apache/iotdb/db/metrics/ui/MetricsPage.java    | 138 ---------
 .../apache/iotdb/db/metrics/ui/MetricsWebUI.java   |  62 ----
 .../apache/iotdb/db/metrics2/IoTDBRegistry.java    | 274 ------------------
 .../iotdb/db/metrics2/IoTDBRegistryConfig.java     |  41 ---
 .../iotdb/db/metrics2/MicrometerServerService.java | 118 --------
 .../java/org/apache/iotdb/db/service/IoTDB.java    |   2 -
 .../apache/iotdb/db/service/MetricsService.java    | 267 ++++++-----------
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  99 ++-----
 .../org/apache/iotdb/session/IoTDBSessionIT.java   |   0
 .../iotdb/session/IoTDBSessionIteratorIT.java      |   0
 .../apache/iotdb/session/pool/SessionPoolIT.java   |   2 +-
 session/pom.xml                                    |  13 -
 .../apache/iotdb/spark/db/EnvironmentUtils.java    |  19 +-
 32 files changed, 522 insertions(+), 1835 deletions(-)
 create mode 100644 micrometer-registry-iotdb/pom.xml
 create mode 100644 micrometer-registry-iotdb/src/main/java/org/apache/iotdb/micrometer/IoTDBRegistry.java
 create mode 100644 micrometer-registry-iotdb/src/main/java/org/apache/iotdb/micrometer/IoTDBRegistryConfig.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/server/JettyUtil.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/server/MetricsSystem.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/server/QueryServlet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/server/ServerArgument.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/server/SqlArgument.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/sink/ConsoleSink.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/sink/MetricsServletSink.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/sink/Sink.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/source/JvmSource.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/source/MetricsSource.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/source/Source.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/ui/MetricsPage.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics/ui/MetricsWebUI.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics2/IoTDBRegistry.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics2/IoTDBRegistryConfig.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/metrics2/MicrometerServerService.java
 rename {session => server}/src/test/java/org/apache/iotdb/session/IoTDBSessionIT.java (100%)
 rename {session => server}/src/test/java/org/apache/iotdb/session/IoTDBSessionIteratorIT.java (100%)
 rename session/src/test/java/org/apache/iotdb/session/pool/SessionPoolTest.java => server/src/test/java/org/apache/iotdb/session/pool/SessionPoolIT.java (99%)