From bf6efde8cccb4b7a215e3e6a817afcb6bef4f37d Mon Sep 17 00:00:00 2001
From: Mostafa Abdelraouf <mostafa.abdelraouf@instacart.com>
Date: Mon, 13 Feb 2023 15:29:08 -0600
Subject: [PATCH] Fix code coverage + less flakiness (#318)

Code coverage logic was missing coverage from rust tests. This is now fixed.
Also, we weren't reaping spawned PgCat processes correctly which left zombie processes.
---
 .circleci/generate_coverage.sh      | 10 +++++++++-
 tests/ruby/helpers/pgcat_process.rb | 10 +++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.circleci/generate_coverage.sh b/.circleci/generate_coverage.sh
index 59fe44a..0a21e1c 100755
--- a/.circleci/generate_coverage.sh
+++ b/.circleci/generate_coverage.sh
@@ -1,7 +1,15 @@
 #!/bin/bash
 
+# inspired by https://doc.rust-lang.org/rustc/instrument-coverage.html#tips-for-listing-the-binaries-automatically
+TEST_OBJECTS=$( \
+    for file in $(cargo test --no-run 2>&1 | grep "target/debug/deps/pgcat-[[:alnum:]]\+" -o); \
+    do \
+        printf "%s %s " --object $file; \
+    done \
+)
+
 rust-profdata merge -sparse pgcat-*.profraw -o pgcat.profdata
 
-rust-cov export -ignore-filename-regex="rustc|registry" -Xdemangler=rustfilt -instr-profile=pgcat.profdata --object ./target/debug/pgcat --format lcov > ./lcov.info
+bash -c "rust-cov export -ignore-filename-regex='rustc|registry' -Xdemangler=rustfilt -instr-profile=pgcat.profdata $TEST_OBJECTS --object ./target/debug/pgcat --format lcov > ./lcov.info"
 
 genhtml lcov.info --output-directory /tmp/cov --prefix $(pwd)
diff --git a/tests/ruby/helpers/pgcat_process.rb b/tests/ruby/helpers/pgcat_process.rb
index 00d72bd..63b5104 100644
--- a/tests/ruby/helpers/pgcat_process.rb
+++ b/tests/ruby/helpers/pgcat_process.rb
@@ -8,7 +8,11 @@ class PgcatProcess
   attr_reader :pid
 
   def self.finalize(pid, log_filename, config_filename)
-    `kill #{pid}` if pid
+    if pid
+      Process.kill("TERM", pid)
+      Process.wait(pid)
+    end
+
     File.delete(config_filename) if File.exist?(config_filename)
     File.delete(log_filename) if File.exist?(log_filename)
   end
@@ -77,8 +81,8 @@ class PgcatProcess
   def stop
     return unless @pid
 
-    `kill #{@pid}`
-    sleep 0.1
+    Process.kill("TERM", @pid)
+    Process.wait(@pid)
     @pid = nil
   end