Merge remote-tracking branch 'origin/topic/vern/event-trace-on-exit'

* origin/topic/vern/event-trace-on-exit:
  Generate --event-trace output explicitly rather than in EventTraceMgr destructor

CHANGES

@@ -1,3 +1,7 @@
+8.0.0-dev.106 | 2025-05-16 13:39:56 +0200
+
+  * Generate --event-trace output explicitly rather than in EventTraceMgr destructor (Vern Paxson, Corelight)
+
 8.0.0-dev.104 | 2025-05-15 12:15:42 -0700
 
   * Require non-system version of libkrb5 on macOS (Tim Wojtulewicz, Corelight)

VERSION

@@ -1 +1 @@
-8.0.0-dev.104
+8.0.0-dev.106

src/EventTrace.cc

@@ -958,7 +958,7 @@ EventTraceMgr::EventTraceMgr(const std::string& trace_file) {
         reporter->FatalError("can't open event trace file %s", trace_file.c_str());
 }
 
-EventTraceMgr::~EventTraceMgr() {
+void EventTraceMgr::Generate() {
     if ( events.empty() )
         return;
 

src/EventTrace.h

@@ -440,7 +440,9 @@ private:
 class EventTraceMgr {
 public:
     EventTraceMgr(const std::string& trace_file);
-    ~EventTraceMgr();
+
+    // Generates the trace upon exit.
+    void Generate();
 
     // Called at the beginning of invoking an event's handlers.
     void StartEvent(const ScriptFunc* ev, const zeek::Args* args);

src/zeek-setup.cc

@@ -399,6 +399,9 @@ static void terminate_zeek() {
 
     script_coverage_mgr.WriteStats();
 
+    if ( etm )
+        etm->Generate();
+
     delete zeekygen_mgr;
     delete packet_mgr;
     delete analyzer_mgr;