Revert "Avoid to use environment."

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 251 matching lines @@
 
 
 def GetCompilerProxyStartTime():
   """Returns datetime instance of the latest compiler_proxy start time."""
   with open(GetLatestGomaCompilerProxyInfo()) as f:
     matched = TIMESTAMP_PATTERN.search(f.readline())
     if matched:
       return datetime.datetime.strptime(matched.group(1), TIMESTAMP_FORMAT)
 
 
-def SendGomaTsMon(json_file, exit_status,
-                  builder='unknown', master='unknown', slave='unknown',
-                  clobber=''):
+def SendGomaTsMon(json_file, exit_status):
   """Send latest Goma status to ts_mon.
 
   Args:
     json_file: json filename string that has goma_ctl.py jsonstatus.
     exit_status: integer exit status of the build.
   """
   json_statuses = {}
   try:
     with open(json_file) as f:
       json_statuses = json.load(f)
@@ skipping 21 matching lines @@
           infra_status['ping_status_code'] != 200 or
           infra_status.get('num_user_error', 0) > 0):
         result = 'exception'
 
     num_failure = 0
     ping_status_code = 0
     if infra_status:
       num_failure = infra_status['num_exec_compiler_proxy_failure']
       ping_status_code = infra_status['ping_status_code']
 
+    clobber = 0
+    if os.environ.get('BUILDBOT_CLOBBER'):
+      clobber = 1
+
     counter = {
         'name': 'goma/failure',
         'value': num_failure,
-        'builder': builder,
-        'master': master,
-        'slave': slave,
-        'clobber': 1 if clobber else 0,
+        'builder': os.environ.get('BUILDBOT_BUILDERNAME', 'unknown'),
+        'master': os.environ.get('BUILDBOT_MASTERNAME', 'unknown'),
+        'slave': os.environ.get('BUILDBOT_SLAVENAME', 'unknown'),
+        'clobber': clobber,
         'os': chromium_utils.PlatformName(),
         'ping_status_code': ping_status_code,
         'result': result}
     start_time = GetCompilerProxyStartTime()
     if start_time:
       counter['start_time'] = int(time.mktime(start_time.timetuple()))
     run_cmd = PLATFORM_RUN_CMD.get(os.name)
     if not run_cmd:
       print 'Unknown os.name: %s' % os.name
       return
@@ skipping 13 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))