Notify all metric reporters when metric registry has been changed
With existing implementation, it is difficult to notify the
metric reports on metric registry changes. With this commit,
we can spontaneously notify all reporters about the metric
registry changes, so that newly added metrics can be automatically
reported to third party monitoring system.
Change-Id: I1273194553900f6bb03e2ef6bb1b54838af1da00
diff --git a/utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java b/utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java
index e8644cc..433311f 100644
--- a/utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java
+++ b/utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java
@@ -15,10 +15,6 @@
*/
package org.onlab.metrics;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
import com.codahale.metrics.Counter;
import com.codahale.metrics.Gauge;
import com.codahale.metrics.Histogram;
@@ -27,6 +23,12 @@
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Timer;
+import com.google.common.collect.Sets;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
/**
* This class holds the Metrics registry for ONOS.
@@ -74,6 +76,11 @@
private MetricRegistry metricsRegistry = new MetricRegistry();
/**
+ * Reporter for exposing metrics objects to third party persistent system.
+ */
+ private Set<MetricsReporter> reporters = Sets.newConcurrentHashSet();
+
+ /**
* Clears the internal state.
*/
protected void clear() {
@@ -216,6 +223,34 @@
}
/**
+ * Registers a reporter to receive any changes on metric registry.
+ *
+ * @param reporter metric reporter
+ */
+ @Override
+ public void registerReporter(MetricsReporter reporter) {
+ reporters.add(reporter);
+ }
+
+ /**
+ * Unregisters the given metric reporter.
+ *
+ * @param reporter metric reporter
+ */
+ @Override
+ public void unregisterReporter(MetricsReporter reporter) {
+ reporters.remove(reporter);
+ }
+
+ /**
+ * Notifies the changes on metric registry to all registered reporters.
+ */
+ @Override
+ public void notifyReporters() {
+ reporters.forEach(MetricsReporter::notifyMetricsChange);
+ }
+
+ /**
* Removes the metric with the given name.
*
* @param component component the Metric is defined in