svn commit: r1716309 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java test/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProviderTest.java

[chetanm]

Author: chetanm
Date: Wed Nov 25 06:30:14 2015
New Revision: 1716309

URL: http://svn.apache.org/viewvc?rev=1716309&view=rev
Log:
OAK-3654 - Integrate with Metrics for various stats collection

Add QUERY_COUNTER to noop list as that is being managed in QUERY_DURATION

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProviderTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java?rev=1716309&r1=1716308&r2=1716309&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProvider.java
 Wed Nov 25 06:30:14 2015
@@ -62,7 +62,8 @@ public class MetricStatisticsProvider im
      */
     private static final Set<String> NOOPS_TYPES = ImmutableSet.of(
             Type.SESSION_READ_DURATION.name(),
-            Type.SESSION_WRITE_DURATION.name()
+            Type.SESSION_WRITE_DURATION.name(),
+            Type.QUERY_COUNT.name()
     );
 
     private final Map<String, Stats> statsRegistry = Maps.newHashMap();
@@ -158,10 +159,6 @@ public class MetricStatisticsProvider im
     }
 
     private void registerAverages() {
-        registry.register(typeToName(Type.QUERY_AVERAGE),
-                new AvgGauge(compStats(Type.QUERY_COUNT, 
StatsBuilder.METERS).getMeter(),
-                        compStats(Type.QUERY_DURATION, 
StatsBuilder.TIMERS).getTimer()));
-
         registry.register(typeToName(Type.OBSERVATION_EVENT_AVERAGE),
                 new AvgGauge(compStats(Type.OBSERVATION_EVENT_COUNTER, 
StatsBuilder.METERS).getMeter(),
                         compStats(Type.OBSERVATION_EVENT_DURATION, 
StatsBuilder.TIMERS).getTimer()));

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProviderTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProviderTest.java?rev=1716309&r1=1716308&r2=1716309&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProviderTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/MetricStatisticsProviderTest.java
 Wed Nov 25 06:30:14 2015
@@ -54,8 +54,11 @@ public class MetricStatisticsProviderTes
     @Test
     public void basicSetup() throws Exception {
         statsProvider = new MetricStatisticsProvider(server, executorService);
-        assertEquals(2, statsProvider.getRegistry().getMeters().size());
-        assertEquals(2, statsProvider.getRegistry().getTimers().size());
+
+        //By default avg counters would be configured. So check if they are
+        //configured
+        assertEquals(1, statsProvider.getRegistry().getMeters().size());
+        assertEquals(1, statsProvider.getRegistry().getTimers().size());
 
         assertNotNull(statsProvider.getStats());
         assertEquals(statsProvider.getRegistry().getMetrics().size(), 
getMetricMbeans().size());
@@ -115,6 +118,7 @@ public class MetricStatisticsProviderTes
         statsProvider = new MetricStatisticsProvider(server, executorService);
         assertTrue(statsProvider.getTimer(Type.SESSION_READ_DURATION.name()) 
instanceof SimpleStats);
         assertTrue(statsProvider.getTimer(Type.SESSION_WRITE_DURATION.name()) 
instanceof SimpleStats);
+        assertTrue(statsProvider.getTimer(Type.QUERY_COUNT.name()) instanceof 
SimpleStats);
         
assertNotEquals(statsProvider.getMeter(Type.OBSERVATION_EVENT_COUNTER.name()), 
NoopStats.INSTANCE);
     }