Drop name setter (#84)

Drop metric name setter

Author: awegrzyn

include/Monitoring/Metric.h

@@ -71,10 +71,6 @@ class Metric
     /// \return	metric name
     std::string getName() const;
 
-    /// Name setter
-    /// \param name	new name of the metric
-    void setName(std::string name);
-
     /// Timestamp getter
     /// \return 	metric timestamp
     std::chrono::time_point<std::chrono::system_clock> getTimestamp() const;

src/Backends/InfoLoggerBackend.cxx

@@ -43,13 +43,10 @@ void InfoLoggerBackend::send(std::vector<Metric>&& metrics) {
   }
 }
 
-void InfoLoggerBackend::sendMultiple(std::string measurement, std::vector<Metric>&& metrics)
+void InfoLoggerBackend::sendMultiple(std::string, std::vector<Metric>&& metrics)
 {
   for (auto& m : metrics) {
-    std::string tempName = m.getName();
-    m.setName(measurement + "-" + m.getName());
     send(m);
-    m.setName(tempName);
   }
 }
 

src/Backends/StdOut.cxx

@@ -46,11 +46,20 @@ void StdOut::send(std::vector<Metric>&& metrics) {
 
 void StdOut::sendMultiple(std::string measurement, std::vector<Metric>&& metrics)
 {
-  for (auto& m : metrics) {
-    std::string tempName = m.getName();
-    m.setName(measurement + "-" + m.getName());
-    send(m);
-    m.setName(tempName);
+  for (auto& metric : metrics) {
+    std::string metricTags{};
+    for (const auto& tag : metric.getTags()) {
+      if (!metricTags.empty()) {
+        metricTags += ",";
+      }
+      metricTags += tag.name + "=" + tag.value;
+    }
+    if (!metricTags.empty()) {
+      metricTags = "," + metricTags;
+    }
+    MonLogger::Get() << "[METRIC] " << measurement << "/" << metric.getName() << "," << metric.getType() << " "
+      << metric.getValue() << " " << convertTimestamp(metric.getTimestamp()) << " " << tagString << metricTags
+      << MonLogger::End();
   }
 }
 

src/Metric.cxx

@@ -30,11 +30,6 @@ std::string Metric::getName() const
   return mName;
 }
 
-void Metric::setName(std::string name)
-{
-  mName = name;
-}
-
 Metric::Metric(int value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp) :
   mValue(value), mName(name), mTimestamp(timestamp)
 {}

test/testMetric.cxx

@@ -94,15 +94,6 @@ BOOST_AUTO_TEST_CASE(customCopyConstructor) {
   }
 }
 
-BOOST_AUTO_TEST_CASE(setters) {
-  o2::monitoring::Metric metric = o2::monitoring::Metric{10, "myMetric"};
-  metric.setName("renamed");
-  auto timestamp = Metric::getCurrentTimestamp();
-  metric.setTimestamp(timestamp);
-
-  BOOST_CHECK_EQUAL(metric.getName(), "renamed");
-}
-
 } // namespace Test
 } // namespace monitoring
 } // namespace o2