From a19bcb6ba11a8a4bb9f7ab67051b9c7e749d9e12 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 19 May 2018 20:17:10 -0300 Subject: [PATCH 1/4] #203 ehcache 2.0 support - initial commit --- simpleclient_ehcache2/pom.xml | 71 ++++++ .../cache/EhCacheMetricsCollector.java | 202 ++++++++++++++++++ .../cache/CacheMetricsCollectorTest.java | 82 +++++++ 3 files changed, 355 insertions(+) create mode 100644 simpleclient_ehcache2/pom.xml create mode 100644 simpleclient_ehcache2/src/main/java/io/prometheus/client/ehcache2/cache/EhCacheMetricsCollector.java create mode 100644 simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java diff --git a/simpleclient_ehcache2/pom.xml b/simpleclient_ehcache2/pom.xml new file mode 100644 index 000000000..396941db8 --- /dev/null +++ b/simpleclient_ehcache2/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + + io.prometheus + parent + 0.0.27-SNAPSHOT + + + io.prometheus + simpleclient_ehcache2 + bundle + + Prometheus Java Simpleclient ehcache2 + + Metrics collector for ehcache2 based caches + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + luan-cestari + Luan Cestari + luan.cestari@gmail.com + + + + + + io.prometheus + simpleclient + 0.0.27-SNAPSHOT + + + net.sf.ehcache + ehcache + 2.10.4 + compile + + + + + junit + junit + 4.11 + test + + + + org.mockito + mockito-core + 2.9.0 + test + + + org.assertj + assertj-core + 3.8.0 + test + + + + diff --git a/simpleclient_ehcache2/src/main/java/io/prometheus/client/ehcache2/cache/EhCacheMetricsCollector.java b/simpleclient_ehcache2/src/main/java/io/prometheus/client/ehcache2/cache/EhCacheMetricsCollector.java new file mode 100644 index 000000000..7dbdfee41 --- /dev/null +++ b/simpleclient_ehcache2/src/main/java/io/prometheus/client/ehcache2/cache/EhCacheMetricsCollector.java @@ -0,0 +1,202 @@ +package io.prometheus.client.ehcache2.cache; + +import io.prometheus.client.Collector; +import io.prometheus.client.CounterMetricFamily; +import io.prometheus.client.GaugeMetricFamily; +import net.sf.ehcache.Ehcache; +import net.sf.ehcache.statistics.StatisticsGateway; +import net.sf.ehcache.statistics.extended.ExtendedStatistics; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +/** + * Collect metrics from Ehcache's v2 net.sf.ehcache.Ehcache. + *

+ * 

{@code
+ *
+ * // Note need to set statistics="true" to the  element of your ehcache configuration XML
+ * org.springframework.cache.Cache ehcache2 = //get from Springs's context
+ * org.springframework.cache.Cache otherEhcache2 = //get from Springs's context
+ * CacheMetricsCollector cacheMetrics = new EhCacheMetricsCollector();
+ * cacheMetrics.addCache("mycache", ehcache2);
+ * cacheMetrics.addCache("othercache", otherEhcache2);
+ * cacheMetrics.register()
+ *
+ * }
+ * + * Exposed metrics are labeled with the provided cache name. + * + * With the example above, sample metric names would be: + * 
+ *     ehcache2_cache_hit_total{cache="mycache"} 10.0
+ *     ehcache2_cache_hit_total{cache="othercache"} 87.0
+ *     ehcache2_cache_miss_total{cache="mycache"} 3.0
+ *     ehcache2_cache_miss_total{cache="othercache"} 55.0
+ *
+ * + * + */ +public class EhCacheMetricsCollector extends Collector { + + protected final ConcurrentMap children = new ConcurrentHashMap(); + + + /** + * Add or replace the cache with the given name. + *

+ * Any references any previous cache with this name is invalidated. + * + * @param cacheName The name of the cache, will be the metrics label value + * @param cache The cache being monitored + */ + public void addCache(String cacheName, Ehcache cache) { + children.put(cacheName, cache); + } + + /** + * Remove the cache with the given name. + *

+ * Any references to the cache are invalidated. + * + * @param cacheName cache to be removed + */ + public Ehcache removeCache(String cacheName) { + return children.remove(cacheName); + } + + /** + * Remove all caches. + *

+ * Any references to all caches are invalidated. + */ + public void clear(){ + children.clear(); + } + + @Override + public List collect() { + List mfs = new ArrayList(); + List labelNames = Arrays.asList("cache"); + + CounterMetricFamily cacheHitRatio = new CounterMetricFamily("ehcache2_cache_hit_ratio", "Cache hit ratio", labelNames); + mfs.add(cacheHitRatio); + CounterMetricFamily cacheHitTotal = new CounterMetricFamily("ehcache2_cache_hit_total", "Cache hit totals", labelNames); + mfs.add(cacheHitTotal); + CounterMetricFamily cacheInMemoryHitTotal = new CounterMetricFamily("ehcache2_cache_in_memory_hit_total", "Cache in-memory hit totals", labelNames); + mfs.add(cacheInMemoryHitTotal); + CounterMetricFamily cacheOffHeapHitTotal = new CounterMetricFamily("ehcache2_cache_off_heap_hit_total", "Cache off-heap hit totals", labelNames); + mfs.add(cacheOffHeapHitTotal); + CounterMetricFamily cacheOnDiskHitTotal = new CounterMetricFamily("ehcache2_cache_on_disk_hit_total", "Cache on-disk hit totals", labelNames); + mfs.add(cacheOnDiskHitTotal); + + CounterMetricFamily cacheMissExpired = new CounterMetricFamily("ehcache2_cache_miss_expired", "Cache miss expired", labelNames); + mfs.add(cacheMissExpired); + CounterMetricFamily cacheMissTotal = new CounterMetricFamily("ehcache2_cache_miss_total", "Cache miss totals", labelNames); + mfs.add(cacheMissTotal); + CounterMetricFamily cacheInMemoryMissTotal = new CounterMetricFamily("ehcache2_cache_in_memory_miss_total", "Cache in-memory miss totals", labelNames); + mfs.add(cacheInMemoryMissTotal); + CounterMetricFamily cacheOffHeapMissTotal = new CounterMetricFamily("ehcache2_cache_off_heap_miss_total", "Cache off-heap miss totals", labelNames); + mfs.add(cacheOffHeapMissTotal); + CounterMetricFamily cacheOnDiskMissTotal = new CounterMetricFamily("ehcache2_cache_on_disk_miss_total", "Cache on-disk miss totals", labelNames); + mfs.add(cacheOnDiskMissTotal); + + GaugeMetricFamily cacheSize = new GaugeMetricFamily("ehcache2_cache_size", "Cache size", labelNames); + mfs.add(cacheSize); + GaugeMetricFamily cacheInMemorySize = new GaugeMetricFamily("ehcache2_cache_in_memory_size", "Cache size", labelNames); + mfs.add(cacheInMemorySize); + GaugeMetricFamily cacheOffHeapSize = new GaugeMetricFamily("ehcache2_cache_off_heap_size", "Cache size", labelNames); + mfs.add(cacheOffHeapSize); + GaugeMetricFamily cacheOnDiskSize = new GaugeMetricFamily("ehcache2_cache_on_disk_size", "Cache size", labelNames); + mfs.add(cacheOnDiskSize); + + GaugeMetricFamily cacheExpiredTotal = new GaugeMetricFamily("ehcache2_cache_expired_total", "Cache expired total", labelNames); + mfs.add(cacheExpiredTotal); + GaugeMetricFamily cacheEvictedTotal = new GaugeMetricFamily("ehcache2_cache_evicted_total", "Cache evicted total", labelNames); + mfs.add(cacheEvictedTotal); + + GaugeMetricFamily cacheGetLatencyAvg = new GaugeMetricFamily("ehcache2_cache_get_latency_avg", "Cache average get latency ", labelNames); + mfs.add(cacheGetLatencyAvg); + + GaugeMetricFamily cacheMissLatencyAvg = new GaugeMetricFamily("ehcache2_cache_miss_latency_avg", "Cache average miss latency ", labelNames); + mfs.add(cacheMissLatencyAvg); + + GaugeMetricFamily cacheEvictionLatencyAvg = new GaugeMetricFamily("ehcache2_cache_eviction_latency_avg", "Cache average eviction latency ", labelNames); + mfs.add(cacheEvictionLatencyAvg); + + GaugeMetricFamily cacheExpiredLatencyAvg = new GaugeMetricFamily("ehcache2_cache_expired_latency_avg", "Cache average expired latency ", labelNames); + mfs.add(cacheExpiredLatencyAvg); + + GaugeMetricFamily cacheSearchLatencyAvg = new GaugeMetricFamily("ehcache2_cache_search_latency_avg", "Cache average search latency ", labelNames); + mfs.add(cacheSearchLatencyAvg); + + GaugeMetricFamily cacheSearchPerSecond = new GaugeMetricFamily("ehcache2_cache_search_per_second", "Cache search per second ", labelNames); + mfs.add(cacheSearchPerSecond); + GaugeMetricFamily cacheGetPerSecond = new GaugeMetricFamily("ehcache2_cache_get_per_second", "Cache get per second ", labelNames); + mfs.add(cacheGetPerSecond); + + GaugeMetricFamily cacheHeapSizeInBytes = new GaugeMetricFamily("ehcache2_cache_heap_memory_bytes", "Used memory of cache in heap in bytes", labelNames); + mfs.add(cacheHeapSizeInBytes); + GaugeMetricFamily cacheOffHeapSizeInBytes = new GaugeMetricFamily("ehcache2_cache_off_heap_memory_bytes", "Used memory of cache in off-heap in bytes ", labelNames); + mfs.add(cacheOffHeapSizeInBytes); + GaugeMetricFamily cacheDiskSizeInBytes = new GaugeMetricFamily("ehcache2_cache_disk_memory_bytes", "Used memory of cache in disk in bytes", labelNames); + mfs.add(cacheDiskSizeInBytes); + + GaugeMetricFamily cacheWriterQueueLength = new GaugeMetricFamily("ehcache2_cache_writer_queue_length", "Cache writer queue length", labelNames); + mfs.add(cacheWriterQueueLength); + + for(Map.Entry c: children.entrySet()) { + List cacheName = Arrays.asList(c.getKey()); + StatisticsGateway stats = c.getValue().getStatistics(); + + cacheHitRatio.addMetric(cacheName,stats.cacheHitRatio()); + cacheHitTotal.addMetric(cacheName, stats.cacheHitCount()); + cacheInMemoryHitTotal.addMetric(cacheName, stats.localHeapHitCount()); + cacheOffHeapHitTotal.addMetric(cacheName, stats.localOffHeapHitCount()); + cacheOnDiskHitTotal.addMetric(cacheName, stats.localDiskHitCount()); + + cacheMissExpired.addMetric(cacheName, stats.cacheMissExpiredCount()); + cacheMissTotal.addMetric(cacheName, stats.cacheMissCount()); + cacheInMemoryMissTotal.addMetric(cacheName, stats.localHeapMissCount()); + cacheOffHeapMissTotal.addMetric(cacheName, stats.localOffHeapMissCount()); + cacheOnDiskMissTotal.addMetric(cacheName, stats.localDiskMissCount()); + + cacheSize.addMetric(cacheName, stats.getSize()); + cacheInMemorySize.addMetric(cacheName, stats.getLocalHeapSize()); + cacheOffHeapSize.addMetric(cacheName, stats.getLocalOffHeapSize()); + cacheOnDiskSize.addMetric(cacheName, stats.getLocalDiskSize()); + + cacheExpiredTotal.addMetric(cacheName,stats.cacheExpiredCount()); + cacheEvictedTotal.addMetric(cacheName,stats.cacheEvictedCount()); + + ExtendedStatistics.Result cacheGetOperation = stats.cacheGetOperation(); + ExtendedStatistics.Result cacheSearchOperation = stats.cacheSearchOperation(); + ExtendedStatistics.Result cacheMissOperation = stats.cacheMissOperation(); + ExtendedStatistics.Result cacheEvictionOperation = stats.cacheEvictionOperation(); + ExtendedStatistics.Result cacheExpiredOperation = stats.cacheExpiredOperation(); + + cacheGetLatencyAvg.addMetric(cacheName, cacheGetOperation.latency().average().value()); + + cacheMissLatencyAvg.addMetric(cacheName, cacheMissOperation.latency().average().value()); + + cacheEvictionLatencyAvg.addMetric(cacheName, cacheEvictionOperation.latency().average().value()); + + cacheExpiredLatencyAvg.addMetric(cacheName, cacheExpiredOperation.latency().average().value()); + + cacheSearchLatencyAvg.addMetric(cacheName, cacheSearchOperation.latency().average().value()); + + cacheGetPerSecond.addMetric(cacheName, cacheGetOperation.rate().value()); + cacheSearchPerSecond.addMetric(cacheName, cacheSearchOperation.rate().value()); + + cacheHeapSizeInBytes.addMetric(cacheName, stats.getLocalHeapSizeInBytes()); + cacheOffHeapSizeInBytes.addMetric(cacheName, stats.getLocalOffHeapSizeInBytes()); + cacheDiskSizeInBytes.addMetric(cacheName, stats.getLocalDiskSizeInBytes()); + + cacheWriterQueueLength.addMetric(cacheName, stats.getWriterQueueLength()); + } + return mfs; + } +} \ No newline at end of file diff --git a/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java b/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java new file mode 100644 index 000000000..82c9b3df9 --- /dev/null +++ b/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java @@ -0,0 +1,82 @@ +package io.prometheus.client.ehcache2.cache; + +import io.prometheus.client.CollectorRegistry; +import org.junit.Test; + + +import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class CacheMetricsCollectorTest { + + @Test + public void cacheExposesMetricsForHitMissAndEviction() throws Exception { + Cache cache = CacheBuilder.newBuilder().maximumSize(2).recordStats().build(); + CollectorRegistry registry = new CollectorRegistry(); + + CacheMetricsCollector collector = new CacheMetricsCollector().register(registry); + collector.addCache("users", cache); + + cache.getIfPresent("user1"); + cache.getIfPresent("user1"); + cache.put("user1", "First User"); + cache.getIfPresent("user1"); + + // Add to cache to trigger eviction. + cache.put("user2", "Second User"); + cache.put("user3", "Third User"); + cache.put("user4", "Fourth User"); + + assertMetric(registry, "guava_cache_hit_total", "users", 1.0); + assertMetric(registry, "guava_cache_miss_total", "users", 2.0); + assertMetric(registry, "guava_cache_requests_total", "users", 3.0); + assertMetric(registry, "guava_cache_eviction_total", "users", 2.0); + } + + @SuppressWarnings("unchecked") + @Test + public void loadingCacheExposesMetricsForLoadsAndExceptions() throws Exception { + CacheLoader loader = mock(CacheLoader.class); + when(loader.load(anyString())) + .thenReturn("First User") + .thenThrow(new RuntimeException("Seconds time fails")) + .thenReturn("Third User"); + + LoadingCache cache = CacheBuilder.newBuilder().recordStats().build(loader); + CollectorRegistry registry = new CollectorRegistry(); + CacheMetricsCollector collector = new CacheMetricsCollector().register(registry); + collector.addCache("loadingusers", cache); + + cache.get("user1"); + cache.get("user1"); + try{ + cache.get("user2"); + } catch (Exception e) { + // ignoring. + } + cache.get("user3"); + + assertMetric(registry, "guava_cache_hit_total", "loadingusers", 1.0); + assertMetric(registry, "guava_cache_miss_total", "loadingusers", 3.0); + + assertMetric(registry, "guava_cache_load_failure_total", "loadingusers", 1.0); + assertMetric(registry, "guava_cache_loads_total", "loadingusers", 3.0); + + assertMetric(registry, "guava_cache_load_duration_seconds_count", "loadingusers", 3.0); + assertMetricGreatThan(registry, "guava_cache_load_duration_seconds_sum", "loadingusers", 0.0); + } + + + private void assertMetric(CollectorRegistry registry, String name, String cacheName, double value) { + assertThat(registry.getSampleValue(name, new String[]{"cache"}, new String[]{cacheName})).isEqualTo(value); + } + + + private void assertMetricGreatThan(CollectorRegistry registry, String name, String cacheName, double value) { + assertThat(registry.getSampleValue(name, new String[]{"cache"}, new String[]{cacheName})).isGreaterThan(value); + } + + +} From 64d89f66ac92f8a67e7440ae90305a7f2837244f Mon Sep 17 00:00:00 2001 From: Luan Cestari Date: Sat, 26 May 2018 19:05:29 -0300 Subject: [PATCH 2/4] #203 Created EhCache 2 implementation --- pom.xml | 3 +- simpleclient_ehcache2/pom.xml | 4 +- .../cache/EhCacheMetricsCollector.java | 26 +++--- .../cache/CacheMetricsCollectorTest.java | 91 +++++++------------ 4 files changed, 53 insertions(+), 71 deletions(-) diff --git a/pom.xml b/pom.xml index 419ca2922..dd03c2f3f 100644 --- a/pom.xml +++ b/pom.xml @@ -47,9 +47,10 @@ simpleclient_common simpleclient_caffeine simpleclient_dropwizard + simpleclient_ehcache2 simpleclient_graphite_bridge - simpleclient_hibernate simpleclient_guava + simpleclient_hibernate simpleclient_hotspot simpleclient_httpserver simpleclient_log4j diff --git a/simpleclient_ehcache2/pom.xml b/simpleclient_ehcache2/pom.xml index 396941db8..06b8a51f3 100644 --- a/simpleclient_ehcache2/pom.xml +++ b/simpleclient_ehcache2/pom.xml @@ -42,8 +42,8 @@ net.sf.ehcache ehcache - 2.10.4 - compile + 2.10.5 + provided diff --git a/simpleclient_ehcache2/src/main/java/io/prometheus/client/ehcache2/cache/EhCacheMetricsCollector.java b/simpleclient_ehcache2/src/main/java/io/prometheus/client/ehcache2/cache/EhCacheMetricsCollector.java index 7dbdfee41..135d81daf 100644 --- a/simpleclient_ehcache2/src/main/java/io/prometheus/client/ehcache2/cache/EhCacheMetricsCollector.java +++ b/simpleclient_ehcache2/src/main/java/io/prometheus/client/ehcache2/cache/EhCacheMetricsCollector.java @@ -13,6 +13,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; + /** * Collect metrics from Ehcache's v2 net.sf.ehcache.Ehcache. *

@@ -27,9 +28,9 @@ * cacheMetrics.register() * * } - * + *

* Exposed metrics are labeled with the provided cache name. - * + *

* With the example above, sample metric names would be: * 

  *     ehcache2_cache_hit_total{cache="mycache"} 10.0
@@ -37,10 +38,8 @@
  *     ehcache2_cache_miss_total{cache="mycache"} 3.0
  *     ehcache2_cache_miss_total{cache="othercache"} 55.0
  *
- * - * */ -public class EhCacheMetricsCollector extends Collector { +public class EhCacheMetricsCollector extends Collector { protected final ConcurrentMap children = new ConcurrentHashMap(); @@ -51,7 +50,7 @@ public class EhCacheMetricsCollector extends Collector { * Any references any previous cache with this name is invalidated. * * @param cacheName The name of the cache, will be the metrics label value - * @param cache The cache being monitored + * @param cache The cache being monitored */ public void addCache(String cacheName, Ehcache cache) { children.put(cacheName, cache); @@ -73,7 +72,7 @@ public Ehcache removeCache(String cacheName) { *

* Any references to all caches are invalidated. */ - public void clear(){ + public void clear() { children.clear(); } @@ -86,6 +85,10 @@ public List collect() { mfs.add(cacheHitRatio); CounterMetricFamily cacheHitTotal = new CounterMetricFamily("ehcache2_cache_hit_total", "Cache hit totals", labelNames); mfs.add(cacheHitTotal); + + CounterMetricFamily cacheEvictionTotal = new CounterMetricFamily("ehcache2_cache_eviction_total", "Cache eviction totals", labelNames); + mfs.add(cacheEvictionTotal); + CounterMetricFamily cacheInMemoryHitTotal = new CounterMetricFamily("ehcache2_cache_in_memory_hit_total", "Cache in-memory hit totals", labelNames); mfs.add(cacheInMemoryHitTotal); CounterMetricFamily cacheOffHeapHitTotal = new CounterMetricFamily("ehcache2_cache_off_heap_hit_total", "Cache off-heap hit totals", labelNames); @@ -148,12 +151,13 @@ public List collect() { GaugeMetricFamily cacheWriterQueueLength = new GaugeMetricFamily("ehcache2_cache_writer_queue_length", "Cache writer queue length", labelNames); mfs.add(cacheWriterQueueLength); - for(Map.Entry c: children.entrySet()) { + for (Map.Entry c : children.entrySet()) { List cacheName = Arrays.asList(c.getKey()); StatisticsGateway stats = c.getValue().getStatistics(); - cacheHitRatio.addMetric(cacheName,stats.cacheHitRatio()); + cacheHitRatio.addMetric(cacheName, stats.cacheHitRatio()); cacheHitTotal.addMetric(cacheName, stats.cacheHitCount()); + cacheEvictionTotal.addMetric(cacheName, stats.cacheEvictedCount()); cacheInMemoryHitTotal.addMetric(cacheName, stats.localHeapHitCount()); cacheOffHeapHitTotal.addMetric(cacheName, stats.localOffHeapHitCount()); cacheOnDiskHitTotal.addMetric(cacheName, stats.localDiskHitCount()); @@ -169,8 +173,8 @@ public List collect() { cacheOffHeapSize.addMetric(cacheName, stats.getLocalOffHeapSize()); cacheOnDiskSize.addMetric(cacheName, stats.getLocalDiskSize()); - cacheExpiredTotal.addMetric(cacheName,stats.cacheExpiredCount()); - cacheEvictedTotal.addMetric(cacheName,stats.cacheEvictedCount()); + cacheExpiredTotal.addMetric(cacheName, stats.cacheExpiredCount()); + cacheEvictedTotal.addMetric(cacheName, stats.cacheEvictedCount()); ExtendedStatistics.Result cacheGetOperation = stats.cacheGetOperation(); ExtendedStatistics.Result cacheSearchOperation = stats.cacheSearchOperation(); diff --git a/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java b/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java index 82c9b3df9..b8edcabda 100644 --- a/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java +++ b/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java @@ -1,74 +1,51 @@ package io.prometheus.client.ehcache2.cache; import io.prometheus.client.CollectorRegistry; +import net.sf.ehcache.Cache; +import net.sf.ehcache.CacheManager; +import net.sf.ehcache.Element; +import net.sf.ehcache.config.CacheConfiguration; +import net.sf.ehcache.config.PersistenceConfiguration; +import net.sf.ehcache.store.MemoryStoreEvictionPolicy; import org.junit.Test; - import static org.assertj.core.api.Java6Assertions.assertThat; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; public class CacheMetricsCollectorTest { @Test public void cacheExposesMetricsForHitMissAndEviction() throws Exception { - Cache cache = CacheBuilder.newBuilder().maximumSize(2).recordStats().build(); + CacheManager singletonManager = CacheManager.create(); + Cache testCache = new Cache( + new CacheConfiguration("testCache", 2) + .memoryStoreEvictionPolicy(MemoryStoreEvictionPolicy.LRU) + .eternal(false) + .timeToLiveSeconds(5) + .timeToIdleSeconds(5) + .diskExpiryThreadIntervalSeconds(5) + .persistence(new PersistenceConfiguration().strategy(PersistenceConfiguration.Strategy.NONE)) + + ); + singletonManager.addCache(testCache); + Cache test = singletonManager.getCache("testCache"); CollectorRegistry registry = new CollectorRegistry(); - - CacheMetricsCollector collector = new CacheMetricsCollector().register(registry); - collector.addCache("users", cache); - - cache.getIfPresent("user1"); - cache.getIfPresent("user1"); - cache.put("user1", "First User"); - cache.getIfPresent("user1"); - - // Add to cache to trigger eviction. - cache.put("user2", "Second User"); - cache.put("user3", "Third User"); - cache.put("user4", "Fourth User"); - - assertMetric(registry, "guava_cache_hit_total", "users", 1.0); - assertMetric(registry, "guava_cache_miss_total", "users", 2.0); - assertMetric(registry, "guava_cache_requests_total", "users", 3.0); - assertMetric(registry, "guava_cache_eviction_total", "users", 2.0); + EhCacheMetricsCollector collector = new EhCacheMetricsCollector().register(registry); + collector.addCache("testCache", test); + test.get("key1"); + test.get("key1"); + test.put(new Element("key1", "value1")); + test.get("key1"); + + test.put(new Element("key2", "value2")); + test.put(new Element("key3", "value3")); + test.put(new Element("key4", "value4")); + + assertMetric(registry, "ehcache2_cache_hit_total", "testCache", 1.0); + assertMetric(registry, "ehcache2_cache_miss_total", "testCache", 2.0); + assertMetric(registry, "ehcache2_cache_hit_total", "testCache", 3.0); + singletonManager.removeCache("testCache"); } - @SuppressWarnings("unchecked") - @Test - public void loadingCacheExposesMetricsForLoadsAndExceptions() throws Exception { - CacheLoader loader = mock(CacheLoader.class); - when(loader.load(anyString())) - .thenReturn("First User") - .thenThrow(new RuntimeException("Seconds time fails")) - .thenReturn("Third User"); - - LoadingCache cache = CacheBuilder.newBuilder().recordStats().build(loader); - CollectorRegistry registry = new CollectorRegistry(); - CacheMetricsCollector collector = new CacheMetricsCollector().register(registry); - collector.addCache("loadingusers", cache); - - cache.get("user1"); - cache.get("user1"); - try{ - cache.get("user2"); - } catch (Exception e) { - // ignoring. - } - cache.get("user3"); - - assertMetric(registry, "guava_cache_hit_total", "loadingusers", 1.0); - assertMetric(registry, "guava_cache_miss_total", "loadingusers", 3.0); - - assertMetric(registry, "guava_cache_load_failure_total", "loadingusers", 1.0); - assertMetric(registry, "guava_cache_loads_total", "loadingusers", 3.0); - - assertMetric(registry, "guava_cache_load_duration_seconds_count", "loadingusers", 3.0); - assertMetricGreatThan(registry, "guava_cache_load_duration_seconds_sum", "loadingusers", 0.0); - } - - private void assertMetric(CollectorRegistry registry, String name, String cacheName, double value) { assertThat(registry.getSampleValue(name, new String[]{"cache"}, new String[]{cacheName})).isEqualTo(value); } From 569505d17644da2b1fba46bee72ffa3085671ca9 Mon Sep 17 00:00:00 2001 From: Luan Cestari Date: Sat, 26 May 2018 19:10:04 -0300 Subject: [PATCH 3/4] #203 Updated to latest version of parent --- simpleclient_ehcache2/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/simpleclient_ehcache2/pom.xml b/simpleclient_ehcache2/pom.xml index 06b8a51f3..8309c112f 100644 --- a/simpleclient_ehcache2/pom.xml +++ b/simpleclient_ehcache2/pom.xml @@ -5,7 +5,7 @@ io.prometheus parent - 0.0.27-SNAPSHOT + 0.4.1-SNAPSHOT io.prometheus @@ -37,7 +37,7 @@ io.prometheus simpleclient - 0.0.27-SNAPSHOT + 0.4.1-SNAPSHOT net.sf.ehcache @@ -53,7 +53,7 @@ 4.11 test - + org.mockito mockito-core From e3341e0961573663eefa04a3f1292efb02658fe9 Mon Sep 17 00:00:00 2001 From: Luan Cestari Date: Sat, 26 May 2018 19:12:11 -0300 Subject: [PATCH 4/4] #203 Removed duplicated line --- .../client/ehcache2/cache/CacheMetricsCollectorTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java b/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java index b8edcabda..1df941e9c 100644 --- a/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java +++ b/simpleclient_ehcache2/src/test/java/io/prometheus/client/ehcache2/cache/CacheMetricsCollectorTest.java @@ -42,7 +42,6 @@ public void cacheExposesMetricsForHitMissAndEviction() throws Exception { assertMetric(registry, "ehcache2_cache_hit_total", "testCache", 1.0); assertMetric(registry, "ehcache2_cache_miss_total", "testCache", 2.0); - assertMetric(registry, "ehcache2_cache_hit_total", "testCache", 3.0); singletonManager.removeCache("testCache"); }