Author: mreutegg
Date: Mon Aug 28 12:55:11 2017
New Revision: 1806454
URL: http://svn.apache.org/viewvc?rev=1806454&view=rev
Log:
OAK-6593: CacheStats metrics
Also expose request count
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetrics.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetrics.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetrics.java?rev=1806454&r1=1806453&r2=1806454&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetrics.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetrics.java
Mon Aug 28 12:55:11 2017
@@ -44,6 +44,7 @@ public class CacheStatsMetrics {
private static final Logger LOG =
LoggerFactory.getLogger(CacheStatsMetrics.class);
+ static final String REQUEST = "request";
static final String HIT = "hit";
static final String MISS = "miss";
static final String EVICTION = "eviction";
@@ -51,7 +52,7 @@ public class CacheStatsMetrics {
static final String LOAD_TIME = "loadTime";
private static final List<String> TYPES = ImmutableList.of(
- HIT, MISS, EVICTION, ELEMENT, LOAD_TIME);
+ REQUEST, HIT, MISS, EVICTION, ELEMENT, LOAD_TIME);
private Map<String, CacheStatsMBean> cacheStatsMBeans = Maps.newHashMap();
private MetricRegistry registry = new MetricRegistry();
@@ -86,6 +87,7 @@ public class CacheStatsMetrics {
private static void registerCacheStatsMBean(MetricRegistry registry,
CacheStatsMBean stats) {
+ registerMetric(registry, new RequestCounter(stats));
registerMetric(registry, new HitCounter(stats));
registerMetric(registry, new MissCounter(stats));
registerMetric(registry, new EvictionCounter(stats));
@@ -128,6 +130,18 @@ public class CacheStatsMetrics {
}
}
+ private static final class RequestCounter extends CacheStatsMBeanCounter {
+
+ RequestCounter(CacheStatsMBean stats) {
+ super(stats, REQUEST);
+ }
+
+ @Override
+ public long getCount() {
+ return stats.getRequestCount();
+ }
+ }
+
private static final class HitCounter extends CacheStatsMBeanCounter {
HitCounter(CacheStatsMBean stats) {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java?rev=1806454&r1=1806453&r2=1806454&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
Mon Aug 28 12:55:11 2017
@@ -34,6 +34,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.cache.impl.CacheStatsMetrics.EVICTION;
import static org.apache.jackrabbit.oak.cache.impl.CacheStatsMetrics.HIT;
import static org.apache.jackrabbit.oak.cache.impl.CacheStatsMetrics.MISS;
+import static org.apache.jackrabbit.oak.cache.impl.CacheStatsMetrics.REQUEST;
import static
org.apache.jackrabbit.oak.cache.impl.CacheStatsMetrics.metricName;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -43,6 +44,7 @@ public class CacheStatsMetricsTest {
private static final Random RANDOM = new Random();
private static final long HIT_COUNT = RANDOM.nextInt(Integer.MAX_VALUE);
private static final long MISS_COUNT = RANDOM.nextInt(Integer.MAX_VALUE);
+ private static final long REQUEST_COUNT = HIT_COUNT + MISS_COUNT;
private static final long EVICTION_COUNT =
RANDOM.nextInt(Integer.MAX_VALUE);
private static final long ELEMENT_COUNT =
RANDOM.nextInt(Integer.MAX_VALUE);
private static final long LOAD_TIME = RANDOM.nextInt(Integer.MAX_VALUE);
@@ -58,7 +60,11 @@ public class CacheStatsMetricsTest {
Map<String, Counter> counters = registry.getCounters();
- Counter counter = counters.get(metricName(bean.getName(), HIT));
+ Counter counter = counters.get(metricName(bean.getName(), REQUEST));
+ assertNotNull(counter);
+ assertEquals(REQUEST_COUNT, counter.getCount());
+
+ counter = counters.get(metricName(bean.getName(), HIT));
assertNotNull(counter);
assertEquals(HIT_COUNT, counter.getCount());
