RANGER-5553: Incorrect Tags count reported in SummaryTOTALTAGS metric from /service/metrics/json API

Author: RakeshGuptaDev

security-admin/src/main/java/org/apache/ranger/metrics/RangerMetricsFetcher.java

@@ -57,6 +57,7 @@ public class RangerMetricsFetcher {
 
     private final HashMap<String, Long> summaryReusable = new HashMap<>();
     private final HashMap<Integer, Long> summaryPolicy  = new HashMap<>();
+    private final Map<Integer, Long> summaryTagPolicy   = new HashMap<>();
 
     public Long getGroupCount() {
         Long totalGroupCount = groupService.getAllGroupCount();
@@ -121,19 +122,21 @@ public Map<String, Long> getPolicyMetrics(Integer policyType) {
 
         Map<String, Long> ret   = new HashMap<>();
         long              total = 0L;
+        long              totalTagPolicies = 0L;
 
         for (Map.Entry<String, Long> entry : svcStore.getPolicyCountByTypeAndServiceType(policyType).entrySet()) {
             ret.put(entry.getKey(), entry.getValue());
 
             total += entry.getValue();
 
             if ("tag".equalsIgnoreCase(entry.getKey())) {
-                summaryReusable.put("TotalTags", entry.getValue());
+                totalTagPolicies += entry.getValue().longValue();
             }
         }
 
         ret.put("Total", total);
         summaryPolicy.put(policyType, total);
+        summaryTagPolicy.put(policyType, totalTagPolicies);
 
         return ret;
     }
@@ -174,6 +177,9 @@ public Map<String, Long> getSummary() {
         //policies
         ret.put("TotalPolicies", summaryPolicy.values().stream().mapToLong(Long::longValue).sum());
 
+        //tag_policies
+        ret.put("TotalTagPolicies", summaryTagPolicy.values().stream().mapToLong(Long::longValue).sum());
+
         //roles
         ret.put("TotalRoles", daoMgr.getXXRole().getAllCount());
 
@@ -192,6 +198,9 @@ public Map<String, Long> getSummary() {
         //x_policy_export_audit
         ret.put("TotalPluginDownloads", daoMgr.getXXPolicyExportAudit().getAllCount());
 
+        //x_tag
+        ret.put("TotalTags", daoMgr.getXXTag().getAllCount());
+
         return ret;
     }