[OMON-691] Use MonLogger in executables (#325)

Author: awegrzyn

CMakeLists.txt

@@ -31,7 +31,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.16.2
+  VERSION 3.17.0
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )
@@ -287,7 +287,9 @@ if(RdKafka_FOUND AND Protobuf_FOUND AND CURL_FOUND)
       Monitoring
       Boost::program_options
       protobuf::libprotobuf
+      $<$<BOOL:${InfoLogger_FOUND}>:AliceO2::InfoLogger>
     )
+    target_compile_definitions(${example_name} PRIVATE $<$<BOOL:${InfoLogger_FOUND}>:O2_MONITORING_WITH_INFOLOGGER>)
     target_include_directories(${example_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
     install(TARGETS ${example_name})
   endforeach()

examples/12-KafkaToInfluxDb.cxx

@@ -14,6 +14,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "envs.pb.h"
+#include "../src/MonLogger.h"
 
 using namespace o2::monitoring;
 
@@ -51,10 +52,10 @@ int main(int argc, char* argv[])
         auto metric = Metric{"run_times"};
         if (change.first.find("leave") != std::string::npos) {
           metric.addValue(stateChange.timestamp(), "eor");
-          std::cout << stateChange.envinfo().environmentid() << "/" << stateChange.envinfo().runnumber() << "  " << change.first << " EOR: " << stateChange.timestamp() << std::endl;
+          MonLogger::Get() << stateChange.envinfo().environmentid() << "/" << stateChange.envinfo().runnumber() << "  " << change.first << " EOR: " << stateChange.timestamp() << MonLogger::End();
         } else {
           metric.addValue(stateChange.envinfo().runtype(), "type").addValue(stateChange.envinfo().enterstatetimestamp(), "sor");
-          std::cout << stateChange.envinfo().environmentid() << "/" << stateChange.envinfo().runnumber() << "  " << change.first << " SOR: " <<stateChange.envinfo().enterstatetimestamp() << std::endl;
+          MonLogger::Get() << stateChange.envinfo().environmentid() << "/" << stateChange.envinfo().runnumber() << "  " << change.first << " SOR: " <<stateChange.envinfo().enterstatetimestamp() << MonLogger::End();
         }
         int run = stateChange.envinfo().runnumber();
         if (run > 1) {

examples/14-OrbitId.cxx

@@ -14,6 +14,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include "envs.pb.h"
+#include "../src/MonLogger.h"
 
 using namespace o2::monitoring;
 
@@ -61,11 +62,11 @@ int main(int argc, char* argv[])
             }
           }
           if (detectorRunMap.empty()) {
-            std::cout << "No ongoing runs" << std::endl;
+            MonLogger::Get() << "No ongoing runs" << MonLogger::End();
             referenceOrbitIdMap.clear();
           }
           for (const auto &p : detectorRunMap) {
-            std::cout << p.first << " belongs to run " <<  p.second << std::endl;
+            MonLogger::Get() << p.first << " belongs to run " <<  p.second << MonLogger::End();
           }
           // if SOR
         // handle link status messages
@@ -105,12 +106,12 @@ int main(int argc, char* argv[])
               continue;
             }
             referenceOrbitIdMap.insert({detectorRunMap.at(detector), orbitId});
-            std::cout << "Set reference orbitId for run " << detectorRunMap.at(detector) << ": " << orbitId << std::endl;
+            MonLogger::Get() << "Set reference orbitId for run " << detectorRunMap.at(detector) << ": " << orbitId << MonLogger::End();
             unixSocket->send(outputMetric + " reference=" + orbitId);
           }
           auto referenceOrbitId = referenceOrbitIdMap.at(detectorRunMap.at(detector));
           if (orbitId != referenceOrbitId) {
-             std::cout << "Abnormal condition for " << detector << "; expected orbitID: " << referenceOrbitId << " but got: " << orbitId << std::endl;
+             MonLogger::Get() << "Abnormal condition for " << detector << "; expected orbitID: " << referenceOrbitId << " but got: " << orbitId << MonLogger::End();
              unixSocket->send(outputMetric + " mismatched=" + orbitId);
           }
         }

examples/8-KafkaToHttpServer.cxx

@@ -16,12 +16,13 @@
 
 #include "../src/Transports/KafkaConsumer.h"
 #include "envs.pb.h"
+#include "../src/MonLogger.h"
 
 namespace beast = boost::beast;
 namespace http = beast::http;
 using tcp = boost::asio::ip::tcp;
 using namespace std::literals::string_literals;
-
+using o2::monitoring::MonLogger;
 
 aliceo2::envs::ActiveRunsList gActiveEnvs;
 std::mutex gEnvAccess;
@@ -198,11 +199,11 @@ void deserializeActiveRuns(const std::string& lastActiveRunMessage)
   aliceo2::envs::ActiveRunsList activeRuns;
   activeRuns.ParseFromString(lastActiveRunMessage);
   if (activeRuns.activeruns_size() == 0) {
-    std::cout << "Empty active runs" << std::endl;
+    MonLogger::Get() << "Empty active runs" << MonLogger::End();
   } else {
     for (int i = 0; i < activeRuns.activeruns_size(); i++) {
-      std::cout << "Active run: " << activeRuns.activeruns(i).runnumber() << " ("
-                       << activeRuns.activeruns(i).environmentid() << ")" << std::endl;
+      MonLogger::Get() << "Active run: " << activeRuns.activeruns(i).runnumber() << " ("
+                       << activeRuns.activeruns(i).environmentid() << ")" << MonLogger::End();
     }
   }
   const std::lock_guard<std::mutex> lock(gEnvAccess);
@@ -220,7 +221,7 @@ int main(int argc, char* argv[]) {
   boost::program_options::notify(vm);
   unsigned short port = vm["http-port"].as<unsigned short>();
 
-  std::cout << "Using Kafka instance: " << vm["kafka-host"].as<std::string>() << ":9092 and HTTP server port: " << port << std::endl;
+  MonLogger::Get() << "Using Kafka instance: " << vm["kafka-host"].as<std::string>() << ":9092 and HTTP server port: " << port << MonLogger::End();
   std::thread webServerThread([&port](){
     auto const address = boost::asio::ip::make_address("0.0.0.0");
     boost::asio::io_context ioc{1};

src/MonLogger.h

@@ -18,12 +18,13 @@
 #define MONITORING_MONINFOLOGGER_H
 
 #include <chrono>
-#include <iomanip>
-#include <iostream>
 
 #ifdef O2_MONITORING_WITH_INFOLOGGER
 #include <InfoLogger/InfoLogger.hxx>
 using namespace AliceO2::InfoLogger;
+#else
+#include <iostream>
+#include <iomanip>
 #endif
 
 namespace o2