Push more upload arguments logic from perf_test_runner -> devtools.

mojo/devtools/common/devtoolslib/perf_dashboard.py

 # Copyright 2015 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.
 
 # Disable the line-too-long warning.
 # pylint: disable=C0301
 """This module implements the Chromium Performance Dashboard JSON v1.0 data
 format.
 
 See http://www.chromium.org/developers/speed-infra/performance-dashboard/sending-data-to-the-performance-dashboard.
 """
 
 from collections import defaultdict
 import httplib
 import json
 import pprint
+import subprocess
 import urllib
 import urllib2
 
 
 _LOCAL_SERVER = "http://127.0.0.1:8080"
 
 
 class ChartDataRecorder(object):
   """Allows one to record measurement values one by one and then generate the
   JSON string that represents them in the 'chart_data' format expected by the
@@ skipping 56 matching lines @@
   dashboard_group.add_argument(
       '--build-number', type=int,
       help='Build number, used to construct link to buildbot log by the '
            'dashboard.')
   dashboard_group.add_argument(
       '--dry-run', action='store_true', default=False,
       help='Display the server URL and the data to upload, but do not actually '
            'upload the data.')
 
 
+def _get_commit_count():
+  """Returns the number of git commits in the repository of the cwd."""
+  return subprocess.check_output(
+      ["git", "rev-list", "HEAD", "--count"]).strip()
+
+
+def _get_current_commit():
+  """Returns the hash of the current commit in the repository of the cwd."""
+  return subprocess.check_output(["git", "rev-parse", "HEAD"]).strip()
+
+
 def upload_chart_data(master_name, bot_name, test_name, builder_name,
-                      build_number, revision, chart_data, point_id,
-                      server_url=None, dry_run=False):
+                      build_number, chart_data, server_url=None, dry_run=False):
   """Uploads the provided chart data to an instance of performance dashboard.
   See the argparse help above for description of the arguments.
 
 
   Returns:
     A boolean value indicating whether the operation succeeded or not.
   """
   class _UploadException(Exception):
     pass
 
@@ skipping 15 matching lines @@
       urllib2.urlopen(req)
     except urllib2.HTTPError as e:
       raise _UploadException("HTTPError: %d. Response: %s\n"
                              "JSON: %s\n" % (e.code, e.read(), json_data))
     except urllib2.URLError as e:
       raise _UploadException("URLError: %s for JSON %s\n" %
                              (str(e.reason), json_data))
     except httplib.HTTPException as e:
       raise _UploadException("HTTPException for JSON %s\n" % json_data)
 
+  if (not master_name or not bot_name or not test_name or not builder_name or
+      not build_number):
+    print ('Cannot upload perf data to the dashboard because not all of the '
+           'following values are specified: master-name, bot-name, test_name, '
+           'builder-name, build-number.')
+    return False
+
+  point_id = _get_commit_count()
+  cur_commit = _get_current_commit()
+
   # Wrap the |chart_data| with meta data as required by the spec.
   formatted_data = {
       "master": master_name,
       "bot": bot_name,
       "masterid": master_name,
       "buildername": builder_name,
       "buildnumber": build_number,
       "versions": {
-          "mojo": revision
+          "mojo": cur_commit,
       },
       "point_id": point_id,
       "supplemental": {},
-      "chart_data": chart_data
+      "chart_data": chart_data,
   }
 
   upload_url = server_url if server_url else _LOCAL_SERVER
 
   if dry_run:
     print "Won't upload because --dry-run is specified."
     print "Server: %s" % upload_url
     print "Data:"
     pprint.pprint(formatted_data)
   else:
     print "Uploading data to %s ..." % upload_url
     try:
       _upload(upload_url, json.dumps(formatted_data))
     except _UploadException as e:
       print e
       return False
 
     print "Done."
 
     dashboard_params = urllib.urlencode({
         "masters": master_name,
         "bots": bot_name,
         "tests": test_name,
         "rev": point_id
     })
     print "Results Dashboard: %s/report?%s" % (upload_url, dashboard_params)
 
   return True