move metrics out to its own MetricsService

fcrepo · May 22, 2013 · 8fc38d7 · 8fc38d7
1 parent 518171b
commit 8fc38d7
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 24 deletions.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/Datastream.java b/fcrepo-kernel/src/main/java/org/fcrepo/Datastream.java
@@ -2,7 +2,7 @@
 package org.fcrepo;
 
 import static com.codahale.metrics.MetricRegistry.name;
-import static org.fcrepo.services.RepositoryService.metrics;
+import static org.fcrepo.services.MetricsService.metrics;
 import static org.fcrepo.services.ServiceHelpers.getNodePropertySize;
 import static org.fcrepo.utils.FedoraTypesUtils.getBinary;
 import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/identifiers/UUIDPidMinter.java b/fcrepo-kernel/src/main/java/org/fcrepo/identifiers/UUIDPidMinter.java
@@ -3,7 +3,7 @@
 
 import static com.codahale.metrics.MetricRegistry.name;
 import static java.util.UUID.randomUUID;
-import static org.fcrepo.services.RepositoryService.metrics;
+import static org.fcrepo.services.MetricsService.metrics;
 
 import com.codahale.metrics.Timer;
 

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/observer/SimpleObserver.java b/fcrepo-kernel/src/main/java/org/fcrepo/observer/SimpleObserver.java
@@ -9,7 +9,7 @@
 import static javax.jcr.observation.Event.PROPERTY_ADDED;
 import static javax.jcr.observation.Event.PROPERTY_CHANGED;
 import static javax.jcr.observation.Event.PROPERTY_REMOVED;
-import static org.fcrepo.services.RepositoryService.metrics;
+import static org.fcrepo.services.MetricsService.metrics;
 import static org.slf4j.LoggerFactory.getLogger;
 
 import javax.annotation.PostConstruct;

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/DatastreamService.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/DatastreamService.java
@@ -6,6 +6,7 @@
 import static com.google.common.collect.Sets.difference;
 import static java.security.MessageDigest.getInstance;
 import static org.slf4j.LoggerFactory.getLogger;
+import static org.fcrepo.services.MetricsService.metrics;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/MetricsService.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/MetricsService.java
@@ -0,0 +1,20 @@
+package org.fcrepo.services;
+
+import com.codahale.metrics.MetricRegistry;
+import org.fcrepo.metrics.RegistryService;
+
+import java.io.PrintStream;
+
+public class MetricsService {
+
+    public static final MetricRegistry metrics = RegistryService.getMetrics();
+
+    public static MetricRegistry getMetrics() {
+        return metrics;
+    }
+
+    public static void dumpMetrics(final PrintStream os) {
+        RegistryService.dumpMetrics(os);
+    }
+
+}
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/services/RepositoryService.java b/fcrepo-kernel/src/main/java/org/fcrepo/services/RepositoryService.java
@@ -43,22 +43,13 @@ public class RepositoryService extends JcrTools implements FedoraJcrTypes {
 
     private static final Logger logger = getLogger(RepositoryService.class);
 
-    public static final MetricRegistry metrics = RegistryService.getMetrics();
 
-    private final Timer objectSizeCalculationTimer = metrics.timer(name(
+    private final Timer objectSizeCalculationTimer = MetricsService.getMetrics().timer(name(
             RepositoryService.class, "objectSizeCalculation"));
 
     @Inject
     protected Repository repo;
 
-    public static MetricRegistry getMetrics() {
-        return metrics;
-    }
-
-    public static void dumpMetrics(final PrintStream os) {
-        RegistryService.dumpMetrics(os);
-    }
-
     /**
      * 
      * @param path

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/utils/JcrRdfTools.java b/fcrepo-kernel/src/main/java/org/fcrepo/utils/JcrRdfTools.java
@@ -40,7 +40,7 @@
 
 import org.fcrepo.rdf.GraphSubjects;
 import org.fcrepo.services.LowLevelStorageService;
-import org.fcrepo.services.RepositoryService;
+import org.fcrepo.services.MetricsService;
 import org.fcrepo.services.functions.GetClusterConfiguration;
 import org.modeshape.jcr.api.JcrConstants;
 import org.modeshape.jcr.api.NamespaceRegistry;
@@ -236,7 +236,7 @@ private static void addRepositoryMetricsToModel(
         final Repository repository = node.getSession().getRepository();
         /* retreive the metrics from the service */
         final SortedMap<String, Counter> counters =
-                RepositoryService.getMetrics().getCounters();
+                MetricsService.getMetrics().getCounters();
 
         final Resource subject = factory.getGraphSubject(node);
         for (final String key : repository.getDescriptorKeys()) {

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/integration/AbstractIT.java b/fcrepo-kernel/src/test/java/org/fcrepo/integration/AbstractIT.java
@@ -3,6 +3,7 @@
 
 import static org.slf4j.LoggerFactory.getLogger;
 
+import org.fcrepo.services.MetricsService;
 import org.fcrepo.services.RepositoryService;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -22,7 +23,7 @@ public void setLogger() {
 
     @AfterClass
     public static void dumpMetrics() {
-        RepositoryService.dumpMetrics(System.out);
+        MetricsService.dumpMetrics(System.out);
     }
 
 }
diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/services/MetricsServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/services/MetricsServiceTest.java
@@ -0,0 +1,18 @@
+package org.fcrepo.services;
+
+import com.codahale.metrics.MetricRegistry;
+import org.junit.Test;
+
+import java.io.PrintStream;
+
+public class MetricsServiceTest {
+
+    MetricRegistry mockMetricRegistry;
+
+    PrintStream mockPrintStream;
+
+    @Test
+    public void testDumpMetrics() {
+        MetricsService.dumpMetrics(mockPrintStream);
+    }
+}
diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/services/RepositoryServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/services/RepositoryServiceTest.java
@@ -72,12 +72,8 @@ public class RepositoryServiceTest implements FedoraJcrTypes {
 
     RepositoryService testObj;
 
-    MetricRegistry mockMetricRegistry;
-
     Repository mockRepo;
 
-    PrintStream mockPrintStream;
-
     Session mockSession;
 
     Node mockRootNode;
@@ -162,10 +158,6 @@ public void tearDown() {
 
     }
 
-    @Test
-    public void testDumpMetrics() {
-        RepositoryService.dumpMetrics(mockPrintStream);
-    }
 
     @Test
     public void testGetRepositorySize() throws RepositoryException {