Skip to content

Commit 9e80c05

Browse files
committed
Ironed another corner case in the collector
1 parent 578862b commit 9e80c05

1 file changed

Lines changed: 18 additions & 12 deletions

File tree

treecript/collector.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,12 @@ def process_metrics_collector(
621621
c_mem_rss = c_mem.rss
622622
c_full_mem_uss = getattr(c_full_mem, "uss", 0)
623623
c_full_mem_swap = getattr(c_full_mem, "swap", 0)
624+
c_io_read_count = getattr(c_io, "read_count", 0)
625+
c_io_write_count = getattr(c_io, "write_count", 0)
626+
c_io_read_bytes = getattr(c_io, "read_bytes", 0)
627+
c_io_write_bytes = getattr(c_io, "write_bytes", 0)
628+
c_io_read_chars = getattr(c_io, "read_chars", 0)
629+
c_io_write_chars = getattr(c_io, "write_chars", 0)
624630
metrics = (
625631
timestamp_str,
626632
child_pid_str,
@@ -644,12 +650,12 @@ def process_metrics_collector(
644650
" ".join(map(str, child_d["threads_core_num"])),
645651
" ".join(map(str, child_d["threads_cpu_num"])),
646652
str(child_d["status"]),
647-
str(getattr(c_io, "read_count", 0)),
648-
str(getattr(c_io, "write_count", 0)),
649-
str(getattr(c_io, "read_bytes", 0)),
650-
str(getattr(c_io, "write_bytes", 0)),
651-
str(getattr(c_io, "read_chars", 0)),
652-
str(getattr(c_io, "write_chars", 0)),
653+
str(c_io_read_count),
654+
str(c_io_write_count),
655+
str(c_io_read_bytes),
656+
str(c_io_write_bytes),
657+
str(c_io_read_chars),
658+
str(c_io_write_chars),
653659
)
654660

655661
# Aggregated statistics
@@ -660,12 +666,12 @@ def process_metrics_collector(
660666
sumuss += c_full_mem_uss
661667
sumswap += c_full_mem_swap
662668
sumthreads += child_d["num_threads"]
663-
sum_read_count += c_io.read_count
664-
sum_write_count += c_io.write_count
665-
sum_read_bytes += c_io.read_bytes
666-
sum_write_bytes += c_io.write_bytes
667-
sum_read_chars += c_io.read_chars
668-
sum_write_chars += c_io.write_chars
669+
sum_read_count += c_io_read_count
670+
sum_write_count += c_io_write_count
671+
sum_read_bytes += c_io_read_bytes
672+
sum_write_bytes += c_io_write_bytes
673+
sum_read_chars += c_io_read_chars
674+
sum_write_chars += c_io_write_chars
669675

670676
print(",".join(metrics), file=cH)
671677

0 commit comments

Comments
 (0)