Logdog for logcats

build/android/test_wrapper/logdog_wrapper.py

Index: build/android/test_wrapper/logdog_wrapper.py
diff --git a/build/android/test_wrapper/logdog_wrapper.py b/build/android/test_wrapper/logdog_wrapper.py
new file mode 100755
index 0000000000000000000000000000000000000000..f16ba799162c7f262fe7e5157f53ed8444f61c50
--- /dev/null
+++ b/build/android/test_wrapper/logdog_wrapper.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Wrapper for adding logdog streaming support to swarming tasks."""
+
+import argparse
+import logging
+import os
+import subprocess
+import sys
+import urllib
+
+
+def CommandParser():
+  # Parses the command line arguments being passed in
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--logdog-bin-cmd', required=True,
+                      help='Command for running logdog butler binary')
+  parser.add_argument('--project', required=True,
+                      help='Name of logdog project')
+  parser.add_argument('--logdog-server',
+                      default='services-dot-luci-logdog.appspot.com',
+                      help='URL of logdog server, https:// is assumed.')
+  parser.add_argument('--service-account-json', required=True,
+                      help='Location of authentication json')
+  parser.add_argument('--prefix', required=True,
+                      help='Prefix to be used for logdog stream')
+  parser.add_argument('--source', required=True,
+                      help='Location of file for logdog to stream')
+  parser.add_argument('--name', required=True,
+                      help='Name to be used for logdog stream')
+  return parser
+
+
+def CreateUrl(server, project, prefix, name):
+  stream_name = '%s/%s/+/%s' % (project, prefix, name)
+  return 'https://%s/v/?s=%s' % (server, urllib.quote_plus(stream_name))
+
+
+def main():
+  parser = CommandParser()
+  args, test_cmd = parser.parse_known_args(sys.argv[1:])
+  if not test_cmd:
+    parser.error('Must specify command to run after the logdog flags')
+  result = subprocess.call(test_cmd)
+  if '${SWARMING_TASK_ID}' in args.prefix:
+    args.prefix = args.prefix.replace('${SWARMING_TASK_ID}',
+                                      os.environ.get('SWARMING_TASK_ID'))
+  url = CreateUrl('luci-logdog.appspot.com', args.project, args.prefix,
+                  args.name)
+  logging.basicConfig(level=logging.INFO)

[jbudorick, 2016/08/10 16:47:04]

nit: Do this immediately after argument parsing.

+  logging.info('Logcats are located at: %s', url)
+  logdog_cmd = [args.logdog_bin_cmd, '-project', args.project,
+                '-output', 'logdog,host=%s' % args.logdog_server,
+                '-prefix', args.prefix,
+                '-service-account-json', args.service_account_json,
+                'stream', '-source', args.source,
+                '-stream', '-name=%s' % args.name]
+  subprocess.call(logdog_cmd)
+  return result
+
+
+if __name__ == '__main__':
+  sys.exit(main())