Add buildbot metadata to compiler_proxy log

scripts/slave/goma_utils.py

 # Copyright (c) 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.
 
 """Functions specific to handle goma related info.
 """
 
 import base64
 import datetime
 import getpass
@@ skipping 97 matching lines @@
     slave_utils.GSUtilCopy(temp.name, gs_path, override_gsutil=override_gsutil)
     print "Copied log file to %s" % gs_path
   finally:
     os.remove(temp.name)
   return log_path
 
 
 def UploadGomaCompilerProxyInfo(override_gsutil=None):
   """Upload goma compiler_proxy.INFO to Google Storage."""
   latest_subproc_info = GetLatestGomaCompilerProxySubprocInfo()
+
+  clobber = 0
+  if os.environ.get('BUILDBOT_CLOBBER'):
+    clobber = 1
+  metadata = {
+    'master': os.environ.get('BUILDBOT_MASTERNAME', 'unknown'),
+    'slave': os.environ.get('BUILDBOT_SLAVENAME', 'unknown'),
+    'builder': os.environ.get('BUILDBOT_BUILDERNAME', 'unknown'),
+    'clobber': clobber
+    'os': chromium_utils.PlatformName(),
+    'env': {},

[tikuta, 2016/09/01 09:12:54]

Why don't you use os.environ.clone()?

[shinyak, 2016/09/01 09:25:38]

There is no method clone() in os.environ.
json.dumps(os.environ) also does not work. It's not JSON serializable.
Actually os.environ is not Dict.

+  }

[ukai, 2016/09/02 05:06:31]

sucproc info name?

+  for k, v in os.environ.iteritems():
+    metadata['env'][k] = v
+
+  text_to_append = '# end of compiler proxy log\n' + json.dumps(metadata)
+
   if latest_subproc_info:
     UploadToGomaLogGS(latest_subproc_info,
                       os.path.basename(latest_subproc_info),
                       override_gsutil=override_gsutil)
   else:
     print 'No compiler_proxy-subproc.INFO to upload'
   latest_info = GetLatestGomaCompilerProxyInfo()
   if not latest_info:
     print 'No compiler_proxy.INFO to upload'
     return
   # Since a filename of compiler_proxy.INFO is fairly unique,
   # we might be able to upload it as-is.
   log_path = UploadToGomaLogGS(
       latest_info, os.path.basename(latest_info),
+      text_to_append=text_to_append,
       override_gsutil=override_gsutil)
   viewer_url = ('http://chromium-build-stats.appspot.com/compiler_proxy_log/'
                 + log_path)
   print 'Visualization at %s' % viewer_url
 
 
 def UploadNinjaLog(
     outdir, compiler, command, exit_status, override_gsutil=None):
   """Upload .ninja_log to Google Cloud Storage (gs://chrome-goma-log),
   in the same folder with goma's compiler_proxy.INFO.
@@ skipping 206 matching lines @@
     retcode = chromium_utils.RunCommand(
       cmd, filter_obj=cmd_filter,
       max_time=30)
     if retcode:
       print('Execution of send_ts_mon_values failed with code %s'
             % retcode)
       print '\n'.join(cmd_filter.text)
 
   except Exception as ex:
     print('error while sending ts mon json_file=%s: %s' % (json_file, ex))