better Java/system reporting

Author: vladak

opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java

@@ -84,6 +84,7 @@
 import org.opengrok.indexer.util.Executor;
 import org.opengrok.indexer.util.HostUtil;
 import org.opengrok.indexer.util.OptionParser;
+import org.opengrok.indexer.util.RuntimeUtil;
 import org.opengrok.indexer.util.Statistics;
 
 import static org.opengrok.indexer.util.RuntimeUtil.checkJavaVersion;
@@ -372,8 +373,9 @@ public static void main(String[] argv) {
                 }
             }
 
-            LOGGER.log(Level.INFO, "Indexer version {0} ({1}) running on Java {2}",
-                    new Object[]{Info.getVersion(), Info.getRevision(), Runtime.version()});
+            LOGGER.log(Level.INFO, "Indexer version {0} ({1}) running on Java {2} with properties: {3}",
+                    new Object[]{Info.getVersion(), Info.getRevision(), RuntimeUtil.getJavaVersion(),
+                            RuntimeUtil.getJavaProperties()});
 
             checkJavaVersion();
 

opengrok-indexer/src/main/java/org/opengrok/indexer/util/RuntimeUtil.java

@@ -22,6 +22,7 @@
  */
 package org.opengrok.indexer.util;
 
+
 public class RuntimeUtil {
     private RuntimeUtil() {
         // private for static
@@ -45,4 +46,43 @@ public static void checkJavaVersion() throws RuntimeException {
                     majorVersion, JAVA_VERSION_MIN, JAVA_VERSION_MAX));
         }
     }
+
+    /**
+     * @return string representing Java version and some properties
+     */
+    public static String getJavaVersion() {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("version: ").append(Runtime.version());
+        stringBuilder.append(", name: ").append(System.getProperty("java.vm.name"));
+        stringBuilder.append(", vendor: ").append(System.getProperty("java.vendor"));
+        stringBuilder.append(", arch: ").append(System.getProperty("os.arch"));
+        return stringBuilder.toString();
+    }
+
+    private static String bytesToHumanReadable(long size) {
+        if (size < 0) {
+            throw new IllegalArgumentException("Invalid size: " + size);
+        }
+        if (size < 1024) {
+            return size + " bytes";
+        }
+        String units = " KMGTPE";
+        int idx = 0;
+        float value = size;
+        while (value > 1024) {
+            value /= 1024;
+            idx++;
+        }
+        return String.format("%.1f %siB", value, units.substring(idx, idx + 1));
+    }
+
+    /**
+     * @return string representing Java properties of interest
+     */
+    public static String getJavaProperties() {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("ncpu: ").append(Runtime.getRuntime().availableProcessors());
+        stringBuilder.append(", maxMemory: ").append(bytesToHumanReadable(Runtime.getRuntime().maxMemory()));
+        return stringBuilder.toString();
+    }
 }

opengrok-web/src/main/java/org/opengrok/web/WebappListener.java

@@ -40,6 +40,7 @@
 import org.opengrok.indexer.index.IndexCheck;
 import org.opengrok.indexer.index.IndexCheckException;
 import org.opengrok.indexer.logger.LoggerFactory;
+import org.opengrok.indexer.util.RuntimeUtil;
 import org.opengrok.indexer.web.SearchHelper;
 import org.opengrok.web.api.ApiTaskManager;
 import org.opengrok.web.api.v1.controller.ConfigurationController;
@@ -79,8 +80,9 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
         ServletContext context = servletContextEvent.getServletContext();
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
-        LOGGER.log(Level.INFO, "Starting webapp with version {0} ({1}) on Java {2}",
-                    new Object[]{Info.getVersion(), Info.getRevision(), Runtime.version()});
+        LOGGER.log(Level.INFO, "Starting webapp with version {0} ({1}) on Java {2} with properties {3}",
+                    new Object[]{Info.getVersion(), Info.getRevision(), RuntimeUtil.getJavaVersion(),
+                    RuntimeUtil.getJavaProperties()});
 
         checkJavaVersion();