RANGER-4168: added unit tests for Metrics and TagDBStore the missing …

…classes Signed-off-by: Madhan Neethiraj <[email protected]>
gympass · May 30, 2023 · ce3c3b8 · ce3c3b8
1 parent e3137b2
commit ce3c3b8
Show file tree

Hide file tree

Showing 5 changed files with 1,329 additions and 14 deletions.
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/MetricsREST.java b/security-admin/src/main/java/org/apache/ranger/rest/MetricsREST.java
@@ -77,7 +77,7 @@ public RangerMetrics getStatus() {
         jvm.put("jvm",vmDetails);
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("<== MetricsREST.getStatus() " + jvm);
+            LOG.debug("<== MetricsREST.getStatus(): jvm=" + jvm);
         }
 
         return new RangerMetrics(jvm);
@@ -88,7 +88,7 @@ public RangerMetrics getStatus() {
     @Produces(MediaType.TEXT_PLAIN)
     public String getMetricsPrometheus() {
         if (LOG.isDebugEnabled()) {
-            LOG.debug("MetricsREST.getMetricsPrometheus() ===>>");
+            LOG.debug("==> MetricsREST.getMetricsPrometheus()");
         }
         String ret = "";
         try {
@@ -98,7 +98,7 @@ public String getMetricsPrometheus() {
         }
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("MetricsREST.getMetricsPrometheus() <<=== {}", ret);
+            LOG.debug("<== MetricsREST.getMetricsPrometheus(): ret=" + ret);
         }
         return ret;
     }
@@ -108,7 +108,7 @@ public String getMetricsPrometheus() {
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Map<String, Object>> getMetricsJson() {
         if (LOG.isDebugEnabled()) {
-            LOG.debug("MetricsREST.getMetricsJson() ===>>");
+            LOG.debug("==> MetricsREST.getMetricsJson()");
         }
 
         Map<String, Map<String, Object>> ret = null;
@@ -119,7 +119,7 @@ public Map<String, Map<String, Object>> getMetricsJson() {
         }
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("MetricsREST.getMetricsJson() <<=== {}", ret);
+            LOG.debug("<== MetricsREST.getMetricsJson(): ret=" + ret);
         }
         return ret;
     }

diff --git a/security-admin/src/main/java/org/apache/ranger/util/RangerMetricsUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RangerMetricsUtil.java
@@ -44,7 +44,6 @@ public class RangerMetricsUtil {
     private static final Logger LOG = LoggerFactory.getLogger(RangerMetricsUtil.class);
     private static final OperatingSystemMXBean OS;
     private static final MemoryMXBean MEM_BEAN;
-    public static final String NL = System.getProperty("line.separator");
 
     static {
         OS = ManagementFactory.getOperatingSystemMXBean();
@@ -53,7 +52,7 @@ public class RangerMetricsUtil {
 
     public Map<String, Object> getValues() {
         if (LOG.isDebugEnabled()) {
-            LOG.debug("==> RangerJVMMetricUtil.getValues()");
+            LOG.debug("==> RangerMetricsUtil.getValues()");
         }
 
         Map<String, Object> values = new LinkedHashMap<>();
@@ -62,7 +61,7 @@ public Map<String, Object> getValues() {
         values.put("memory", addMemoryDetails());
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("<== RangerJVMMetricUtil.getValues()" + values);
+            LOG.debug("<== RangerMetricsUtil.getValues()" + values);
         }
 
         return values;
@@ -73,7 +72,7 @@ public Map<String, Object> getValues() {
      */
     protected Map<String, Object> getPoolDivision() {
         if (LOG.isDebugEnabled()) {
-            LOG.debug("==> RangerJVMMetricUtil.getPoolDivision()");
+            LOG.debug("==> RangerMetricsUtil.getPoolDivision()");
         }
 
         Map<String, Object> poolDivisionValues = new LinkedHashMap<>();
@@ -84,7 +83,7 @@ protected Map<String, Object> getPoolDivision() {
         }
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("<== RangerJVMMetricUtil.getPoolDivision()" + poolDivisionValues);
+            LOG.debug("<== RangerMetricsUtil.getPoolDivision()" + poolDivisionValues);
         }
 
         return poolDivisionValues;
@@ -95,7 +94,7 @@ protected Map<String, Object> getPoolDivision() {
      */
     protected Map<String, Object> addMemoryDetails() {
         if (LOG.isDebugEnabled()) {
-            LOG.debug("==> RangerJVMMetricUtil.addMemoryDetails()");
+            LOG.debug("==> RangerMetricsUtil.addMemoryDetails()");
         }
 
         Map<String, Object> memory  = new LinkedHashMap<>();
@@ -112,7 +111,7 @@ protected Map<String, Object> addMemoryDetails() {
         memory.put("memory_pool_usages", getPoolDivision());
 
         if (LOG.isDebugEnabled()) {
-            LOG.debug("<== RangerJVMMetricUtil.addMemoryDetails()" + memory);
+            LOG.debug("<== RangerMetricsUtil.addMemoryDetails()" + memory);
         }
 
         return memory;
@@ -123,12 +122,12 @@ protected Map<String, Object> addMemoryDetails() {
      */
     protected String[] addSystemInfo() {
         if (LOG.isDebugEnabled()) {
-            LOG.debug("==> RangerJVMMetricUtil.addSystemInfo()");
+            LOG.debug("==> RangerMetricsUtil.addSystemInfo()");
         }
 
         String[] osInfo = { OS.getName(), OS.getArch(), OS.getVersion() };
         if (LOG.isDebugEnabled()) {
-            LOG.debug("<== RangerJVMMetricUtil.addSystemInfo()" + osInfo);
+            LOG.debug("<== RangerMetricsUtil.addSystemInfo()" + osInfo);
         }
 
         return osInfo;