moved from uint64_t to int64_t

Author: awegrzyn

include/Monitoring/Metric.h

@@ -43,10 +43,16 @@ class Metric
     Metric(double value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
 
     /// Initialize class variables
-    /// \param value            metric value (uint64_t)
+    /// \param value            metric value (int64_t)
     /// \param name             metric name
     /// \param timestamp        metric timestamp in milliseconds
-    Metric(uint64_t value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
+    Metric(int64_t value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
+
+    /// Initialize class variables, required by derived metrics logic
+    /// \param value            metric value (boost variant)
+    /// \param name             metric name
+    /// \param timestamp        metric timestamp in milliseconds
+    Metric(boost::variant< int, std::string, double, int64_t >, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
 
     /// Default destructor
     ~Metric() = default;
@@ -61,7 +67,7 @@ class Metric
 
     /// Value getter
     /// \return metric value
-    boost::variant< int, std::string, double, uint64_t > getValue() const;
+    boost::variant< int, std::string, double, int64_t > getValue() const;
 
     /// Value type getter
     /// \return type of value stores inside metric : 0 - int, 1 - std::string, 2 - double
@@ -87,7 +93,7 @@ class Metric
 
   private:
     /// Metric value
-    boost::variant< int, std::string, double, uint64_t > mValue;
+    boost::variant< int, std::string, double, int64_t > mValue;
 
     /// Metric name
     std::string mName;

src/Collector.cxx

@@ -181,17 +181,17 @@ void Collector::sendTimed(T value, std::string name, std::chrono::time_point<std
 template void Collector::send(int, std::string);
 template void Collector::send(double, std::string);
 template void Collector::send(std::string, std::string);
-template void Collector::send(uint64_t, std::string);
+template void Collector::send(int64_t, std::string);
 
 template void Collector::sendTagged(int, std::string, std::vector<Tag>&& tags);
 template void Collector::sendTagged(double, std::string, std::vector<Tag>&& tags);
 template void Collector::sendTagged(std::string, std::string, std::vector<Tag>&& tags);
-template void Collector::sendTagged(uint64_t, std::string, std::vector<Tag>&& tags);
+template void Collector::sendTagged(int64_t, std::string, std::vector<Tag>&& tags);
 
 template void Collector::sendTimed(int, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
 template void Collector::sendTimed(double, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
 template void Collector::sendTimed(std::string, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
-template void Collector::sendTimed(uint64_t, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
+template void Collector::sendTimed(int64_t, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
 
 } // namespace Monitoring
 } // namespace AliceO2

src/DerivedMetrics.cxx

@@ -6,13 +6,16 @@
 #include "Monitoring/DerivedMetrics.h"
 #include "Exceptions/MonitoringInternalException.h"
 #include <boost/lexical_cast.hpp>
+#include <boost/variant/variant.hpp>
+#include <boost/variant/apply_visitor.hpp>
 #include <chrono>
 #include <iostream>
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 #include "MonLogger.h"
+#include "VariantVisitorRate.h"
 
 namespace AliceO2
 {

src/ProcessMonitor.cxx

@@ -39,11 +39,11 @@ std::vector<Metric> ProcessMonitor::getNetworkUsage()
     auto position = line.find(":");
     auto secondPosition = line.find(":", position + 1);
     metrics.emplace_back(Metric{
-      static_cast<uint64_t>(std::stoull(line.substr(position + 1, secondPosition - position - 1))),
+      static_cast<int64_t>(std::stoll(line.substr(position + 1, secondPosition - position - 1))),
       "bytesReceived"}.addTags({{"if", line.substr(0, position)}})
     );
     metrics.emplace_back(Metric{
-      static_cast<uint64_t>(std::stoull(line.substr(secondPosition + 1, line.size()))),
+      static_cast<int64_t>(std::stoll(line.substr(secondPosition + 1, line.size()))),
       "bytesTransmitted"}.addTags({{"if", line.substr(0, position)}})
     );
   }

test/testMetric.cxx

@@ -50,11 +50,11 @@ BOOST_AUTO_TEST_CASE(retrieveString)
 
 BOOST_AUTO_TEST_CASE(retrieveUnsignedLongLong)
 {
-  uint64_t value = 10000000000000LL;
+  int64_t value = 10000000000000LL;
   std::string name("metric name");
   AliceO2::Monitoring::Metric metricInstance(value,  name );
 
-  BOOST_CHECK_EQUAL(boost::get<uint64_t>(metricInstance.getValue()), 10000000000000LL);
+  BOOST_CHECK_EQUAL(boost::get<int64_t>(metricInstance.getValue()), 10000000000000LL);
   BOOST_CHECK_EQUAL(metricInstance.getType(), 3);
 }