commit 128651a422b3ede7f315435a70a9e70c5e4523fc
author Ray Milkey <ray@onlab.us> Mon Jul 14 11:24:28 2014 -0700
committer Ray Milkey <ray@onlab.us> Tue Jul 15 10:06:28 2014 -0700
tree 8584f8f18073babb81fe273c04b1c4c27f8cfe1c
parent 9ec39822db90540bcb628091e4476d329fd26ca3

Remove visibility to codahale Metrics registry

Removed getRegistry() method from OnosMetrics class so
callers no longer have direct access to the Metrics
registry.  Added APIs that were ncessary to query lists of
Metrics in the system, and an API to remove Metrics.

Change-Id: I7b9efc86dd990cee7a715ef44b228ef94e03367d

src/main/java/net/onrc/onos/core/metrics/MetricsResource.java

diff --git a/src/main/java/net/onrc/onos/core/metrics/MetricsResource.java b/src/main/java/net/onrc/onos/core/metrics/MetricsResource.java
index 40feaaa..f8d8a12 100644
--- a/src/main/java/net/onrc/onos/core/metrics/MetricsResource.java
+++ b/src/main/java/net/onrc/onos/core/metrics/MetricsResource.java
@@ -6,7 +6,6 @@
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricFilter;
-import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Get;
@@ -66,8 +65,7 @@
      */
     @Get("json")
     @SuppressWarnings("rawtypes")
-    public Representation retrieve() throws Exception {
-        final MetricRegistry registry = OnosMetrics.getMetricsRegistry();
+    public Representation retrieve() {
         final MetricsObjectResource result = new MetricsObjectResource();
 
         final List<MetricsObjectResource.TimerObjectResource> timers =
@@ -86,35 +84,35 @@
         final MetricFilter filter = new MetricNameFilter(metricIdsString);
 
         for (final Map.Entry<String, Timer> timer :
-             registry.getTimers(filter).entrySet()) {
+             OnosMetrics.getTimers(filter).entrySet()) {
             timers.add(new MetricsObjectResource.TimerObjectResource(
                     timer.getKey(), timer.getValue()));
         }
         result.setTimers(timers);
 
         for (final Map.Entry<String, Gauge> gauge :
-             registry.getGauges(filter).entrySet()) {
+             OnosMetrics.getGauges(filter).entrySet()) {
             gauges.add(new MetricsObjectResource.GaugeObjectResource(
                     gauge.getKey(), gauge.getValue()));
         }
         result.setGauges(gauges);
 
         for (final Map.Entry<String, Counter> counter :
-             registry.getCounters(filter).entrySet()) {
+             OnosMetrics.getCounters(filter).entrySet()) {
             counters.add(new MetricsObjectResource.CounterObjectResource(
                     counter.getKey(), counter.getValue()));
         }
         result.setCounters(counters);
 
         for (final Map.Entry<String, Meter> meter :
-             registry.getMeters(filter).entrySet()) {
+             OnosMetrics.getMeters(filter).entrySet()) {
             meters.add(new MetricsObjectResource.MeterObjectResource(
                     meter.getKey(), meter.getValue()));
         }
         result.setMeters(meters);
 
         for (final Map.Entry<String, Histogram> histogram :
-             registry.getHistograms(filter).entrySet()) {
+             OnosMetrics.getHistograms(filter).entrySet()) {
             histograms.add(new MetricsObjectResource.HistogramObjectResource(
                     histogram.getKey(), histogram.getValue()));
         }