Move transport creating to factory (#185)

* Move transport creating to factory

* Fix clang-format

Author: awegrzyn

src/Backends/InfluxDB.cxx

@@ -14,10 +14,10 @@
 ///
 
 #include "InfluxDB.h"
+#include <sstream>
 #include <string>
 #include <variant>
-#include "../Transports/UDP.h"
-#include "../Transports/Unix.h"
+#include <boost/algorithm/string/replace.hpp>
 #include "../Exceptions/MonitoringException.h"
 
 namespace o2
@@ -36,19 +36,14 @@ struct overloaded : Ts... {
 template <class... Ts>
 overloaded(Ts...)->overloaded<Ts...>;
 
-InfluxDB::InfluxDB(const std::string& host, unsigned int port) : mTransport(std::make_unique<transports::UDP>(host, port))
+InfluxDB::InfluxDB(std::unique_ptr<transports::TransportInterface> transport)
+  : mTransport(std::move(transport))
 {
-  MonLogger::Get() << "InfluxDB/UDP backend initialized"
-                   << " (" << host << ":" << port << ")" << MonLogger::End();
+  MonLogger::Get() << "InfluxDB backend initialized" << MonLogger::End();
 }
 
 InfluxDB::InfluxDB() {}
 
-InfluxDB::InfluxDB(const std::string& socketPath) : mTransport(std::make_unique<transports::Unix>(socketPath))
-{
-  MonLogger::Get() << "InfluxDB/Unix backend initialized (" << socketPath << ")" << MonLogger::End();
-}
-
 inline unsigned long InfluxDB::convertTimestamp(const std::chrono::time_point<std::chrono::system_clock>& timestamp)
 {
   return std::chrono::duration_cast<std::chrono::nanoseconds>(

src/Backends/InfluxDB.h

@@ -37,17 +37,13 @@ namespace backends
 class InfluxDB final : public Backend
 {
  public:
-  /// Constructor for UDP transport
-  /// \param host      InfluxDB UDP endpoint hostname
-  /// \param port      InfluxDB UDP endpoint port number
-  InfluxDB(const std::string& host, unsigned int port);
+  /// Constuctor
+  /// \param transport 	Any available transport (udp, unix, kafka)
+  InfluxDB(std::unique_ptr<transports::TransportInterface> transport);
 
   /// Constructor for other backends
   InfluxDB();
 
-  /// Constructor for Unix socket transport
-  InfluxDB(const std::string& socketPath);
-
   /// Default destructor
   ~InfluxDB() = default;
 

src/MonitoringFactory.cxx

@@ -22,9 +22,11 @@
 
 #include "Backends/StdOut.h"
 #include "Backends/Noop.h"
-
 #include "Backends/InfluxDB.h"
 
+#include "Transports/UDP.h"
+#include "Transports/Unix.h"
+
 #ifdef O2_MONITORING_WITH_APPMON
 #include "Backends/ApMonBackend.h"
 #endif
@@ -75,18 +77,20 @@ std::unique_ptr<Backend> getInfluxDb(http::url uri)
     uri.protocol = uri.protocol.substr(position + 1);
   }
   if (uri.protocol == "udp") {
-    return std::make_unique<backends::InfluxDB>(uri.host, uri.port);
+    auto transport = std::make_unique<transports::UDP>(uri.host, uri.port);
+    return std::make_unique<backends::InfluxDB>(std::move(transport));
   }
   if (uri.protocol == "unix") {
     std::string path = uri.path;
-    ;
     auto found = std::find_if(begin(verbosities), end(verbosities),
                               [&](const auto& s) { return path.find(s.first) != std::string::npos; });
     if (found != end(verbosities)) {
       path.erase(path.rfind('/'));
     }
-    return std::make_unique<backends::InfluxDB>(path);
+    auto transport = std::make_unique<transports::Unix>(path);
+    return std::make_unique<backends::InfluxDB>(std::move(transport));
   }
+
   throw std::runtime_error("InfluxDB transport protocol not supported");
 }
 

src/Transports/UDP.cxx

@@ -15,6 +15,7 @@
 
 #include "UDP.h"
 #include <string>
+#include "../MonLogger.h"
 
 namespace o2
 {
@@ -31,6 +32,7 @@ UDP::UDP(const std::string& hostname, int port) : mSocket(mIoService, boost::asi
   boost::asio::ip::udp::resolver::query query(boost::asio::ip::udp::v4(), hostname, std::to_string(port));
   boost::asio::ip::udp::resolver::iterator resolverInerator = resolver.resolve(query);
   mEndpoint = *resolverInerator;
+  MonLogger::Get() << "UDP transport initialized (" << hostname << ":" << port << ")" << MonLogger::End();
 }
 
 void UDP::send(std::string&& message)

src/Transports/Unix.cxx

@@ -15,6 +15,7 @@
 
 #include "Unix.h"
 #include <string>
+#include "../MonLogger.h"
 
 namespace o2
 {
@@ -28,6 +29,7 @@ namespace transports
 Unix::Unix(const std::string& socketPath) : mSocket(mIoService), mEndpoint(socketPath)
 {
   mSocket.open();
+  MonLogger::Get() << "Unix socket transport initialized (" << socketPath << ")" << MonLogger::End();
 }
 
 void Unix::send(std::string&& message)

test/testInfluxDb.cxx

@@ -13,6 +13,7 @@
 #define BOOST_TEST_MODULE Test Monitoring InfluxDB
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
+#include "../src/Transports/UDP.h"
 #include "../src/Backends/InfluxDB.h"
 
 namespace o2
@@ -26,7 +27,8 @@ BOOST_AUTO_TEST_CASE(simplySendMetric)
 {
   std::string url = "influxdb-udp://localhost:1000";
   auto parsed = http::ParseHttpUrl(url);
-  o2::monitoring::backends::InfluxDB influxBackend(parsed.host, parsed.port);
+  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);
 }