[OMON-613] Remove hostname from default global tags (#307)

Author: awegrzyn

CMakeLists.txt

@@ -31,7 +31,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.14.1
+  VERSION 3.15.0
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )

include/Monitoring/Monitoring.h

@@ -90,6 +90,9 @@ class Monitoring
   /// \param value            tag value
   void addGlobalTag(tags::Key key, tags::Value value);
 
+  /// Temporary add helper function to add hostname tag as it is not set by default anymore (since 3.15.0)
+  void addHostnameTag();
+
   /// Sets run number
   /// \param name run  run number
   void setRunNumber(uint32_t run);

src/Backends/InfluxDB.cxx

@@ -95,7 +95,10 @@ std::string InfluxDB::toInfluxLineProtocol(const Metric& metric)
   std::stringstream convert;
   std::string name = metric.getName();
   escape(name);
-  convert << name << "," << tagSet;
+  convert << name;
+  if (!tagSet.empty()) {
+     convert << "," << tagSet;
+  }
 
   for (const auto& [key, value] : metric.getTags()) {
     convert << "," << tags::TAG_KEY[key] << "=";

src/Monitoring.cxx

@@ -100,6 +100,14 @@ void Monitoring::enableProcessMonitoring(const unsigned int interval, std::vecto
 #endif
 }
 
+void Monitoring::addHostnameTag()
+{
+  ProcessDetails processDetails{};
+  for (auto& backend : mBackends) {
+    backend->addGlobalTag("hostname", processDetails.getHostname());
+  }
+}
+
 void Monitoring::addGlobalTag(std::string_view key, std::string_view value)
 {
   for (auto& backend : mBackends) {
@@ -125,8 +133,6 @@ void Monitoring::setRunNumber(uint32_t run)
 
 void Monitoring::addBackend(std::unique_ptr<Backend> backend)
 {
-  ProcessDetails processDetails{};
-  backend->addGlobalTag("hostname", processDetails.getHostname());
   mBackends.push_back(std::move(backend));
 }
 

test/testMonitoring.cxx

@@ -38,14 +38,12 @@ void disableRedirect()
   std::cout.rdbuf(coutBuffer);
 }
 
-void removeRandomValues(std::string& metric)
+void removeTimestamp(std::string& metric)
 {
-  metric.erase(metric.rfind(' ')); // remove timestamp
-  auto begHost = metric.find(",hostname");
-  auto endHost = metric.find(",", begHost+1);
-  metric.erase(begHost, endHost-begHost);
+  metric.erase(metric.rfind(' '));
 }
 
+
 BOOST_AUTO_TEST_CASE(parseDataPoints)
 {
   enableRedirect();
@@ -63,8 +61,8 @@ BOOST_AUTO_TEST_CASE(parseDataPoints)
   std::string returned1 = coutRedirect.str();
 
   disableRedirect();
-  removeRandomValues(returned1);
-  BOOST_CHECK(expected1 == returned1);
+  removeTimestamp(returned1);
+  BOOST_CHECK_EQUAL(expected1, returned1);
 
   enableRedirect();
   monitoring->send(Metric{"link"}
@@ -83,8 +81,8 @@ BOOST_AUTO_TEST_CASE(parseDataPoints)
   std::string expected2 = R"(link,CRU=3,id=3 gbtMode="GBT/GBT",loopback="None",gbtMux="TTC:CTP",datapathMode="Continuous",datapath="Disabled",rxFreq=181.371,txFreq=196.25,status=0i,opticalPower=657.4)";
   std::string returned2 = coutRedirect.str();
   disableRedirect();
-  removeRandomValues(returned2);
-  BOOST_CHECK(expected2 == returned2);
+  removeTimestamp(returned2);
+  BOOST_CHECK_EQUAL(expected2, returned2);
 }
 
 BOOST_AUTO_TEST_CASE(testSettingRun)
@@ -97,8 +95,8 @@ BOOST_AUTO_TEST_CASE(testSettingRun)
   std::string returned = coutRedirect.str();
 
   disableRedirect();
-  removeRandomValues(returned);
-  BOOST_CHECK(expected == returned);
+  removeTimestamp(returned);
+  BOOST_CHECK_EQUAL(expected, returned);
 }
 
 BOOST_AUTO_TEST_CASE(testGlobalTags)
@@ -112,8 +110,21 @@ BOOST_AUTO_TEST_CASE(testGlobalTags)
   std::string returned = coutRedirect.str();
 
   disableRedirect();
-  removeRandomValues(returned);
-  BOOST_CHECK(expected == returned);
+  removeTimestamp(returned);
+  BOOST_CHECK_EQUAL(expected, returned);
+}
+
+BOOST_AUTO_TEST_CASE(addHostnameTag)
+{
+  enableRedirect();
+
+  monitoring->setRunNumber(1234);
+  monitoring->addHostnameTag();
+  monitoring->send(Metric{4321, "test"});
+  std::string returned = coutRedirect.str();
+
+  disableRedirect();
+  BOOST_CHECK(returned.find("hostname=") != std::string::npos);
 }
 
 } // namespace Test

test/testProcessMonitor.cxx

@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE(monitorProcessCpuOnly)
   disableRedirect();
   unsigned short int countMetrics = 0;
   for (std::string line; std::getline(returned, line); ) {
-    BOOST_CHECK(std::find(names.begin(), names.end(), line.substr(0, line.find(','))) != names.end());
+    BOOST_CHECK(std::find(names.begin(), names.end(), line.substr(0, line.find(' '))) != names.end());
     countMetrics++;
   }
   // On linux and macOS 6
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE(monitorProcessAll)
   disableRedirect();
   unsigned short int countMetrics = 0;
   for (std::string line; std::getline(returned, line); ) {
-    BOOST_CHECK(std::find(names.begin(), names.end(), line.substr(0, line.find(','))) != names.end());
+    BOOST_CHECK(std::find(names.begin(), names.end(), line.substr(0, line.find(' '))) != names.end());
     countMetrics++;
   }
   // On linux 14 and macOS 6