remove precalculation of stats holder

bump up to new minor

pom.xml

@@ -23,7 +23,7 @@
   <groupId>io.rainfall</groupId>
   <artifactId>rainfall-core</artifactId>
   <name>Rainfall-core</name>
-  <version>1.4.17-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>

src/main/java/io/rainfall/ScenarioRun.java

@@ -19,13 +19,11 @@
 import io.rainfall.configuration.ConcurrencyConfig;
 import io.rainfall.configuration.DistributedConfig;
 import io.rainfall.configuration.ReportingConfig;
-import io.rainfall.reporting.Reporter;
 import io.rainfall.reporting.PeriodicReporter;
-import io.rainfall.statistics.InitStatisticsHolder;
+import io.rainfall.reporting.Reporter;
 import io.rainfall.statistics.RuntimeStatisticsHolder;
 import io.rainfall.statistics.StatisticsPeekHolder;
 import io.rainfall.statistics.StatisticsThread;
-import io.rainfall.utils.RangeMap;
 import io.rainfall.utils.distributed.RainfallClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +32,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -113,16 +110,11 @@ public StatisticsPeekHolder<E> start() {
     //TODO : add generics ? cast?
     ReportingConfig<E> reportingConfig = (ReportingConfig<E>)configurations.get(ReportingConfig.class);
 
-    //TODO change this, this is ugly
-    // we need to call all operations to init the 'names', measured, should the 'name' be the key of the maps or instead
-    // be inside of the Statistics, and the key would be operation result
-    // besides, we end up having to initialize two stats holder, one real, and one blank for warmup phase, it's ugly
-    RuntimeStatisticsHolder<E> blankStatisticsHolder = new RuntimeStatisticsHolder<E>(reportingConfig.getResults(), reportingConfig
-        .getResultsReported(), reportingConfig.getStatisticsCollectors());
-    initStatistics(blankStatisticsHolder);
 
     try {
       if (warmup != null) {
+        RuntimeStatisticsHolder<E> blankStatisticsHolder = new RuntimeStatisticsHolder<E>(reportingConfig.getResults(), reportingConfig
+            .getResultsReported(), reportingConfig.getStatisticsCollectors());
         System.out.println("Executing warmup phase, please wait.");
         warmup.execute(blankStatisticsHolder, scenario, configurations, assertions);
       }
@@ -132,11 +124,10 @@ public StatisticsPeekHolder<E> start() {
 
     this.statisticsHolder = new RuntimeStatisticsHolder<E>(reportingConfig.getResults(), reportingConfig.getResultsReported(),
         reportingConfig.getStatisticsCollectors());
-    initStatistics(this.statisticsHolder);
 
     final Set<Reporter<E>> logReporters = reportingConfig.getLogReporters();
     ScheduledExecutorService topOfSecondExecutor = Executors.newScheduledThreadPool(logReporters.size(), new CustomThreadFactory());
-    StatisticsThread<E>  stats = null;
+    StatisticsThread<E> stats = null;
     StatisticsPeekHolder<E> peek = null;
     try {
       stats = new StatisticsThread<E>(statisticsHolder, reportingConfig, getDescription(),
@@ -260,20 +251,6 @@ private List<String> getDescription() {
     return description;
   }
 
-  private void initStatistics(RuntimeStatisticsHolder<E> statisticsHolder) {
-    try {
-      for (RangeMap<WeightedOperation> operation : scenario.getOperations().values()) {
-        Collection<WeightedOperation> allOperations = operation.getAll();
-        for (WeightedOperation allOperation : allOperations) {
-          allOperation.getOperation()
-              .exec(new InitStatisticsHolder<E>(statisticsHolder), this.configurations, this.assertions);
-        }
-      }
-    } catch (TestException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   public Scenario getScenario() {
     return scenario;
   }

src/main/java/io/rainfall/statistics/RuntimeStatisticsHolder.java

@@ -81,11 +81,6 @@ public Histogram fetchHistogram(final Enum<E> result) {
     return this.histograms.fetchHistogram(result);
   }
 
-  public void addStatistics(String name, Statistics<E> statistics) {
-    this.statistics.put(name, statistics);
-    this.assertionsErrors.put(name, new LongAdder());
-  }
-
   @Override
   public synchronized void reset() {
     for (Statistics<E> statistics : this.statistics.values()) {
@@ -105,7 +100,15 @@ public synchronized long getCurrentTps(Enum result) {
 
   @Override
   public void record(final String name, final long responseTimeInNs, final Enum result) {
-    this.statistics.get(name).increaseCounterAndSetLatencyInNs(result, responseTimeInNs);
+    Statistics<E> eStatistics = this.statistics.get(name);
+    if (eStatistics == null) {
+      final Statistics<E> statistics = new Statistics<>(name, results);
+      eStatistics = this.statistics.putIfAbsent(name, statistics);
+      if (eStatistics == null) {
+        eStatistics = statistics;
+      }
+    }
+    eStatistics.increaseCounterAndSetLatencyInNs(result, responseTimeInNs);
     histograms.recordValue(result, responseTimeInNs);
   }
 

src/test/java/io/rainfall/integration/StatsTest.java

@@ -19,7 +19,6 @@
 import io.rainfall.configuration.ReportingConfig;
 import io.rainfall.reporting.Reporter;
 import io.rainfall.statistics.RuntimeStatisticsHolder;
-import io.rainfall.statistics.Statistics;
 import io.rainfall.utils.SystemTest;
 import org.HdrHistogram.Histogram;
 import org.junit.Ignore;
@@ -60,7 +59,6 @@ public void testStatsHolderOnly() {
     );
 
     String name = "MY_TEST";
-    statisticsHolder.addStatistics(name, new Statistics<StatsTestResult>(name, statisticsHolder.getResults()));
 
     TimeUnit reportIntervalUnit = reportingConfig.getReportTimeUnit();
     long reportIntervalMillis = reportIntervalUnit.toMillis(reportingConfig.getReportInterval());