[OMON-417] Make sure to crash on backend init but not on send (#228)

Author: awegrzyn

CMakeLists.txt

@@ -17,7 +17,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.5.2
+  VERSION 3.6.0
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )

src/Backends/InfluxDB.cxx

@@ -66,19 +66,12 @@ void InfluxDB::send(std::vector<Metric>&& metrics)
   //remove last \n
   if (influxMetrics.size() > 0) influxMetrics.pop_back();
 
-
-  try {
-    mTransport->send(std::move(influxMetrics));
-  } catch (MonitoringException&) {
-  }
+  mTransport->send(std::move(influxMetrics));
 }
 
 void InfluxDB::send(const Metric& metric)
 {
-  try {
-    mTransport->send(toInfluxLineProtocol(metric));
-  } catch (MonitoringException&) {
-  }
+  mTransport->send(toInfluxLineProtocol(metric));
 }
 
 std::string InfluxDB::toInfluxLineProtocol(const Metric& metric)

src/Exceptions/MonitoringException.cxx

@@ -22,13 +22,11 @@ namespace o2
 namespace monitoring
 {
 
-MonitoringException::MonitoringException(const std::string& source, const std::string& message) : MonitoringException(-1, source, message) {}
-
-MonitoringException::MonitoringException(int code, const std::string& source, const std::string& message)
+MonitoringException::MonitoringException(const std::string& source, const std::string& message)
   : message(message)
 {
-  MonLogger::Get(Severity::Warn) << "MonitoringException["
-                                 << source << "] (" << code << "): " << message << MonLogger::End();
+  MonLogger::Get(Severity::Error) << "MonitoringException["
+                                 << source << "] : " << message << MonLogger::End();
 }
 
 const char* MonitoringException::what() const throw()

src/Exceptions/MonitoringException.h

@@ -30,7 +30,6 @@ class MonitoringException : public std::exception
 {
  public:
   MonitoringException(const std::string& source, const std::string& message);
-  MonitoringException(int code, const std::string& source, const std::string& message);
   ~MonitoringException() = default;
   const char* what() const throw();
 

src/MonLogger.h

@@ -77,14 +77,14 @@ class MonLogger
   void setDate()
   {
     auto now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-    mStream << std::put_time(std::localtime(&now), "%Y-%m-%d %X") << "\t";
+    mStream << std::put_time(std::localtime(&now), "%Y-%m-%d %X") << "\t" << "Monitoring" << "\t";
   }
 
   /// Sets log color based on severity
   /// \param severity - log severity
   void setSeverity(Severity severity)
   {
-    mStream << "\033[1;" << static_cast<int>(severity) << "m";
+    mStream << "\033[0;" << static_cast<int>(severity) << "m";
   }
 
   /// Delete copy and move constructors

src/MonitoringFactory.cxx

@@ -14,8 +14,8 @@
 ///
 
 #include "Monitoring/MonitoringFactory.h"
+#include "Exceptions/MonitoringException.h"
 #include <functional>
-#include <stdexcept>
 #include <boost/algorithm/string.hpp>
 #include "MonLogger.h"
 #include "UriParser/UriParser.h"
@@ -87,7 +87,7 @@ std::unique_ptr<Backend> getInfluxDbv2(http::url uri)
   transport->addHeader("Authorization: Token " + token);
   return std::make_unique<backends::InfluxDB>(std::move(transport));
 #else
-  throw std::runtime_error("HTTP transport is not enabled");
+  throw MonitoringException("Factory", "HTTP transport is not enabled");
 #endif
 }
 
@@ -120,10 +120,10 @@ std::unique_ptr<Backend> getInfluxDb(http::url uri)
     auto transport = std::make_unique<transports::Kafka>(uri.host, uri.port, uri.search);
     return std::make_unique<backends::InfluxDB>(std::move(transport));
 #else
-    throw std::runtime_error("Kafka transport is not enabled");
+    throw MonitoringException("Factory", "Kafka transport is not enabled");
 #endif
   }
-  throw std::runtime_error("InfluxDB transport not supported: " + uri.protocol);
+  throw MonitoringException("Factory", "InfluxDB transport not supported: " + uri.protocol);
 }
 
 #ifdef O2_MONITORING_WITH_APPMON
@@ -134,7 +134,7 @@ std::unique_ptr<Backend> getApMon(http::url uri)
 #else
 std::unique_ptr<Backend> getApMon(http::url /*uri*/)
 {
-  throw std::runtime_error("ApMon backend is not enabled");
+  throw MonitoringException("Factory", "ApMon backend is not enabled");
 }
 #endif
 
@@ -171,19 +171,22 @@ std::unique_ptr<Backend> MonitoringFactory::GetBackend(std::string& url)
 
   http::url parsedUrl = http::ParseHttpUrl(url);
   if (parsedUrl.protocol.empty()) {
-    throw std::runtime_error("Ill-formed URI");
+    throw MonitoringException("Factory", "Ill-formed URI");
   }
 
   auto iterator = map.find(parsedUrl.protocol);
   if (iterator == map.end()) {
-    throw std::runtime_error("Unrecognized backend " + parsedUrl.protocol);
+    throw MonitoringException("Factory", "Unrecognized backend " + parsedUrl.protocol);
   }
-
-  auto backend = iterator->second(parsedUrl);
-  if (!parsedUrl.path.empty() && parsedUrl.path != "/") {
-    SetVerbosity(parsedUrl.path.substr(parsedUrl.path.rfind("/")), backend);
+  try {
+    auto backend = iterator->second(parsedUrl);
+    if (!parsedUrl.path.empty() && parsedUrl.path != "/") {
+      SetVerbosity(parsedUrl.path.substr(parsedUrl.path.rfind("/")), backend);
+    }
+    return backend;
+  } catch (...) {
+    throw MonitoringException("Factory", "Unable to create backend " + parsedUrl.url);
   }
-  return backend;
 }
 
 std::unique_ptr<Monitoring> MonitoringFactory::Get(std::string urlsString)

src/Transports/HTTP.cxx

@@ -56,10 +56,10 @@ void HTTP::send(std::string&& post)
   response = curl_easy_perform(mCurl);
   curl_easy_getinfo(mCurl, CURLINFO_RESPONSE_CODE, &responseCode);
   if (response != CURLE_OK) {
-    MonLogger::Get() << "HTTP Tranport " << curl_easy_strerror(response) << MonLogger::End();
+    MonLogger::Get(Severity::Warn) << "HTTP Tranport " << curl_easy_strerror(response) << MonLogger::End();
   }
   if (responseCode < 200 || responseCode > 206) {
-    MonLogger::Get() << "HTTP Transport: Response code : " << std::to_string(responseCode) << MonLogger::End();
+    MonLogger::Get(Severity::Warn) << "HTTP Transport: Response code : " << std::to_string(responseCode) << MonLogger::End();
   }
 }
 

src/Transports/TCP.cxx

@@ -50,7 +50,7 @@ void TCP::send(std::string&& message)
   try {
     mSocket.send(boost::asio::buffer(message));
   } catch (const boost::system::system_error& e) {
-    MonLogger::Get() << "TCP send: " << e.what() << MonLogger::End();
+    MonLogger::Get(Severity::Error) << "TCP / " << e.what() << MonLogger::End();
   }
 }
 

src/Transports/Unix.cxx

@@ -34,7 +34,11 @@ Unix::Unix(const std::string& socketPath) : mSocket(mIoService), mEndpoint(socke
 
 void Unix::send(std::string&& message)
 {
-  mSocket.send_to(boost::asio::buffer(message, message.size()), mEndpoint);
+  try {
+    mSocket.send_to(boost::asio::buffer(message, message.size()), mEndpoint);
+  } catch (const boost::system::system_error& e) {
+    MonLogger::Get(Severity::Error) << "Unix socket / " << e.what() << MonLogger::End();
+  }
 }
 #endif // defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
 } // namespace transports