Fixed syntax errors from log analyzer framework, and added sigar depe…

…ndencies (to do native Java monitoring of system resources).

balancers.iml

@@ -42,5 +42,10 @@
     <orderEntry type="library" name="Maven: com.jcraft:jzlib:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:12.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: jfree:jfreechart:1.0.13" level="project" />
+    <orderEntry type="library" name="Maven: jfree:jcommon:1.0.16" level="project" />
+    <orderEntry type="library" name="Maven: org.fusesource:sigar:1.6.4" level="project" />
+    <orderEntry type="library" name="sigar-lib" level="project" />
   </component>
 </module>

pom.xml

@@ -40,6 +40,26 @@
             <version>12.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>3.4.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jfree</groupId>
+            <artifactId>jfreechart</artifactId>
+            <version>1.0.13</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.fusesource</groupId>
+            <artifactId>sigar</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+
+
+
     </dependencies>
 
 </project>

src/main/java/com/loadbalancers/analysis/Runner.java

@@ -1,11 +1,12 @@
 package com.loadbalancers.analysis;
 
-import main.analyzers.Analyzer;
-import main.analyzers.balancer.MasterAnalyzer;
-import main.analyzers.system.GlobalAnalyzer;
-import main.analyzers.workers.WorkersAnalyzer;
-import main.events.LogEvent;
-import main.events.LogEventStream;
+
+import com.loadbalancers.analysis.analyzers.Analyzer;
+import com.loadbalancers.analysis.analyzers.balancer.MasterAnalyzer;
+import com.loadbalancers.analysis.analyzers.system.GlobalAnalyzer;
+import com.loadbalancers.analysis.analyzers.workers.WorkersAnalyzer;
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

src/main/java/com/loadbalancers/analysis/analyzers/balancer/ArrivalRateAnalyzer.java

@@ -1,7 +1,8 @@
 package com.loadbalancers.analysis.analyzers.balancer;
 
-import main.events.LogEvent;
-import main.events.LogEventStream;
+
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.springframework.stereotype.Component;

src/main/java/com/loadbalancers/analysis/analyzers/balancer/ArrivalRateTypeAnalyzer.java

@@ -1,7 +1,8 @@
 package com.loadbalancers.analysis.analyzers.balancer;
 
-import main.events.LogEvent;
-import main.events.LogEventStream;
+
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.jfree.data.xy.DefaultTableXYDataset;
 import org.jfree.data.xy.TableXYDataset;
 import org.jfree.data.xy.XYSeries;

src/main/java/com/loadbalancers/analysis/analyzers/balancer/BacklogAnalyzer.java

@@ -1,7 +1,8 @@
 package com.loadbalancers.analysis.analyzers.balancer;
 
-import main.events.LogEvent;
-import main.events.LogEventStream;
+
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.springframework.stereotype.Component;

src/main/java/com/loadbalancers/analysis/analyzers/balancer/DuplicateRateAnalyzer.java

@@ -1,7 +1,8 @@
 package com.loadbalancers.analysis.analyzers.balancer;
 
-import main.events.LogEvent;
-import main.events.LogEventStream;
+
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.jfree.data.xy.DefaultTableXYDataset;
 import org.jfree.data.xy.TableXYDataset;
 import org.jfree.data.xy.XYSeries;

src/main/java/com/loadbalancers/analysis/analyzers/balancer/LatencyAnalyzer.java

@@ -1,7 +1,8 @@
 package com.loadbalancers.analysis.analyzers.balancer;
 
-import main.events.LogEvent;
-import main.events.LogEventStream;
+
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.jfree.chart.renderer.AbstractRenderer;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;

src/main/java/com/loadbalancers/analysis/analyzers/balancer/MasterAnalyzer.java

@@ -1,7 +1,8 @@
 package com.loadbalancers.analysis.analyzers.balancer;
 
-import main.analyzers.Analyzer;
-import main.events.LogEventStream;
+
+import com.loadbalancers.analysis.analyzers.Analyzer;
+import com.loadbalancers.analysis.events.LogEventStream;
 
 /**
  * @author Elias Szabo-Wexler

src/main/java/com/loadbalancers/analysis/analyzers/balancer/ThroughputAnalyzer.java

@@ -1,7 +1,7 @@
 package com.loadbalancers.analysis.analyzers.balancer;
 
-import main.events.LogEvent;
-import main.events.LogEventStream;
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.springframework.stereotype.Component;

src/main/java/com/loadbalancers/analysis/analyzers/balancer/WindowedLatencyAnalyzer.java

@@ -1,7 +1,8 @@
 package com.loadbalancers.analysis.analyzers.balancer;
 
-import main.events.LogEvent;
-import main.events.LogEventStream;
+
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.jfree.chart.renderer.AbstractRenderer;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;

src/main/java/com/loadbalancers/analysis/analyzers/balancer/WorkerCountAnalyzer.java

@@ -1,7 +1,7 @@
 package com.loadbalancers.analysis.analyzers.balancer;
 
-import main.events.LogEvent;
-import main.events.LogEventStream;
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.springframework.stereotype.Component;

src/main/java/com/loadbalancers/analysis/analyzers/system/GlobalAnalyzer.java

@@ -1,7 +1,7 @@
 package com.loadbalancers.analysis.analyzers.system;
 
-import main.analyzers.Analyzer;
-import main.events.LogEventStream;
+import com.loadbalancers.analysis.analyzers.Analyzer;
+import com.loadbalancers.analysis.events.LogEventStream;
 
 import java.util.List;
 

src/main/java/com/loadbalancers/analysis/analyzers/system/NetworkLatencyAnalyzer.java

@@ -1,7 +1,8 @@
 package com.loadbalancers.analysis.analyzers.system;
 
-import main.events.LogEvent;
-import main.events.LogEventStream;
+
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.jfree.data.xy.XYSeries;

src/main/java/com/loadbalancers/analysis/analyzers/workers/WorkerBacklogAnalyzer.java

@@ -1,8 +1,8 @@
 package com.loadbalancers.analysis.analyzers.workers;
 
-import main.analyzers.system.NetworkLatencyAnalyzer;
-import main.events.LogEvent;
-import main.events.LogEventStream;
+import com.loadbalancers.analysis.analyzers.system.NetworkLatencyAnalyzer;
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYSplineRenderer;
 import org.jfree.data.xy.XYSeries;

src/main/java/com/loadbalancers/analysis/analyzers/workers/WorkerCPUEfficiencyAnalyzer.java

@@ -1,8 +1,9 @@
 package com.loadbalancers.analysis.analyzers.workers;
 
-import main.analyzers.system.NetworkLatencyAnalyzer;
-import main.events.LogEvent;
-import main.events.LogEventStream;
+
+import com.loadbalancers.analysis.analyzers.system.NetworkLatencyAnalyzer;
+import com.loadbalancers.analysis.events.LogEvent;
+import com.loadbalancers.analysis.events.LogEventStream;
 import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.data.xy.XYSeries;

src/main/java/com/loadbalancers/main/Runner.java

@@ -36,7 +36,6 @@ public static void main (final String [] args) throws Exception {
         final RpcServer balancer = spinUpBalancer(context, workers);
         final LocalTracePlaybackClient client = makeClient(conf);
         final List<LoadBalancer.Trace> traces = loadTraces(context.getBean(Configs.class));
-        traces.forEach(client::runTrace);
         System.exit(0);
     }
 

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 balancer.server.hostname=localhost
 balancer.server.port=15418
 
-worker.server.count=1
+worker.server.count=2
 worker.server.hostnames=localhost
 
 client.hostname=localhost

src/main/resources/hyperic-sigar-1.6.4/AUTHORS

@@ -0,0 +1,23 @@
+Doug MacEachern <dougm at vmware.com>
+
+Jan Kneschke <jan at kneschke.de>
+
+Matthew Kent <mkent at magoazul.com>
+
+Ryan Beasley <rbeasley at vmware.com>
+
+Bjoern Martin <boris59 at boris59.de>
+
+Kay Ropke <kroepke at classdump.local>
+
+Ryan Morgan <rmorgan at hyperic.com>
+
+Monty Taylor <mordred at inaugust.com>
+
+Trevor Pounds <trevor.pounds at gmail.com>
+
+Jon Travis <jtravis at hyperic.com>
+
+Tony Ashburner <tashburner at emergency.qld.gov.au>
+
+Ryan Bloom <rbloom at covalent.net>