Now gathers physical CPU and RAM data to close #2

.gitignore

@@ -10,3 +10,4 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+/bin/

build.gradle

@@ -15,6 +15,9 @@ repositories {
 }
 
 dependencies {
+    // OSHI to collect HW and system state data
+    compile group: 'com.github.dblock', name: 'oshi-core', version: '2.+'
+
     // Raven, exception reporting client (requires logback)
     compile group: 'net.kencochrane.raven', name: 'raven-logback', version: '6.+'
 

src/main/java/com/shootoff/diagnostics/Main.java

@@ -25,12 +25,35 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import oshi.SystemInfo;
+
 public class Main {
 	private static final Logger logger = LoggerFactory.getLogger(Main.class);
 	private static final long BYTES_IN_MEGABYTE = 1048576;
 	private static final long SHOOTOFF_PROCESS_TIMEOUT = 15000; // ms
 
 	public static void main(String[] args) throws IOException, InterruptedException {
+		SystemInfo si = new SystemInfo();
+
+		StringBuilder cpuLoadPerProcessor = new StringBuilder("CPU Load Per Processor:");
+
+		for (double load : si.getHardware().getProcessor().getProcessorCpuLoadBetweenTicks()) {
+			cpuLoadPerProcessor.append(" ");
+			cpuLoadPerProcessor.append(String.format("%.02f", load * 100));
+			cpuLoadPerProcessor.append("%");
+		}
+
+		String cpuData = String.format("%s%n is64bit = %b%n physical cpu(s): %d%n logical cpu(s): %d%n%s", 
+				si.getHardware().getProcessor().getName(),
+				si.getHardware().getProcessor().isCpu64bit(),
+				si.getHardware().getProcessor().getPhysicalProcessorCount(),
+				si.getHardware().getProcessor().getLogicalProcessorCount(),
+				cpuLoadPerProcessor);
+
+		String ramData = String.format("Total RAM Installed: %d MB%nAvailable RAM: %d MB", 
+				si.getHardware().getMemory().getTotal() / BYTES_IN_MEGABYTE,
+				si.getHardware().getMemory().getAvailable() / BYTES_IN_MEGABYTE);
+
 		String runtimeName = System.getProperty("java.runtime.name");
 		String runtimeVersion = System.getProperty("java.runtime.version");
 		String jvmBitness = System.getProperty("sun.arch.data.model");
@@ -47,8 +70,8 @@ public static void main(String[] args) throws IOException, InterruptedException
 		long maxMemory = Runtime.getRuntime().maxMemory() / BYTES_IN_MEGABYTE;
 		String memoryAvailableToJVM = String.format("Max amount of memory JVM will use = %d MB", maxMemory);
 
-		String diagnosticData = String.format("%s%n%s%n%s%n%n%s", runtimeData, osData, 
-				memoryAvailableToJVM, getShootOFFOutput());
+		String diagnosticData = String.format("%s%n%s%n%s%n%s%n%s%n%s%n", runtimeData, osData, 
+				memoryAvailableToJVM, cpuData, ramData, getShootOFFOutput());
 
 		logger.error(diagnosticData);
 	}

src/main/resources/logback.xml

@@ -16,7 +16,7 @@
 
   <appender name="Sentry" class="net.kencochrane.raven.logback.SentryAppender">
     <dsn>http://e125530c2ca249bd956343ca2ad09dd4:c34458865bef486195a6b0341e95e3de@dev.shootoffapp.com:9000/1</dsn>
-    <tags>shootoff-diagnostic-tool:1.0</tags>
+    <tags>shootoff-diagnostic-tool:1.1</tags>
   </appender>
 
   <root level="warn">