Fix warning and linking against pthread (#191)

* Use tag name in ApMon * Fix InfluxDB test * Bump CMake version
AliceO2Group · Apr 15, 2020 · c169cc5 · c169cc5
1 parent 205b2dc
commit c169cc5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 2.6.6
+  VERSION 3.0.2
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )

diff --git a/src/Backends/ApMonBackend.cxx b/src/Backends/ApMonBackend.cxx
@@ -64,6 +64,8 @@ void ApMonBackend::send(const Metric& metric)
   std::string entity = mEntity;
   for (const auto& [key, value] : metric.getTags()) {
     entity += ',';
+    entity += tags::TAG_KEY[key];
+    entity += '=';
     entity += tags::GetValue(value);
   }
 

diff --git a/test/testInfluxDb.cxx b/test/testInfluxDb.cxx
@@ -11,10 +11,7 @@
 #define BOOST_TEST_MODULE Test Monitoring InfluxDB
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include "../src/UriParser/UriParser.h"
-#include "../src/Transports/UDP.h"
-#include "../src/Transports/StdOut.h"
-#include "../src/Backends/InfluxDB.h"
+#include "Monitoring/MonitoringFactory.h"
 
 namespace o2
 {
@@ -25,20 +22,14 @@ namespace Test
 
 BOOST_AUTO_TEST_CASE(simplySendMetric)
 {
-  std::string url = "influxdb-udp://localhost:1000";
-  auto parsed = http::ParseHttpUrl(url);
-  auto transport = std::make_unique<transports::UDP>(parsed.host, parsed.port);
-  o2::monitoring::backends::InfluxDB influxBackend(std::move(transport));
-  o2::monitoring::Metric metric{10, "myCrazyMetric"};
-  influxBackend.send(metric);
+  auto monitoring = MonitoringFactory::Get("influxdb-udp://localhost:1000");
+  monitoring->send(Metric{10, "myCrazyMetric"});
 }
 
 BOOST_AUTO_TEST_CASE(simplySendMetric2)
 {
-  auto transport = std::make_unique<transports::StdOut>();
-  o2::monitoring::backends::InfluxDB influxBackend(std::move(transport));
-  o2::monitoring::Metric metric{10, "myCrazyMetric"};
-  influxBackend.send(metric);
+  auto monitoring = MonitoringFactory::Get("influxdb-stdout://");
+  monitoring->send(Metric{10, "myCrazyMetric"});
 }
 
 } // namespace Test

diff --git a/test/testMetric.cxx b/test/testMetric.cxx
@@ -1,6 +1,5 @@
 #include "../include/Monitoring/Metric.h"
 #include <chrono>
-#include <thread>
 
 #define BOOST_TEST_MODULE Test Monitoring Metric
 #define BOOST_TEST_DYN_LINK