[#3] Add api /app/env & Modify api /app/status

WikiDru · WikiDru · commit b2df4232dc4d · 2018-09-30T22:06:46.000+09:00
diff --git a/src/main/java/org/code13k/heets/app/Env.java b/src/main/java/org/code13k/heets/app/Env.java
@@ -5,7 +5,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.InetAddress;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
 
 public class Env {
     // Logger
@@ -14,7 +23,6 @@ public class Env {
     // Data
     private String mHostname = "";
     private String mIP = "";
-    private int mProcessorCount = 0;
     private String mVersionString = "";
     private String mJarFilename = "";
 
@@ -56,30 +64,15 @@ public void init() {
             mLogger.error("Failed to get IP", e);
         }
 
-        // Processor Count
-        try {
-            mProcessorCount = Runtime.getRuntime().availableProcessors();
-        } catch (Exception e) {
-            mLogger.error("Filed to get processor count", e);
-        }
-
         // Version
         try {
-            mVersionString = Util.getApplicationVersion();
+            mVersionString = parseApplicationVersion();
         } catch (Exception e) {
             mLogger.error("Failed to get version", e);
         }
 
         // Jar File Name
-        String javaClassPath = System.getProperty("java.class.path");
-        String jarFilename = "";
-        if (StringUtils.isBlank(javaClassPath) == false) {
-            String[] temp = StringUtils.split(javaClassPath, "/");
-            if (temp.length > 0) {
-                jarFilename = temp[temp.length - 1];
-            }
-        }
-        mJarFilename = jarFilename;
+        mJarFilename = parseJarFilename();
 
         // End
         logging();
@@ -89,35 +82,31 @@ public void init() {
      * Logging
      */
     public void logging() {
-        // Begin
+        Map<String, Object> values = values();
         mLogger.info("------------------------------------------------------------------------");
         mLogger.info("Application Environments");
         mLogger.info("------------------------------------------------------------------------");
-
-        // Hostname
-        mLogger.info("Hostname = " + mHostname);
-
-        // IP
-        mLogger.info("IP = " + mIP);
-
-        // Processor Count
-        mLogger.info("Processor count = " + mProcessorCount);
-
-        // Version
-        mLogger.info("Version = " + mVersionString);
-
-        // Jar File Name
-        mLogger.info("Jar filename = " + mJarFilename);
-
-        // End
+        values.forEach((k, v) -> mLogger.info(k + " = " + v));
         mLogger.info("------------------------------------------------------------------------");
     }
 
     /**
-     * String of app version
+     * Get all values
      */
-    public String getVersionString() {
-        return mVersionString;
+    public Map<String, Object> values() {
+        HashMap<String, Object> result = new HashMap<>();
+
+        result.put("hostname", getHostname());
+        result.put("ip", getIP());
+        result.put("cpuProcessorCount", getProcessorCount());
+        result.put("applicationVersion", getVersionString());
+        result.put("jarFile", getJarFilename());
+        result.put("javaVersion", getJavaVersion());
+        result.put("javaVendor", getJavaVendor());
+        result.put("osVersion", getOsVersion());
+        result.put("osName", getOsName());
+
+        return result;
     }
 
     /**
@@ -138,13 +127,92 @@ public String getIP() {
      * Processor count of server
      */
     public int getProcessorCount() {
-        return mProcessorCount;
+        return Runtime.getRuntime().availableProcessors();
+    }
+
+    /**
+     * String of app version
+     */
+    public String getVersionString() {
+        return mVersionString;
     }
 
     /**
      * Filename of Jar
      */
-    public String getJarFilename(){
+    public String getJarFilename() {
         return mJarFilename;
     }
+
+    /**
+     * Get java version
+     */
+    public String getJavaVersion() {
+        return System.getProperty("java.version");
+    }
+
+    /**
+     * Get java vendor
+     */
+    public String getJavaVendor() {
+        return System.getProperty("java.vendor");
+    }
+
+    /**
+     * Get OS name
+     */
+    public String getOsName() {
+        return System.getProperty("os.name");
+    }
+
+    /**
+     * Get OS version
+     */
+    public String getOsVersion() {
+        return System.getProperty("os.version");
+    }
+
+    /**
+     * Get app version from manifest info
+     */
+    private String parseApplicationVersion() {
+        Enumeration resourceEnum;
+        try {
+            resourceEnum = Thread.currentThread().getContextClassLoader().getResources(JarFile.MANIFEST_NAME);
+            while (resourceEnum.hasMoreElements()) {
+                try {
+                    URL url = (URL) resourceEnum.nextElement();
+                    InputStream is = url.openStream();
+                    if (is != null) {
+                        Manifest manifest = new Manifest(is);
+                        Attributes attr = manifest.getMainAttributes();
+                        String version = attr.getValue("Implementation-Version");
+                        if (version != null) {
+                            return version;
+                        }
+                    }
+                } catch (Exception e) {
+                    // Nothing
+                }
+            }
+        } catch (IOException e1) {
+            // Nothing
+        }
+        return null;
+    }
+
+    /**
+     * Get jar file name from system property
+     */
+    private String parseJarFilename() {
+        String javaClassPath = System.getProperty("java.class.path");
+        String jarFilename = "";
+        if (StringUtils.isBlank(javaClassPath) == false) {
+            String[] temp = StringUtils.split(javaClassPath, "/");
+            if (temp.length > 0) {
+                jarFilename = temp[temp.length - 1];
+            }
+        }
+        return jarFilename;
+    }
 }
diff --git a/src/main/java/org/code13k/heets/app/Status.java b/src/main/java/org/code13k/heets/app/Status.java
@@ -1,14 +1,20 @@
 package org.code13k.heets.app;
 
-import io.netty.channel.group.ChannelGroup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.management.ManagementFactory;
+import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.*;
 
+/**
+ * Status
+ */
 public class Status {
     // Logger
     private static final Logger mLogger = LoggerFactory.getLogger(Status.class);
@@ -71,6 +77,25 @@ public void logging() {
         mLogger.info(sb.toString());
     }
 
+    /**
+     * Get all values
+     */
+    public Map<String, Object> values() {
+        HashMap<String, Object> result = new HashMap<>();
+
+        // Common
+        HashMap<Long, String> threadInfo = getThreadInfo();
+        result.put("threadInfo", threadInfo);
+        result.put("threadCount", threadInfo.size());
+        result.put("startedDate", getAppStartedDateString());
+        result.put("currentDate", getCurrentDateString());
+        result.put("runningTimeHour", getAppRunningTimeHour());
+        result.put("cpuUsage", getCpuUsage());
+        result.put("vmMemoryUsage", getVmMemoryUsage());
+
+        return result;
+    }
+
     /**
      * Get application started time
      */
@@ -107,4 +132,54 @@ public int getAppRunningTimeHour() {
         int runningTimeHour = runningTimeMin / 60;
         return runningTimeHour;
     }
+
+    /**
+     * Get CPU usage
+     */
+    public double getCpuUsage() {
+        // CPU Usage
+        OperatingSystemMXBean operatingSystemMXBean = ManagementFactory.getOperatingSystemMXBean();
+        double cpuUsage = operatingSystemMXBean.getSystemLoadAverage();
+        return new Double(new DecimalFormat("#.##").format(cpuUsage));
+    }
+
+    /**
+     * Get memory usage of VM
+     */
+    public HashMap<String, String> getVmMemoryUsage() {
+        // VM Memory Usage
+        Runtime runtime = Runtime.getRuntime();
+        NumberFormat format = NumberFormat.getInstance();
+        long vmMemoryMax = runtime.maxMemory();
+        long vmMemoryAllocated = runtime.totalMemory();
+        long vmMemoryFree = runtime.freeMemory();
+        String vmMemoryMaxString = format.format(vmMemoryMax / 1024 / 1024) + "M";
+        String vmMemoryAllocatedString = format.format(vmMemoryAllocated / 1024 / 1024) + "M";
+        String vmMemoryFreeString = format.format(vmMemoryFree / 1024 / 1024) + "M";
+        String vmMemoryTotalFreeString = format.format((vmMemoryFree + (vmMemoryMax - vmMemoryAllocated)) / 1024 / 1024) + "M";
+
+        // Result
+        HashMap<String, String> result = new HashMap<>();
+        result.put("max", vmMemoryMaxString);
+        result.put("allocated", vmMemoryAllocatedString);
+        result.put("free", vmMemoryFreeString);
+        result.put("totalFree", vmMemoryTotalFreeString);
+        return result;
+    }
+
+    /**
+     * Get thread info
+     */
+    public HashMap<Long, String> getThreadInfo() {
+        NumberFormat format = NumberFormat.getInstance();
+        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+        long[] threadIds = threadMXBean.getAllThreadIds();
+        HashMap<Long, String> threadResult = new HashMap<>();
+        for (long threadId : threadIds) {
+            ThreadInfo threadInfo = threadMXBean.getThreadInfo(threadId);
+            String threadInfoValue = threadInfo.getThreadName() + ", " + format.format(threadMXBean.getThreadCpuTime(threadId) / 1000000000) + "sec";
+            threadResult.put(threadId, threadInfoValue);
+        }
+        return threadResult;
+    }
 }
diff --git a/src/main/java/org/code13k/heets/business/ClusteredCache.java b/src/main/java/org/code13k/heets/business/ClusteredCache.java
@@ -22,7 +22,7 @@ public class ClusteredCache {
     private static final Logger mLogger = LoggerFactory.getLogger(ClusteredCache.class);
 
     // Const
-    private static final String NAME = "Code13k-Heets-Expired-Cached-Map-Data";
+    private static final String NAME = "Code13k-Heets-Cache-Data";
 
     // Data
     private IMap<String, CacheData> mData = null;
diff --git a/src/main/java/org/code13k/heets/service/api/ApiHttpServer.java b/src/main/java/org/code13k/heets/service/api/ApiHttpServer.java
@@ -81,12 +81,21 @@ private void logging(HttpServerOptions httpServerOptions, Router router) {
      * Set app router
      */
     private void setAppRouter(Router router) {
+        // GET /app/env
+        router.route().method(HttpMethod.GET).path("/app/env").handler(routingContext -> {
+            routingContext.request().endHandler(new Handler<Void>() {
+                @Override
+                public void handle(Void event) {
+                    responseHttpOK(routingContext, mAppAPI.env());
+                }
+            });
+        });
         // GET /app/status
         router.route().method(HttpMethod.GET).path("/app/status").handler(routingContext -> {
             routingContext.request().endHandler(new Handler<Void>() {
                 @Override
                 public void handle(Void event) {
-                    responseHttpOK(routingContext, mAppAPI.info());
+                    responseHttpOK(routingContext, mAppAPI.status());
                 }
             });
         });
diff --git a/src/main/java/org/code13k/heets/service/api/controller/AppAPI.java b/src/main/java/org/code13k/heets/service/api/controller/AppAPI.java
