rage: fix {hostname} not substituted in sub-paste titles

Summary:
The `rage.reporter` config contains a `{hostname}` placeholder (e.g. `pastry --title "eden rage from {hostname}"`). `RageCmd.run()` in `main.py` correctly substituted this via `str.format(hostname=socket.getfqdn())`, but `print_diagnostic_info()` in `rage.py` and `upload_logs()` in `debug.py` read the same config without substitution. This caused every sub-paste created during a rage (verbose logs, watchman logs, crash logs, etc.) to have a literal `{hostname}` in the title — see P2292964945 for an example.

This diff extracts the config-read-and-substitute logic into `get_rage_reporter()` and uses it in all three call sites.

Reviewed By: kavehahmadi60

Differential Revision: D103877922

fbshipit-source-id: 175e55fc636c4c4bdb5c80574b40134b5bf27c25

Author: Olivier Richard

eden/fs/cli/debug.py

@@ -1384,8 +1384,7 @@ def setup_parser(self, parser: argparse.ArgumentParser) -> None:
     def upload_logs(
         self, args: argparse.Namespace, instance: EdenInstance, eden_log_path: Path
     ) -> int:
-        # For ease of use, just use the same rage reporter
-        rage_processor = instance.get_config_value("rage.reporter", default="")
+        rage_processor = rage_mod.get_rage_reporter(instance)
 
         # pyre-fixme[24]: Generic type `subprocess.Popen` expects 1 type parameter.
         proc: Optional[subprocess.Popen] = None

eden/fs/cli/main.py

@@ -19,7 +19,6 @@
 import shlex
 import shutil
 import signal
-import socket
 import subprocess
 import sys
 import traceback
@@ -3067,10 +3066,7 @@ def setup_parser(self, parser: argparse.ArgumentParser) -> None:
     def run(self, args: argparse.Namespace) -> int:
         instance = get_eden_instance(args)
         instance.log_sample("eden_rage")
-        rage_processor = instance.get_config_value("rage.reporter", default="")
-
-        # Allow "{hostname}" substitution in rage.reporter config.
-        rage_processor = rage_processor.format(hostname=socket.getfqdn())
+        rage_processor = rage_mod.get_rage_reporter(instance)
 
         if args.report:
             rage_mod.report_edenfs_bug(instance, rage_processor)

eden/fs/cli/rage.py

@@ -15,6 +15,7 @@
 import re
 import shlex
 import shutil
+import socket
 import subprocess
 import sys
 import time
@@ -131,6 +132,11 @@ def flush(self) -> None:
         self.wrapped.flush()
 
 
+def get_rage_reporter(instance: EdenInstance) -> str:
+    processor = instance.get_config_value("rage.reporter", default="")
+    return processor.format(hostname=socket.getfqdn())
+
+
 THRIFT_COUNTER_REGEX = (
     r"thrift\.(EdenService|BaseService)\..*(time|num_samples|num_calls).*"
 )
@@ -375,7 +381,7 @@ def print_diagnostic_info(
     print_build_info(out, host, instance)
     print_host_dashboard(out, host)
 
-    processor = instance.get_config_value("rage.reporter", default="")
+    processor = get_rage_reporter(instance)
     get_eden_logs(out, processor, instance, dry_run)
 
     print_watchman_log(out, processor, dry_run)