improve(trace): incorporate the new logger

src/accountsdb/download.zig

@@ -164,7 +164,9 @@ pub fn downloadSnapshotsFromGossip(
     output_dir: std.fs.Dir,
     min_mb_per_sec: usize,
 ) !void {
-    logger.infof("starting snapshot download with min download speed: {d} MB/s", .{min_mb_per_sec});
+    logger
+        .info()
+        .logf("starting snapshot download with min download speed: {d} MB/s", .{min_mb_per_sec});
 
     // TODO: maybe make this bigger? or dynamic?
     var contact_info_buf: [1_000]ThreadSafeContactInfo = undefined;
@@ -208,7 +210,9 @@ pub fn downloadSnapshotsFromGossip(
                     i += r.len;
                 }
             }
-            logger.infof("searched for snapshot peers: {s}", .{write_buf[0..i]});
+            logger
+                .info()
+                .logf("searched for snapshot peers: {s}", .{write_buf[0..i]});
         }
 
         for (available_snapshot_peers.items) |peer| {
@@ -230,7 +234,10 @@ pub fn downloadSnapshotsFromGossip(
             });
             defer allocator.free(snapshot_url);
 
-            logger.infof("downloading full_snapshot from: {s}", .{snapshot_url});
+            logger
+                .info()
+                .logf("downloading full_snapshot from: {s}", .{snapshot_url});
+
             downloadFile(
                 allocator,
                 logger,
@@ -244,11 +251,11 @@ pub fn downloadSnapshotsFromGossip(
                     // downloadFile function
                     error.Unexpected => {},
                     error.TooSlow => {
-                        logger.infof("peer is too slow, skipping", .{});
+                        logger.info().logf("peer is too slow, skipping", .{});
                         try slow_peer_pubkeys.append(peer.contact_info.pubkey);
                     },
                     else => {
-                        logger.infof("failed to download full_snapshot: {s}", .{@errorName(err)});
+                        logger.info().logf("failed to download full_snapshot: {s}", .{@errorName(err)});
                     },
                 }
                 continue;
@@ -271,7 +278,7 @@ pub fn downloadSnapshotsFromGossip(
                 });
                 defer allocator.free(inc_snapshot_url);
 
-                logger.infof("downloading inc_snapshot from: {s}", .{inc_snapshot_url});
+                logger.info().logf("downloading inc_snapshot from: {s}", .{inc_snapshot_url});
                 _ = downloadFile(
                     allocator,
                     logger,
@@ -282,13 +289,13 @@ pub fn downloadSnapshotsFromGossip(
                     null,
                 ) catch |err| {
                     // failure here is ok (for now?)
-                    logger.warnf("failed to download inc_snapshot: {s}", .{@errorName(err)});
+                    logger.warn().logf("failed to download inc_snapshot: {s}", .{@errorName(err)});
                     return;
                 };
             }
 
             // success
-            logger.infof("snapshot downloaded finished", .{});
+            logger.info().logf("snapshot downloaded finished", .{});
             return;
         }
     }
@@ -359,7 +366,7 @@ const DownloadProgress = struct {
             // each MB
             const mb_read = self.bytes_read / 1024 / 1024;
             if (mb_read == 0) {
-                self.logger.infof("download speed is too slow (<1MB/s) -- disconnecting", .{});
+                self.logger.info().logf("download speed is too slow (<1MB/s) -- disconnecting", .{});
                 return 0;
             }
 
@@ -379,14 +386,14 @@ const DownloadProgress = struct {
                 self.has_checked_speed = true;
                 if (mb_per_second < self.min_mb_per_second.?) {
                     // not fast enough => abort
-                    self.logger.infof("[download progress]: speed is too slow ({d} MB/s) -- disconnecting", .{mb_per_second});
+                    self.logger.info().logf("[download progress]: speed is too slow ({d} MB/s) -- disconnecting", .{mb_per_second});
                     return 0;
                 } else {
-                    self.logger.infof("[download progress]: speed is ok ({d} MB/s) -- maintaining", .{mb_per_second});
+                    self.logger.info().logf("[download progress]: speed is ok ({d} MB/s) -- maintaining", .{mb_per_second});
                 }
             }
 
-            self.logger.infof("[download progress]: {d}% done ({d} MB/s - {d}/{d}) (time left: {d})", .{
+            self.logger.info().logf("[download progress]: {d}% done ({d} MB/s - {d}/{d}) (time left: {d})", .{
                 self.file_memory_index * 100 / self.download_size,
                 mb_per_second,
                 self.file_memory_index,
@@ -437,7 +444,7 @@ pub fn downloadFile(
     if (try head_resp.getHeader("content-length")) |content_length| {
         download_size = try std.fmt.parseInt(usize, content_length.get(), 10);
     } else {
-        logger.debugf("header request didnt have content-length...", .{});
+        logger.debug().logf("header request didnt have content-length...", .{});
         return error.NoContentLength;
     }
 

src/accountsdb/fuzz.zig

@@ -4,6 +4,8 @@ const zstd = @import("zstd");
 
 const AccountsDB = sig.accounts_db.AccountsDB;
 const Logger = sig.trace.Logger;
+const StandardErrLogger = sig.trace.ChannelPrintLogger;
+const Level = sig.trace.Level;
 const Account = sig.core.Account;
 const Slot = sig.core.time.Slot;
 const Pubkey = sig.core.pubkey.Pubkey;
@@ -55,9 +57,14 @@ pub fn run(seed: u64, args: *std.process.ArgIterator) !void {
     defer _ = gpa_state.deinit();
     const allocator = gpa_state.allocator();
 
-    const logger = Logger.init(allocator, .debug);
-    defer logger.deinit();
-    logger.spawn();
+    var std_logger = StandardErrLogger.init(.{
+        .allocator = allocator,
+        .max_level = Level.debug,
+        .max_buffer = 2048,
+    }) catch @panic("Logger init failed");
+    defer std_logger.deinit();
+
+    const logger = std_logger.logger();
 
     const use_disk = rand.boolean();
 
@@ -248,14 +255,14 @@ pub fn run(seed: u64, args: *std.process.ArgIterator) !void {
 
             try sig.accounts_db.snapshots.parallelUnpackZstdTarBall(
                 allocator,
-                .noop,
+                Logger{ .noop = {} },
                 archive_file,
                 alternative_snapshot_dir,
                 5,
                 true,
             );
 
-            logger.infof("fuzz[validate]: unpacked full snapshot at slot: {}", .{snapshot_info.slot});
+            logger.info().logf("fuzz[validate]: unpacked full snapshot at slot: {}", .{snapshot_info.slot});
             var snapshot_files: sig.accounts_db.SnapshotFiles = .{
                 .full_snapshot = .{
                     .hash = snapshot_info.hash,
@@ -296,16 +303,15 @@ pub fn run(seed: u64, args: *std.process.ArgIterator) !void {
 
                 const inc_archive_file = try alternative_snapshot_dir.openFile(inc_archive_name.slice(), .{});
                 defer inc_archive_file.close();
-
                 try sig.accounts_db.snapshots.parallelUnpackZstdTarBall(
                     allocator,
-                    .noop,
+                    Logger{ .noop = {} },
                     inc_archive_file,
                     alternative_snapshot_dir,
                     5,
                     true,
                 );
-                logger.infof("fuzz[validate]: unpacked inc snapshot at slot: {}", .{inc_snapshot_info.slot});
+                logger.info().logf("fuzz[validate]: unpacked inc snapshot at slot: {}", .{inc_snapshot_info.slot});
 
                 snapshot_files.incremental_snapshot = .{
                     .base_slot = inc_snapshot_info.base_slot,
@@ -323,12 +329,12 @@ pub fn run(seed: u64, args: *std.process.ArgIterator) !void {
             );
             defer snapshot_fields.deinit(allocator);
 
-            var alt_accounts_db = try AccountsDB.init(allocator, .noop, alternative_snapshot_dir, accounts_db.config, null);
+            var alt_accounts_db = try AccountsDB.init(allocator, Logger{ .noop = {} }, alternative_snapshot_dir, accounts_db.config, null);
             defer alt_accounts_db.deinit();
 
             _ = try alt_accounts_db.loadWithDefaults(allocator, &snapshot_fields, 1, true, 1_500);
             const maybe_inc_slot = if (snapshot_files.incremental_snapshot) |inc| inc.slot else null;
-            logger.infof("loaded and validated snapshot at slot: {} (and inc snapshot @ slot {any})", .{ snapshot_info.slot, maybe_inc_slot });
+            logger.info().logf("loaded and validated snapshot at slot: {} (and inc snapshot @ slot {any})", .{ snapshot_info.slot, maybe_inc_slot });
         }
     }
 

src/accountsdb/snapshots.zig

@@ -1745,7 +1745,7 @@ pub const AllSnapshotFields = struct {
             const rel_path_bounded = sig.utils.fmt.boundedFmt("snapshots/{0}/{0}", .{files.full_snapshot.slot});
             const rel_path = rel_path_bounded.constSlice();
 
-            logger.infof("reading snapshot fields from: {s}", .{sig.utils.fmt.tryRealPath(snapshot_dir, rel_path)});
+            logger.info().logf("reading snapshot fields from: {s}", .{sig.utils.fmt.tryRealPath(snapshot_dir, rel_path)});
 
             const full_file = try snapshot_dir.openFile(rel_path, .{});
             defer full_file.close();
@@ -1759,7 +1759,7 @@ pub const AllSnapshotFields = struct {
                 const rel_path_bounded = sig.utils.fmt.boundedFmt("snapshots/{0}/{0}", .{incremental_snapshot_path.slot});
                 const rel_path = rel_path_bounded.constSlice();
 
-                logger.infof("reading inc snapshot fields from: {s}", .{sig.utils.fmt.tryRealPath(snapshot_dir, rel_path)});
+                logger.info().logf("reading inc snapshot fields from: {s}", .{sig.utils.fmt.tryRealPath(snapshot_dir, rel_path)});
 
                 const incremental_file = try snapshot_dir.openFile(rel_path, .{});
                 defer incremental_file.close();
@@ -1769,7 +1769,7 @@ pub const AllSnapshotFields = struct {
 
                 break :blk incremental_fields;
             } else {
-                logger.info("no incremental snapshot fields found");
+                logger.info().log("no incremental snapshot fields found");
                 break :blk null;
             }
         };

src/benchmarks.zig

@@ -12,7 +12,6 @@ const meta = std.meta;
 /// zig build benchmark -- gossip
 pub fn main() !void {
     const allocator = std.heap.c_allocator;
-    logger.default_logger.* = logger.Logger.init(allocator, .debug);
 
     if (builtin.mode == .Debug) std.debug.print("warning: running benchmark in Debug mode\n", .{});