just: Replace singletons for progress tracking and statistics...

...with regular instances that have controlled life-times.

This avoids race conditions in tracking and reporting the results
of analysis and build, as the serve endpoint can orchestrate
multiple builds at the same time asynchronously. As a bonus
side-effect this also ensures the correctness of the progress
reporting per orchestrated build.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/buildtool/build_engine/target_map/export.cpp b/src/buildtool/build_engine/target_map/export.cpp
index c9aed0e3..29085716 100644
--- a/src/buildtool/build_engine/target_map/export.cpp
+++ b/src/buildtool/build_engine/target_map/export.cpp
@@ -98,6 +98,7 @@ void ExportRule(
     const BuildMaps::Target::ConfiguredTarget& key,
     const gsl::not_null<RepositoryConfig*>& repo_config,
     const ActiveTargetCache& target_cache,
+    const gsl::not_null<Statistics*>& stats,
     const BuildMaps::Target::TargetMap::SubCallerPtr& subcaller,
     const BuildMaps::Target::TargetMap::SetterPtr& setter,
     const BuildMaps::Target::TargetMap::LoggerPtr& logger,
@@ -134,7 +135,7 @@ void ExportRule(
 #endif  // BOOTSTRAP_BUILD_TOOL
 
         if (not target_cache_value) {
-            Statistics::Instance().IncrementExportsUncachedCounter();
+            stats->IncrementExportsUncachedCounter();
             Logger::Log(LogLevel::Performance,
                         "Export target {} registered for caching: {}",
                         key.target.ToString(),
@@ -176,7 +177,7 @@ void ExportRule(
                             info.ToString());
 
                 (*setter)(std::move(analysis_result));
-                Statistics::Instance().IncrementExportsCachedCounter();
+                stats->IncrementExportsCachedCounter();
                 return;
             }
             (*logger)(fmt::format("Reading target entry for key {} failed",
@@ -185,7 +186,7 @@ void ExportRule(
         }
     }
     else {
-        Statistics::Instance().IncrementExportsNotEligibleCounter();
+        stats->IncrementExportsNotEligibleCounter();
         Logger::Log(LogLevel::Performance,
                     "Export target {} is not eligible for target caching",
                     key.target.ToString());