Send both raw and derived metrics (#54)

README.md

@@ -106,7 +106,7 @@ See table below to find out how to create `URI` for each backend:
 ### Sending metric
 
 ```cpp
-send(Metric&& metric)
+send(Metric&& metric, [DerivedMetricMode mode])
 ```
 Where metric constructor receives following parameters:
   - `T value`
@@ -118,6 +118,8 @@ For example:
 monitoring->send({10, "myMetricInt"});
 ```
 
+Regarding  `DerivedMetricMode` see [Calculating derived metrics](#calculating-derived-metrics).
+
 ### Customized metrics
 Two additional methods can be chained the to `send(Metric&& metric)` in order to __insert custom tags__ or __set custom timestamp__:
    + `addTags(std::vector<Tag>&& tags)`
@@ -179,9 +181,10 @@ Metrics consist of 4 parameters: name, value, timestamp and tags.
 + process name
 
 ### Calculating derived metrics
-The module can calculate derived metrics. To do so, use `addDerivedMetric(std::string name, DerivedMetricMode mode)` with one of two available modes:
-+ `DerivedMetricMode::RATE` - rate between two following metrics;
-+ `DerivedMetricMode::AVERAGE` - average value of all metrics stored in cache;
+The module can calculate derived metrics. To do so, use optional `DerivedMetricMode mode` parameter of `send` method:
++ `DerivedMetricMode::NONE` - no action,
++ `DerivedMetricMode::RATE` - rate between two following metrics,
++ `DerivedMetricMode::AVERAGE` - average value of all metrics stored in cache.
 
 Derived metrics are generated each time as new value is passed to the module. Their names are suffixed with derived mode name.
 

include/Monitoring/Monitoring.h

@@ -103,6 +103,9 @@ class Monitoring
     /// List of timers
     std::unordered_map <std::string, std::chrono::time_point<std::chrono::steady_clock>> mTimers;
 
+    /// Pushes metric to all backends or to the buffer
+    void pushToBackends(Metric&& metric);
+
     /// States whether Process Monitor thread is running
     std::atomic<bool> mMonitorRunning;
 

src/Monitoring.cxx

@@ -136,21 +136,15 @@ void Monitoring::sendGrouped(std::string measurement, std::vector<Metric>&& metr
   }
 }
 
-void Monitoring::send(std::vector<Metric>&& metrics) {
+void Monitoring::send(std::vector<Metric>&& metrics)
+{
   for (auto& b: mBackends) {
     b->send(std::move(metrics));
   }
 }
 
-void Monitoring::send(Metric&& metric, DerivedMetricMode mode)
+void Monitoring::pushToBackends(Metric&& metric)
 {
-  if (mode == DerivedMetricMode::RATE) {
-    metric = mDerivedHandler->rate(metric);
-  }
-
-  if (mode == DerivedMetricMode::INCREMENT) {
-    metric = mDerivedHandler->increment(metric);
-  }
   if (mBuffering) {
     mStorage.push_back(std::move(metric));
     if (mStorage.size() >= mBufferSize) {
@@ -163,5 +157,18 @@ void Monitoring::send(Metric&& metric, DerivedMetricMode mode)
   }
 }
 
+void Monitoring::send(Metric&& metric, DerivedMetricMode mode)
+{
+  if (mode == DerivedMetricMode::RATE) {
+    pushToBackends(mDerivedHandler->rate(metric));
+  }
+
+  if (mode == DerivedMetricMode::INCREMENT) {
+    pushToBackends(mDerivedHandler->increment(metric));
+  }
+
+  pushToBackends(std::move(metric));
+}
+
 } // namespace monitoring
 } // namespace o2