Support for TransactionAwareCacheDecorator

This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-8984
This commit is contained in:
Stephane Nicoll
2017-05-22 11:05:39 +02:00
parent b73e1d46ae
commit a59000354c
2 changed files with 43 additions and 1 deletions

View File

@@ -18,6 +18,7 @@ package org.springframework.boot.actuate.endpoint;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -29,7 +30,10 @@ import org.springframework.boot.actuate.cache.CaffeineCacheStatisticsProvider;
import org.springframework.boot.actuate.cache.ConcurrentMapCacheStatisticsProvider;
import org.springframework.boot.actuate.metrics.Metric;
import org.springframework.cache.CacheManager;
import org.springframework.cache.concurrent.ConcurrentMapCache;
import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
import org.springframework.cache.support.SimpleCacheManager;
import org.springframework.cache.transaction.TransactionAwareCacheDecorator;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
@@ -78,6 +82,19 @@ public class CachePublicMetricsTests {
entry("cache.anotherCacheManager_foo.size", 0L));
}
@Test
public void cacheMetricsWithTransactionAwareCacheDecorator() {
SimpleCacheManager cacheManager = new SimpleCacheManager();
cacheManager.setCaches(Collections.singletonList(
new TransactionAwareCacheDecorator(new ConcurrentMapCache("foo"))));
cacheManager.afterPropertiesSet();
this.cacheManagers.put("cacheManager", cacheManager);
CachePublicMetrics cpm = new CachePublicMetrics(this.cacheManagers,
providers(new ConcurrentMapCacheStatisticsProvider()));
Map<String, Number> metrics = metrics(cpm);
assertThat(metrics).containsOnly(entry("cache.foo.size", 0L));
}
private Map<String, Number> metrics(CachePublicMetrics cpm) {
Collection<Metric<?>> metrics = cpm.metrics();
assertThat(metrics).isNotNull();