Drop Flume backend (#184)

awegrzyn · web-flow · commit 933bc8c9fe92 · 2020-03-26T11:20:16.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,7 +86,6 @@ set(INCLUDE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/include")
 # Backends
 message(STATUS "Backends")
 message(STATUS "  Compiling StdCout backend")
-message(STATUS "  Compiling Flume UDP/JSON backend")
 message(STATUS "  Compiling InfluxDB backend with Unix socket and UDP transport")
 
 # Create library
@@ -95,7 +94,6 @@ add_library(Monitoring SHARED
   src/Metric.cxx
   src/ComplexMetric.cxx
   src/Backends/InfluxDB.cxx
-  src/Backends/Flume.cxx
   src/Backends/StdOut.cxx
   src/DerivedMetrics.cxx
   src/ProcessMonitor.cxx
@@ -202,7 +200,6 @@ set(TEST_SRCS
   test/testMonitoring.cxx
   test/testMonitoringFactory.cxx
   test/testDerived.cxx
-  test/testFlume.cxx
   test/testMetric.cxx
   test/testProcessDetails.cxx
   test/testProcessMonitor.cxx
diff --git a/README.md b/README.md
@@ -48,7 +48,6 @@ See the table below to find `URI`s for supported backends:
 | InfluxDB     | Unix socket | `influxdb-unix`        | -          | `info`            |
 | ApMon        | UDP         | `apmon`                | -          | `info`            |
 | StdOut       | -           | `stdout`, `infologger` | [Prefix]   | `debug`           |
-| Flume        | UDP         | `flume`                | -          | `info`            |
 | Kafka        | TCP         | `kafka`                | -          | `info`            |
 
 ##### StdCout output format
@@ -104,7 +103,7 @@ In order to send more than one metric in a packet group them into vector:
 monitoring->send(std::vector<Metric>&& metrics);
 ```
 
-It's also possible to send multiple, grouped values (only `Flume` and `InfluxDB` backends are supported); For example `cpu` metric can be composed of `cpuUser`, `cpuSystem` values.
+It's also possible to send multiple, grouped values (`InfluxDB` backends are supported); For example `cpu` metric can be composed of `cpuUser`, `cpuSystem` values.
 ```cpp
 void sendGroupped(std::string name, std::vector<Metric>&& metrics)
 ```
diff --git a/examples/7-InternalBenchamrk.cxx b/examples/7-InternalBenchamrk.cxx
@@ -30,7 +30,6 @@ int main()
 {
   static constexpr std::array<std::string_view, 4> backends = {
     "no-op://",
-    "flume://localhost:1234",
     "influxdb-udp://localhost:1234",
     "stdout://"};
   std::cout << "| " << std::setw(30) << "Backend"
diff --git a/src/Backends/Flume.cxx b/src/Backends/Flume.cxx
diff --git a/src/Backends/Flume.h b/src/Backends/Flume.h
diff --git a/src/MonitoringFactory.cxx b/src/MonitoringFactory.cxx
@@ -21,7 +21,6 @@
 #include "UriParser/UriParser.h"
 
 #include "Backends/StdOut.h"
-#include "Backends/Flume.h"
 #include "Backends/Noop.h"
 
 #include "Backends/InfluxDB.h"
@@ -108,11 +107,6 @@ std::unique_ptr<Backend> getNoop(http::url /*uri*/)
   return std::make_unique<backends::Noop>();
 }
 
-std::unique_ptr<Backend> getFlume(http::url uri)
-{
-  return std::make_unique<backends::Flume>(uri.host, uri.port);
-}
-
 void MonitoringFactory::SetVerbosity(std::string selected, std::unique_ptr<Backend>& backend)
 {
   auto found = verbosities.find(selected);
@@ -133,7 +127,6 @@ std::unique_ptr<Backend> MonitoringFactory::GetBackend(std::string& url)
     {"influxdb-udp", getInfluxDb},
     {"influxdb-unix", getInfluxDb},
     {"apmon", getApMon},
-    {"flume", getFlume},
     {"no-op", getNoop},
     {"kafka", getKafka}};
 
diff --git a/test/testApMon.cxx b/test/testApMon.cxx
@@ -10,7 +10,7 @@
 
 #include "../src/UriParser/UriParser.h"
 
-#define BOOST_TEST_MODULE Test Monitoring Flume
+#define BOOST_TEST_MODULE Test Monitoring ApMon
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/path.hpp>
diff --git a/test/testFlume.cxx b/test/testFlume.cxx
diff --git a/test/testInfluxDb.cxx b/test/testInfluxDb.cxx
@@ -10,7 +10,7 @@
 
 #include "../src/UriParser/UriParser.h"
 
-#define BOOST_TEST_MODULE Test Monitoring Flume
+#define BOOST_TEST_MODULE Test Monitoring InfluxDB
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include "../src/Backends/InfluxDB.h"
diff --git a/test/testMonitoring.cxx b/test/testMonitoring.cxx
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(createMonitoring)
 
 BOOST_AUTO_TEST_CASE(buffering)
 {
-  auto monitoring = Monitoring::Get("stdout://,flume://localhost:1234");
+  auto monitoring = Monitoring::Get("stdout://,influxdb-udp://localhost:1234");
   monitoring->enableBuffering(10);
   for (int i = 0; i < 25; i++) {
     monitoring->send({10, "myMetricInt"});
diff --git a/test/testNoop.cxx b/test/testNoop.cxx
@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#define BOOST_TEST_MODULE Test Monitoring Flume
+#define BOOST_TEST_MODULE Test Monitoring Noop
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ int main()`
`30`	`30`	`{`
`31`	`31`	`static constexpr std::array<std::string_view, 4> backends = {`
`32`	`32`	`"no-op://",`
`33`		`- "flume://localhost:1234",`
`34`	`33`	`"influxdb-udp://localhost:1234",`
`35`	`34`	`"stdout://"};`
`36`	`35`	`std::cout << "\| " << std::setw(30) << "Backend"`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(createMonitoring)`
`45`	`45`
`46`	`46`	`BOOST_AUTO_TEST_CASE(buffering)`
`47`	`47`	`{`
`48`		`- auto monitoring = Monitoring::Get("stdout://,flume://localhost:1234");`
	`48`	`+ auto monitoring = Monitoring::Get("stdout://,influxdb-udp://localhost:1234");`
`49`	`49`	`monitoring->enableBuffering(10);`
`50`	`50`	`for (int i = 0; i < 25; i++) {`
`51`	`51`	`monitoring->send({10, "myMetricInt"});`