Fix and require --metrics-file argument use

Author: tautschnig

doc/mdbook-metrics/src/main.rs

@@ -46,6 +46,8 @@ fn run_kani_metrics_script() -> Result<(), Error> {
             "kani_std_analysis.py",
             "--crate",
             "core",
+            "--metrics-file",
+            "metrics-data-core.json",
             "--plot-only",
             "--plot-dir",
             &tools_path.to_string_lossy(),
@@ -59,6 +61,8 @@ fn run_kani_metrics_script() -> Result<(), Error> {
             "kani_std_analysis.py",
             "--crate",
             "std",
+            "--metrics-file",
+            "metrics-data-std.json",
             "--plot-only",
             "--plot-dir",
             &tools_path.to_string_lossy(),

scripts/kani-std-analysis/kani_std_analysis.py

@@ -158,12 +158,9 @@ def __init__(self, metrics_file, crate):
 
     # Read historical data from self.metrics_file and initialize the date range.    
     def read_historical_data(self):
-        try:
-            with open(self.metrics_file, 'r') as f:
-                all_data = json.load(f)["results"]
-                self.update_plot_metrics(all_data)
-        except FileNotFoundError:
-            all_data = {}
+        with open(self.metrics_file, 'r') as f:
+            all_data = json.load(f)["results"]
+            self.update_plot_metrics(all_data)
 
         self.dates = [datetime.strptime(data["date"], '%Y-%m-%d').date() for data in all_data]
 
@@ -305,8 +302,8 @@ def main():
                     help="Name of standard library crate to produce metrics for")
     parser.add_argument('--metrics-file', 
                     type=str, 
-                    default="metrics-data.json", 
-                    help="Path to the JSON file containing metrics data (default: metrics-data.json)")
+                    required=True,
+                    help="Path to the JSON file containing metrics data")
     parser.add_argument('--kani-list-file', 
                     type=str, 
                     default="kani-list.json", 

scripts/run-kani.sh

@@ -309,8 +309,12 @@ main() {
         pushd scripts/kani-std-analysis
         pip install -r requirements.txt
         echo "Computing Kani-specific metrics..."
-        ./kani_std_analysis.py --crate core --kani-list-file $current_dir/kani-list.json
-        ./kani_std_analysis.py --crate std --kani-list-file $current_dir/kani-list.json
+        ./kani_std_analysis.py --crate core \
+          --kani-list-file $current_dir/kani-list.json \
+          --metrics-file metrics-data-core.json
+        ./kani_std_analysis.py --crate std \
+          --kani-list-file $current_dir/kani-list.json \
+          --metrics-file metrics-data-std.json
         popd
         rm kani-list.json
     fi