v3.19.12

Hide apmon and kafka includes to fix conflicts.

Author: sy-c

CMakeLists.txt

@@ -29,7 +29,7 @@ cmake_policy(VERSION 3.12)
 
 # Define project
 project(Monitoring
-  VERSION 3.19.11
+  VERSION 3.19.12
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )

src/Backends/ApMonBackend.cxx

@@ -24,6 +24,7 @@
 #include <cstdlib>
 #include "../MonLogger.h"
 #include "../Exceptions/MonitoringException.h"
+#include <ApMon.h>
 
 namespace o2
 {
@@ -186,6 +187,7 @@ void ApMonBackend::send(std::vector<Metric>&& metrics)
   }
 }
 
+ApMonBackend::~ApMonBackend() = default;
 } // namespace backends
 } // namespace monitoring
 } // namespace o2

src/Backends/ApMonBackend.h

@@ -18,12 +18,16 @@
 #define ALICEO2_MONITORING_BACKENDS_APMONBACKEND_H
 
 #include "Monitoring/Backend.h"
-#include <ApMon.h>
 #include <string>
 #include <chrono>
 #include <memory>
 #include <functional>
 
+// class forward-declaration
+// #include <ApMon.h>
+// not included here because the header imports some conflicting macros like mem_free
+class ApMon;
+
 namespace o2
 {
 /// ALICE O2 Monitoring system
@@ -47,7 +51,7 @@ class ApMonBackend final : public Backend
   ApMonBackend(const std::string& path);
 
   /// Default destructor
-  ~ApMonBackend() = default;
+  ~ApMonBackend(); // not defaulted here
 
   /// Sends multiple metrics not related to each other
   /// \@param metrics  vector of metrics

src/Transports/KafkaConsumer.cxx

@@ -19,6 +19,7 @@
 #include <string>
 #include "../MonLogger.h"
 #include "../Exceptions/MonitoringException.h"
+#include <librdkafka/rdkafkacpp.h>
 
 namespace o2
 {

src/Transports/KafkaConsumer.h

@@ -21,7 +21,14 @@
 
 #include <chrono>
 #include <string>
-#include <librdkafka/rdkafkacpp.h>
+
+// class forward-declaration
+// #include <librdkafka/rdkafkacpp.h>
+// not included here because the header imports some conflicting macros like mem_free
+namespace RdKafka
+{
+class KafkaConsumer;
+}
 
 namespace o2
 {

src/Transports/KafkaProducer.cxx

@@ -18,6 +18,7 @@
 #include <memory>
 #include <string>
 #include "../MonLogger.h"
+#include <librdkafka/rdkafkacpp.h>
 
 namespace o2
 {

src/Transports/KafkaProducer.h

@@ -21,7 +21,14 @@
 
 #include <chrono>
 #include <string>
-#include <librdkafka/rdkafkacpp.h>
+
+// class forward-declaration
+// #include <librdkafka/rdkafkacpp.h>
+// not included here because the header imports some conflicting macros like mem_free
+namespace RdKafka
+{
+class Producer;
+}
 
 namespace o2
 {

test/testMonitoringFactory.cxx

@@ -53,8 +53,8 @@ BOOST_AUTO_TEST_CASE(Noop)
 BOOST_AUTO_TEST_CASE(ApMon)
 {
   std::filesystem::path configPath = std::filesystem::canonical(".");
-  auto Monitoring = MonitoringFactory::Get("apmon://" + configPath.string() + "/ApMon.conf");
-  monitoring->send({10, "myCrazyMetric"});
+  auto m = MonitoringFactory::Get("apmon://" + configPath.string() + "/ApMon.conf");
+  // m->send({10, "myCrazyMetric"});
 }
 #endif