Merge pull request #495 from opensafely-core/fix-depenency-failed-mis…

…sing-error-state

fix: make DEPENDENCY_FAILED spans with the error state

jobrunner/run.py

@@ -133,7 +133,7 @@ def handle_single_job(job, api):
             "for users to fix.\n"
             "The tech team are automatically notified of these errors and will be "
             "investigating.",
-            exc=exc,
+            error=exc,
         )
         # Do not clean up, as we may want to debug
         #
@@ -222,6 +222,7 @@ def handle_job(job, api, mode=None, paused=None):
                 job,
                 StatusCode.DEPENDENCY_FAILED,
                 "Not starting as dependency failed",
+                error=True,
             )
             return
 
@@ -455,11 +456,11 @@ def get_states_of_awaited_jobs(job):
     return states
 
 
-def mark_job_as_failed(job, code, message=None, exc=None, **attrs):
+def mark_job_as_failed(job, code, message=None, error=None, **attrs):
     if message is None:
-        message = f"{type(exc).__name__}: {exc}"
+        message = str(error)
 
-    set_state(job, State.FAILED, code, message, error=exc, attrs=attrs)
+    set_state(job, State.FAILED, code, message, error=error, attrs=attrs)
 
 
 def set_state(job, state, code, message, error=None, **attrs):

tests/test_run.py

@@ -118,7 +118,9 @@ def test_handle_job_pending_dependency_failed(db):
     spans = get_trace()
     assert spans[-3].name == "CREATED"
     assert spans[-2].name == "DEPENDENCY_FAILED"
+    assert spans[-2].status.status_code == trace.StatusCode.ERROR
     assert spans[-1].name == "JOB"
+    assert spans[-1].status.status_code == trace.StatusCode.ERROR
 
 
 def test_handle_pending_job_waiting_on_dependency(db):