Update benchmark (#82)

* drop sending strings

* adapt changes to new tests

Author: awegrzyn

examples/5-Benchmark.cxx

@@ -11,7 +11,8 @@ using Monitoring = o2::monitoring::MonitoringFactory;
 
 int main(int argc, char *argv[]) {
   int sleep = 1000000;
-  int count = 0;
+  int count = 1;
+  int measurements = 1;
 
   std::random_device rd;
   std::mt19937 mt(rd());
@@ -24,12 +25,13 @@ int main(int argc, char *argv[]) {
     ("sleep", boost::program_options::value<int>(), "Thread sleep in microseconds")
     ("url", boost::program_options::value<std::string>()->required(), "URL to monitoring backend (or list of comma seperated URLs)")
     ("id", boost::program_options::value<std::string>(), "Instance ID")
-    ("count", boost::program_options::value<int>(), "Number of metric bunches (x3)")
+    ("count", boost::program_options::value<int>(), "Number of loop cycles")
     ("multiple", boost::program_options::bool_switch()->default_value(false), "Sends multiple metrics per measurement")
     ("vector", boost::program_options::bool_switch()->default_value(false), "Sends vector of metrics")
     ("monitor", boost::program_options::bool_switch()->default_value(false), "Enabled process monitor")
     ("buffer", boost::program_options::value<int>(), "Creates buffr of given size")
-  ;
+    ("measurements", boost::program_options::value<int>(), "Number of different measurements") 
+ ;
 
   boost::program_options::variables_map vm;
   boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
@@ -43,44 +45,48 @@ int main(int argc, char *argv[]) {
     count = vm["count"].as<int>();
   }
 
+  if (vm.count("measurements")) {
+    measurements = vm["measurements"].as<int>();
+  }
+
   auto monitoring = Monitoring::Get(vm["url"].as<std::string>());
   if (vm["monitor"].as<bool>()) {
     monitoring->enableProcessMonitoring(1);
   }
-  int add = 0;
-  if (count != 0) {
-    count--;
-    add = 1;
-  }
-
   if (vm["multiple"].as<bool>()) {
-    for (int i = 0; i <= count; i += add) {
-      monitoring->sendGrouped("benchmarkMeasurement",{
-        {"string" + std::to_string(intDist(mt)), "stringMetric"},
-        {doubleDist(mt), "doubleMetric"},
-        {intDist(mt), "intMetric"}
-      });
-      std::this_thread::sleep_for(std::chrono::microseconds(sleep));
+    for (int j = 1; j <= count; j++) {
+      for (int i = 1; i <= measurements; i++) {
+        monitoring->sendGrouped("measurement" + std::to_string(i) ,{
+          {doubleDist(mt), "doubleMetric"  + std::to_string(i)},
+          {intDist(mt), "intMetric"  + std::to_string(i)}
+        });
+        std::this_thread::sleep_for(std::chrono::microseconds(sleep));
+      }
+      if (!vm.count("count")) j--;
     }
   } else if (vm["vector"].as<bool>()) {
-    for (int i = 0; i <= count; i += add) {
-      monitoring->send({
-        {"string" + std::to_string(intDist(mt)), "stringMetric"},
-        {doubleDist(mt), "doubleMetric"},
-        {intDist(mt), "intMetricDebug"}
-      });
-      std::this_thread::sleep_for(std::chrono::microseconds(sleep));
+    for (int j = 1; j <= count; j++) {
+      for (int i = 1; i <= measurements; i++) {
+        monitoring->send({
+          {doubleDist(mt), "doubleMetric"  + std::to_string(i)},
+          {intDist(mt), "intMetricDebug"  + std::to_string(i)}
+        });
+        std::this_thread::sleep_for(std::chrono::microseconds(sleep));
+      }
+      if (!vm.count("count")) j--;
     }
   } else {
     if (vm.count("buffer")) {
       monitoring->enableBuffering(vm["buffer"].as<int>());
     }
-    for (int i = 0; i <= count; i += add) {
-      monitoring->send({"string" + std::to_string(intDist(mt)), "stringMetric"});
-      monitoring->send({doubleDist(mt), "doubleMetric"});
-      monitoring->send({intDist(mt), "intMetric"});
-      monitoring->debug({intDist(mt), "intMetricDebug"});
-      std::this_thread::sleep_for(std::chrono::microseconds(sleep));
+    for (int j = 1; j <= count; j++) {
+      for (int i = 1; i <= measurements; i++) {
+        monitoring->send({doubleDist(mt), "doubleMetric"  + std::to_string(i)});
+        monitoring->send({intDist(mt), "intMetric" + std::to_string(i)});
+        monitoring->debug({intDist(mt), "intMetricDebug" + std::to_string(i)});
+        std::this_thread::sleep_for(std::chrono::microseconds(sleep));
+      }
+      if (!vm.count("count")) j--;
     }
   }
 }

src/Backends/Flume.cxx

@@ -57,7 +57,7 @@ void Flume::send(std::vector<Metric>&& metrics)
 
 void Flume::sendMultiple(std::string measurement, std::vector<Metric>&& metrics)
 {
-  mTransport->send(metricsToJson(measurement, std::move(metrics)));
+  mTransport->send(metricsToJson(measurement, std::move(metrics)) + '\n');
 }
 
 std::string Flume::metricsToJson(std::string measurement, std::vector<Metric>&& metrics)