commit 7665049b1b14453819f7cb7bfdd88ffca845be1c
author pankaj <pankaj@onlab.us> Thu Oct 02 15:18:03 2014 -0700
committer pankaj <pankaj@onlab.us> Thu Oct 02 15:18:03 2014 -0700
tree ecff7ab74bc051ac94d354d68bceeb4ca1685832
parent 208221de386f53562a5df6ca7d9689db3e5d2803
parent 48e54c34d6cf34fa14eff76c4d0cad62de8f0152

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

features/features.xml

diff --git a/features/features.xml b/features/features.xml
index f008c14..68fa8c3 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -11,7 +11,7 @@
         <bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
 
         <bundle>mvn:com.hazelcast/hazelcast/3.3</bundle>
-        <bundle>mvn:com.codahale.metrics/metrics-core/3.0.2</bundle>
+        <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle>
         <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.1</bundle>
 
         <bundle>mvn:com.esotericsoftware.kryo/kryo/2.24.0</bundle>

utils/misc/pom.xml

diff --git a/utils/misc/pom.xml b/utils/misc/pom.xml
index bb25635..ae47a38 100644
--- a/utils/misc/pom.xml
+++ b/utils/misc/pom.xml
@@ -56,9 +56,9 @@
             <artifactId>objenesis</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.codahale.metrics</groupId>
+            <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
-            <version>3.0.2</version>
+            <version>3.1.0</version>
         </dependency>
     </dependencies>
 

utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java

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 2b13efb..3b66df3 100644
--- a/utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java
+++ b/utils/misc/src/main/java/org/onlab/metrics/MetricsManager.java
@@ -1,7 +1,6 @@
 package org.onlab.metrics;
 
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 import com.codahale.metrics.Counter;
@@ -50,19 +49,18 @@
     /**
      * Registry to hold the Components defined in the system.
      */
-    private ConcurrentMap<String, MetricsComponent> componentsRegistry =
-            new ConcurrentHashMap<>();
+    private ConcurrentMap<String, MetricsComponent> componentsRegistry;
 
     /**
      * Registry for the Metrics objects created in the system.
      */
     private final MetricRegistry metricsRegistry = new MetricRegistry();
 
-    /**
-     * Hide constructor.  The only way to get the registry is through the
-     * singleton getter.
-     */
-    private MetricsManager() {}
+    public MetricsManager(
+            ConcurrentMap<String, MetricsComponent> componentsRegistry) {
+        this.componentsRegistry = componentsRegistry;
+
+    }
 
     /**
      * Registers a component.