status_logger: record step data

scripts/master/status_logger.py

 # Copyright 2014 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.
 
 """Log status events to a file on disk or event collection endpoint."""
 
 
 import json
 import logging
 import logging.handlers
@@ skipping 168 matching lines @@
         self._configure({'file_logging': False,
                          'event_logging': False,
                          'ts_mon_logging': False})  # Reset to defaults.
 
       self._last_checked_active = now
     return self._active
 
 
   def send_build_result(
       self, scheduled, started, finished, builder_name, bot_name, result,
-      project_id=None, subproject_tag=None):
+      project_id=None, subproject_tag=None, steps=None):
     """Log a build result for ts_mon.
 
     This allows computing metrics for builds in mastermon.
     """
     d = {
         'timestamp_ms': finished * 1000,
         'builder': builder_name,
         'slave': bot_name,
         'result': result.lower(),
         'duration_s': finished - started,
         'pending_s': started - scheduled,
         'total_s': finished - scheduled,
     }
     if project_id:
       d['project_id'] = project_id
     if subproject_tag:
       d['subproject_tag'] = subproject_tag
+    if steps:
+      d['steps'] = steps

[Adrian Kuegel, 2015/12/08 11:36:08]

I am wondering if this will work. I haven't seen another example where a
dictionary was used as a value and how it will be processed when writing a graph
query.

     self.ts_mon_logger.info(json.dumps(d))
 
   def send_build_event(self, timestamp_kind, timestamp, build_event_type,
                        bot_name, builder_name, build_number, build_scheduled_ts,
                        step_name=None, step_number=None, result=None,
                        extra_result_code=None):
     """Log a build/step event for event_mon."""
 
     if self.active and self._event_logging:
       # List options to pass to send_monitoring_event, without the --, to save
@@ skipping 268 matching lines @@
       scheduled = source_stamp.changes[0].when
 
     properties = build.getProperties()
     extra_result_code = properties.getProperty('extra_result_code')
     self.send_build_event(
         'END', finished * 1000, 'BUILD', bot, builderName, build_number,
         self._get_requested_at_millis(build),
         result=buildbot.status.results.Results[results],
         extra_result_code=extra_result_code)
 
+    steps_to_send = []
+    for step in build.getSteps():
+      step_started, step_finished = step.getTimes()
+      steps_to_send.append({
+        'step_name': step.getName(),
+        'duration_s': step_finished - step_started,
+        'result': buildbot.status.results.Results[step.getResults()[0]],
+      })
+
     # If property doesn't exist, this function returns None.
     # Note: this is not true for build.getProperty(), it raises KeyError.
     project_id = properties.getProperty('patch_project')
     subproject_tag = properties.getProperty('subproject_tag')
     self.send_build_result(
         scheduled, started, finished, builderName, bot,
         buildbot.status.results.Results[results],
-        project_id, subproject_tag)
+        project_id, subproject_tag, steps=steps_to_send)
 
   def builderRemoved(self, builderName):
     self.log('builderRemoved', '%s', builderName)
 
   def slaveConnected(self, slaveName):
     self.log('slaveConnected', '%s', slaveName)
 
   def slaveDisconnected(self, slaveName):
     self.log('slaveDisconnected', '%s', slaveName)