Update apport reporting

scripts/runtests.sh

@@ -62,7 +62,7 @@ validate () {
                 # not to do that.
                 # If we run an autoinstall that customizes the security section as part
                 # of the test-suite, we will need to adapt this test.
-                python3 scripts/check-yaml-fields.py $tmpdir/var/log/installer/subiquity-curtin-apt.conf \
+                python3 scripts/check-yaml-fields.py $tmpdir/var/log/installer/curtin-install/subiquity-curtin-apt.conf \
                     apt.security[0].uri='"http://security.ubuntu.com/ubuntu/"' \
                     apt.security[0].arches='["amd64", "i386"]' \
                     apt.security[1].uri='"http://ports.ubuntu.com/ubuntu-ports"'
@@ -259,7 +259,7 @@ LANG=C.UTF-8 timeout --foreground 60 \
     --kernel-cmdline autoinstall \
     --source-catalog examples/sources/install.yaml
 validate
-python3 scripts/check-yaml-fields.py $tmpdir/var/log/installer/subiquity-curtin-apt.conf \
+python3 scripts/check-yaml-fields.py $tmpdir/var/log/installer/curtin-install/subiquity-curtin-apt.conf \
         apt.disable_components='[non-free, restricted]' \
         apt.preferences[0].pin-priority=200 \
         apt.preferences[0].pin='"origin *ubuntu.com*"' \

subiquity/cmd/server.py

@@ -194,9 +194,13 @@ def main():
     logfiles = setup_logger(dir=logdir, base="subiquity-server")
 
     logger = logging.getLogger("subiquity")
-    version = os.environ.get("SNAP_REVISION", "unknown")
+    revision = os.environ.get("SNAP_REVISION", "unknown")
+    version = os.environ.get("SNAP_VERSION", "unknown")
     snap = os.environ.get("SNAP", "unknown")
-    logger.info(f"Starting Subiquity server revision {version} of snap {snap}")
+    logger.info(
+        f"Starting Subiquity server revision {revision} of snap {snap} "
+        f"of version {version}"
+    )
     logger.info(f"Arguments passed: {sys.argv}")
     logger.debug(f"Kernel commandline: {opts.kernel_cmdline}")
     logger.debug(f"Environment: {os.environ}")

subiquity/cmd/tui.py

@@ -146,8 +146,12 @@ def main():
 
     async def run_with_loop():
         subiquity_interface = SubiquityClient(opts)
-        subiquity_interface.note_file_for_apport("InstallerLog", logfiles["debug"])
-        subiquity_interface.note_file_for_apport("InstallerLogInfo", logfiles["info"])
+        subiquity_interface.note_file_for_apport(
+            "InstallerClientLog", logfiles["debug"]
+        )
+        subiquity_interface.note_file_for_apport(
+            "InstallerClientLogInfo", logfiles["info"]
+        )
         await subiquity_interface.run()
 
     asyncio.run(run_with_loop())

subiquity/common/errorreport.py

@@ -34,6 +34,7 @@
 
 from subiquity.common.types import ErrorReportKind, ErrorReportRef, ErrorReportState
 from subiquitycore.async_helpers import run_in_thread, schedule_task
+from subiquitycore.file_util import write_file
 
 log = logging.getLogger("subiquity.common.errorreport")
 
@@ -132,7 +133,9 @@ def _bg_add_info():
             if not self.reporter.dry_run:
                 self.pr.add_hooks_info(None)
                 apport.hookutils.attach_hardware(self.pr)
-            self.pr["Syslog"] = apport.hookutils.recent_syslog(re.compile("."))
+            self.pr["InstallerJournal"] = apport.hookutils.recent_syslog(
+                re.compile(".")
+            )
             snap_name = os.environ.get("SNAP_NAME", "")
             if snap_name != "":
                 self.add_tags([snap_name])
@@ -343,6 +346,7 @@ class ErrorReporter(object):
     def __init__(self, context, dry_run, root, client=None):
         self.context = context
         self.dry_run = dry_run
+        self.root = root
         self.crash_directory = os.path.join(root, "var/crash")
         self.client = client
 
@@ -408,6 +412,11 @@ def make_apport_report(self, kind, thing, *, wait=False, exc=None, **kw):
             report.pr["Title"] = "{} crashed with {}".format(thing, type(exc).__name__)
             tb = traceback.TracebackException.from_exception(exc)
             report.pr["Traceback"] = "".join(tb.format())
+            # Write out traceback for apport consumption
+            traceback_log = os.path.join(
+                self.root, "var/log/installer", "subiquity-traceback.txt"
+            )
+            write_file(traceback_log, "".join(tb.format()))
             self._reports_by_exception[exc] = report
         else:
             report.pr["Title"] = thing

subiquity/server/apt.py

@@ -148,7 +148,7 @@ async def apply_apt_config(self, context, final: bool):
         self.configured_tree = await self.mounter.setup_overlay([self.source_path])
 
         config_location = os.path.join(
-            self.app.root, "var/log/installer/subiquity-curtin-apt.conf"
+            self.app.root, "var/log/installer/curtin-install/subiquity-curtin-apt.conf"
         )
         generate_config_yaml(config_location, self.apt_config(final))
         self.app.note_data_for_apport("CurtinAptConfig", config_location)

system_setup/cmd/tui.py

@@ -155,8 +155,12 @@ def main():
 
     async def run_with_loop():
         subiquity_interface = SystemSetupClient(opts)
-        subiquity_interface.note_file_for_apport("InstallerLog", logfiles["debug"])
-        subiquity_interface.note_file_for_apport("InstallerLogInfo", logfiles["info"])
+        subiquity_interface.note_file_for_apport(
+            "InstallerClientLog", logfiles["debug"]
+        )
+        subiquity_interface.note_file_for_apport(
+            "InstallerClientLogInfo", logfiles["info"]
+        )
         await subiquity_interface.run()
 
     asyncio.run(run_with_loop())