ATLAS-3052: removed caching of metrics query results

repository/src/main/java/org/apache/atlas/services/MetricsService.java

@@ -59,30 +59,21 @@ public class MetricsService {
     protected static final String METRIC_TAG_COUNT         = TAG + "Count";
     protected static final String METRIC_ENTITIES_PER_TAG  = TAG + "Entities";
 
-    public static final String METRIC_QUERY_CACHE_TTL                = "atlas.metric.query.cache.ttlInSecs";
-    public static final String METRIC_QUERY_GREMLIN_TYPES_BATCH_SIZE = "atlas.metric.query.gremlin.typesBatchSize";
-    public static final int    DEFAULT_CACHE_TTL_IN_SECS             = 900;
     public static final String METRIC_COLLECTION_TIME                = "collectionTime";
 
     private final AtlasGraph        atlasGraph;
     private final AtlasTypeRegistry typeRegistry;
-    private final int               cacheTTLInSecs;
     private final String            indexSearchPrefix = AtlasGraphUtilsV2.getIndexSearchPrefix();
 
-    private AtlasMetrics cachedMetrics       = null;
-    private long         cacheExpirationTime = 0;
-
     @Inject
-    public MetricsService(final Configuration configuration, final AtlasGraph graph, final AtlasTypeRegistry typeRegistry) {
+    public MetricsService(final AtlasGraph graph, final AtlasTypeRegistry typeRegistry) {
         this.atlasGraph   = graph;
-        this.cacheTTLInSecs = configuration != null ? configuration.getInt(METRIC_QUERY_CACHE_TTL, DEFAULT_CACHE_TTL_IN_SECS) : DEFAULT_CACHE_TTL_IN_SECS;
         this.typeRegistry = typeRegistry;
 
     }
 
     @SuppressWarnings("unchecked")
-    public AtlasMetrics getMetrics(boolean ignoreCache) {
-        if (ignoreCache || !isCacheValid()) {
+    public AtlasMetrics getMetrics() {
         AtlasMetrics metrics = new AtlasMetrics();
 
         metrics.addMetric(GENERAL, METRIC_TYPE_COUNT, getAllTypesCount());
@@ -156,11 +147,7 @@ public class MetricsService {
 
         metrics.addMetric(GENERAL, METRIC_COLLECTION_TIME, collectionTime);
 
-            this.cachedMetrics       = metrics;
-            this.cacheExpirationTime = (collectionTime + cacheTTLInSecs * 1000);
-        }
-
-        return cachedMetrics;
+        return metrics;
     }
 
     private Long getTypeCount(String typeName, Status status) {
@@ -183,16 +170,4 @@ public class MetricsService {
 
         return CollectionUtils.isNotEmpty(allTagNames) ? allTagNames.size() : 0;
     }
-
-    private boolean isCacheValid() {
-        boolean valid = cachedMetrics != null && System.currentTimeMillis() < cacheExpirationTime;
-
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("cachedMetrics: {}", cachedMetrics != null);
-            LOG.debug("cacheExpirationTime: {}", cacheExpirationTime);
-            LOG.debug("valid: {}", valid);
-        }
-
-        return valid;
-    }
 }
\ No newline at end of file

repository/src/test/java/org/apache/atlas/services/MetricsServiceTest.java

@@ -124,7 +124,7 @@ public class MetricsServiceTest {
 
     @Test
     public void testGetMetrics() {
-        AtlasMetrics metrics = metricsService.getMetrics(true);
+        AtlasMetrics metrics = metricsService.getMetrics();
 
         assertNotNull(metrics);
 

webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java

@@ -319,12 +319,12 @@ public class AdminResource {
     @GET
     @Path("metrics")
     @Produces(Servlets.JSON_MEDIA_TYPE)
-    public AtlasMetrics getMetrics(@QueryParam("ignoreCache") boolean ignoreCache) {
+    public AtlasMetrics getMetrics() {
         if (LOG.isDebugEnabled()) {
             LOG.debug("==> AdminResource.getMetrics()");
         }
 
-        AtlasMetrics metrics = metricsService.getMetrics(ignoreCache);
+        AtlasMetrics metrics = metricsService.getMetrics();
 
         if (LOG.isDebugEnabled()) {
             LOG.debug("<== AdminResource.getMetrics()");