Add unit tags (#149)

* Add unit tags

* fix

* Add test

* clang-format

Author: awegrzyn

include/Monitoring/Tags.h

@@ -26,46 +26,100 @@ namespace monitoring
 
 namespace tags
 {
-  using namespace std::string_view_literals; 
+using namespace std::string_view_literals;
 
-  // Tag keys
-  enum class Key : unsigned short int { Hostname, Rolename, Name, Detector, Subsystem, CRU, FLP, EPN };
+// Tag keys
+enum class Key : unsigned short int { Hostname,
+                                      Rolename,
+                                      Name,
+                                      Detector,
+                                      Subsystem,
+                                      CRU,
+                                      FLP,
+                                      EPN,
+                                      Unit };
 
-  /// Tag keys array
-  static constexpr std::array<std::string_view, 8> TAG_KEY = {
-    "hostname"sv, "rolenane"sv, "name"sv, "detector"sv, "subsystem"sv, "CRU"sv, "FLP"sv, "EPN"sv
-  };
+/// Tag keys array
+static constexpr std::array<std::string_view, 9> TAG_KEY = {
+  "hostname"sv, "rolenane"sv, "name"sv, "detector"sv, "subsystem"sv, "CRU"sv, "FLP"sv, "EPN"sv, "unit"sv
+};
 
-  // Tag values
-  enum class Value : unsigned short int { ACO, AD, CPV, EMC, FMD, HMP, MCH, MTR, PHS, PMD, ITS, T0, TOF, TPC, TRD, V0, QC, Readout, DPL, CRU};
+// Tag values
+enum class Value : unsigned short int { ACO,
+                                        AD,
+                                        CPV,
+                                        EMC,
+                                        FMD,
+                                        HMP,
+                                        MCH,
+                                        MTR,
+                                        PHS,
+                                        PMD,
+                                        ITS,
+                                        T0,
+                                        TOF,
+                                        TPC,
+                                        TRD,
+                                        V0,
+                                        QC,
+                                        Readout,
+                                        DPL,
+                                        CRU,
+                                        Bytes,
+                                        Megabytes,
+                                        Gigabytes,
+                                        Bits,
+                                        Megabits,
+                                        Gigabits,
+                                        bps,
+                                        Mbps,
+                                        Gbps,
+                                        Nanoseconds,
+                                        Microseconds,
+                                        Milliseconds,
+                                        Seconds };
 
-  // Tag value array
-  static constexpr std::array<std::string_view, 20> TAG_VALUE = {{
-    "ACO"sv,
-    "AD"sv,  // 1
-    "CPV"sv, // 2
-    "EMC"sv, // 3
-    "FMD"sv, // 4
-    "HMP"sv, // 5
-    "MCH"sv, // 6
-    "MTR"sv, // 7
-    "PHS"sv, // 8
-    "PHS"sv, // 9
-    "PMD"sv, // 10
-    "ITS"sv, // 11
-    "TOF"sv, // 12
-    "TPC"sv, // 13
-    "TRD"sv, // 14
-    "V0"sv,  // 15
-    "QC"sv,
-    "Readout"sv,
-    "DPL"sv,
-    "CRU"sv
-  }};
-  static constexpr std::string_view GetValue(const int value) {
-    return value >= 0 ? TAG_VALUE[value] : std::to_string(0 - value);
-  }
+// Tag value array
+static constexpr std::array<std::string_view, 33> TAG_VALUE = { {
+  "ACO"sv,
+  "AD"sv,      // 1
+  "CPV"sv,     // 2
+  "EMC"sv,     // 3
+  "FMD"sv,     // 4
+  "HMP"sv,     // 5
+  "MCH"sv,     // 6
+  "MTR"sv,     // 7
+  "PHS"sv,     // 8
+  "PHS"sv,     // 9
+  "PMD"sv,     // 10
+  "ITS"sv,     // 11
+  "TOF"sv,     // 12
+  "TPC"sv,     // 13
+  "TRD"sv,     // 14
+  "V0"sv,      // 15
+  "QC"sv,      // 16
+  "Readout"sv, //17
+  "DPL"sv,     // 18
+  "CRU"sv,     // 19
+  "B"sv,       // 20
+  "MB"sv,      // 21
+  "GB"sv,      // 22
+  "b"sv,       // 23
+  "Mb"sv,      // 24
+  "Gb"sv,      // 25
+  "bps"sv,     // 26
+  "Mbps"sv,    // 27
+  "Gbps"sv,    //28
+  "ns"sv,      //29
+  "us"sv,      //30
+  "ms"sv       //31
+  "s"sv        // 32
+} };
+static constexpr std::string_view GetValue(const int value)
+{
+  return value >= 0 ? TAG_VALUE[value] : std::to_string(0 - value);
 }
+} // namespace tags
 
 } // namespace monitoring
 } // namespace o2

test/testMetric.cxx

@@ -75,13 +75,13 @@ BOOST_AUTO_TEST_CASE(retrieveWrongType) {
 }
 
 BOOST_AUTO_TEST_CASE(tags) {
-  Metric metric = Metric{10, "myMetric"}.addTag(o2::monitoring::tags::Key::Detector, o2::monitoring::tags::Value::TRD);
+  Metric metric = Metric{10, "myMetric"}.addTag(o2::monitoring::tags::Key::Detector, o2::monitoring::tags::Value::TRD).addTag(o2::monitoring::tags::Key::Unit, o2::monitoring::tags::Value::Milliseconds);
   auto tags = metric.getTags();
   int sum = 0;
   for (auto const& tag: tags) {
     sum += tag.second;
   }
-  BOOST_CHECK_EQUAL(sum, 14);
+  BOOST_CHECK_EQUAL(sum, 45);
 }
 
 BOOST_AUTO_TEST_CASE(regexVerbosityPolicy)