diff options
156 files changed, 411 insertions, 86 deletions
diff --git a/src/buildtool/auth/TARGETS b/src/buildtool/auth/TARGETS index a4d6fdbe..4d501a91 100644 --- a/src/buildtool/auth/TARGETS +++ b/src/buildtool/auth/TARGETS @@ -2,7 +2,11 @@ { "type": ["@", "rules", "CC", "library"] , "name": ["auth"] , "hdrs": ["authentication.hpp"] - , "deps": [["@", "gsl", "", "gsl"], ["src/buildtool/logging", "logging"]] + , "deps": + [ ["@", "gsl", "", "gsl"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + ] , "stage": ["src", "buildtool", "auth"] } } diff --git a/src/buildtool/auth/authentication.hpp b/src/buildtool/auth/authentication.hpp index d6ce7cfe..a7e66c05 100644 --- a/src/buildtool/auth/authentication.hpp +++ b/src/buildtool/auth/authentication.hpp @@ -23,6 +23,7 @@ #include <utility> #include "gsl/gsl" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" enum class AuthMethod : std::uint8_t { kNONE, kTLS }; diff --git a/src/buildtool/build_engine/analysed_target/TARGETS b/src/buildtool/build_engine/analysed_target/TARGETS index baa959c1..829e269d 100644 --- a/src/buildtool/build_engine/analysed_target/TARGETS +++ b/src/buildtool/build_engine/analysed_target/TARGETS @@ -12,6 +12,7 @@ , ["src/buildtool/build_engine/expression", "expression_ptr_interface"] ] , "stage": ["src", "buildtool", "build_engine", "analysed_target"] + , "private-deps": [["@", "gsl", "", "gsl"]] } , "graph_information": { "type": ["@", "rules", "CC", "library"] diff --git a/src/buildtool/build_engine/analysed_target/analysed_target.cpp b/src/buildtool/build_engine/analysed_target/analysed_target.cpp index 18650727..045add0d 100644 --- a/src/buildtool/build_engine/analysed_target/analysed_target.cpp +++ b/src/buildtool/build_engine/analysed_target/analysed_target.cpp @@ -14,6 +14,8 @@ #include "src/buildtool/build_engine/analysed_target/analysed_target.hpp" +#include "gsl/gsl" + namespace { // NOLINTNEXTLINE(misc-no-recursion) diff --git a/src/buildtool/build_engine/analysed_target/target_graph_information.hpp b/src/buildtool/build_engine/analysed_target/target_graph_information.hpp index 791f35b9..f926421d 100644 --- a/src/buildtool/build_engine/analysed_target/target_graph_information.hpp +++ b/src/buildtool/build_engine/analysed_target/target_graph_information.hpp @@ -16,6 +16,8 @@ #define INCLUDED_SRC_BUILDTOOL_BUILDENGINE_ANALYSED_TARGET_TARGET_GRAPH_INFORMATION_HPP #include <optional> +#include <string> +#include <vector> #include "nlohmann/json.hpp" #include "src/buildtool/build_engine/target_map/configured_target.hpp" diff --git a/src/buildtool/build_engine/base_maps/TARGETS b/src/buildtool/build_engine/base_maps/TARGETS index 22e87862..5a54ea54 100644 --- a/src/buildtool/build_engine/base_maps/TARGETS +++ b/src/buildtool/build_engine/base_maps/TARGETS @@ -113,6 +113,7 @@ , "hdrs": ["expression_function.hpp"] , "deps": [ ["src/buildtool/build_engine/expression", "expression"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "gsl"] , ["@", "gsl", "", "gsl"] diff --git a/src/buildtool/build_engine/base_maps/expression_function.hpp b/src/buildtool/build_engine/base_maps/expression_function.hpp index 52bd53c2..aa01f57a 100644 --- a/src/buildtool/build_engine/base_maps/expression_function.hpp +++ b/src/buildtool/build_engine/base_maps/expression_function.hpp @@ -25,6 +25,7 @@ #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/buildtool/build_engine/expression/evaluator.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/gsl.hpp" diff --git a/src/buildtool/build_engine/expression/TARGETS b/src/buildtool/build_engine/expression/TARGETS index ed888b25..807a43ab 100644 --- a/src/buildtool/build_engine/expression/TARGETS +++ b/src/buildtool/build_engine/expression/TARGETS @@ -17,6 +17,7 @@ , "deps": [ "linked_map" , ["@", "json", "", "json"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] ] , "stage": ["src", "buildtool", "build_engine", "expression"] @@ -54,7 +55,8 @@ ] , "stage": ["src", "buildtool", "build_engine", "expression"] , "private-deps": - [ ["src/buildtool/logging", "logging"] + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "type_safe_arithmetic"] , ["src/utils/cpp", "path"] ] diff --git a/src/buildtool/build_engine/expression/expression_ptr.hpp b/src/buildtool/build_engine/expression/expression_ptr.hpp index b40a4afe..0c29cc04 100644 --- a/src/buildtool/build_engine/expression/expression_ptr.hpp +++ b/src/buildtool/build_engine/expression/expression_ptr.hpp @@ -23,6 +23,7 @@ #include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/function_map.hpp" #include "src/buildtool/build_engine/expression/linked_map.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" class Configuration; diff --git a/src/buildtool/build_engine/expression/target_result.cpp b/src/buildtool/build_engine/expression/target_result.cpp index 2ec31a55..62676ee9 100644 --- a/src/buildtool/build_engine/expression/target_result.cpp +++ b/src/buildtool/build_engine/expression/target_result.cpp @@ -20,6 +20,7 @@ #include "gsl/gsl" #include "src/buildtool/build_engine/expression/expression.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" namespace { diff --git a/src/buildtool/build_engine/target_map/TARGETS b/src/buildtool/build_engine/target_map/TARGETS index 5e77e98f..14bd48a5 100644 --- a/src/buildtool/build_engine/target_map/TARGETS +++ b/src/buildtool/build_engine/target_map/TARGETS @@ -62,6 +62,7 @@ , ["src/buildtool/build_engine/base_maps", "field_reader"] , ["src/buildtool/build_engine/expression", "expression"] , ["src/buildtool/execution_api/local", "local"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "hash_combine"] , ["src/utils/cpp", "path"] @@ -107,6 +108,7 @@ , "stage": ["src", "buildtool", "build_engine", "target_map"] , "private-deps": [ ["src/buildtool/storage", "storage"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/serve_api/remote", "serve_api"] ] diff --git a/src/buildtool/build_engine/target_map/absent_target_map.cpp b/src/buildtool/build_engine/target_map/absent_target_map.cpp index d725ef22..39e3d3bb 100644 --- a/src/buildtool/build_engine/target_map/absent_target_map.cpp +++ b/src/buildtool/build_engine/target_map/absent_target_map.cpp @@ -14,6 +14,8 @@ #include "src/buildtool/build_engine/target_map/absent_target_map.hpp" #ifndef BOOTSTRAP_BUILD_TOOL +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" #include "src/buildtool/storage/target_cache_key.hpp" #endif diff --git a/src/buildtool/build_engine/target_map/built_in_rules.cpp b/src/buildtool/build_engine/target_map/built_in_rules.cpp index 1ab71a1c..77298d5c 100644 --- a/src/buildtool/build_engine/target_map/built_in_rules.cpp +++ b/src/buildtool/build_engine/target_map/built_in_rules.cpp @@ -25,7 +25,6 @@ #include <unordered_set> #include "fmt/core.h" -#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/base_maps/field_reader.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" #include "src/buildtool/build_engine/expression/expression_ptr.hpp" diff --git a/src/buildtool/build_engine/target_map/export.cpp b/src/buildtool/build_engine/target_map/export.cpp index b8c0edb6..3ed86dd1 100644 --- a/src/buildtool/build_engine/target_map/export.cpp +++ b/src/buildtool/build_engine/target_map/export.cpp @@ -19,6 +19,8 @@ #include "src/buildtool/build_engine/base_maps/field_reader.hpp" #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/buildtool/common/statistics.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" #ifndef BOOTSTRAP_BUILD_TOOL #include "src/buildtool/serve_api/remote/config.hpp" diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp index 2d76abe9..b5350eb8 100644 --- a/src/buildtool/build_engine/target_map/target_map.cpp +++ b/src/buildtool/build_engine/target_map/target_map.cpp @@ -30,6 +30,7 @@ #include "src/buildtool/build_engine/expression/function_map.hpp" #include "src/buildtool/build_engine/target_map/built_in_rules.hpp" #include "src/buildtool/build_engine/target_map/utils.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/gsl.hpp" #include "src/utils/cpp/path.hpp" diff --git a/src/buildtool/common/TARGETS b/src/buildtool/common/TARGETS index 978cebc5..d79fa3bf 100644 --- a/src/buildtool/common/TARGETS +++ b/src/buildtool/common/TARGETS @@ -46,16 +46,13 @@ , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "hash_combine"] , ["src/utils/cpp", "gsl"] , ["@", "json", "", "json"] ] , "stage": ["src", "buildtool", "common"] - , "private-deps": - [ ["src/buildtool/logging", "logging"] - , ["src/buildtool/execution_api/remote", "config"] - , ["src/utils/cpp", "type_safe_arithmetic"] - ] } , "artifact_factory": { "type": ["@", "rules", "CC", "library"] @@ -64,13 +61,12 @@ , "deps": [ "common" , "action_description" - , ["src/buildtool/logging", "logging"] + , "artifact_description" + , ["@", "json", "", "json"] , ["src/buildtool/file_system", "object_type"] , ["src/utils/cpp", "json"] ] , "stage": ["src", "buildtool", "common"] - , "private-deps": - [["src/utils/cpp", "type_safe_arithmetic"], "artifact_description"] } , "artifact_description": { "type": ["@", "rules", "CC", "library"] @@ -88,18 +84,29 @@ { "type": ["@", "rules", "CC", "library"] , "name": ["action_description"] , "hdrs": ["action_description.hpp"] - , "deps": ["common", "artifact_description", ["@", "json", "", "json"]] + , "deps": + [ "common" + , "artifact_description" + , ["@", "json", "", "json"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + ] , "stage": ["src", "buildtool", "common"] - , "private-deps": [["src/buildtool/logging", "logging"]] } , "tree": { "type": ["@", "rules", "CC", "library"] , "name": ["tree"] , "hdrs": ["tree.hpp"] , "deps": - ["action_description", "artifact_description", ["@", "json", "", "json"]] + [ "action_description" + , "artifact_description" + , "common" + , ["@", "json", "", "json"] + , ["src/buildtool/crypto", "hash_function"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + ] , "stage": ["src", "buildtool", "common"] - , "private-deps": ["common", ["src/buildtool/logging", "logging"]] } , "config": { "type": ["@", "rules", "CC", "library"] @@ -107,7 +114,9 @@ , "hdrs": ["repository_config.hpp"] , "srcs": ["repository_config.cpp"] , "deps": - [ ["src/buildtool/file_system", "file_root"] + [ ["@", "gsl", "", "gsl"] + , ["@", "json", "", "json"] + , ["src/buildtool/file_system", "file_root"] , ["src/buildtool/file_system", "git_cas"] , ["src/buildtool/multithreading", "atomic_value"] ] diff --git a/src/buildtool/common/action_description.hpp b/src/buildtool/common/action_description.hpp index 621e3a12..374227f2 100644 --- a/src/buildtool/common/action_description.hpp +++ b/src/buildtool/common/action_description.hpp @@ -25,6 +25,8 @@ #include "nlohmann/json.hpp" #include "src/buildtool/common/action.hpp" #include "src/buildtool/common/artifact_description.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" class ActionDescription { public: diff --git a/src/buildtool/common/artifact.hpp b/src/buildtool/common/artifact.hpp index 76bb1c9f..5bef1f27 100644 --- a/src/buildtool/common/artifact.hpp +++ b/src/buildtool/common/artifact.hpp @@ -25,6 +25,8 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/identifier.hpp" #include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/hash_combine.hpp" // Artifacts (source files, libraries, executables...) need to store their diff --git a/src/buildtool/common/artifact_description.hpp b/src/buildtool/common/artifact_description.hpp index 69dfef7e..8393fd76 100644 --- a/src/buildtool/common/artifact_description.hpp +++ b/src/buildtool/common/artifact_description.hpp @@ -23,6 +23,7 @@ #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/json.hpp" diff --git a/src/buildtool/common/artifact_factory.hpp b/src/buildtool/common/artifact_factory.hpp index 64b7d33c..59d7c80a 100644 --- a/src/buildtool/common/artifact_factory.hpp +++ b/src/buildtool/common/artifact_factory.hpp @@ -21,6 +21,8 @@ #include <utility> #include <vector> +#include "nlohmann/json.hpp" +#include "src/buildtool/common/action.hpp" #include "src/buildtool/common/action_description.hpp" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/identifier.hpp" diff --git a/src/buildtool/common/remote/TARGETS b/src/buildtool/common/remote/TARGETS index 087a0ea4..ae4c9b5b 100644 --- a/src/buildtool/common/remote/TARGETS +++ b/src/buildtool/common/remote/TARGETS @@ -3,10 +3,12 @@ , "name": ["client_common"] , "hdrs": ["client_common.hpp"] , "deps": - [ ["@", "grpc", "", "grpc++"] + [ ["@", "fmt", "", "fmt"] + , ["@", "grpc", "", "grpc++"] , ["src/buildtool/auth", "auth"] , ["src/buildtool/common", "common"] , "port" + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] ] , "stage": ["src", "buildtool", "common", "remote"] @@ -17,6 +19,7 @@ , "hdrs": ["port.hpp"] , "deps": [ ["@", "gsl", "", "gsl"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "type_safe_arithmetic"] ] @@ -33,7 +36,10 @@ { "type": ["@", "rules", "CC", "library"] , "name": ["retry_parameters"] , "hdrs": ["retry_parameters.hpp"] - , "deps": [["src/buildtool/logging", "logging"]] + , "deps": + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + ] , "stage": ["src", "buildtool", "common", "remote"] } , "retry": @@ -41,7 +47,8 @@ , "name": ["retry"] , "hdrs": ["retry.hpp"] , "deps": - [ ["src/buildtool/logging", "logging"] + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["@", "grpc", "", "grpc++"] , "retry_parameters" ] diff --git a/src/buildtool/common/remote/client_common.hpp b/src/buildtool/common/remote/client_common.hpp index 6a13de34..bd962e8d 100644 --- a/src/buildtool/common/remote/client_common.hpp +++ b/src/buildtool/common/remote/client_common.hpp @@ -18,13 +18,16 @@ /// \file client_common.hpp /// \brief Common types and functions required by client implementations. +#include <optional> #include <sstream> #include <string> +#include "fmt/core.h" #include "grpcpp/grpcpp.h" #include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/port.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" [[maybe_unused]] [[nodiscard]] static inline auto CreateChannelWithCredentials( diff --git a/src/buildtool/common/remote/port.hpp b/src/buildtool/common/remote/port.hpp index bc850f3a..1fb2467c 100644 --- a/src/buildtool/common/remote/port.hpp +++ b/src/buildtool/common/remote/port.hpp @@ -18,6 +18,7 @@ #include <optional> #include "gsl/gsl" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/type_safe_arithmetic.hpp" diff --git a/src/buildtool/common/remote/retry.hpp b/src/buildtool/common/remote/retry.hpp index 7abfcc2e..1d2d54a0 100644 --- a/src/buildtool/common/remote/retry.hpp +++ b/src/buildtool/common/remote/retry.hpp @@ -15,9 +15,9 @@ #include <optional> #include <thread> -#include <grpcpp/grpcpp.h> - +#include "grpcpp/grpcpp.h" #include "src/buildtool/common/remote/retry_parameters.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" // Utility class to help detecting when exit the retry loop. This class can be diff --git a/src/buildtool/common/remote/retry_parameters.hpp b/src/buildtool/common/remote/retry_parameters.hpp index 73b92db7..6a9beedf 100644 --- a/src/buildtool/common/remote/retry_parameters.hpp +++ b/src/buildtool/common/remote/retry_parameters.hpp @@ -15,6 +15,7 @@ #include <mutex> #include <random> +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" constexpr unsigned int kDefaultInitialBackoffSeconds{1}; diff --git a/src/buildtool/common/repository_config.hpp b/src/buildtool/common/repository_config.hpp index de5d4225..795ee5e5 100644 --- a/src/buildtool/common/repository_config.hpp +++ b/src/buildtool/common/repository_config.hpp @@ -18,9 +18,12 @@ #include <filesystem> #include <map> #include <memory> +#include <optional> #include <string> #include <unordered_map> +#include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/git_cas.hpp" #include "src/buildtool/multithreading/atomic_value.hpp" diff --git a/src/buildtool/common/tree.hpp b/src/buildtool/common/tree.hpp index 73d4f30b..6e066c75 100644 --- a/src/buildtool/common/tree.hpp +++ b/src/buildtool/common/tree.hpp @@ -16,12 +16,16 @@ #define INCLUDED_SRC_BUILDTOOL_COMMON_TREE_HPP #include <memory> +#include <optional> #include <string> #include <unordered_map> +#include <utility> #include "nlohmann/json.hpp" +#include "src/buildtool/common/action.hpp" #include "src/buildtool/common/action_description.hpp" #include "src/buildtool/common/artifact_description.hpp" +#include "src/buildtool/crypto/hash_function.hpp" // Describes tree, its inputs, output (tree artifact), and action (tree action). class Tree { diff --git a/src/buildtool/compatibility/TARGETS b/src/buildtool/compatibility/TARGETS index 18dac1c5..6c26fb48 100644 --- a/src/buildtool/compatibility/TARGETS +++ b/src/buildtool/compatibility/TARGETS @@ -5,6 +5,7 @@ , "deps": [ ["src/buildtool/crypto", "hash_function"] , ["@", "gsl", "", "gsl"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "gsl"] ] diff --git a/src/buildtool/compatibility/compatibility.hpp b/src/buildtool/compatibility/compatibility.hpp index 3d4951f4..72b22244 100644 --- a/src/buildtool/compatibility/compatibility.hpp +++ b/src/buildtool/compatibility/compatibility.hpp @@ -19,6 +19,7 @@ #include <utility> #include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" class Compatibility { using git_hash = std::string; diff --git a/src/buildtool/crypto/TARGETS b/src/buildtool/crypto/TARGETS index 47309f72..1b4a7ae7 100644 --- a/src/buildtool/crypto/TARGETS +++ b/src/buildtool/crypto/TARGETS @@ -15,7 +15,10 @@ ] , "stage": ["src", "buildtool", "crypto"] , "deps": - [["src/buildtool/logging", "logging"], ["src/utils/cpp", "hex_string"]] + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + , ["src/utils/cpp", "hex_string"] + ] , "private-deps": [["@", "ssl", "", "crypto"]] } , "hash_function": diff --git a/src/buildtool/crypto/hasher.hpp b/src/buildtool/crypto/hasher.hpp index 6abf2b0c..ceabc44c 100644 --- a/src/buildtool/crypto/hasher.hpp +++ b/src/buildtool/crypto/hasher.hpp @@ -20,6 +20,7 @@ #include <optional> #include <string> +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/hex_string.hpp" diff --git a/src/buildtool/execution_api/bazel_msg/TARGETS b/src/buildtool/execution_api/bazel_msg/TARGETS index 31bbc5df..8eb64976 100644 --- a/src/buildtool/execution_api/bazel_msg/TARGETS +++ b/src/buildtool/execution_api/bazel_msg/TARGETS @@ -27,6 +27,8 @@ , ["src/buildtool/file_system", "git_repo"] , ["src/buildtool/execution_engine/dag", "dag"] , ["src/buildtool/common", "bazel_types"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] ] , "private-deps": [ ["src/buildtool/compatibility", "compatibility"] @@ -48,6 +50,7 @@ ] , "private-deps": [ ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] ] , "stage": ["src", "buildtool", "execution_api", "bazel_msg"] diff --git a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp index f27f246f..e90d862b 100644 --- a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp +++ b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp @@ -31,6 +31,8 @@ #include "src/buildtool/execution_api/bazel_msg/directory_tree.hpp" #include "src/buildtool/execution_engine/dag/dag.hpp" #include "src/buildtool/file_system/git_repo.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" /// \brief Factory for creating Bazel API protobuf messages. /// Responsible for creating protobuf messages necessary for Bazel API server diff --git a/src/buildtool/execution_api/bazel_msg/directory_tree.cpp b/src/buildtool/execution_api/bazel_msg/directory_tree.cpp index 25e17ee6..5b3b20e2 100644 --- a/src/buildtool/execution_api/bazel_msg/directory_tree.cpp +++ b/src/buildtool/execution_api/bazel_msg/directory_tree.cpp @@ -16,6 +16,7 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/gsl.hpp" diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS index 573be160..d2fcfc6d 100644 --- a/src/buildtool/execution_api/common/TARGETS +++ b/src/buildtool/execution_api/common/TARGETS @@ -16,6 +16,7 @@ , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/file_system", "object_type"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "gsl"] , ["src/utils/cpp", "hex_string"] diff --git a/src/buildtool/execution_api/common/execution_api.cpp b/src/buildtool/execution_api/common/execution_api.cpp index f91dee43..d52e555c 100644 --- a/src/buildtool/execution_api/common/execution_api.cpp +++ b/src/buildtool/execution_api/common/execution_api.cpp @@ -14,10 +14,11 @@ #include "src/buildtool/execution_api/common/execution_api.hpp" +#include "gsl/gsl" #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" - -#include <gsl/gsl> +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" [[nodiscard]] auto IExecutionApi::UploadFile( std::filesystem::path const& file_path, diff --git a/src/buildtool/execution_api/common/execution_common.hpp b/src/buildtool/execution_api/common/execution_common.hpp index d9aea07f..5269a76f 100644 --- a/src/buildtool/execution_api/common/execution_common.hpp +++ b/src/buildtool/execution_api/common/execution_common.hpp @@ -32,6 +32,7 @@ #include "gsl/gsl" #include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/gsl.hpp" #include "src/utils/cpp/hex_string.hpp" diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS index a7d31a27..3e195136 100644 --- a/src/buildtool/execution_api/execution_service/TARGETS +++ b/src/buildtool/execution_api/execution_service/TARGETS @@ -6,16 +6,17 @@ , "proto": [["@", "bazel_remote_apis", "", "remote_execution_proto"]] , "stage": ["src", "buildtool", "execution_api", "execution_service"] , "deps": - [ ["src/buildtool/execution_api/local", "local"] + [ ["@", "gsl", "", "gsl"] + , ["src/buildtool/execution_api/local", "local"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/common", "bazel_types"] , ["src/buildtool/storage", "storage"] ] , "private-deps": [ ["@", "fmt", "", "fmt"] - , ["@", "gsl", "", "gsl"] , ["src/buildtool/storage", "storage"] , ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/logging", "log_level"] , "operation_cache" , ["src/utils/cpp", "verify_hash"] ] @@ -30,13 +31,15 @@ , "proto": [["@", "bazel_remote_apis", "", "remote_execution_proto"]] , "stage": ["src", "buildtool", "execution_api", "execution_service"] , "deps": - [ ["src/buildtool/logging", "logging"] + [ ["@", "gsl", "", "gsl"] + , ["src/buildtool/logging", "logging"] , ["src/buildtool/common", "bazel_types"] , ["src/buildtool/storage", "storage"] ] , "private-deps": [ ["src/buildtool/storage", "storage"] , ["src/buildtool/execution_api/local", "local"] + , ["src/buildtool/logging", "log_level"] , ["src/utils/cpp", "verify_hash"] ] } @@ -55,6 +58,7 @@ ] , "private-deps": [ ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/logging", "log_level"] , ["@", "fmt", "", "fmt"] , ["src/buildtool/storage", "storage"] , ["src/utils/cpp", "verify_hash"] @@ -75,6 +79,8 @@ , "capabilities_server" , "operations_server" , ["src/buildtool/execution_api/remote", "config"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/buildtool/auth", "auth"] , ["@", "json", "", "json"] , ["src/buildtool/execution_api/local", "local"] @@ -93,12 +99,14 @@ , "proto": [["@", "googleapis", "", "google_bytestream_proto"]] , "stage": ["src", "buildtool", "execution_api", "execution_service"] , "deps": - [ ["src/buildtool/logging", "logging"] + [ ["@", "gsl", "", "gsl"] + , ["src/buildtool/logging", "logging"] , ["src/buildtool/storage", "storage"] ] , "private-deps": [ ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/execution_api/common", "bytestream-common"] + , ["src/buildtool/logging", "log_level"] , ["src/utils/cpp", "tmp_dir"] , ["@", "fmt", "", "fmt"] , ["src/buildtool/storage", "storage"] @@ -115,7 +123,8 @@ , "stage": ["src", "buildtool", "execution_api", "execution_service"] , "deps": [["src/buildtool/common", "bazel_types"]] , "private-deps": - [ ["src/buildtool/logging", "logging"] + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/buildtool/compatibility", "compatibility"] ] } @@ -136,7 +145,11 @@ , "deps": [["src/buildtool/logging", "logging"]] , "proto": [["@", "googleapis", "", "google_longrunning_operations_proto"]] , "stage": ["src", "buildtool", "execution_api", "execution_service"] - , "private-deps": ["operation_cache", ["src/utils/cpp", "verify_hash"]] + , "private-deps": + [ "operation_cache" + , ["src/buildtool/logging", "log_level"] + , ["src/utils/cpp", "verify_hash"] + ] } , "file_chunker": { "type": ["@", "rules", "CC", "library"] diff --git a/src/buildtool/execution_api/execution_service/ac_server.cpp b/src/buildtool/execution_api/execution_service/ac_server.cpp index 84a75d18..53000cad 100644 --- a/src/buildtool/execution_api/execution_service/ac_server.cpp +++ b/src/buildtool/execution_api/execution_service/ac_server.cpp @@ -15,6 +15,7 @@ #include "src/buildtool/execution_api/execution_service/ac_server.hpp" #include "fmt/core.h" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/verify_hash.hpp" diff --git a/src/buildtool/execution_api/execution_service/ac_server.hpp b/src/buildtool/execution_api/execution_service/ac_server.hpp index ce31e0ce..d862c5da 100644 --- a/src/buildtool/execution_api/execution_service/ac_server.hpp +++ b/src/buildtool/execution_api/execution_service/ac_server.hpp @@ -16,6 +16,7 @@ #define AC_SERVER_HPP #include "build/bazel/remote/execution/v2/remote_execution.grpc.pb.h" +#include "gsl/gsl" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" diff --git a/src/buildtool/execution_api/execution_service/bytestream_server.cpp b/src/buildtool/execution_api/execution_service/bytestream_server.cpp index 09a46110..ed5a6bc2 100644 --- a/src/buildtool/execution_api/execution_service/bytestream_server.cpp +++ b/src/buildtool/execution_api/execution_service/bytestream_server.cpp @@ -21,6 +21,7 @@ #include "fmt/core.h" #include "src/buildtool/compatibility/native_support.hpp" #include "src/buildtool/execution_api/common/bytestream_common.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/tmp_dir.hpp" #include "src/utils/cpp/verify_hash.hpp" diff --git a/src/buildtool/execution_api/execution_service/bytestream_server.hpp b/src/buildtool/execution_api/execution_service/bytestream_server.hpp index b69b5344..f4c000f0 100644 --- a/src/buildtool/execution_api/execution_service/bytestream_server.hpp +++ b/src/buildtool/execution_api/execution_service/bytestream_server.hpp @@ -16,6 +16,7 @@ #define BYTESTREAM_SERVER_HPP #include "google/bytestream/bytestream.grpc.pb.h" +#include "gsl/gsl" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" diff --git a/src/buildtool/execution_api/execution_service/capabilities_server.cpp b/src/buildtool/execution_api/execution_service/capabilities_server.cpp index 22209524..7fef8a19 100644 --- a/src/buildtool/execution_api/execution_service/capabilities_server.cpp +++ b/src/buildtool/execution_api/execution_service/capabilities_server.cpp @@ -15,6 +15,7 @@ #include "src/buildtool/execution_api/execution_service/capabilities_server.hpp" #include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" auto CapabilitiesServiceImpl::GetCapabilities( diff --git a/src/buildtool/execution_api/execution_service/cas_server.cpp b/src/buildtool/execution_api/execution_service/cas_server.cpp index b266cd9e..32ec1d58 100644 --- a/src/buildtool/execution_api/execution_service/cas_server.cpp +++ b/src/buildtool/execution_api/execution_service/cas_server.cpp @@ -24,6 +24,7 @@ #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/compatibility/native_support.hpp" #include "src/buildtool/execution_api/execution_service/cas_utils.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/verify_hash.hpp" diff --git a/src/buildtool/execution_api/execution_service/execution_server.cpp b/src/buildtool/execution_api/execution_service/execution_server.cpp index c6789235..f122da81 100644 --- a/src/buildtool/execution_api/execution_service/execution_server.cpp +++ b/src/buildtool/execution_api/execution_service/execution_server.cpp @@ -22,9 +22,9 @@ #include "execution_server.hpp" #include "fmt/core.h" -#include "gsl/gsl" #include "src/buildtool/execution_api/execution_service/operation_cache.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/verify_hash.hpp" diff --git a/src/buildtool/execution_api/execution_service/execution_server.hpp b/src/buildtool/execution_api/execution_service/execution_server.hpp index 6d99fb6a..198b5f14 100644 --- a/src/buildtool/execution_api/execution_service/execution_server.hpp +++ b/src/buildtool/execution_api/execution_service/execution_server.hpp @@ -16,6 +16,7 @@ #define EXECUTION_SERVER_HPP #include "build/bazel/remote/execution/v2/remote_execution.grpc.pb.h" +#include "gsl/gsl" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/execution_api/local/local_api.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/src/buildtool/execution_api/execution_service/operations_server.cpp b/src/buildtool/execution_api/execution_service/operations_server.cpp index 228b3595..13a8efd6 100644 --- a/src/buildtool/execution_api/execution_service/operations_server.cpp +++ b/src/buildtool/execution_api/execution_service/operations_server.cpp @@ -15,6 +15,7 @@ #include "src/buildtool/execution_api/execution_service/operations_server.hpp" #include "src/buildtool/execution_api/execution_service/operation_cache.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/utils/cpp/verify_hash.hpp" auto OperarationsServiceImpl::GetOperation( diff --git a/src/buildtool/execution_api/execution_service/server_implementation.cpp b/src/buildtool/execution_api/execution_service/server_implementation.cpp index 9804c53e..3ab12696 100644 --- a/src/buildtool/execution_api/execution_service/server_implementation.cpp +++ b/src/buildtool/execution_api/execution_service/server_implementation.cpp @@ -32,6 +32,7 @@ #include "src/buildtool/execution_api/execution_service/execution_server.hpp" #include "src/buildtool/execution_api/execution_service/operations_server.hpp" #include "src/buildtool/execution_api/remote/config.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" namespace { diff --git a/src/buildtool/execution_api/git/TARGETS b/src/buildtool/execution_api/git/TARGETS index bed87ae8..c77a9741 100644 --- a/src/buildtool/execution_api/git/TARGETS +++ b/src/buildtool/execution_api/git/TARGETS @@ -7,6 +7,7 @@ , ["src/buildtool/common", "config"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] , ["src/buildtool/execution_api/common", "common"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] ] , "stage": ["src", "buildtool", "execution_api", "git"] diff --git a/src/buildtool/execution_api/git/git_api.hpp b/src/buildtool/execution_api/git/git_api.hpp index 5d222c32..f9465ce1 100644 --- a/src/buildtool/execution_api/git/git_api.hpp +++ b/src/buildtool/execution_api/git/git_api.hpp @@ -21,6 +21,7 @@ #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" /// \brief API for local execution. diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS index f4cfde76..6467512f 100644 --- a/src/buildtool/execution_api/local/TARGETS +++ b/src/buildtool/execution_api/local/TARGETS @@ -11,12 +11,10 @@ , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] - ] - , "stage": ["src", "buildtool", "execution_api", "local"] - , "private-deps": - [ ["src/buildtool/execution_api/remote", "config"] + , ["src/buildtool/execution_api/remote", "config"] , ["src/buildtool/compatibility", "compatibility"] ] + , "stage": ["src", "buildtool", "execution_api", "local"] } , "local": { "type": ["@", "rules", "CC", "library"] @@ -36,6 +34,7 @@ , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/execution_api/execution_service", "cas_utils"] ] diff --git a/src/buildtool/execution_api/local/local_action.cpp b/src/buildtool/execution_api/local/local_action.cpp index d9900a61..1fecb9f5 100644 --- a/src/buildtool/execution_api/local/local_action.cpp +++ b/src/buildtool/execution_api/local/local_action.cpp @@ -17,7 +17,6 @@ #include <algorithm> #include <filesystem> -#include "gsl/gsl" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/compatibility/native_support.hpp" #include "src/buildtool/execution_api/local/config.hpp" @@ -25,6 +24,7 @@ #include "src/buildtool/execution_api/utils/outputscheck.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/system/system_command.hpp" diff --git a/src/buildtool/execution_api/local/local_action.hpp b/src/buildtool/execution_api/local/local_action.hpp index c4d9ecd1..46f414cc 100644 --- a/src/buildtool/execution_api/local/local_action.hpp +++ b/src/buildtool/execution_api/local/local_action.hpp @@ -21,9 +21,11 @@ #include <string> #include <vector> +#include "gsl/gsl" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/common/execution_action.hpp" #include "src/buildtool/execution_api/common/execution_response.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" class LocalApi; diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp index bdf0e790..e3751175 100644 --- a/src/buildtool/execution_api/local/local_api.hpp +++ b/src/buildtool/execution_api/local/local_api.hpp @@ -38,6 +38,7 @@ #include "src/buildtool/execution_api/git/git_api.hpp" #include "src/buildtool/execution_api/local/local_action.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" diff --git a/src/buildtool/execution_api/local/local_response.hpp b/src/buildtool/execution_api/local/local_response.hpp index 8e6cb04f..5c69c491 100644 --- a/src/buildtool/execution_api/local/local_response.hpp +++ b/src/buildtool/execution_api/local/local_response.hpp @@ -15,9 +15,15 @@ #ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_LOCAL_RESPONSE_HPP #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_LOCAL_RESPONSE_HPP +#include <string> +#include <utility> + +#include "gsl/gsl" #include "src/buildtool/execution_api/common/execution_response.hpp" #include "src/buildtool/execution_api/local/local_action.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" /// \brief Response of a LocalAction. diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS index ba30dc9a..5ffda22f 100644 --- a/src/buildtool/execution_api/remote/TARGETS +++ b/src/buildtool/execution_api/remote/TARGETS @@ -20,6 +20,7 @@ ] , "deps": [ "config" + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/execution_api/common", "common"] , ["@", "gsl", "", "gsl"] @@ -72,6 +73,7 @@ , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/file_system", "object_type"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/storage", "fs_utils"] ] } diff --git a/src/buildtool/execution_api/remote/bazel/bazel_ac_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_ac_client.cpp index 78675073..39bc2b40 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_ac_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_ac_client.cpp @@ -18,6 +18,7 @@ #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/common/remote/retry.hpp" +#include "src/buildtool/logging/log_level.hpp" BazelAcClient::BazelAcClient(std::string const& server, Port port) noexcept { stub_ = bazel_re::ActionCache::NewStub( diff --git a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp index 65dfd083..f1984ef4 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_action.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_action.cpp @@ -18,6 +18,7 @@ #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp" #include "src/buildtool/execution_api/utils/outputscheck.hpp" +#include "src/buildtool/logging/log_level.hpp" BazelAction::BazelAction( std::shared_ptr<BazelNetwork> network, diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp index 994d2b43..9e79f178 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp @@ -37,6 +37,7 @@ #include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/multithreading/task_system.hpp" #include "src/buildtool/storage/fs_utils.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp index e034bd14..e7dea224 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp @@ -29,6 +29,7 @@ #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/execution_api/common/message_limits.hpp" +#include "src/buildtool/logging/log_level.hpp" namespace { diff --git a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp index e5d9e6b7..02766abd 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.cpp @@ -18,6 +18,7 @@ #include "gsl/gsl" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/common/remote/retry.hpp" +#include "src/buildtool/logging/log_level.hpp" namespace bazel_re = build::bazel::remote::execution::v2; diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp index f8333792..d6b61fb7 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network.cpp @@ -17,6 +17,7 @@ #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/execution_api/common/message_limits.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_response.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" namespace { diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp index 5e4da3d6..df4685fb 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp @@ -17,6 +17,7 @@ #include "gsl/gsl" #include "src/buildtool/compatibility/native_support.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/gsl.hpp" diff --git a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp index eba2b0fd..eb3c17c9 100644 --- a/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bytestream_client.hpp @@ -23,10 +23,12 @@ #include <vector> #include "google/bytestream/bytestream.grpc.pb.h" +#include "gsl/gsl" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/execution_api/common/bytestream_common.hpp" #include "src/buildtool/execution_api/remote/config.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" /// Implements client side for google.bytestream.ByteStream service. diff --git a/src/buildtool/execution_engine/dag/TARGETS b/src/buildtool/execution_engine/dag/TARGETS index e4fb5bed..e6d581b1 100644 --- a/src/buildtool/execution_engine/dag/TARGETS +++ b/src/buildtool/execution_engine/dag/TARGETS @@ -4,14 +4,16 @@ , "hdrs": ["dag.hpp"] , "srcs": ["dag.cpp"] , "deps": - [ ["src/utils/cpp", "type_safe_arithmetic"] + [ ["src/utils/cpp", "hex_string"] + , ["src/utils/cpp", "type_safe_arithmetic"] , ["src/buildtool/common", "common"] , ["src/buildtool/common", "action_description"] , ["src/buildtool/common", "artifact_description"] , ["src/buildtool/file_system", "object_type"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["@", "gsl", "", "gsl"] ] , "stage": ["src", "buildtool", "execution_engine", "dag"] - , "private-deps": [["src/buildtool/logging", "logging"]] } } diff --git a/src/buildtool/execution_engine/dag/dag.cpp b/src/buildtool/execution_engine/dag/dag.cpp index 8784222d..03dc932f 100644 --- a/src/buildtool/execution_engine/dag/dag.cpp +++ b/src/buildtool/execution_engine/dag/dag.cpp @@ -14,9 +14,6 @@ #include "src/buildtool/execution_engine/dag/dag.hpp" -#include "src/buildtool/common/artifact_description.hpp" -#include "src/buildtool/logging/logger.hpp" - auto DependencyGraph::CreateOutputArtifactNodes( std::string const& action_id, std::vector<std::string> const& file_paths, diff --git a/src/buildtool/execution_engine/dag/dag.hpp b/src/buildtool/execution_engine/dag/dag.hpp index 6b10c6cf..d7cbeebf 100644 --- a/src/buildtool/execution_engine/dag/dag.hpp +++ b/src/buildtool/execution_engine/dag/dag.hpp @@ -33,6 +33,9 @@ #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" +#include "src/utils/cpp/hex_string.hpp" #include "src/utils/cpp/type_safe_arithmetic.hpp" /// \brief Plain DirectedAcyclicGraph. diff --git a/src/buildtool/execution_engine/executor/TARGETS b/src/buildtool/execution_engine/executor/TARGETS index 97c7fea4..82171387 100644 --- a/src/buildtool/execution_engine/executor/TARGETS +++ b/src/buildtool/execution_engine/executor/TARGETS @@ -3,7 +3,8 @@ , "name": ["executor"] , "hdrs": ["executor.hpp"] , "deps": - [ ["src/buildtool/logging", "logging"] + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/buildtool/common", "config"] , ["src/buildtool/common", "tree"] , ["src/buildtool/compatibility", "compatibility"] diff --git a/src/buildtool/execution_engine/executor/executor.hpp b/src/buildtool/execution_engine/executor/executor.hpp index 2220f15a..eab18898 100644 --- a/src/buildtool/execution_engine/executor/executor.hpp +++ b/src/buildtool/execution_engine/executor/executor.hpp @@ -37,6 +37,7 @@ #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/execution_engine/dag/dag.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/progress_reporting/progress.hpp" #include "src/utils/cpp/hex_string.hpp" diff --git a/src/buildtool/execution_engine/traverser/TARGETS b/src/buildtool/execution_engine/traverser/TARGETS index d757d216..5f6f6a9f 100644 --- a/src/buildtool/execution_engine/traverser/TARGETS +++ b/src/buildtool/execution_engine/traverser/TARGETS @@ -5,6 +5,7 @@ , "deps": [ ["src/buildtool/execution_engine/dag", "dag"] , ["src/buildtool/multithreading", "task_system"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "concepts"] , ["@", "gsl", "", "gsl"] diff --git a/src/buildtool/execution_engine/traverser/traverser.hpp b/src/buildtool/execution_engine/traverser/traverser.hpp index bc09dc72..d55a8059 100644 --- a/src/buildtool/execution_engine/traverser/traverser.hpp +++ b/src/buildtool/execution_engine/traverser/traverser.hpp @@ -19,6 +19,7 @@ #include "gsl/gsl" #include "src/buildtool/execution_engine/dag/dag.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/multithreading/task_system.hpp" #include "src/utils/cpp/concepts.hpp" diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS index 4c56cad3..b8b86d29 100644 --- a/src/buildtool/file_system/TARGETS +++ b/src/buildtool/file_system/TARGETS @@ -10,8 +10,11 @@ , "name": ["file_storage"] , "hdrs": ["file_storage.hpp"] , "deps": - [ ["src/buildtool/execution_api/common", "common"] + [ "object_type" + , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] ] , "stage": ["src", "buildtool", "file_system"] } @@ -23,10 +26,10 @@ [ "file_storage" , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/common", "common"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] ] , "stage": ["src", "buildtool", "file_system"] - , "private-deps": [["src/buildtool/execution_api/common", "common"]] } , "file_system_manager": { "type": ["@", "rules", "CC", "library"] @@ -34,6 +37,7 @@ , "hdrs": ["file_system_manager.hpp"] , "deps": [ "object_type" + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/system", "system"] , ["src/utils/cpp", "path"] @@ -45,7 +49,13 @@ { "type": ["@", "rules", "CC", "library"] , "name": ["jsonfs"] , "hdrs": ["jsonfs.hpp"] - , "deps": ["object_type", "file_system_manager", ["src/utils/cpp", "json"]] + , "deps": + [ "object_type" + , "file_system_manager" + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + , ["src/utils/cpp", "json"] + ] , "stage": ["src", "buildtool", "file_system"] } , "git_cas": @@ -56,7 +66,8 @@ , "deps": ["git_context", "git_utils", ["@", "gsl", "", "gsl"]] , "stage": ["src", "buildtool", "file_system"] , "private-deps": - [ ["src/buildtool/logging", "logging"] + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "hex_string"] , ["src/utils/cpp", "path"] , ["", "libgit2"] @@ -78,6 +89,7 @@ , "private-deps": [ ["", "libgit2"] , "file_system_manager" + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "path"] , ["src/buildtool/common", "common"] @@ -90,7 +102,8 @@ , "srcs": ["git_context.cpp"] , "stage": ["src", "buildtool", "file_system"] , "private-deps": - [ ["src/buildtool/logging", "logging"] + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["", "libgit2"] , ["src/utils/cpp", "gsl"] ] @@ -103,7 +116,8 @@ , "deps": ["git_cas", ["src/buildtool/common", "bazel_types"]] , "stage": ["src", "buildtool", "file_system"] , "private-deps": - [ ["src/buildtool/logging", "logging"] + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["", "libgit2"] , ["src/utils/cpp", "path"] , ["src/utils/cpp", "hex_string"] @@ -124,6 +138,7 @@ , "private-deps": [ ["", "libgit2"] , ["@", "fmt", "", "fmt"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "hex_string"] ] @@ -137,6 +152,8 @@ , "file_system_manager" , ["src/buildtool/common", "artifact_description"] , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["@", "gsl", "", "gsl"] , ["@", "json", "", "json"] , ["src/utils/cpp", "concepts"] diff --git a/src/buildtool/file_system/file_root.hpp b/src/buildtool/file_system/file_root.hpp index 950cd36b..0f2a3d79 100644 --- a/src/buildtool/file_system/file_root.hpp +++ b/src/buildtool/file_system/file_root.hpp @@ -30,6 +30,8 @@ #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_tree.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/concepts.hpp" /// FilteredIterator is an helper class to allow for iteration over diff --git a/src/buildtool/file_system/file_storage.hpp b/src/buildtool/file_system/file_storage.hpp index 488274a5..6006a410 100644 --- a/src/buildtool/file_system/file_storage.hpp +++ b/src/buildtool/file_system/file_storage.hpp @@ -17,9 +17,13 @@ #include <filesystem> #include <string> +#include <utility> #include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" enum class StoreMode { // First thread to write conflicting file wins. diff --git a/src/buildtool/file_system/file_system_manager.hpp b/src/buildtool/file_system/file_system_manager.hpp index 71b319d1..9bbd2264 100644 --- a/src/buildtool/file_system/file_system_manager.hpp +++ b/src/buildtool/file_system/file_system_manager.hpp @@ -36,6 +36,7 @@ #include "gsl/gsl" #include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/system/system.hpp" #include "src/utils/cpp/path.hpp" diff --git a/src/buildtool/file_system/git_cas.cpp b/src/buildtool/file_system/git_cas.cpp index 898c7508..32426e88 100644 --- a/src/buildtool/file_system/git_cas.cpp +++ b/src/buildtool/file_system/git_cas.cpp @@ -19,6 +19,7 @@ #include <sstream> #include "gsl/gsl" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/hex_string.hpp" #include "src/utils/cpp/path.hpp" diff --git a/src/buildtool/file_system/git_context.cpp b/src/buildtool/file_system/git_context.cpp index 084e9d58..94fb3cef 100644 --- a/src/buildtool/file_system/git_context.cpp +++ b/src/buildtool/file_system/git_context.cpp @@ -14,6 +14,7 @@ #include "src/buildtool/file_system/git_context.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/gsl.hpp" diff --git a/src/buildtool/file_system/git_repo.cpp b/src/buildtool/file_system/git_repo.cpp index eceb5a1d..4799bcbf 100644 --- a/src/buildtool/file_system/git_repo.cpp +++ b/src/buildtool/file_system/git_repo.cpp @@ -19,6 +19,7 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/config.hpp" #include "src/utils/cpp/gsl.hpp" diff --git a/src/buildtool/file_system/git_tree.cpp b/src/buildtool/file_system/git_tree.cpp index a3c441d9..a5a3262d 100644 --- a/src/buildtool/file_system/git_tree.cpp +++ b/src/buildtool/file_system/git_tree.cpp @@ -17,6 +17,7 @@ #include <sstream> #include "src/buildtool/common/artifact_digest.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/path.hpp" diff --git a/src/buildtool/file_system/git_utils.cpp b/src/buildtool/file_system/git_utils.cpp index a3b503ab..55d1ca38 100644 --- a/src/buildtool/file_system/git_utils.cpp +++ b/src/buildtool/file_system/git_utils.cpp @@ -15,6 +15,7 @@ #include "src/buildtool/file_system/git_utils.hpp" #include "fmt/core.h" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/hex_string.hpp" diff --git a/src/buildtool/file_system/jsonfs.hpp b/src/buildtool/file_system/jsonfs.hpp index 550efab4..952d2f32 100644 --- a/src/buildtool/file_system/jsonfs.hpp +++ b/src/buildtool/file_system/jsonfs.hpp @@ -22,6 +22,8 @@ #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/json.hpp" class Json { diff --git a/src/buildtool/file_system/object_cas.hpp b/src/buildtool/file_system/object_cas.hpp index e7cd7f1b..c4377a5c 100644 --- a/src/buildtool/file_system/object_cas.hpp +++ b/src/buildtool/file_system/object_cas.hpp @@ -20,8 +20,10 @@ #include <thread> #include "src/buildtool/common/artifact.hpp" +#include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/file_system/file_storage.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" /// \brief CAS for storing objects as plain blobs. diff --git a/src/buildtool/graph_traverser/TARGETS b/src/buildtool/graph_traverser/TARGETS index 76fab72b..23bd8e94 100644 --- a/src/buildtool/graph_traverser/TARGETS +++ b/src/buildtool/graph_traverser/TARGETS @@ -22,6 +22,7 @@ , ["@", "fmt", "", "fmt"] , ["src/buildtool/common", "common"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/progress_reporting", "base_progress_reporter"] ] diff --git a/src/buildtool/graph_traverser/graph_traverser.hpp b/src/buildtool/graph_traverser/graph_traverser.hpp index b4604ef8..83876072 100644 --- a/src/buildtool/graph_traverser/graph_traverser.hpp +++ b/src/buildtool/graph_traverser/graph_traverser.hpp @@ -47,6 +47,7 @@ #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/jsonfs.hpp" #include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/log_sink_cmdline.hpp" #include "src/buildtool/logging/log_sink_file.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/src/buildtool/logging/log_sink_cmdline.hpp b/src/buildtool/logging/log_sink_cmdline.hpp index 1a99de09..8cbceb1c 100644 --- a/src/buildtool/logging/log_sink_cmdline.hpp +++ b/src/buildtool/logging/log_sink_cmdline.hpp @@ -23,6 +23,7 @@ #include "fmt/color.h" #include "fmt/core.h" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/log_sink.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS index 2cb08ea9..aee9e569 100644 --- a/src/buildtool/main/TARGETS +++ b/src/buildtool/main/TARGETS @@ -4,11 +4,15 @@ , "name": ["just"] , "srcs": ["main.cpp"] , "private-deps": - [ ["src/buildtool/common", "common"] + [ ["@", "fmt", "", "fmt"] + , ["@", "gsl", "", "gsl"] + , ["@", "json", "", "json"] + , ["src/buildtool/common", "common"] , ["src/buildtool/common", "config"] , ["src/buildtool/storage", "storage"] , ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/graph_traverser", "graph_traverser"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/progress_reporting", "progress"] , ["src/buildtool/progress_reporting", "progress_reporter"] @@ -55,7 +59,8 @@ , "hdrs": ["describe.hpp"] , "srcs": ["describe.cpp"] , "deps": - [ ["src/buildtool/build_engine/base_maps", "entity_name"] + [ ["@", "gsl", "", "gsl"] + , ["src/buildtool/build_engine/base_maps", "entity_name"] , ["src/buildtool/build_engine/target_map", "configured_target"] , ["src/buildtool/common", "config"] ] @@ -67,6 +72,7 @@ , ["src/buildtool/build_engine/target_map", "target_map"] , ["src/buildtool/execution_api/remote", "config"] , ["src/buildtool/execution_api/common", "create_execution_api"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/serve_api/remote", "config"] , ["src/buildtool/serve_api/remote", "serve_api"] @@ -86,7 +92,12 @@ , "srcs": ["cli.cpp"] , "stage": ["src", "buildtool", "main"] , "deps": [["src/buildtool/common", "cli"]] - , "private-deps": [["@", "gsl", "", "gsl"], "common"] + , "private-deps": + [ ["@", "gsl", "", "gsl"] + , "common" + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + ] } , "install_cas": { "type": ["@", "rules", "CC", "library"] @@ -104,6 +115,7 @@ [ ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_api/remote", "config"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/execution_api/utils", "subobject"] ] @@ -114,7 +126,8 @@ , "hdrs": ["analyse.hpp"] , "srcs": ["analyse.cpp"] , "deps": - [ ["src/buildtool/common", "cli"] + [ ["@", "gsl", "", "gsl"] + , ["src/buildtool/common", "cli"] , ["src/buildtool/common", "common"] , ["src/buildtool/build_engine/target_map", "configured_target"] , ["src/buildtool/build_engine/target_map", "result_map"] @@ -135,6 +148,8 @@ , ["src/buildtool/build_engine/base_maps", "targets_file_map"] , ["src/buildtool/build_engine/target_map", "absent_target_map"] , ["src/buildtool/build_engine/target_map", "target_map"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/buildtool/progress_reporting", "exports_progress_reporter"] , ["src/buildtool/progress_reporting", "progress"] , ["src/buildtool/serve_api/remote", "config"] @@ -151,7 +166,13 @@ , ["src/buildtool/common", "cli"] , ["src/buildtool/build_engine/target_map", "result_map"] ] - , "private-deps": [["src/utils/cpp", "json"], ["@", "json", "", "json"]] + , "private-deps": + [ ["src/utils/cpp", "json"] + , ["@", "gsl", "", "gsl"] + , ["@", "json", "", "json"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + ] } , "version": { "type": ["@", "rules", "CC", "library"] @@ -233,6 +254,9 @@ , ["src/buildtool/storage", "storage"] ] , "stage": ["src", "buildtool", "main"] - , "private-deps": [["src/buildtool/logging", "logging"]] + , "private-deps": + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + ] } } diff --git a/src/buildtool/main/analyse.cpp b/src/buildtool/main/analyse.cpp index b52c376f..07cd7273 100644 --- a/src/buildtool/main/analyse.cpp +++ b/src/buildtool/main/analyse.cpp @@ -26,6 +26,8 @@ #include "src/buildtool/build_engine/base_maps/targets_file_map.hpp" #include "src/buildtool/build_engine/target_map/absent_target_map.hpp" #include "src/buildtool/build_engine/target_map/target_map.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/multithreading/async_map_consumer.hpp" #include "src/buildtool/multithreading/async_map_utils.hpp" #include "src/buildtool/multithreading/task_system.hpp" diff --git a/src/buildtool/main/analyse.hpp b/src/buildtool/main/analyse.hpp index c3b4917a..3a0a761d 100644 --- a/src/buildtool/main/analyse.hpp +++ b/src/buildtool/main/analyse.hpp @@ -15,6 +15,10 @@ #ifndef INCLUDED_SRC_BUILDOOL_MAIN_ANALYSE_HPP #define INCLUDED_SRC_BUILDOOL_MAIN_ANALYSE_HPP +#include <optional> +#include <string> + +#include "gsl/gsl" #include "src/buildtool/build_engine/analysed_target/analysed_target.hpp" #include "src/buildtool/build_engine/target_map/configured_target.hpp" #include "src/buildtool/build_engine/target_map/result_map.hpp" diff --git a/src/buildtool/main/build_utils.cpp b/src/buildtool/main/build_utils.cpp index ff0bbf93..4b6c7dab 100644 --- a/src/buildtool/main/build_utils.cpp +++ b/src/buildtool/main/build_utils.cpp @@ -14,6 +14,7 @@ #include "src/buildtool/main/build_utils.hpp" #ifndef BOOTSTRAP_BUILD_TOOL +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/multithreading/async_map_utils.hpp" #include "src/buildtool/storage/storage.hpp" diff --git a/src/buildtool/main/cli.cpp b/src/buildtool/main/cli.cpp index 413befa6..449e12fd 100644 --- a/src/buildtool/main/cli.cpp +++ b/src/buildtool/main/cli.cpp @@ -15,6 +15,8 @@ #include "src/buildtool/main/cli.hpp" #include "gsl/gsl" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/main/exit_codes.hpp" namespace { diff --git a/src/buildtool/main/describe.cpp b/src/buildtool/main/describe.cpp index 93817c2e..659ec3ab 100644 --- a/src/buildtool/main/describe.cpp +++ b/src/buildtool/main/describe.cpp @@ -21,6 +21,7 @@ #include "src/buildtool/build_engine/base_maps/rule_map.hpp" #include "src/buildtool/build_engine/base_maps/targets_file_map.hpp" #include "src/buildtool/build_engine/target_map/target_map.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/main/exit_codes.hpp" #ifndef BOOTSTRAP_BUILD_TOOL diff --git a/src/buildtool/main/describe.hpp b/src/buildtool/main/describe.hpp index f2c9614b..ca02924d 100644 --- a/src/buildtool/main/describe.hpp +++ b/src/buildtool/main/describe.hpp @@ -15,6 +15,7 @@ #ifndef INCLUDED_SRC_BUILDTOOL_MAIN_DESCRIBE_HPP #define INCLUDED_SRC_BUILDTOOL_MAIN_DESCRIBE_HPP +#include "gsl/gsl" #include "src/buildtool/build_engine/base_maps/entity_name.hpp" #include "src/buildtool/build_engine/target_map/configured_target.hpp" #include "src/buildtool/common/repository_config.hpp" diff --git a/src/buildtool/main/diagnose.cpp b/src/buildtool/main/diagnose.cpp index 0595970d..75e6854f 100644 --- a/src/buildtool/main/diagnose.cpp +++ b/src/buildtool/main/diagnose.cpp @@ -14,7 +14,10 @@ #include "src/buildtool/main/diagnose.hpp" +#include "gsl/gsl" #include "nlohmann/json.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/json.hpp" namespace { diff --git a/src/buildtool/main/install_cas.cpp b/src/buildtool/main/install_cas.cpp index 90351420..84968109 100644 --- a/src/buildtool/main/install_cas.cpp +++ b/src/buildtool/main/install_cas.cpp @@ -16,10 +16,12 @@ #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/execution_api/remote/config.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #ifndef BOOTSTRAP_BUILD_TOOL #include "src/buildtool/execution_api/utils/subobject.hpp" #endif -#include "src/buildtool/execution_api/remote/config.hpp" namespace { diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp index 65f5278d..c8a74a5b 100644 --- a/src/buildtool/main/main.cpp +++ b/src/buildtool/main/main.cpp @@ -17,32 +17,50 @@ #include <filesystem> #include <fstream> #include <iostream> +#include <optional> #include <string> #include <unordered_map> #include <unordered_set> +#include <utility> +#include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/base_maps/entity_name.hpp" #include "src/buildtool/build_engine/expression/evaluator.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" #include "src/buildtool/build_engine/target_map/target_map.hpp" #include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/common/repository_config.hpp" +#include "src/buildtool/common/statistics.hpp" #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/execution_service/file_chunker.hpp" #include "src/buildtool/execution_api/local/config.hpp" #include "src/buildtool/file_system/file_root.hpp" +#include "src/buildtool/logging/log_config.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/log_sink_cmdline.hpp" +#include "src/buildtool/logging/log_sink_file.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/main/analyse.hpp" +#include "src/buildtool/main/build_utils.hpp" #include "src/buildtool/main/cli.hpp" #include "src/buildtool/main/constants.hpp" #include "src/buildtool/main/describe.hpp" #include "src/buildtool/main/diagnose.hpp" #include "src/buildtool/main/exit_codes.hpp" #include "src/buildtool/main/install_cas.hpp" +#include "src/buildtool/main/version.hpp" +#include "src/buildtool/multithreading/async_map_consumer.hpp" +#include "src/buildtool/multithreading/task_system.hpp" +#include "src/buildtool/progress_reporting/progress.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/buildtool/storage/storage.hpp" #include "src/buildtool/storage/target_cache.hpp" +#include "src/utils/cpp/concepts.hpp" +#include "src/utils/cpp/json.hpp" #ifndef BOOTSTRAP_BUILD_TOOL +#include "fmt/core.h" #include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/remote/retry_parameters.hpp" #include "src/buildtool/execution_api/execution_service/operation_cache.hpp" @@ -55,17 +73,6 @@ #include "src/buildtool/serve_api/serve_service/serve_server_implementation.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #endif // BOOTSTRAP_BUILD_TOOL -#include "src/buildtool/common/statistics.hpp" -#include "src/buildtool/logging/log_config.hpp" -#include "src/buildtool/logging/log_sink_cmdline.hpp" -#include "src/buildtool/logging/log_sink_file.hpp" -#include "src/buildtool/main/build_utils.hpp" -#include "src/buildtool/main/version.hpp" -#include "src/buildtool/multithreading/async_map_consumer.hpp" -#include "src/buildtool/multithreading/task_system.hpp" -#include "src/buildtool/progress_reporting/progress.hpp" -#include "src/utils/cpp/concepts.hpp" -#include "src/utils/cpp/json.hpp" namespace { diff --git a/src/buildtool/serve_api/remote/TARGETS b/src/buildtool/serve_api/remote/TARGETS index d0ef6aa5..1e875bbd 100644 --- a/src/buildtool/serve_api/remote/TARGETS +++ b/src/buildtool/serve_api/remote/TARGETS @@ -20,7 +20,10 @@ ] , "proto": [["src/buildtool/serve_api/serve_service", "just_serve_proto"]] , "stage": ["src", "buildtool", "serve_api", "remote"] - , "private-deps": [["src/buildtool/common/remote", "client_common"]] + , "private-deps": + [ ["src/buildtool/common/remote", "client_common"] + , ["src/buildtool/logging", "log_level"] + ] } , "serve_api": { "type": ["@", "rules", "CC", "library"] @@ -43,7 +46,8 @@ , "hdrs": ["target_client.hpp"] , "srcs": ["target_client.cpp"] , "deps": - [ ["src/buildtool/common/remote", "port"] + [ ["@", "gsl", "", "gsl"] + , ["src/buildtool/common/remote", "port"] , ["src/buildtool/common", "common"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/execution_api/common", "create_execution_api"] @@ -72,6 +76,7 @@ , "private-deps": [ ["@", "json", "", "json"] , ["src/buildtool/execution_api/remote", "config"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/serve_api/remote", "config"] ] } diff --git a/src/buildtool/serve_api/remote/configuration_client.cpp b/src/buildtool/serve_api/remote/configuration_client.cpp index dcc7d31a..d8e61b97 100644 --- a/src/buildtool/serve_api/remote/configuration_client.cpp +++ b/src/buildtool/serve_api/remote/configuration_client.cpp @@ -19,6 +19,7 @@ #include "nlohmann/json.hpp" #include "src/buildtool/execution_api/remote/config.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/serve_api/remote/config.hpp" auto ConfigurationClient::CheckServeRemoteExecution() noexcept -> bool { diff --git a/src/buildtool/serve_api/remote/source_tree_client.cpp b/src/buildtool/serve_api/remote/source_tree_client.cpp index b7bfcecb..b734dae8 100644 --- a/src/buildtool/serve_api/remote/source_tree_client.cpp +++ b/src/buildtool/serve_api/remote/source_tree_client.cpp @@ -15,6 +15,7 @@ #include "src/buildtool/serve_api/remote/source_tree_client.hpp" #include "src/buildtool/common/remote/client_common.hpp" +#include "src/buildtool/logging/log_level.hpp" namespace { diff --git a/src/buildtool/serve_api/remote/target_client.cpp b/src/buildtool/serve_api/remote/target_client.cpp index 18d3048c..bee31249 100644 --- a/src/buildtool/serve_api/remote/target_client.cpp +++ b/src/buildtool/serve_api/remote/target_client.cpp @@ -20,6 +20,7 @@ #include "nlohmann/json.hpp" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/client_common.hpp" +#include "src/buildtool/logging/log_level.hpp" TargetClient::TargetClient(std::string const& server, Port port) noexcept { stub_ = justbuild::just_serve::Target::NewStub( diff --git a/src/buildtool/serve_api/remote/target_client.hpp b/src/buildtool/serve_api/remote/target_client.hpp index 5b21208e..c9540cb0 100644 --- a/src/buildtool/serve_api/remote/target_client.hpp +++ b/src/buildtool/serve_api/remote/target_client.hpp @@ -21,6 +21,7 @@ #include <utility> #include <vector> +#include "gsl/gsl" #include "justbuild/just_serve/just_serve.grpc.pb.h" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" diff --git a/src/buildtool/serve_api/serve_service/TARGETS b/src/buildtool/serve_api/serve_service/TARGETS index 90ff7427..d68e5bac 100644 --- a/src/buildtool/serve_api/serve_service/TARGETS +++ b/src/buildtool/serve_api/serve_service/TARGETS @@ -31,6 +31,7 @@ , ["src/buildtool/execution_api/local", "local"] , ["src/buildtool/execution_api/remote", "bazel"] , ["src/buildtool/file_system", "git_repo"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/multithreading", "async_map_utils"] , ["src/buildtool/serve_api/remote", "config"] , ["src/buildtool/storage", "config"] @@ -56,6 +57,7 @@ , ["src/buildtool/auth", "auth"] , ["src/buildtool/common/remote", "port"] , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/storage", "config"] , ["src/buildtool/execution_api/execution_service", "execution_server"] , ["src/buildtool/execution_api/execution_service", "ac_server"] @@ -93,6 +95,7 @@ , ["src/buildtool/build_engine/target_map", "result_map"] , ["src/buildtool/common/remote", "remote_common"] , ["src/buildtool/graph_traverser", "graph_traverser"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/main", "analyse"] , ["src/buildtool/main", "build_utils"] , ["src/buildtool/multithreading", "task_system"] diff --git a/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp b/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp index 1c0453e5..01be64af 100644 --- a/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp +++ b/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp @@ -33,7 +33,7 @@ #include "src/buildtool/execution_api/execution_service/operations_server.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_repo.hpp" -#include "src/buildtool/logging/logger.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/serve_api/serve_service/configuration.hpp" #include "src/buildtool/serve_api/serve_service/source_tree.hpp" #include "src/buildtool/serve_api/serve_service/target.hpp" diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp index 5156ce9c..eb08f643 100644 --- a/src/buildtool/serve_api/serve_service/source_tree.cpp +++ b/src/buildtool/serve_api/serve_service/source_tree.cpp @@ -27,6 +27,7 @@ #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_repo.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/multithreading/async_map_utils.hpp" #include "src/buildtool/serve_api/remote/config.hpp" #include "src/buildtool/storage/config.hpp" diff --git a/src/buildtool/serve_api/serve_service/target.cpp b/src/buildtool/serve_api/serve_service/target.cpp index 1387eaee..3836c7d8 100644 --- a/src/buildtool/serve_api/serve_service/target.cpp +++ b/src/buildtool/serve_api/serve_service/target.cpp @@ -25,6 +25,7 @@ #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/graph_traverser/graph_traverser.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/main/analyse.hpp" #include "src/buildtool/main/build_utils.hpp" #include "src/buildtool/multithreading/task_system.hpp" diff --git a/src/buildtool/storage/TARGETS b/src/buildtool/storage/TARGETS index 5bcca567..a3e06628 100644 --- a/src/buildtool/storage/TARGETS +++ b/src/buildtool/storage/TARGETS @@ -56,7 +56,10 @@ , ["src/buildtool/common", "artifact_description"] ] , "stage": ["src", "buildtool", "storage"] - , "private-deps": [["src/buildtool/execution_api/remote", "config"]] + , "private-deps": + [ ["src/buildtool/execution_api/remote", "config"] + , ["src/buildtool/logging", "log_level"] + ] } , "fs_utils": { "type": ["@", "rules", "CC", "library"] @@ -71,6 +74,8 @@ , "private-deps": [ ["@", "json", "", "json"] , ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "path"] , "config" , "storage" diff --git a/src/buildtool/storage/fs_utils.cpp b/src/buildtool/storage/fs_utils.cpp index b606431c..95b5e72b 100644 --- a/src/buildtool/storage/fs_utils.cpp +++ b/src/buildtool/storage/fs_utils.cpp @@ -19,6 +19,8 @@ #include "nlohmann/json.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" #include "src/utils/cpp/path.hpp" diff --git a/src/buildtool/storage/local_ac.tpp b/src/buildtool/storage/local_ac.tpp index e285a899..3f74d97e 100644 --- a/src/buildtool/storage/local_ac.tpp +++ b/src/buildtool/storage/local_ac.tpp @@ -16,6 +16,7 @@ #define INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_AC_TPP #include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/local_ac.hpp" template <bool kDoGlobalUplink> diff --git a/src/buildtool/storage/local_cas.hpp b/src/buildtool/storage/local_cas.hpp index 84de7e95..382af848 100644 --- a/src/buildtool/storage/local_cas.hpp +++ b/src/buildtool/storage/local_cas.hpp @@ -15,9 +15,11 @@ #ifndef INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_CAS_HPP #define INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_CAS_HPP +#include <filesystem> #include <optional> #include <unordered_set> +#include "gsl/gsl" #include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/file_system/object_cas.hpp" #include "src/buildtool/storage/garbage_collector.hpp" diff --git a/src/buildtool/storage/local_cas.tpp b/src/buildtool/storage/local_cas.tpp index f1c7d1cb..9bcb090d 100644 --- a/src/buildtool/storage/local_cas.tpp +++ b/src/buildtool/storage/local_cas.tpp @@ -16,6 +16,7 @@ #define INCLUDED_SRC_BUILDTOOL_STORAGE_LOCAL_CAS_TPP #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/local_cas.hpp" namespace detail { diff --git a/src/buildtool/storage/storage.hpp b/src/buildtool/storage/storage.hpp index fe6c1e1f..d4ea83fe 100644 --- a/src/buildtool/storage/storage.hpp +++ b/src/buildtool/storage/storage.hpp @@ -15,8 +15,11 @@ #ifndef INCLUDED_SRC_BUILDTOOL_STORAGE_STORAGE_HPP #define INCLUDED_SRC_BUILDTOOL_STORAGE_STORAGE_HPP +#include <filesystem> #include <optional> +#include <vector> +#include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/storage/config.hpp" diff --git a/src/buildtool/storage/target_cache.tpp b/src/buildtool/storage/target_cache.tpp index cd56ef59..ed1991e8 100644 --- a/src/buildtool/storage/target_cache.tpp +++ b/src/buildtool/storage/target_cache.tpp @@ -15,6 +15,7 @@ #ifndef INCLUDED_SRC_BUILDTOOL_STORAGE_TARGET_CACHE_TPP #define INCLUDED_SRC_BUILDTOOL_STORAGE_TARGET_CACHE_TPP +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/target_cache.hpp" template <bool kDoGlobalUplink> diff --git a/src/buildtool/system/TARGETS b/src/buildtool/system/TARGETS index a72fcac4..691fbc3b 100644 --- a/src/buildtool/system/TARGETS +++ b/src/buildtool/system/TARGETS @@ -19,6 +19,7 @@ , "deps": [ "system" , ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["@", "gsl", "", "gsl"] ] diff --git a/src/buildtool/system/system_command.hpp b/src/buildtool/system/system_command.hpp index 5777404f..7c40ec2c 100644 --- a/src/buildtool/system/system_command.hpp +++ b/src/buildtool/system/system_command.hpp @@ -31,6 +31,7 @@ #include "gsl/gsl" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/system/system.hpp" diff --git a/src/other_tools/git_operations/TARGETS b/src/other_tools/git_operations/TARGETS index a8f86183..9d14f4bc 100644 --- a/src/other_tools/git_operations/TARGETS +++ b/src/other_tools/git_operations/TARGETS @@ -29,7 +29,8 @@ , "deps": [["src/buildtool/file_system", "git_repo"]] , "stage": ["src", "other_tools", "git_operations"] , "private-deps": - [ ["src/buildtool/logging", "logging"] + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/buildtool/file_system", "git_utils"] , ["src/buildtool/storage", "config"] , ["@", "fmt", "", "fmt"] diff --git a/src/other_tools/git_operations/git_repo_remote.cpp b/src/other_tools/git_operations/git_repo_remote.cpp index 5b1a9750..d323c08f 100644 --- a/src/other_tools/git_operations/git_repo_remote.cpp +++ b/src/other_tools/git_operations/git_repo_remote.cpp @@ -17,6 +17,7 @@ #include "fmt/core.h" #include "nlohmann/json.hpp" #include "src/buildtool/file_system/git_utils.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/system/system_command.hpp" diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS index 8471282b..e71f144c 100644 --- a/src/other_tools/just_mr/TARGETS +++ b/src/other_tools/just_mr/TARGETS @@ -44,6 +44,10 @@ , ["src/buildtool/build_engine/expression", "expression"] ] , "stage": ["src", "other_tools", "just_mr"] + , "private-deps": + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + ] } , "exit_codes": { "type": ["@", "rules", "CC", "library"] @@ -85,6 +89,7 @@ , "private-deps": [ ["@", "json", "", "json"] , ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , "exit_codes" , ["src/buildtool/auth", "auth"] @@ -197,6 +202,7 @@ , "hdrs": ["mirrors.hpp"] , "deps": [ ["@", "json", "", "json"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/other_tools/utils", "curl_url_handle"] ] diff --git a/src/other_tools/just_mr/mirrors.hpp b/src/other_tools/just_mr/mirrors.hpp index 4db387aa..71d811b5 100644 --- a/src/other_tools/just_mr/mirrors.hpp +++ b/src/other_tools/just_mr/mirrors.hpp @@ -23,6 +23,7 @@ #include <vector> #include "nlohmann/json.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/other_tools/utils/curl_url_handle.hpp" diff --git a/src/other_tools/just_mr/setup_utils.cpp b/src/other_tools/just_mr/setup_utils.cpp index 915efe08..7c78533c 100644 --- a/src/other_tools/just_mr/setup_utils.cpp +++ b/src/other_tools/just_mr/setup_utils.cpp @@ -26,6 +26,7 @@ #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/remote/bazel/bazel_api.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/serve_api/remote/config.hpp" #include "src/other_tools/just_mr/exit_codes.hpp" diff --git a/src/other_tools/just_mr/utils.cpp b/src/other_tools/just_mr/utils.cpp index 031e58cc..2243b799 100644 --- a/src/other_tools/just_mr/utils.cpp +++ b/src/other_tools/just_mr/utils.cpp @@ -14,6 +14,9 @@ #include "src/other_tools/just_mr/utils.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" + namespace JustMR::Utils { // NOLINTNEXTLINE(misc-no-recursion) diff --git a/src/other_tools/repo_map/TARGETS b/src/other_tools/repo_map/TARGETS index 1e805352..1b2f23a0 100644 --- a/src/other_tools/repo_map/TARGETS +++ b/src/other_tools/repo_map/TARGETS @@ -20,6 +20,8 @@ , ["src/other_tools/just_mr/progress_reporting", "statistics"] , ["src/buildtool/file_system", "file_root"] , ["src/buildtool/file_system/symlinks_map", "pragma_special"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/buildtool/multithreading", "task_system"] , ["src/other_tools/ops_maps", "content_cas_map"] , ["src/other_tools/ops_maps", "git_tree_fetch_map"] diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp index ccffd201..df7eebb0 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.cpp +++ b/src/other_tools/repo_map/repos_to_setup_map.cpp @@ -17,6 +17,8 @@ #include "fmt/core.h" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/symlinks_map/pragma_special.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/multithreading/task_system.hpp" #include "src/other_tools/just_mr/progress_reporting/progress.hpp" #include "src/other_tools/just_mr/progress_reporting/statistics.hpp" diff --git a/src/other_tools/utils/TARGETS b/src/other_tools/utils/TARGETS index 207dfb76..e210f901 100644 --- a/src/other_tools/utils/TARGETS +++ b/src/other_tools/utils/TARGETS @@ -4,21 +4,22 @@ , "hdrs": ["curl_context.hpp"] , "srcs": ["curl_context.cpp"] , "stage": ["src", "other_tools", "utils"] - , "private-deps": [["src/buildtool/logging", "logging"], ["", "libcurl"]] + , "private-deps": + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + , ["", "libcurl"] + ] } , "curl_easy_handle": { "type": ["@", "rules", "CC", "library"] , "name": ["curl_easy_handle"] , "hdrs": ["curl_easy_handle.hpp"] , "srcs": ["curl_easy_handle.cpp"] - , "deps": - [ "curl_context" - , ["src/buildtool/logging", "log_level"] - , ["@", "gsl", "", "gsl"] - ] + , "deps": ["curl_context", ["src/buildtool/logging", "log_level"]] , "stage": ["src", "other_tools", "utils"] , "private-deps": - [ ["src/buildtool/file_system", "file_system_manager"] + [ ["@", "gsl", "", "gsl"] + , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/logging", "logging"] , ["", "libcurl"] ] @@ -30,7 +31,11 @@ , "srcs": ["curl_url_handle.cpp"] , "deps": ["curl_context", ["@", "gsl", "", "gsl"]] , "stage": ["src", "other_tools", "utils"] - , "private-deps": [["src/buildtool/logging", "logging"], ["", "libcurl"]] + , "private-deps": + [ ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + , ["", "libcurl"] + ] } , "content": { "type": ["@", "rules", "CC", "library"] diff --git a/src/other_tools/utils/curl_context.cpp b/src/other_tools/utils/curl_context.cpp index 46f7cfac..44d8048d 100644 --- a/src/other_tools/utils/curl_context.cpp +++ b/src/other_tools/utils/curl_context.cpp @@ -14,6 +14,7 @@ #include "src/other_tools/utils/curl_context.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" extern "C" { diff --git a/src/other_tools/utils/curl_easy_handle.cpp b/src/other_tools/utils/curl_easy_handle.cpp index cf833be9..6939c6d1 100644 --- a/src/other_tools/utils/curl_easy_handle.cpp +++ b/src/other_tools/utils/curl_easy_handle.cpp @@ -17,7 +17,9 @@ #include <cstdio> #include <fstream> +#include "gsl/gsl" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" extern "C" { diff --git a/src/other_tools/utils/curl_easy_handle.hpp b/src/other_tools/utils/curl_easy_handle.hpp index 4c03d968..1a3d31c3 100644 --- a/src/other_tools/utils/curl_easy_handle.hpp +++ b/src/other_tools/utils/curl_easy_handle.hpp @@ -21,7 +21,6 @@ #include <optional> #include <string> -#include "gsl/gsl" #include "src/buildtool/logging/log_level.hpp" #include "src/other_tools/utils/curl_context.hpp" diff --git a/src/other_tools/utils/curl_url_handle.cpp b/src/other_tools/utils/curl_url_handle.cpp index 27898299..912691b4 100644 --- a/src/other_tools/utils/curl_url_handle.cpp +++ b/src/other_tools/utils/curl_url_handle.cpp @@ -17,6 +17,7 @@ #include <regex> #include <sstream> +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" extern "C" { diff --git a/src/utils/archive/TARGETS b/src/utils/archive/TARGETS index df3e6009..bed5d3a0 100644 --- a/src/utils/archive/TARGETS +++ b/src/utils/archive/TARGETS @@ -6,6 +6,10 @@ , "deps": [["@", "gsl", "", "gsl"]] , "stage": ["src", "utils", "archive"] , "private-deps": - [["src/buildtool/file_system", "file_system_manager"], ["", "libarchive"]] + [ ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + , ["", "libarchive"] + ] } } diff --git a/src/utils/archive/archive_ops.cpp b/src/utils/archive/archive_ops.cpp index c92358c1..d8363b76 100644 --- a/src/utils/archive/archive_ops.cpp +++ b/src/utils/archive/archive_ops.cpp @@ -15,6 +15,8 @@ #include "src/utils/archive/archive_ops.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" extern "C" { #include <archive.h> diff --git a/src/utils/automata/TARGETS b/src/utils/automata/TARGETS index 39df4e98..29f43a92 100644 --- a/src/utils/automata/TARGETS +++ b/src/utils/automata/TARGETS @@ -4,7 +4,8 @@ , "hdrs": ["dfa_minimizer.hpp"] , "stage": ["src", "utils", "automata"] , "deps": - [ ["@", "json", "", "json"] + [ ["@", "gsl", "", "gsl"] + , ["@", "json", "", "json"] , ["src/utils/cpp", "hex_string"] , ["src/utils/cpp", "hash_combine"] ] diff --git a/src/utils/automata/dfa_minimizer.hpp b/src/utils/automata/dfa_minimizer.hpp index ae647b44..93acb83e 100644 --- a/src/utils/automata/dfa_minimizer.hpp +++ b/src/utils/automata/dfa_minimizer.hpp @@ -22,6 +22,7 @@ #include <utility> #include <vector> +#include "gsl/gsl" #include "nlohmann/json.hpp" #include "src/utils/cpp/hash_combine.hpp" #include "src/utils/cpp/hex_string.hpp" diff --git a/src/utils/cpp/TARGETS b/src/utils/cpp/TARGETS index 578996b2..dbc409a6 100644 --- a/src/utils/cpp/TARGETS +++ b/src/utils/cpp/TARGETS @@ -59,9 +59,12 @@ , "name": ["tmp_dir"] , "hdrs": ["tmp_dir.hpp"] , "srcs": ["tmp_dir.cpp"] - , "deps": [["@", "gsl", "", "gsl"]] , "stage": ["src", "utils", "cpp"] - , "private-deps": [["src/buildtool/file_system", "file_system_manager"]] + , "private-deps": + [ ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] + ] } , "file_locking": { "type": ["@", "rules", "CC", "library"] @@ -72,6 +75,8 @@ , "stage": ["src", "utils", "cpp"] , "private-deps": [ ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/utils/cpp", "path"] ] } diff --git a/src/utils/cpp/file_locking.cpp b/src/utils/cpp/file_locking.cpp index c633b32b..f4b6eb2c 100644 --- a/src/utils/cpp/file_locking.cpp +++ b/src/utils/cpp/file_locking.cpp @@ -17,6 +17,8 @@ #include <sys/file.h> #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/path.hpp" auto LockFile::Acquire(std::filesystem::path const& fspath, diff --git a/src/utils/cpp/tmp_dir.cpp b/src/utils/cpp/tmp_dir.cpp index 987bcbcf..11f10559 100644 --- a/src/utils/cpp/tmp_dir.cpp +++ b/src/utils/cpp/tmp_dir.cpp @@ -14,8 +14,9 @@ #include "src/utils/cpp/tmp_dir.hpp" -#include "gsl/gsl" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" auto TmpDir::Create(std::filesystem::path const& prefix, std::string const& dir_template) noexcept -> TmpDirPtr { diff --git a/src/utils/cpp/tmp_dir.hpp b/src/utils/cpp/tmp_dir.hpp index 3801e7a0..9188fa60 100644 --- a/src/utils/cpp/tmp_dir.hpp +++ b/src/utils/cpp/tmp_dir.hpp @@ -17,6 +17,7 @@ #include <cstdlib> #include <filesystem> +#include <memory> #include <optional> #include <string> diff --git a/test/buildtool/execution_api/common/TARGETS b/test/buildtool/execution_api/common/TARGETS index f1b0f211..f49f65fc 100644 --- a/test/buildtool/execution_api/common/TARGETS +++ b/test/buildtool/execution_api/common/TARGETS @@ -8,6 +8,8 @@ , ["@", "src", "src/buildtool/execution_api/common", "common"] , ["@", "src", "src/buildtool/execution_api/local", "config"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/logging", "log_level"] + , ["@", "src", "src/buildtool/logging", "logging"] ] , "stage": ["test", "buildtool", "execution_api", "common"] } diff --git a/test/buildtool/execution_api/common/api_test.hpp b/test/buildtool/execution_api/common/api_test.hpp index be9abb1f..0b74d1af 100644 --- a/test/buildtool/execution_api/common/api_test.hpp +++ b/test/buildtool/execution_api/common/api_test.hpp @@ -22,6 +22,8 @@ #include "src/buildtool/execution_api/common/execution_response.hpp" #include "src/buildtool/execution_api/local/config.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" using ApiFactory = std::function<IExecutionApi::Ptr()>; using ExecProps = std::map<std::string, std::string>; diff --git a/test/buildtool/execution_api/local/TARGETS b/test/buildtool/execution_api/local/TARGETS index 65ced26c..e98e27cc 100644 --- a/test/buildtool/execution_api/local/TARGETS +++ b/test/buildtool/execution_api/local/TARGETS @@ -9,6 +9,8 @@ , ["@", "src", "src/buildtool/common", "config"] , ["@", "src", "src/buildtool/execution_api/local", "config"] , ["@", "src", "src/buildtool/execution_api/local", "local"] + , ["@", "src", "src/buildtool/logging", "log_level"] + , ["@", "src", "src/buildtool/logging", "logging"] , ["utils", "local_hermeticity"] ] , "stage": ["test", "buildtool", "execution_api", "local"] diff --git a/test/buildtool/execution_api/local/local_execution.test.cpp b/test/buildtool/execution_api/local/local_execution.test.cpp index 41b416a4..7b308a59 100644 --- a/test/buildtool/execution_api/local/local_execution.test.cpp +++ b/test/buildtool/execution_api/local/local_execution.test.cpp @@ -21,6 +21,8 @@ #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/execution_api/local/config.hpp" #include "src/buildtool/execution_api/local/local_api.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "test/utils/hermeticity/local.hpp" namespace { diff --git a/test/buildtool/file_system/TARGETS b/test/buildtool/file_system/TARGETS index 4c8a0d76..d7101454 100644 --- a/test/buildtool/file_system/TARGETS +++ b/test/buildtool/file_system/TARGETS @@ -7,6 +7,8 @@ [ ["@", "catch2", "", "catch2"] , ["", "catch-main"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/logging", "log_level"] + , ["@", "src", "src/buildtool/logging", "logging"] ] , "stage": ["test", "buildtool", "file_system"] } @@ -103,6 +105,8 @@ , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "git_repo"] + , ["@", "src", "src/buildtool/logging", "log_level"] + , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/utils/cpp", "atomic"] , ["utils", "shell_quoting"] ] diff --git a/test/buildtool/file_system/file_system_manager.test.cpp b/test/buildtool/file_system/file_system_manager.test.cpp index 8b1ac5c8..18068aec 100644 --- a/test/buildtool/file_system/file_system_manager.test.cpp +++ b/test/buildtool/file_system/file_system_manager.test.cpp @@ -23,6 +23,8 @@ #include "catch2/catch_test_macros.hpp" #include "catch2/generators/catch_generators_all.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" class CopyFileFixture { public: diff --git a/test/buildtool/file_system/git_repo.test.cpp b/test/buildtool/file_system/git_repo.test.cpp index 26ebd8ce..53658b44 100644 --- a/test/buildtool/file_system/git_repo.test.cpp +++ b/test/buildtool/file_system/git_repo.test.cpp @@ -18,6 +18,8 @@ #include "nlohmann/json.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_repo.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/utils/cpp/atomic.hpp" #include "test/utils/shell_quoting.hpp" diff --git a/test/buildtool/graph_traverser/TARGETS b/test/buildtool/graph_traverser/TARGETS index d4936283..77e29e2a 100644 --- a/test/buildtool/graph_traverser/TARGETS +++ b/test/buildtool/graph_traverser/TARGETS @@ -9,6 +9,8 @@ , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/file_system", "jsonfs"] , ["@", "src", "src/buildtool/graph_traverser", "graph_traverser"] + , ["@", "src", "src/buildtool/logging", "log_level"] + , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/progress_reporting", "progress"] , ["utils", "test_env"] ] diff --git a/test/buildtool/graph_traverser/graph_traverser.test.hpp b/test/buildtool/graph_traverser/graph_traverser.test.hpp index a35c56b8..7e060d09 100644 --- a/test/buildtool/graph_traverser/graph_traverser.test.hpp +++ b/test/buildtool/graph_traverser/graph_traverser.test.hpp @@ -25,6 +25,7 @@ #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/jsonfs.hpp" #include "src/buildtool/graph_traverser/graph_traverser.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/progress_reporting/progress.hpp" #include "src/utils/cpp/json.hpp" diff --git a/test/buildtool/logging/TARGETS b/test/buildtool/logging/TARGETS index 869ee786..8bc28c1e 100644 --- a/test/buildtool/logging/TARGETS +++ b/test/buildtool/logging/TARGETS @@ -5,6 +5,7 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["", "catch-main"] + , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] ] , "stage": ["test", "buildtool", "logging"] @@ -16,6 +17,7 @@ , "private-deps": [ ["@", "catch2", "", "catch2"] , ["", "catch-main"] + , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] ] diff --git a/test/buildtool/logging/log_sink_file.test.cpp b/test/buildtool/logging/log_sink_file.test.cpp index f2c7095e..bede3f01 100644 --- a/test/buildtool/logging/log_sink_file.test.cpp +++ b/test/buildtool/logging/log_sink_file.test.cpp @@ -21,6 +21,7 @@ #include "catch2/matchers/catch_matchers_all.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_config.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/log_sink_cmdline.hpp" #include "src/buildtool/logging/log_sink_file.hpp" diff --git a/test/buildtool/logging/logger.test.cpp b/test/buildtool/logging/logger.test.cpp index fd8f3bda..7a265323 100644 --- a/test/buildtool/logging/logger.test.cpp +++ b/test/buildtool/logging/logger.test.cpp @@ -18,6 +18,7 @@ #include "catch2/catch_test_macros.hpp" #include "src/buildtool/logging/log_config.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/log_sink.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/test/end-to-end/just-mr/TARGETS b/test/end-to-end/just-mr/TARGETS index 2b6c9497..a5219153 100644 --- a/test/end-to-end/just-mr/TARGETS +++ b/test/end-to-end/just-mr/TARGETS @@ -24,6 +24,7 @@ , "srcs": ["create_test_archives.cpp"] , "private-deps": [ ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/utils/archive", "archive_ops"] , ["@", "src", "src/utils/cpp", "tmp_dir"] diff --git a/test/end-to-end/just-mr/create_test_archives.cpp b/test/end-to-end/just-mr/create_test_archives.cpp index 5f50bade..93f3f3e7 100644 --- a/test/end-to-end/just-mr/create_test_archives.cpp +++ b/test/end-to-end/just-mr/create_test_archives.cpp @@ -16,6 +16,7 @@ #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_config.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/log_sink_cmdline.hpp" #include "src/utils/archive/archive_ops.hpp" #include "src/utils/cpp/tmp_dir.hpp" diff --git a/test/other_tools/git_operations/TARGETS b/test/other_tools/git_operations/TARGETS index a546a76e..41f9df1c 100644 --- a/test/other_tools/git_operations/TARGETS +++ b/test/other_tools/git_operations/TARGETS @@ -31,6 +31,8 @@ , ["", "catch-main"] , ["@", "json", "", "json"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/logging", "log_level"] + , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/other_tools/git_operations", "git_repo_remote"] , ["@", "src", "src/utils/cpp", "atomic"] , ["utils", "shell_quoting"] @@ -47,6 +49,7 @@ , ["@", "src", "src/other_tools/git_operations", "git_config_settings"] , ["@", "src", "src/buildtool/file_system", "git_utils"] , ["@", "src", "src/buildtool/file_system", "git_context"] + , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] , ["utils", "log_config"] ] diff --git a/test/other_tools/git_operations/git_config_run.test.cpp b/test/other_tools/git_operations/git_config_run.test.cpp index 956b8926..50f859d7 100644 --- a/test/other_tools/git_operations/git_config_run.test.cpp +++ b/test/other_tools/git_operations/git_config_run.test.cpp @@ -12,10 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <exception> #include <filesystem> +#include <functional> +#include <string> #include "src/buildtool/file_system/git_context.hpp" #include "src/buildtool/file_system/git_utils.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/other_tools/git_operations/git_config_settings.hpp" #include "test/utils/logging/log_config.hpp" diff --git a/test/other_tools/git_operations/git_repo_remote.test.cpp b/test/other_tools/git_operations/git_repo_remote.test.cpp index 0330e9be..c781f61b 100644 --- a/test/other_tools/git_operations/git_repo_remote.test.cpp +++ b/test/other_tools/git_operations/git_repo_remote.test.cpp @@ -17,6 +17,8 @@ #include "catch2/catch_test_macros.hpp" #include "nlohmann/json.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" #include "src/utils/cpp/atomic.hpp" #include "test/utils/shell_quoting.hpp" diff --git a/test/utils/TARGETS b/test/utils/TARGETS index 7651d6a0..8cf95774 100644 --- a/test/utils/TARGETS +++ b/test/utils/TARGETS @@ -19,7 +19,10 @@ { "type": ["@", "rules", "CC", "library"] , "name": ["log_config"] , "hdrs": ["logging/log_config.hpp"] - , "deps": [["@", "src", "src/buildtool/logging", "logging"]] + , "deps": + [ ["@", "src", "src/buildtool/logging", "log_level"] + , ["@", "src", "src/buildtool/logging", "logging"] + ] , "stage": ["test", "utils"] } , "test_env": @@ -42,6 +45,7 @@ , ["@", "src", "src/buildtool/execution_api/local", "config"] , ["@", "src", "src/buildtool/execution_api/local", "local"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] + , ["@", "src", "src/buildtool/logging", "log_level"] , ["@", "src", "src/buildtool/logging", "logging"] ] , "stage": ["test", "utils"] @@ -53,6 +57,8 @@ , "deps": [ ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] + , ["@", "src", "src/buildtool/logging", "log_level"] + , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/storage", "storage"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/compatibility", "compatibility"] @@ -69,6 +75,8 @@ [ ["@", "catch2", "", "catch2"] , ["@", "src", "src/buildtool/execution_api/remote", "config"] , ["@", "src", "src/buildtool/serve_api/remote", "config"] + , ["@", "src", "src/buildtool/logging", "log_level"] + , ["@", "src", "src/buildtool/logging", "logging"] , ["@", "src", "src/buildtool/storage", "storage"] , ["@", "src", "src/buildtool/file_system", "file_system_manager"] , ["@", "src", "src/buildtool/compatibility", "compatibility"] diff --git a/test/utils/hermeticity/local.hpp b/test/utils/hermeticity/local.hpp index b774c20a..6716f4b1 100644 --- a/test/utils/hermeticity/local.hpp +++ b/test/utils/hermeticity/local.hpp @@ -17,6 +17,7 @@ #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" diff --git a/test/utils/logging/log_config.hpp b/test/utils/logging/log_config.hpp index 5d5a20f6..54095469 100644 --- a/test/utils/logging/log_config.hpp +++ b/test/utils/logging/log_config.hpp @@ -18,6 +18,7 @@ #include <cstdlib> #include "src/buildtool/logging/log_config.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/log_sink_cmdline.hpp" static auto ReadLogLevelFromEnv() -> LogLevel { diff --git a/test/utils/remote_execution/main-remote-execution.cpp b/test/utils/remote_execution/main-remote-execution.cpp index 49b0b617..fa47d585 100644 --- a/test/utils/remote_execution/main-remote-execution.cpp +++ b/test/utils/remote_execution/main-remote-execution.cpp @@ -24,6 +24,8 @@ #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" #include "test/utils/logging/log_config.hpp" #include "test/utils/test_env.hpp" diff --git a/test/utils/serve_service/main-serve.cpp b/test/utils/serve_service/main-serve.cpp index 0a559c0b..808e1e6a 100644 --- a/test/utils/serve_service/main-serve.cpp +++ b/test/utils/serve_service/main-serve.cpp @@ -25,6 +25,8 @@ #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/serve_api/remote/config.hpp" #include "src/buildtool/storage/storage.hpp" #include "test/utils/logging/log_config.hpp" |