Skip to content

Commit f5fec46

Browse files
committed
Skip host heuristics in unit tests
The heuristics may fail if the builder container is not running as privileged, but they are also not needed for unit testing, so we can just skip them. Normal collector operation will always execute the heuristics.
1 parent 176dde7 commit f5fec46

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

collector/lib/CollectorConfig.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ PathEnvVar config_file("ROX_COLLECTOR_CONFIG_PATH", "/etc/stackrox/runtime_confi
9191

9292
const UnorderedSet<L4ProtoPortPair> CollectorConfig::kIgnoredL4ProtoPortPairs = {{L4Proto::UDP, 9}};
9393

94-
CollectorConfig::CollectorConfig(CollectorArgs* args)
94+
CollectorConfig::CollectorConfig(CollectorArgs* args, bool skipHeuristics)
9595
: host_proc_(GetHostPath("/proc")),
9696
disable_network_flows_(disable_network_flows),
9797
scrape_listen_endpoints_(ports_feature_flag),
@@ -135,7 +135,9 @@ CollectorConfig::CollectorConfig(CollectorArgs* args)
135135
HandleConnectionStatsQuantiles();
136136
HandleConfig(config_file.value());
137137

138-
host_config_ = ProcessHostHeuristics(*this);
138+
if (!skipHeuristics) {
139+
host_config_ = ProcessHostHeuristics(*this);
140+
}
139141
}
140142

141143
void CollectorConfig::HandleArgs(const CollectorArgs* args) {

collector/lib/CollectorConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class CollectorConfig {
6060
static const UnorderedSet<L4ProtoPortPair> kIgnoredL4ProtoPortPairs;
6161

6262
CollectorConfig() = delete;
63-
CollectorConfig(CollectorArgs* collectorArgs);
63+
CollectorConfig(CollectorArgs* collectorArgs, bool skipHeuristics = false);
6464

6565
bool TurnOffScrape() const { return turn_off_scrape_; }
6666
bool ScrapeListenEndpoints() const { return scrape_listen_endpoints_; }

collector/test/CollectorConfigTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace collector {
1313

1414
class MockCollectorConfig : public CollectorConfig {
1515
public:
16-
MockCollectorConfig() : CollectorConfig(nullptr) {}
16+
MockCollectorConfig() : CollectorConfig(nullptr, true) {}
1717

1818
void MockSetSinspBufferSize(unsigned int value) {
1919
SetSinspBufferSize(value);

collector/test/HostHeuristicsTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class MockHostInfoHeuristics : public HostInfo {
5151
class MockCollectorConfig : public CollectorConfig {
5252
public:
5353
MockCollectorConfig()
54-
: CollectorConfig(nullptr) {};
54+
: CollectorConfig(nullptr, true) {};
5555

5656
void SetCollectionMethod(CollectionMethod cm) {
5757
if (host_config_.HasCollectionMethod()) {

collector/test/NetworkStatusNotifierTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class Semaphore {
7070

7171
class MockCollectorConfig : public collector::CollectorConfig {
7272
public:
73-
MockCollectorConfig() : collector::CollectorConfig(nullptr) {}
73+
MockCollectorConfig() : collector::CollectorConfig(nullptr, true) {}
7474

7575
void DisableAfterglow() {
7676
enable_afterglow_ = false;
@@ -185,7 +185,7 @@ class NetworkConnectionInfoMessageParser {
185185
/* Simple validation that the service starts and sends at least one event */
186186
TEST(NetworkStatusNotifier, SimpleStartStop) {
187187
bool running = true;
188-
CollectorConfig config_(nullptr);
188+
CollectorConfig config_(nullptr, true);
189189
std::shared_ptr<MockConnScraper> conn_scraper = std::make_shared<MockConnScraper>();
190190
auto conn_tracker = std::make_shared<ConnectionTracker>();
191191
auto comm = std::make_shared<MockNetworkConnectionInfoServiceComm>();

0 commit comments

Comments
 (0)