ROX-27695: Collector runtime configuration should be logged (#2012)

Author: JoukoVirtanen

collector/lib/CollectorConfig.h

@@ -16,6 +16,7 @@
 
 #include "CollectionMethod.h"
 #include "HostConfig.h"
+#include "Logging.h"
 #include "NetworkConnection.h"
 #include "TlsConfig.h"
 #include "json/value.h"
@@ -146,6 +147,7 @@ class CollectorConfig {
 
   void ResetRuntimeConfig() {
     auto lock = WriteLock();
+    CLOG(INFO) << "Resetting runtime configuration";
     runtime_config_.reset();
   }
 

collector/lib/ConfigLoader.cpp

@@ -96,8 +96,8 @@ bool ConfigLoader::LoadConfiguration(CollectorConfig& config, const YAML::Node&
 
   config.SetRuntimeConfig(std::move(runtime_config));
 
-  CLOG(DEBUG) << "Runtime configuration:\n"
-              << config.GetRuntimeConfigStr();
+  CLOG(INFO) << "Runtime configuration:\n"
+             << config.GetRuntimeConfigStr();
   return true;
 }
 

integration-tests/pkg/collector/collector.go

@@ -18,6 +18,8 @@ type Manager interface {
 	IsRunning() (bool, error)
 	ContainerID() string
 	TestName() string
+	SetTestName(string)
+	GetTestName() string
 }
 
 func New(e executor.Executor, name string) Manager {

integration-tests/pkg/collector/collector_docker.go

@@ -188,3 +188,11 @@ func (c *DockerCollectorManager) ContainerID() string {
 func (c *DockerCollectorManager) TestName() string {
 	return c.testName
 }
+
+func (c *DockerCollectorManager) SetTestName(testName string) {
+	c.testName = testName
+}
+
+func (c *DockerCollectorManager) GetTestName() string {
+	return c.testName
+}

integration-tests/suites/base.go

@@ -128,6 +128,9 @@ func (s *IntegrationTestSuiteBase) StopCollector() {
 func (s *IntegrationTestSuiteBase) Collector() collector.Manager {
 	if s.collector == nil {
 		s.collector = collector.New(s.Executor(), s.T().Name())
+	} else if s.collector.GetTestName() != s.T().Name() {
+		// Otherwise the test name does not get set when subsequent tests are run
+		s.collector.SetTestName(s.T().Name())
 	}
 	return s.collector
 }