From 327f56fa1a6599198c8ee7ee7772610eeadad93a Mon Sep 17 00:00:00 2001
From: Mike Lin <dna@mlin.net>
Date: Sat, 23 Oct 2021 23:07:56 -1000
Subject: [PATCH] show tracebacks for unknown exceptions (without --debug)

---
 WDL/runtime/error.py    |  6 +++++-
 WDL/runtime/task.py     | 20 +++++++++++++++++---
 WDL/runtime/workflow.py | 29 ++++++++++++++++++++++-------
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/WDL/runtime/error.py b/WDL/runtime/error.py
index 2ecdf0c0..8fd85dea 100644
--- a/WDL/runtime/error.py
+++ b/WDL/runtime/error.py
@@ -107,7 +107,9 @@ def __init__(self, exe: Union[_Task, _Workflow], run_id: str, run_dir: str, **kw
         _statusbar.abort()
 
 
-def error_json(exn: BaseException, cause: Optional[Exception] = None) -> Dict[str, Any]:
+def error_json(
+    exn: BaseException, cause: Optional[Exception] = None, traceback: Optional[str] = None
+) -> Dict[str, Any]:
     """
     Make a json-dumpable dict to write into error sentinel file
     """
@@ -156,4 +158,6 @@ def pos_json(pos: SourcePosition) -> Dict[str, Any]:
         for k in more_info:
             if k not in info:
                 info[k] = more_info[k]
+    if traceback:
+        info["traceback"] = traceback.strip().splitlines()
     return info
diff --git a/WDL/runtime/task.py b/WDL/runtime/task.py
index b5bfb4c8..603807d4 100644
--- a/WDL/runtime/task.py
+++ b/WDL/runtime/task.py
@@ -220,16 +220,30 @@ def run_local_task(
                     cache.put(cache_key, outputs)
                 return (run_dir, outputs)
         except Exception as exn:
-            logger.debug(traceback.format_exc())
+            tbtxt = traceback.format_exc()
+            logger.debug(tbtxt)
             wrapper = RunFailed(task, run_id, run_dir)
-            logmsg = _(str(wrapper), dir=run_dir, **error_json(exn))
+            logmsg = _(
+                str(wrapper),
+                dir=run_dir,
+                **error_json(
+                    exn, traceback=tbtxt if not isinstance(exn, Error.RuntimeError) else None
+                ),
+            )
             if isinstance(exn, Terminated) and getattr(exn, "quiet", False):
                 logger.debug(logmsg)
             else:
                 logger.error(logmsg)
             try:
                 write_atomic(
-                    json.dumps(error_json(wrapper, cause=exn), indent=2),
+                    json.dumps(
+                        error_json(
+                            wrapper,
+                            cause=exn,
+                            traceback=tbtxt if not isinstance(exn, Error.RuntimeError) else None,
+                        ),
+                        indent=2,
+                    ),
                     os.path.join(run_dir, "error.json"),
                 )
             except Exception as exn2:
diff --git a/WDL/runtime/workflow.py b/WDL/runtime/workflow.py
index e83879aa..82d43bce 100644
--- a/WDL/runtime/workflow.py
+++ b/WDL/runtime/workflow.py
@@ -42,8 +42,7 @@
 from concurrent import futures
 from typing import Optional, List, Set, Tuple, NamedTuple, Dict, Union, Iterable, Callable, Any
 from contextlib import ExitStack
-from .. import Env, Type, Value, Tree, StdLib
-from ..Error import InputError
+from .. import Env, Type, Value, Tree, StdLib, Error
 from .task import run_local_task, _fspaths, link_outputs, _add_downloadable_defaults
 from .download import able as downloadable, run_cached as download
 from .._util import (
@@ -410,7 +409,7 @@ def _do_job(
                 if not downloadable(cfg, fn, directory=fn.endswith("/"))
             )
             if disallowed_filenames:
-                raise InputError(
+                raise Error.InputError(
                     f"call {job.node.name} inputs use unknown file: {next(iter(disallowed_filenames))}"
                 )
             # issue CallInstructions
@@ -615,7 +614,7 @@ def _devirtualize_filename(self, filename: str) -> str:
                 return cached
         if filename in self.state.filename_whitelist:
             return filename
-        raise InputError("attempted read from unknown or inaccessible file " + filename)
+        raise Error.InputError("attempted read from unknown or inaccessible file " + filename)
 
     def _virtualize_filename(self, filename: str) -> str:
         self.state.filename_whitelist.add(filename)
@@ -875,21 +874,37 @@ def _workflow_main_loop(
             logger.notice("done")
             return outputs
     except Exception as exn:
-        logger.debug(traceback.format_exc())
+        tbtxt = traceback.format_exc()
+        logger.debug(tbtxt)
         cause = exn
         while isinstance(cause, RunFailed) and cause.__cause__:
             cause = cause.__cause__
         wrapper = RunFailed(workflow, run_id_stack[-1], run_dir)
         try:
             write_atomic(
-                json.dumps(error_json(wrapper, cause=exn), indent=2),
+                json.dumps(
+                    error_json(
+                        wrapper,
+                        cause=exn,
+                        traceback=tbtxt if not isinstance(exn, Error.RuntimeError) else None,
+                    ),
+                    indent=2,
+                ),
                 os.path.join(run_dir, "error.json"),
             )
         except Exception as exn2:
             logger.debug(traceback.format_exc())
             logger.critical(_("failed to write error.json", dir=run_dir, message=str(exn2)))
         if not isinstance(exn, RunFailed):
-            logger.error(_(str(wrapper), dir=run_dir, **error_json(exn)))
+            logger.error(
+                _(
+                    str(wrapper),
+                    dir=run_dir,
+                    **error_json(
+                        exn, traceback=tbtxt if not isinstance(exn, Error.RuntimeError) else None
+                    ),
+                )
+            )
         elif not isinstance(exn.__cause__, Terminated):
             logger.error(
                 _("call failure propagating", **{"from": getattr(exn, "run_id"), "dir": run_dir})