treewide: move log.hh into utils/log.hh

the log.hh under the root of the tree was created keep the backward
compatibility when seastar was extracted into a separate library.
so log.hh should belong to `utils` directory, as it is based solely
on seastar, and can be used all subsystems.

in this change, we move log.hh into utils/log.hh to that it is more
modularized. and this also improves the readability, when one see
`#include "utils/log.hh"`, it is obvious that this source file
needs the logging system, instead of its own log facility -- please
note, we do have two other `log.hh` in the tree.

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>

alternator/auth.cc

@@ -8,7 +8,7 @@
 
 #include "alternator/error.hh"
 #include "auth/common.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include <string>
 #include <string_view>
 #include "bytes.hh"

alternator/executor.cc

@@ -14,7 +14,7 @@
 #include "cdc/log.hh"
 #include "auth/service.hh"
 #include "db/config.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "schema/schema_builder.hh"
 #include "exceptions/exceptions.hh"
 #include "service/client_state.hh"

alternator/serialization.cc

@@ -8,7 +8,7 @@
 
 #include "utils/base64.hh"
 #include "utils/rjson.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "serialization.hh"
 #include "error.hh"
 #include "concrete_types.hh"

alternator/server.cc

@@ -8,7 +8,7 @@
 
 #include "alternator/server.hh"
 #include "gms/application_state.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include <fmt/ranges.h>
 #include <seastar/http/function_handlers.hh>
 #include <seastar/http/short_streams.hh>

alternator/ttl.cc

@@ -23,7 +23,7 @@
 #include "gms/inet_address.hh"
 #include "inet_address_vectors.hh"
 #include "locator/abstract_replication_strategy.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "gc_clock.hh"
 #include "replica/database.hh"
 #include "service/client_state.hh"

api/lsa.cc

@@ -11,7 +11,7 @@
 
 #include <seastar/http/exception.hh>
 #include "utils/logalloc.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace api {
 using namespace seastar::httpd;

api/raft.cc

@@ -12,7 +12,7 @@
 
 #include "service/raft/raft_group_registry.hh"
 #include "service/raft/raft_address_map.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 using namespace seastar::httpd;
 

api/storage_service.cc

@@ -39,7 +39,7 @@
 #include "repair/row_level.hh"
 #include "locator/snitch_base.hh"
 #include "column_family.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "release.hh"
 #include "compaction/compaction_manager.hh"
 #include "compaction/task_manager_module.hh"

api/system.cc

@@ -20,7 +20,7 @@
 #include <seastar/util/short_streams.hh>
 #include <seastar/http/short_streams.hh>
 
-#include "log.hh"
+#include "utils/log.hh"
 
 extern logging::logger apilog;
 

auth/default_authorizer.cc

@@ -27,7 +27,7 @@ extern "C" {
 #include "cql3/query_processor.hh"
 #include "cql3/untyped_result_set.hh"
 #include "exceptions/exceptions.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "utils/class_registrator.hh"
 
 namespace auth {

auth/password_authenticator.cc

@@ -25,7 +25,7 @@
 #include "auth/passwords.hh"
 #include "auth/roles-metadata.hh"
 #include "cql3/untyped_result_set.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "service/migration_manager.hh"
 #include "utils/class_registrator.hh"
 #include "replica/database.hh"

auth/permissions_cache.hh

@@ -17,7 +17,7 @@
 #include "auth/permission.hh"
 #include "auth/resource.hh"
 #include "auth/role_or_anonymous.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "utils/hash.hh"
 #include "utils/loading_cache.hh"
 

auth/resource.cc

@@ -23,7 +23,7 @@
 #include "cql3/functions/user_function.hh"
 #include "cql3/util.hh"
 #include "db/marshal/type_parser.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace auth {
 

auth/service.cc

@@ -33,7 +33,7 @@
 #include "db/config.hh"
 #include "db/consistency_level_type.hh"
 #include "db/functions/function_name.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "schema/schema_fwd.hh"
 #include <seastar/core/future.hh>
 #include <seastar/coroutine/parallel_for_each.hh>

auth/standard_role_manager.cc

@@ -29,7 +29,7 @@
 #include "cql3/util.hh"
 #include "db/consistency_level_type.hh"
 #include "exceptions/exceptions.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "seastar/core/loop.hh"
 #include "seastar/coroutine/maybe_yield.hh"
 #include "service/raft/raft_group0_client.hh"

cell_locking.hh

@@ -18,7 +18,7 @@
 #include "utils/xx_hasher.hh"
 
 #include "db/timeout_clock.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 extern logging::logger cell_locker_log;
 

compaction/leveled_manifest.hh

@@ -16,7 +16,7 @@
 #include "sstables/sstables.hh"
 #include "size_tiered_compaction_strategy.hh"
 #include "interval.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 class leveled_manifest {
     table_state& _table_s;

compound_compat.hh

@@ -15,7 +15,7 @@
 #include "compound.hh"
 #include "schema/schema.hh"
 #include "sstables/version.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 //FIXME: de-inline methods and define this as static in a .cc file.
 extern logging::logger compound_logger;

counters.cc

@@ -10,7 +10,7 @@
 #include "counters.hh"
 #include "mutation/mutation.hh"
 #include "combine.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 logging::logger cell_locker_log("cell_locker");
 

cql3/description.cc

@@ -11,7 +11,7 @@
 #include <seastar/core/on_internal_error.hh>
 
 #include "cql3/util.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "types/types.hh"
 
 static logging::logger dlogger{"description"};

cql3/functions/user_function.cc

@@ -9,7 +9,7 @@
 #include "user_function.hh"
 #include "cql3/description.hh"
 #include "cql3/util.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "lang/wasm.hh"
 
 #include <seastar/core/thread.hh>

cql3/statements/batch_statement.hh

@@ -11,7 +11,7 @@
 #include "cql3/cql_statement.hh"
 #include "raw/batch_statement.hh"
 #include "timestamp.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "service_permit.hh"
 #include "exceptions/coordinator_result.hh"
 #include "tracing/trace_state.hh"

db/batchlog_manager.cc

@@ -24,7 +24,7 @@
 #include "service/storage_proxy.hh"
 #include "system_keyspace.hh"
 #include "utils/rate_limiter.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "db_clock.hh"
 #include "unimplemented.hh"
 #include "idl/frozen_schema.dist.hh"

db/commitlog/commitlog.cc

@@ -51,7 +51,7 @@
 #include "utils/crc.hh"
 #include "utils/runtime.hh"
 #include "utils/flush_queue.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "commitlog_entry.hh"
 #include "commitlog_extensions.hh"
 

db/commitlog/commitlog_replayer.cc

@@ -22,7 +22,7 @@
 #include "commitlog_replayer.hh"
 #include "replica/database.hh"
 #include "db/system_keyspace.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "converting_mutation_partition_applier.hh"
 #include "commitlog_entry.hh"
 #include "validation.hh"

db/config.cc

@@ -30,7 +30,7 @@
 #include "db/tags/extension.hh"
 #include "config.hh"
 #include "extensions.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "service/tablet_allocator_fwd.hh"
 #include "utils/config_file_impl.hh"
 #include <seastar/core/metrics_api.hh>

db/consistency_level.hh

@@ -14,7 +14,7 @@
 #include "db/read_repair_decision.hh"
 #include "gms/inet_address.hh"
 #include "inet_address_vectors.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "replica/database_fwd.hh"
 
 namespace gms {

db/heat_load_balance.hh

@@ -32,7 +32,7 @@
 #include <cassert>
 #include <ranges>
 #include <fmt/ranges.h>  // IWYU pragma: keep
-#include "log.hh"
+#include "utils/log.hh"
 
 extern logging::logger hr_logger;
 

db/hints/internal/hint_logger.hh

@@ -9,7 +9,7 @@
 #pragma once
 
 // Scylla includes.
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace db::hints {
 namespace internal {

db/hints/resource_manager.cc

@@ -10,7 +10,7 @@
 #include "gms/inet_address.hh"
 #include "locator/token_metadata.hh"
 #include "manager.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include <boost/range/algorithm/for_each.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include "utils/disk-error-handler.hh"

db/paxos_grace_seconds_extension.hh

@@ -9,7 +9,7 @@
 
 #include "serializer.hh"
 #include "schema/schema.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 extern logging::logger dblog;
 

db/per_partition_rate_limit_options.cc

@@ -11,7 +11,7 @@
 #include "exceptions/exceptions.hh"
 #include "serializer.hh"
 #include "schema/schema.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace db {
 

db/schema_applier.cc

@@ -42,7 +42,7 @@
 #include "query-result-writer.hh"
 #include "map_difference.hh"
 #include <seastar/coroutine/all.hh>
-#include "log.hh"
+#include "utils/log.hh"
 #include "frozen_schema.hh"
 #include "schema/schema_registry.hh"
 #include "system_keyspace.hh"

db/schema_tables.cc

@@ -23,7 +23,7 @@
 #include "utils/UUID_gen.hh"
 #include "utils/to_string.hh"
 #include <seastar/coroutine/all.hh>
-#include "log.hh"
+#include "utils/log.hh"
 #include "frozen_schema.hh"
 #include "schema/schema_registry.hh"
 #include "mutation_query.hh"

db/sstables-format-selector.cc

@@ -10,7 +10,7 @@
 #include "utils/assert.hh"
 #include <seastar/core/coroutine.hh>
 #include "sstables-format-selector.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "replica/database.hh"
 #include "gms/gossiper.hh"
 #include "gms/feature_service.hh"

db/system_keyspace.cc

@@ -26,7 +26,7 @@
 #include "schema/schema_builder.hh"
 #include "utils/assert.hh"
 #include "utils/hashers.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include <seastar/core/enum.hh>
 #include "gms/inet_address.hh"
 #include "message/messaging_service.hh"

db/view/row_locking.cc

@@ -8,7 +8,7 @@
 
 #include "utils/assert.hh"
 #include "row_locking.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 static logging::logger mylog("row_locking");
 

db/virtual_tables.cc

@@ -34,7 +34,7 @@
 #include "types/list.hh"
 #include "types/types.hh"
 #include "utils/build_id.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace db {
 

dht/boot_strapper.cc

@@ -19,7 +19,7 @@
 #include "dht/boot_strapper.hh"
 #include "dht/range_streamer.hh"
 #include "gms/gossiper.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "db/config.hh"
 #include "replica/database.hh"
 #include "streaming/stream_reason.hh"

dht/i_partitioner.cc

@@ -20,7 +20,7 @@
 #include "sstables/key.hh"
 #include <seastar/core/thread.hh>
 #include <seastar/core/on_internal_error.hh>
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace dht {
 

dht/range_streamer.cc

@@ -11,7 +11,7 @@
 #include "dht/range_streamer.hh"
 #include "replica/database.hh"
 #include "gms/gossiper.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "streaming/stream_plan.hh"
 #include "db/config.hh"
 #include <fmt/ranges.h>

direct_failure_detector/failure_detector.cc

@@ -18,7 +18,7 @@
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/util/defer.hh>
 
-#include "log.hh"
+#include "utils/log.hh"
 
 #include "direct_failure_detector/failure_detector.hh"
 

generic_server.hh

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "log.hh"
+#include "utils/log.hh"
 
 #include "seastarx.hh"
 

gms/endpoint_state.cc

@@ -12,7 +12,7 @@
 #include "gms/i_endpoint_state_change_subscriber.hh"
 #include <ostream>
 #include <boost/lexical_cast.hpp>
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace gms {
 

gms/feature_service.cc

@@ -7,7 +7,7 @@
 #include <seastar/core/sstring.hh>
 #include <seastar/core/seastar.hh>
 #include <seastar/core/smp.hh>
-#include "log.hh"
+#include "utils/log.hh"
 #include "db/config.hh"
 #include "gms/feature.hh"
 #include "gms/feature_service.hh"

gms/gossiper.cc

@@ -20,7 +20,7 @@
 #include "gms/application_state.hh"
 #include "gms/i_endpoint_state_change_subscriber.hh"
 #include "message/messaging_service.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "db/system_keyspace.hh"
 #include <fmt/ranges.h>
 #include <seastar/core/sleep.hh>

gms/version_generator.cc

@@ -12,7 +12,7 @@
 #include <seastar/core/shard_id.hh>
 #include <seastar/core/on_internal_error.hh>
 #include <seastar/core/print.hh>
-#include "log.hh"
+#include "utils/log.hh"
 #include "seastarx.hh"
 #include "version_generator.hh"
 

init.hh

@@ -13,7 +13,7 @@
 #include <seastar/core/future.hh>
 #include <seastar/core/distributed.hh>
 #include <seastar/core/abort_source.hh>
-#include "log.hh"
+#include "utils/log.hh"
 #include "seastarx.hh"
 #include <boost/program_options.hpp>
 

lang/wasm_alien_thread_runner.cc

@@ -12,7 +12,7 @@
 #include <seastar/core/reactor.hh>
 #include <unistd.h>
 
-#include "log.hh"
+#include "utils/log.hh"
 #include "lang/wasm.hh"
 #include "lang/wasm_alien_thread_runner.hh"
 #include <seastar/core/posix.hh>

locator/snitch_base.hh

@@ -20,7 +20,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/thread.hh>
 #include <seastar/core/distributed.hh>
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace gms {
 

locator/token_metadata.cc

@@ -11,7 +11,7 @@
 #include "locator/snitch_base.hh"
 #include "locator/abstract_replication_strategy.hh"
 #include "locator/tablets.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "partition_range_compat.hh"
 #include <unordered_map>
 #include <algorithm>

locator/topology.cc

@@ -12,7 +12,7 @@
 #include <seastar/util/lazy.hh>
 #include <utility>
 
-#include "log.hh"
+#include "utils/log.hh"
 #include "locator/topology.hh"
 #include "locator/production_snitch_base.hh"
 #include "utils/assert.hh"

main.cc

@@ -52,7 +52,7 @@
 #include "utils/class_registrator.hh"
 #include "utils/error_injection.hh"
 #include "utils/runtime.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "utils/directories.hh"
 #include "debug.hh"
 #include "auth/common.hh"

mutation/mutation_compactor.hh

@@ -14,7 +14,7 @@
 #include "tombstone_gc.hh"
 #include "full_position.hh"
 #include <type_traits>
-#include "log.hh"
+#include "utils/log.hh"
 
 extern logging::logger mclog;
 

querier.cc

@@ -12,7 +12,7 @@
 #include "dht/i_partitioner.hh"
 #include "reader_concurrency_semaphore.hh"
 #include "schema/schema.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "utils/error_injection.hh"
 
 #include <boost/range/adaptor/map.hpp>

redis/command_factory.cc

@@ -9,7 +9,7 @@
 #include "redis/command_factory.hh"
 #include "service/storage_proxy.hh"
 #include "redis/commands.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace redis {
 

redis/controller.cc

@@ -13,7 +13,7 @@
 #include "redis/server.hh"
 #include "service/storage_proxy.hh"
 #include "db/config.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "auth/common.hh"
 
 static logging::logger slogger("controller");

redis/keyspace_utils.cc

@@ -14,7 +14,7 @@
 #include "types/types.hh"
 #include "cql3/statements/ks_prop_defs.hh"
 #include <seastar/core/future.hh>
-#include "log.hh"
+#include "utils/log.hh"
 #include "auth/service.hh"
 #include "service/migration_manager.hh"
 #include "service/storage_proxy.hh"

replica/database.cc

@@ -10,7 +10,7 @@
 
 #include <fmt/ranges.h>
 #include <fmt/std.h>
-#include "log.hh"
+#include "utils/log.hh"
 #include "replica/database_fwd.hh"
 #include "utils/assert.hh"
 #include "utils/lister.hh"

schema/schema_registry.cc

@@ -10,7 +10,7 @@
 #include <seastar/core/sharded.hh>
 
 #include "schema_registry.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "db/schema_tables.hh"
 #include "view_info.hh"
 

serializer_impl.hh

@@ -21,7 +21,7 @@
 #include <seastar/core/shared_ptr.hh>
 #include <seastar/core/temporary_buffer.hh>
 #include <seastar/core/on_internal_error.hh>
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace seastar {
 extern logger seastar_logger;

service/mapreduce_service.cc

@@ -20,7 +20,7 @@
 #include "gms/gossiper.hh"
 #include "idl/mapreduce_request.dist.hh"
 #include "locator/abstract_replication_strategy.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "message/messaging_service.hh"
 #include "query-request.hh"
 #include "query_ranges_to_vnodes.hh"

service/pager/query_pagers.cc

@@ -13,7 +13,7 @@
 #include "cql3/selection/selection.hh"
 #include "cql3/query_options.hh"
 #include "cql3/restrictions/statement_restrictions.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "service/storage_proxy.hh"
 #include "utils/result_combinators.hh"
 #include "db/view/delete_ghost_rows_visitor.hh"

service/paxos/paxos_state.hh

@@ -9,7 +9,7 @@
 #pragma once
 #include "seastar/core/semaphore.hh"
 #include "service/paxos/proposal.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "utils/digest_algorithm.hh"
 #include "db/timeout_clock.hh"
 #include <unordered_map>

service/raft/group0_state_id_handler.cc

@@ -10,7 +10,7 @@
 #include "service/raft/raft_address_map.hh"
 #include "compaction/compaction_manager.hh"
 #include "gms/gossiper.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "raft/server.hh"
 #include "replica/database.hh"
 #include "service/raft/raft_group_registry.hh"

service/session.cc

@@ -7,7 +7,7 @@
  */
 
 #include "service/session.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace service {
 

service/storage_service.cc

@@ -50,7 +50,7 @@
 #include "utils/UUID.hh"
 #include "utils/to_string.hh"
 #include "gms/inet_address.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "service/migration_manager.hh"
 #include "service/raft/raft_group0.hh"
 #include "gms/gossiper.hh"

service/topology_coordinator.hh

@@ -13,7 +13,7 @@
 #include <seastar/core/future.hh>
 #include <seastar/core/sharded.hh>
 
-#include "log.hh"
+#include "utils/log.hh"
 #include "raft/raft.hh"
 #include "gms/inet_address.hh"
 #include "gms/feature_service.hh"

service/topology_state_machine.cc

@@ -8,7 +8,7 @@
  */
 
 #include "topology_state_machine.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 #include <boost/range/adaptor/map.hpp>
 

sstables/generation_type.hh

@@ -22,7 +22,7 @@
 #include "types/types.hh"
 #include "utils/assert.hh"
 #include "utils/UUID_gen.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace sstables {
 

sstables/integrity_checked_file_impl.hh

@@ -10,7 +10,7 @@
 
 #include <seastar/core/file.hh>
 #include <seastar/core/seastar.hh>
-#include "log.hh"
+#include "utils/log.hh"
 #include "seastarx.hh"
 
 namespace sstables {

sstables/metadata_collector.cc

@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-#include "log.hh"
+#include "utils/log.hh"
 #include "metadata_collector.hh"
 #include "mutation/position_in_partition.hh"
 

sstables/random_access_reader.cc

@@ -10,7 +10,7 @@
 
 #include "sstables/random_access_reader.hh"
 #include "utils/disk-error-handler.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace sstables {
 

sstables/scanning_clustered_index_cursor.hh

@@ -12,7 +12,7 @@
 #include "sstables/index_entry.hh"
 #include "sstables/promoted_index_blocks_reader.hh"
 #include "schema/schema.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace sstables {
 

sstables/sstable_directory.cc

@@ -18,7 +18,7 @@
 #include "sstables/sstables.hh"
 #include "sstables/sstables_manager.hh"
 #include "compaction/compaction_manager.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "sstable_directory.hh"
 #include "utils/assert.hh"
 #include "utils/lister.hh"

sstables/sstables.cc

@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-#include "log.hh"
+#include "utils/log.hh"
 #include <concepts>
 #include <vector>
 #include <limits>

sstables/sstables_manager.cc

@@ -8,7 +8,7 @@
 
 #include <seastar/coroutine/parallel_for_each.hh>
 #include <seastar/coroutine/switch_to.hh>
-#include "log.hh"
+#include "utils/log.hh"
 #include "sstables/sstables_manager.hh"
 #include "sstables/sstables_registry.hh"
 #include "sstables/partition_index_cache.hh"

streaming/stream_coordinator.cc

@@ -10,7 +10,7 @@
 
 #include "streaming/stream_session_state.hh"
 #include "streaming/stream_coordinator.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 namespace streaming {
 

streaming/stream_manager.cc

@@ -12,7 +12,7 @@
 #include "gms/gossiper.hh"
 #include "streaming/stream_manager.hh"
 #include "streaming/stream_result_future.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "streaming/stream_session_state.hh"
 #include <seastar/core/metrics.hh>
 #include <seastar/core/coroutine.hh>

streaming/stream_result_future.cc

@@ -10,7 +10,7 @@
 #include "streaming/stream_result_future.hh"
 #include "streaming/stream_manager.hh"
 #include "streaming/stream_exception.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include <cfloat>
 #include <fmt/ranges.h>
 

streaming/stream_session.cc

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0)
  */
 
-#include "log.hh"
+#include "utils/log.hh"
 #include "message/messaging_service.hh"
 #include <seastar/coroutine/maybe_yield.hh>
 #include "streaming/stream_session.hh"

streaming/stream_transfer_task.cc

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0)
  */
 
-#include "log.hh"
+#include "utils/log.hh"
 #include "streaming/stream_fwd.hh"
 #include "streaming/stream_detail.hh"
 #include "streaming/stream_transfer_task.hh"

tasks/task_manager.hh

@@ -20,7 +20,7 @@
 #include <seastar/core/sleep.hh>
 #include <seastar/coroutine/parallel_for_each.hh>
 #include "db_clock.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "gms/inet_address.hh"
 #include "tasks/types.hh"
 #include "utils/chunked_vector.hh"

test/boost/commitlog_test.cc

@@ -38,7 +38,7 @@
 #include "db/commitlog/rp_set.hh"
 #include "db/extensions.hh"
 #include "readers/combined.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "test/lib/exception_utils.hh"
 #include "test/lib/cql_test_env.hh"
 #include "test/lib/data_model.hh"

test/boost/dirty_memory_manager_test.cc

@@ -32,7 +32,7 @@
 #include "utils/managed_ref.hh"
 #include "utils/managed_bytes.hh"
 #include "test/lib/log.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 [[gnu::unused]]
 static auto x = [] {

test/boost/error_injection_test.cc

@@ -16,7 +16,7 @@
 #include "test/lib/cql_assertions.hh"
 #include "test/lib/test_utils.hh"
 #include "types/list.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include <chrono>
 
 using namespace std::literals::chrono_literals;

test/boost/locator_topology_test.cc

@@ -21,7 +21,7 @@
 #include "locator/host_id.hh"
 #include "locator/topology.hh"
 #include "locator/load_sketch.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 extern logging::logger testlog;
 

test/boost/logalloc_test.cc

@@ -35,7 +35,7 @@
 #include "utils/lsa/weak_ptr.hh"
 #include "test/lib/make_random_string.hh"
 #endif
-#include "log.hh"
+#include "utils/log.hh"
 
 [[gnu::unused]]
 static auto x = [] {

test/boost/network_topology_strategy_test.cc

@@ -18,7 +18,7 @@
 #include "test/lib/scylla_test_case.hh"
 #include <seastar/testing/thread_test_case.hh>
 #include <seastar/core/sstring.hh>
-#include "log.hh"
+#include "utils/log.hh"
 #include "gms/gossiper.hh"
 #include "schema/schema_builder.hh"
 #include <vector>

test/lib/mutation_assertions.hh

@@ -12,7 +12,7 @@
 
 #include "mutation/mutation.hh"
 #include "mutation/mutation_fragment_stream_validator.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "clustering_interval_set.hh"
 #include "mutation/mutation_partition_v2.hh"
 #include "dht/i_partitioner.hh"

test/manual/gossip.cc

@@ -18,7 +18,7 @@
 #include "message/messaging_service.hh"
 #include "gms/gossiper.hh"
 #include "gms/application_state.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include <seastar/core/thread.hh>
 #include <chrono>
 #include "db/schema_tables.hh"

test/manual/message.cc

@@ -23,7 +23,7 @@
 #include "gms/gossip_digest.hh"
 #include "api/api.hh"
 #include "utils/UUID.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "locator/token_metadata.hh"
 #include "db/schema_tables.hh"
 #include "idl/gossip.dist.hh"

test/perf/logalloc.cc

@@ -17,7 +17,7 @@
 
 #include "utils/allocation_strategy.hh"
 #include "utils/logalloc.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "test/perf/perf.hh"
 
 class piggie {

test/perf/perf_row_cache_update.cc

@@ -16,7 +16,7 @@
 #include "utils/logalloc.hh"
 #include "utils/UUID_gen.hh"
 #include "row_cache.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "schema/schema_builder.hh"
 #include "readers/combined.hh"
 #include "readers/mutation_fragment_v1_stream.hh"

test/unit/lsa_async_eviction_test.cc

@@ -14,7 +14,7 @@
 
 #include "utils/managed_bytes.hh"
 #include "utils/logalloc.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 void print_stats() {
     std::cout << "free " << memory::stats().free_memory()

test/unit/lsa_sync_eviction_test.cc

@@ -13,7 +13,7 @@
 
 #include "utils/managed_bytes.hh"
 #include "utils/logalloc.hh"
-#include "log.hh"
+#include "utils/log.hh"
 
 #include <random>
 

test/unit/row_cache_alloc_stress_test.cc

@@ -15,7 +15,7 @@
 #include "utils/assert.hh"
 #include "utils/logalloc.hh"
 #include "row_cache.hh"
-#include "log.hh"
+#include "utils/log.hh"
 #include "schema/schema_builder.hh"
 #include "replica/memtable.hh"
 #include "test/lib/reader_concurrency_semaphore.hh"

tools/load_system_tablets.cc

@@ -11,7 +11,7 @@
 #include <seastar/core/thread.hh>
 #include <seastar/util/closeable.hh>
 
-#include "log.hh"
+#include "utils/log.hh"
 #include "data_dictionary/keyspace_metadata.hh"
 #include "db/cql_type_parser.hh"
 #include "db/system_keyspace.hh"