Use an env variable for legacy services configuration

Author: Molter73

collector/lib/CollectorConfig.cpp

@@ -84,6 +84,8 @@ PathEnvVar tls_client_key_path("ROX_COLLECTOR_TLS_CLIENT_KEY");
 BoolEnvVar disable_process_arguments("ROX_COLLECTOR_NO_PROCESS_ARGUMENTS", false);
 
 BoolEnvVar use_stdout_output("ROX_COLLECTOR_USE_STDOUT", false);
+
+BoolEnvVar use_legacy_services("ROX_COLLECTOR_USE_LEGACY_SERVICES", false);
 }  // namespace
 
 constexpr bool CollectorConfig::kTurnOffScrape;
@@ -116,6 +118,7 @@ void CollectorConfig::InitCollectorConfig(CollectorArgs* args) {
   track_send_recv_ = track_send_recv.value();
   disable_process_arguments_ = disable_process_arguments.value();
   use_stdout_ = use_stdout_output.value();
+  use_legacy_services_ = use_legacy_services.value();
 
   for (const auto& syscall : kSyscalls) {
     syscalls_.emplace_back(syscall);

collector/lib/CollectorConfig.h

@@ -167,6 +167,7 @@ class CollectorConfig {
   unsigned int GetSinspThreadCacheSize() const { return sinsp_thread_cache_size_; }
   bool DisableProcessArguments() const { return disable_process_arguments_; }
   bool UseStdout() const { return use_stdout_; }
+  bool UseLegacyServices() const { return use_legacy_services_; }
 
   static std::pair<option::ArgStatus, std::string> CheckConfiguration(const char* config, Json::Value* root);
 
@@ -236,6 +237,8 @@ class CollectorConfig {
 
   bool use_stdout_ = false;
 
+  bool use_legacy_services_ = false;
+
   // One ring buffer will be initialized for this many CPUs
   unsigned int sinsp_cpu_per_buffer_ = 0;
   // Size of one ring buffer, in bytes.

collector/lib/CollectorOutput.cpp

@@ -9,23 +9,31 @@
 namespace collector {
 
 CollectorOutput::CollectorOutput(const CollectorConfig& config) {
+  use_sensor_client_ = !config.UseLegacyServices();
+
   if (config.grpc_channel != nullptr) {
     channel_ = config.grpc_channel;
 
-    auto sensor_client = std::make_unique<SensorClient>(channel_);
-    auto signal_client = std::make_unique<SignalServiceClient>(channel_);
-    sensor_clients_.emplace_back(std::move(sensor_client));
-    signal_clients_.emplace_back(std::move(signal_client));
+    if (use_sensor_client_) {
+      auto sensor_client = std::make_unique<SensorClient>(channel_);
+      sensor_clients_.emplace_back(std::move(sensor_client));
+    } else {
+      auto signal_client = std::make_unique<SignalServiceClient>(channel_);
+      signal_clients_.emplace_back(std::move(signal_client));
+    }
   }
 
   if (config.UseStdout()) {
-    auto sensor_client = std::make_unique<SensorClientStdout>();
-    auto signal_client = std::make_unique<StdoutSignalServiceClient>();
-    sensor_clients_.emplace_back(std::move(sensor_client));
-    signal_clients_.emplace_back(std::move(signal_client));
+    if (use_sensor_client_) {
+      auto sensor_client = std::make_unique<SensorClientStdout>();
+      sensor_clients_.emplace_back(std::move(sensor_client));
+    } else {
+      auto signal_client = std::make_unique<StdoutSignalServiceClient>();
+      signal_clients_.emplace_back(std::move(signal_client));
+    }
   }
 
-  if (sensor_clients_.empty() || signal_clients_.empty()) {
+  if (sensor_clients_.empty() && signal_clients_.empty()) {
     CLOG(FATAL) << "No available output configured";
   }
 
@@ -94,21 +102,6 @@ SignalHandler::Result CollectorOutput::SendMsg(const MessageType& msg) {
   return std::visit(visitor, msg);
 }
 
-void CollectorOutput::Register() {
-  sensor::MsgFromCollector msg;
-  msg.clear_info();
-  msg.clear_process_signal();
-  msg.mutable_register_()->set_hostname(HostInfo::GetHostname());
-
-  for (const auto& client : sensor_clients_) {
-    auto res = client->SendMsg(msg);
-    if (res != SignalHandler::PROCESSED) {
-      use_sensor_client_ = false;
-      break;
-    }
-  }
-}
-
 void CollectorOutput::EstablishGrpcStream() {
   while (EstablishGrpcStreamSingle()) {
   }

collector/lib/CollectorOutput.h

@@ -39,7 +39,6 @@ class CollectorOutput {
   }
 
   SignalHandler::Result SendMsg(const MessageType& msg);
-  void Register();
 
   bool UseSensorClient() const { return use_sensor_client_; }
 

collector/lib/CollectorService.cpp

@@ -96,8 +96,6 @@ void CollectorService::RunForever() {
   // Start monitoring services.
   config_loader_.Start();
 
-  output_.Register();
-
   CLOG(INFO) << "Network scrape interval set to " << config_.ScrapeInterval() << " seconds";
 
   if (net_status_notifier_) {

collector/test/CollectorOutputTest.cpp

@@ -31,13 +31,6 @@ class CollectorOutputTest : public testing::Test {
   std::unique_ptr<MockSignalClient> signal_client;
 };
 
-TEST_F(CollectorOutputTest, Register) {
-  EXPECT_CALL(*sensor_client, SendMsg).Times(1).WillOnce(testing::Return(SignalHandler::PROCESSED));
-
-  CollectorOutput output{std::move(sensor_client), std::move(signal_client)};
-  output.Register();
-}
-
 TEST_F(CollectorOutputTest, SensorClient) {
   sensor::MsgFromCollector msg;