Remove unnecessary #includes in telemetry and supervisor

src/main.cc

@@ -3,6 +3,7 @@
 #include <unistd.h>
 #include <cinttypes>
 
+#include "zeek/NetVar.h"
 #include "zeek/RunState.h"
 #include "zeek/Stats.h"
 #include "zeek/iosource/Manager.h"

src/supervisor/Supervisor.cc

@@ -29,6 +29,7 @@ extern "C" {
 #include "zeek/Dict.h"
 #include "zeek/Event.h"
 #include "zeek/EventHandler.h"
+#include "zeek/EventRegistry.h"
 #include "zeek/ID.h"
 #include "zeek/NetVar.h"
 #include "zeek/RE.h"

src/supervisor/Supervisor.h

@@ -2,11 +2,8 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
-
 #include <sys/types.h>
 #include <chrono>
-#include <cstdint>
 #include <map>
 #include <memory>
 #include <optional>
@@ -17,8 +14,6 @@
 
 #include "zeek/Flare.h"
 #include "zeek/Func.h"
-#include "zeek/IntrusivePtr.h"
-#include "zeek/NetVar.h"
 #include "zeek/Options.h"
 #include "zeek/Pipe.h"
 #include "zeek/Timer.h"

src/telemetry/Counter.h

@@ -7,7 +7,7 @@
 #include <initializer_list>
 #include <memory>
 
-#include "zeek/NetVar.h"
+#include "zeek/NetVar.h" // For BifEnum::Telemetry value
 #include "zeek/Span.h"
 #include "zeek/telemetry/MetricFamily.h"
 #include "zeek/telemetry/Utils.h"

src/telemetry/Gauge.h

@@ -8,7 +8,7 @@
 #include <initializer_list>
 #include <memory>
 
-#include "zeek/NetVar.h"
+#include "zeek/NetVar.h" // For BifEnum::Telemetry value
 #include "zeek/Span.h"
 #include "zeek/telemetry/MetricFamily.h"
 #include "zeek/telemetry/Utils.h"

src/telemetry/Histogram.h

@@ -4,11 +4,10 @@
 
 #include <prometheus/family.h>
 #include <prometheus/histogram.h>
-#include <cstdint>
 #include <initializer_list>
 #include <memory>
 
-#include "zeek/NetVar.h"
+#include "zeek/NetVar.h" // For BifEnum::Telemetry values
 #include "zeek/Span.h"
 #include "zeek/telemetry/MetricFamily.h"
 #include "zeek/telemetry/Utils.h"

src/telemetry/Opaques.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Opaques.h"
+#include "zeek/telemetry/Opaques.h"
 
 #include "zeek/telemetry/Counter.h"
 #include "zeek/telemetry/Gauge.h"

src/telemetry/ProcessStats.cc

@@ -2,8 +2,6 @@
 
 #include "zeek/telemetry/ProcessStats.h"
 
-#include "zeek/util.h"
-
 #ifdef __APPLE__
 
 #include <libproc.h>
@@ -63,7 +61,13 @@ process_stats get_process_stats() {
 
 #elif defined(HAVE_LINUX)
 
+#include <dirent.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <atomic>
+#include <cstdio>
+#include <cstring>
+
 std::atomic<long> global_ticks_per_second;
 std::atomic<long> global_page_size;
 
@@ -172,9 +176,10 @@ process_stats get_process_stats() {
 // Force these includes into a specific order so that the libraries can find
 // all of the required types.
 // clang-format off
+#include <sys/types.h>
+#include <sys/cdefs.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
-#include <sys/types.h>
 #include <sys/user.h>
 #include <unistd.h>
 #include <libprocstat.h>

src/telemetry/ProcessStats.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek/zeek-config.h"
+#include "zeek/zeek-config.h" // Needed for HAVE_LINUX
 
 #include <cstdint>
 

src/telemetry/Utils.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Utils.h"
+#include "zeek/telemetry/Utils.h"
 
 #include "zeek/ID.h"
 #include "zeek/Reporter.h"