k/record_batcher: Optionally inject a ss::logger

Signed-off-by: Oren Leiman <oren.leiman@redpanda.com>
oleiman · Oct 17, 2024 · 37414a7 · 37414a7
1 parent 11b8a23
commit 37414a7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/v/kafka/client/record_batcher.cc b/src/v/kafka/client/record_batcher.cc
@@ -23,8 +23,12 @@ namespace detail {
 class batcher_impl {
 public:
     batcher_impl() = delete;
-    explicit batcher_impl(size_t batch_max_bytes)
-      : _batch_max_bytes(batch_max_bytes) {}
+    explicit batcher_impl(
+      size_t batch_max_bytes, std::optional<ss::logger*> log)
+      : _batch_max_bytes(batch_max_bytes)
+      , _log(log.value_or(&kclog)) {
+        vassert(_log != nullptr, "Injected logger must not be nullptr");
+    }
     ~batcher_impl() = default;
     batcher_impl(const batcher_impl&) = delete;
     batcher_impl& operator=(const batcher_impl&) = delete;
@@ -48,7 +52,7 @@ class batcher_impl {
         size_t record_size = record.size_bytes();
         if (record_size > max_records_bytes()) {
             vlog(
-              kclog.info,
+              _log->info,
               "Dropped record: size exceeds configured batch max "
               "size: {} > {}",
               human::bytes{static_cast<double>(record_size)},
@@ -93,14 +97,14 @@ class batcher_impl {
                     - static_cast<int64_t>(batch.size_bytes());
         if (diff < 0) {
             vlog(
-              kclog.debug,
+              _log->debug,
               "Underestimaged batch size {} - {} = {}",
               human::bytes{static_cast<double>(batch_size_bytes())},
               human::bytes{static_cast<double>(batch.size_bytes())},
               diff);
         } else {
             vlog(
-              kclog.trace,
+              _log->trace,
               "Building record batch. Actual size: {} (estimated: {}, err:{})",
               human::bytes{static_cast<double>(batch.size_bytes())},
               human::bytes{static_cast<double>(batch_size_bytes())},
@@ -120,15 +124,17 @@ class batcher_impl {
     }
 
     size_t _batch_max_bytes;
+    ss::logger* _log;
     storage::record_batch_builder _builder{bb_init()};
     ss::chunked_fifo<model::record_batch> _record_batches;
     size_t _curr_batch_size{0};
 };
 
 } // namespace detail
 
-record_batcher::record_batcher(size_t max_batch_size)
-  : _impl(std::make_unique<detail::batcher_impl>(max_batch_size)) {}
+record_batcher::record_batcher(
+  size_t max_batch_size, std::optional<ss::logger*> log)
+  : _impl(std::make_unique<detail::batcher_impl>(max_batch_size, log)) {}
 
 record_batcher::~record_batcher() = default;
 

diff --git a/src/v/kafka/client/record_batcher.h b/src/v/kafka/client/record_batcher.h
@@ -14,6 +14,8 @@
 #include "bytes/iobuf.h"
 #include "model/record.h"
 
+#include <seastar/util/log.hh>
+
 #include <optional>
 
 namespace kafka::client {
@@ -34,7 +36,8 @@ class batcher_impl;
 class record_batcher {
 public:
     record_batcher() = delete;
-    explicit record_batcher(size_t batch_max_bytes);
+    explicit record_batcher(
+      size_t batch_max_bytes, std::optional<ss::logger*> log = std::nullopt);
     ~record_batcher();
     record_batcher(const record_batcher&) = delete;
     record_batcher& operator=(const record_batcher&) = delete;

diff --git a/src/v/transform/logging/rpc_client.cc b/src/v/transform/logging/rpc_client.cc
@@ -41,7 +41,7 @@ rpc_client::write(model::partition_id pid, io::json_batches batches) {
     auto max_batch_size = cfg->properties.batch_max_bytes.value_or(
       config::shard_local_cfg().kafka_batch_max_bytes());
 
-    kafka::client::record_batcher batcher{max_batch_size};
+    kafka::client::record_batcher batcher{max_batch_size, &tlg_log};
 
     while (!batches.empty()) {
         auto json_batch = std::move(batches.front());