Emit CURRENT_TIMESTAMP annotation

recipes.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """Tool to interact with recipe repositories.
 
 This tool operates on the nearest ancestor directory containing an
 infra/config/recipes.cfg.
 """
@@ skipping 120 matching lines @@
   workdir = (args.workdir or
       os.path.join(os.path.dirname(os.path.realpath(__file__)), 'workdir'))
   logging.info('Using %s as work directory' % workdir)
   if not os.path.exists(workdir):
     os.makedirs(workdir)
 
   old_cwd = os.getcwd()
   os.chdir(workdir)
   stream_engine = stream.ProductStreamEngine(
       stream.StreamEngineInvariants(),
-      stream.AnnotatorStreamEngine(sys.stdout))
+      stream.AnnotatorStreamEngine(sys.stdout, emit_timestamps=args.timestamps))
+  with stream_engine:
+    try:
+      ret = recipe_run.run_steps(
+          properties, stream_engine,
+          step_runner.SubprocessStepRunner(stream_engine),
+          universe=universe)
+    finally:
+      os.chdir(old_cwd)
 
-  try:
-    ret = recipe_run.run_steps(
-        properties, stream_engine,
-        step_runner.SubprocessStepRunner(stream_engine),
-        universe=universe)
-
-  finally:
-    os.chdir(old_cwd)
-
-  return handle_recipe_return(ret, args.output_result_json, stream_engine)
+    return handle_recipe_return(ret, args.output_result_json, stream_engine)
 
 
 def remote_run(args):
   from recipe_engine import remote_run
 
   return remote_run.main(args)
 
 
 def autoroll(args):
   from recipe_engine import autoroll
@@ skipping 125 matching lines @@
       '--workdir',
       help='The working directory of recipe execution')
   run_p.add_argument(
       '--output-result-json',
       help='The file to write the JSON serialized returned value \
             of the recipe to')
   run_p.add_argument(
       'recipe',
       help='The recipe to execute')
   run_p.add_argument(
-      'props', nargs=argparse.REMAINDER,
+      'props',
+      nargs=argparse.REMAINDER,
       help='A list of property pairs; e.g. mastername=chromium.linux '
            'issue=12345')
+  run_p.add_argument(
+      '--timestamps',
+      action='store_true',
+      help='If true, emit CURRENT_TIMESTAMP annotations. '
+           'Default: false. '
+           'CURRENT_TIMESTAMP annotation has one parameter, current time in '
+           'Unix timestamp format. '
+           'CURRENT_TIMESTAMP annotation will be printed at the beginning and '
+           'end of the annotation stream and also immediately before each '
+           'STEP_START and STEP_END annotations.',
+  )
 
   remote_run_p = subp.add_parser(
       'remote_run',
       description='Run a recipe from specified repo and revision')
   remote_run_p.set_defaults(command='remote_run')
   remote_run_p.add_argument(
       '--repository', required=True,
       help='URL of a git repository to fetch')
   remote_run_p.add_argument(
       '--revision',
@@ skipping 121 matching lines @@
   ret = main()
   if not isinstance(ret, int):
     if ret is None:
       ret = 0
     else:
       print >> sys.stderr, ret
       ret = 1
   sys.stdout.flush()
   sys.stderr.flush()
   os._exit(ret)