This is an automated email from the ASF dual-hosted git repository. jxue pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/helix.git
commit b2b5d9bcd57e7e576b31a86ce39018ff1eeecf0c Author: Zac Policzer <[email protected]> AuthorDate: Wed Nov 28 11:48:16 2018 -0800 Adding new ENUMS and making enum types public to facilitate mbean metric discovery of library clients. --- .../monitoring/mbeans/ZkClientPathMonitor.java | 41 +++++++++++++++------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java index bc294e3..4f52348 100644 --- a/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java +++ b/helix-core/src/main/java/org/apache/helix/monitoring/mbeans/ZkClientPathMonitor.java @@ -40,7 +40,7 @@ public class ZkClientPathMonitor extends DynamicMBeanProvider { private final String _instanceName; private final PredefinedPath _path; - protected enum PredefinedPath { + public enum PredefinedPath { IdealStates(".*/IDEALSTATES/.*"), Instances(".*/INSTANCES/.*"), Configs(".*/CONFIGS/.*"), @@ -63,6 +63,21 @@ public class ZkClientPathMonitor extends DynamicMBeanProvider { } } + public enum PredefinedMetricDomains { + WriteTotalLatencyCounter, + ReadTotalLatencyCounter, + WriteFailureCounter, + ReadFailureCounter, + WriteBytesCounter, + ReadBytesCounter, + WriteCounter, + ReadCounter, + ReadLatencyGauge, + WriteLatencyGauge, + ReadBytesGauge, + WriteBytesGauge + } + private SimpleDynamicMetric<Long> _readCounter; private SimpleDynamicMetric<Long> _writeCounter; private SimpleDynamicMetric<Long> _readBytesCounter; @@ -92,22 +107,22 @@ public class ZkClientPathMonitor extends DynamicMBeanProvider { .format("%s.%s.%s.%s", MonitorDomainNames.HelixZkClient.name(), monitorType, monitorKey, path.name()); - _writeTotalLatencyCounter = new SimpleDynamicMetric("WriteTotalLatencyCounter", 0l); - _readTotalLatencyCounter = new SimpleDynamicMetric("ReadTotalLatencyCounter", 0l); - _writeFailureCounter = new SimpleDynamicMetric("WriteFailureCounter", 0l); - _readFailureCounter = new SimpleDynamicMetric("ReadFailureCounter", 0l); - _writeBytesCounter = new SimpleDynamicMetric("WriteBytesCounter", 0l); - _readBytesCounter = new SimpleDynamicMetric("ReadBytesCounter", 0l); - _writeCounter = new SimpleDynamicMetric("WriteCounter", 0l); - _readCounter = new SimpleDynamicMetric("ReadCounter", 0l); + _writeTotalLatencyCounter = new SimpleDynamicMetric(PredefinedMetricDomains.WriteBytesCounter.name(), 0l); + _readTotalLatencyCounter = new SimpleDynamicMetric(PredefinedMetricDomains.ReadTotalLatencyCounter.name(), 0l); + _writeFailureCounter = new SimpleDynamicMetric(PredefinedMetricDomains.WriteFailureCounter.name(), 0l); + _readFailureCounter = new SimpleDynamicMetric(PredefinedMetricDomains.ReadFailureCounter.name(), 0l); + _writeBytesCounter = new SimpleDynamicMetric(PredefinedMetricDomains.WriteBytesCounter.name(), 0l); + _readBytesCounter = new SimpleDynamicMetric(PredefinedMetricDomains.ReadBytesCounter.name(), 0l); + _writeCounter = new SimpleDynamicMetric(PredefinedMetricDomains.WriteCounter.name(), 0l); + _readCounter = new SimpleDynamicMetric(PredefinedMetricDomains.ReadCounter.name(), 0l); - _readLatencyGauge = new HistogramDynamicMetric("ReadLatencyGauge", new Histogram( + _readLatencyGauge = new HistogramDynamicMetric(PredefinedMetricDomains.ReadLatencyGauge.name(), new Histogram( new SlidingTimeWindowArrayReservoir(DEFAULT_RESET_INTERVAL_MS, TimeUnit.MILLISECONDS))); - _writeLatencyGauge = new HistogramDynamicMetric("WriteLatencyGauge", new Histogram( + _writeLatencyGauge = new HistogramDynamicMetric(PredefinedMetricDomains.WriteLatencyGauge.name(), new Histogram( new SlidingTimeWindowArrayReservoir(DEFAULT_RESET_INTERVAL_MS, TimeUnit.MILLISECONDS))); - _readBytesGauge = new HistogramDynamicMetric("ReadBytesGauge", new Histogram( + _readBytesGauge = new HistogramDynamicMetric(PredefinedMetricDomains.ReadBytesGauge.name(), new Histogram( new SlidingTimeWindowArrayReservoir(DEFAULT_RESET_INTERVAL_MS, TimeUnit.MILLISECONDS))); - _writeBytesGauge = new HistogramDynamicMetric("WriteBytesGauge", new Histogram( + _writeBytesGauge = new HistogramDynamicMetric(PredefinedMetricDomains.WriteBytesGauge.name(), new Histogram( new SlidingTimeWindowArrayReservoir(DEFAULT_RESET_INTERVAL_MS, TimeUnit.MILLISECONDS))); }
