Make statistics a separate library

11 files changed, 26 insertions, 6 deletions

diff --git a/src/buildtool/build_engine/target_map/TARGETS b/src/buildtool/build_engine/target_map/TARGETS
index 44924a69..c2c865b5 100644
--- a/src/buildtool/build_engine/target_map/TARGETS
+++ b/src/buildtool/build_engine/target_map/TARGETS
@@ -25,6 +25,7 @@
     , ["src/buildtool/build_engine/target_map", "configured_target"]
     , ["src/buildtool/common", "action_description"]
     , ["src/buildtool/common", "common"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/common", "tree"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
@@ -71,6 +72,7 @@
     , ["src/buildtool/common", "artifact_description"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/common", "tree"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/crypto", "hasher"]
@@ -132,6 +134,7 @@
     , ["src/buildtool/common", "action_description"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/common", "tree"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
diff --git a/src/buildtool/common/TARGETS b/src/buildtool/common/TARGETS
index ed3cb1f7..9e124045 100644
--- a/src/buildtool/common/TARGETS
+++ b/src/buildtool/common/TARGETS
@@ -88,7 +88,6 @@
     , "artifact_digest_factory.hpp"
     , "artifact.hpp"
     , "identifier.hpp"
-    , "statistics.hpp"
     ]
   , "srcs": ["artifact_digest_factory.cpp"]
   , "deps":
@@ -222,4 +221,10 @@
   , "deps": [["src/buildtool/crypto", "hash_function"]]
   , "stage": ["src", "buildtool", "common"]
   }
+, "statistics":
+  { "type": ["@", "rules", "CC", "library"]
+  , "name": ["statistics"]
+  , "hdrs": ["statistics.hpp"]
+  , "stage": ["src", "buildtool", "common"]
+  }
 }
diff --git a/src/buildtool/computed_roots/TARGETS b/src/buildtool/computed_roots/TARGETS
index 57b4436a..d897e561 100644
--- a/src/buildtool/computed_roots/TARGETS
+++ b/src/buildtool/computed_roots/TARGETS
@@ -82,7 +82,7 @@
   , "stage": ["src", "buildtool", "computed_roots"]
   , "deps":
     [ ["@", "gsl", "", "gsl"]
-    , ["src/buildtool/common", "common"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/progress_reporting", "base_progress_reporter"]
     , ["src/buildtool/progress_reporting", "task_tracker"]
@@ -121,6 +121,7 @@
     , ["src/buildtool/common", "cli"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "protocol_traits"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/execution_api/common", "api_bundle"]
     , ["src/buildtool/execution_api/common", "common"]
diff --git a/src/buildtool/execution_engine/executor/TARGETS b/src/buildtool/execution_engine/executor/TARGETS
index 6435af6a..4e3d1abd 100644
--- a/src/buildtool/execution_engine/executor/TARGETS
+++ b/src/buildtool/execution_engine/executor/TARGETS
@@ -14,6 +14,7 @@
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common", "git_hashes_converter"]
     , ["src/buildtool/common", "protocol_traits"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/common/remote", "remote_common"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/execution_api/bazel_msg", "execution_config"]
@@ -45,8 +46,8 @@
   , "hdrs": ["context.hpp"]
   , "deps":
     [ ["@", "gsl", "", "gsl"]
-    , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/execution_api/common", "api_bundle"]
     , ["src/buildtool/execution_api/remote", "context"]
     , ["src/buildtool/progress_reporting", "progress"]
diff --git a/src/buildtool/graph_traverser/TARGETS b/src/buildtool/graph_traverser/TARGETS
index e4aeeaa3..a47c198f 100644
--- a/src/buildtool/graph_traverser/TARGETS
+++ b/src/buildtool/graph_traverser/TARGETS
@@ -11,6 +11,7 @@
     , ["src/buildtool/common", "artifact_description"]
     , ["src/buildtool/common", "cli"]
     , ["src/buildtool/common", "common"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/common", "tree"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/execution_api/common", "api_bundle"]
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS
index 72cae667..756e275a 100644
--- a/src/buildtool/main/TARGETS
+++ b/src/buildtool/main/TARGETS
@@ -36,6 +36,7 @@
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
     , ["src/buildtool/common", "protocol_traits"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/common/remote", "remote_common"]
     , ["src/buildtool/common/remote", "retry_config"]
     , ["src/buildtool/computed_roots", "evaluate"]
@@ -248,8 +249,8 @@
   , "hdrs": ["analyse_context.hpp"]
   , "deps":
     [ ["@", "gsl", "", "gsl"]
-    , ["src/buildtool/common", "common"]
     , ["src/buildtool/common", "config"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/progress_reporting", "progress"]
     , ["src/buildtool/serve_api/remote", "serve_api"]
     , ["src/buildtool/storage", "storage"]
diff --git a/src/buildtool/progress_reporting/TARGETS b/src/buildtool/progress_reporting/TARGETS
index dc9d8e2f..9a02daf7 100644
--- a/src/buildtool/progress_reporting/TARGETS
+++ b/src/buildtool/progress_reporting/TARGETS
@@ -28,7 +28,7 @@
     [ "base_progress_reporter"
     , "progress"
     , ["@", "gsl", "", "gsl"]
-    , ["src/buildtool/common", "common"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/logging", "logging"]
     ]
   , "private-deps":
@@ -61,7 +61,7 @@
     [ "base_progress_reporter"
     , "progress"
     , ["@", "gsl", "", "gsl"]
-    , ["src/buildtool/common", "common"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/logging", "logging"]
     ]
   , "private-deps":
diff --git a/src/buildtool/serve_api/serve_service/TARGETS b/src/buildtool/serve_api/serve_service/TARGETS
index 357469ff..c2f7f44c 100644
--- a/src/buildtool/serve_api/serve_service/TARGETS
+++ b/src/buildtool/serve_api/serve_service/TARGETS
@@ -135,6 +135,7 @@
     , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/common", "cli"]
     , ["src/buildtool/common", "config"]
+    , ["src/buildtool/common", "statistics"]
     , ["src/buildtool/crypto", "hash_function"]
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_engine/executor", "context"]
diff --git a/test/buildtool/build_engine/target_map/TARGETS b/test/buildtool/build_engine/target_map/TARGETS
index 61e16910..ede3b41c 100644
--- a/test/buildtool/build_engine/target_map/TARGETS
+++ b/test/buildtool/build_engine/target_map/TARGETS
@@ -21,6 +21,7 @@
     , ["@", "src", "src/buildtool/build_engine/target_map", "result_map"]
     , ["@", "src", "src/buildtool/common", "action_description"]
     , ["@", "src", "src/buildtool/common", "common"]
+    , ["@", "src", "src/buildtool/common", "statistics"]
     , ["@", "src", "src/buildtool/common", "tree"]
     , ["@", "src", "src/buildtool/file_system", "file_system_manager"]
     , ["@", "src", "src/buildtool/progress_reporting", "progress"]
@@ -66,6 +67,7 @@
     , ["@", "src", "src/buildtool/common", "action_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
+    , ["@", "src", "src/buildtool/common", "statistics"]
     , ["@", "src", "src/buildtool/common", "tree"]
     , ["@", "src", "src/buildtool/common/remote", "remote_common"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
diff --git a/test/buildtool/execution_engine/executor/TARGETS b/test/buildtool/execution_engine/executor/TARGETS
index aaacf477..a27e8dac 100644
--- a/test/buildtool/execution_engine/executor/TARGETS
+++ b/test/buildtool/execution_engine/executor/TARGETS
@@ -11,6 +11,7 @@
     , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
+    , ["@", "src", "src/buildtool/common", "statistics"]
     , ["@", "src", "src/buildtool/common", "tree"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
@@ -43,6 +44,7 @@
     , ["@", "src", "src/buildtool/common", "artifact_description"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
+    , ["@", "src", "src/buildtool/common", "statistics"]
     , ["@", "src", "src/buildtool/common/remote", "remote_common"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
@@ -75,6 +77,7 @@
     , ["@", "gsl", "", "gsl"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
+    , ["@", "src", "src/buildtool/common", "statistics"]
     , ["@", "src", "src/buildtool/execution_api/local", "config"]
     , ["@", "src", "src/buildtool/execution_api/local", "context"]
     , ["@", "src", "src/buildtool/execution_api/local", "local_api"]
@@ -97,6 +100,7 @@
     , ["@", "src", "src/buildtool/auth", "auth"]
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
+    , ["@", "src", "src/buildtool/common", "statistics"]
     , ["@", "src", "src/buildtool/common/remote", "remote_common"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/crypto", "hash_function"]
diff --git a/test/buildtool/graph_traverser/TARGETS b/test/buildtool/graph_traverser/TARGETS
index d6432a01..c2197369 100644
--- a/test/buildtool/graph_traverser/TARGETS
+++ b/test/buildtool/graph_traverser/TARGETS
@@ -11,6 +11,7 @@
     , ["@", "src", "src/buildtool/common", "common"]
     , ["@", "src", "src/buildtool/common", "config"]
     , ["@", "src", "src/buildtool/common", "protocol_traits"]
+    , ["@", "src", "src/buildtool/common", "statistics"]
     , ["@", "src", "src/buildtool/common/remote", "retry_config"]
     , ["@", "src", "src/buildtool/execution_api/common", "api_bundle"]
     , ["@", "src", "src/buildtool/execution_api/local", "config"]