introduce recipe_exception in result.proto

recipe_engine/run.py

 # Copyright 2016 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Entry point for fully-annotated builds.
 
 This script is part of the effort to move all builds to annotator-based
 systems. Any builder configured to use the AnnotatorFactory.BaseFactory()
 found in scripts/master/factory/annotator_factory.py executes a single
 AddAnnotatedScript step. That step (found in annotator_commands.py) calls
@@ skipping 317 matching lines @@
         result.failure.human_reason = ex.message
         result.failure.step_data.step = f.name
 
         # Let the step runner run_context decide what to do.
         raise
 
       except subprocess42.TimeoutExpired as ex:
         result.failure.human_reason = "Step time out: %r" % ex
         result.failure.timeout.timeout_s = ex.timeout
 
+      except loader.RecipeException as ex:
+        result.failure.human_reason = "Uncaught Exception: %r" % ex
+        result.failure.recipe_exception.traceback[:] = [
+          line.rstrip('\n')
+          for line in traceback.format_exception(
+              type(ex.inner_exception), ex.inner_exception, ex.traceback)
+        ]
+
+        # Let the step runner run_context decide what to do.
+        raise type(ex.inner_exception), ex.inner_exception, ex.traceback
+
       except Exception as ex:
         result.failure.human_reason = "Uncaught Exception: %r" % ex
         result.failure.exception.traceback[:] = (
             traceback.format_exc().splitlines())
 
         # Let the step runner run_context decide what to do.
         raise
 
     return result
 
@@ skipping 22 matching lines @@
           "status_code": -1
         }
 
         raise
       except subprocess42.TimeoutExpired as ex:
         result = {
           "reason": "Step time out: %r" % ex,
           "traceback": traceback.format_exc().splitlines(),
           "status_code": -1
         }
+      except loader.RecipeException as ex:
+        result = {
+          "reason": "Uncaught Exception: %r" % ex.inner_exception,
+          "traceback": [
+            line.rstrip('\n')
+            for line in traceback.format_exception(
+                type(ex.inner_exception), ex.inner_exception, ex.traceback)
+          ],
+          "status_code": -1
+        }
+        assert all('\n' not in line for line in result["traceback"])
+        raise type(ex.inner_exception), ex.inner_exception, ex.traceback
       except Exception as ex:
         result = {
           "reason": "Uncaught Exception: %r" % ex,
           "traceback": traceback.format_exc().splitlines(),
           "status_code": -1
         }
-
         raise
 
     result['name'] = '$result'
     return RecipeResult(result)
 
   def depend_on(self, recipe, properties, distributor=None):
     return self.depend_on_multi(
         ((recipe, properties),), distributor=distributor)[0]
 
   def depend_on_multi(self, dependencies, distributor=None):
@@ skipping 18 matching lines @@
         results.append(
           loader._invoke_with_properties(
             run_recipe, properties, recipe_script.PROPERTIES,
             properties.keys()))
       except TypeError as e:
         raise TypeError(
             "Got %r while trying to call recipe %s with properties %r" % (
               e, recipe, properties))
 
     return results