Add support for build category in BuildEvent

infra_libs/event_mon/monitoring.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.
 
 import logging
 
 from google.protobuf.message import DecodeError
 from infra_libs.event_mon.protos.chrome_infra_log_pb2 import (
   ChromeInfraEvent, ServiceEvent, BuildEvent)
 from infra_libs.event_mon.protos.goma_stats_pb2 import GomaStats
@@ skipping 254 matching lines @@
                     step_number=None,
                     result=None,
                     extra_result_code=None,
                     timestamp_kind=None,
                     event_timestamp=None,
                     service_name=None,
                     goma_stats=None,
                     goma_error=None,
                     goma_crash_report_id=None,
                     patch_url=None,
-                    bbucket_id=None):
+                    bbucket_id=None,
+                    category=None):
   """Compute a ChromeInfraEvent filled with a BuildEvent.
 
   Arguments are identical to those in send_build_event(), please refer
   to this docstring.
 
   Returns:
     event (log_request_lite_pb2.LogRequestLite.LogEventLite): can be None
       if there is a major processing issue.
   """
   if event_type not in BUILD_EVENT_TYPES:
@@ skipping 52 matching lines @@
   if step_number is not None:
     event.build_event.step_number = step_number
   if patch_url is not None:
     event.build_event.patch_url = patch_url
   if bbucket_id is not None:
     try:
       event.build_event.bbucket_id = int(bbucket_id)
     except (ValueError, TypeError):
       pass
 
+  if category:

[Sergey Berezin (google), 2016/06/30 02:07:53]

nit: as an option, you can write this as:

  category_map = {
    'cq': BuildEvent.CATEGORY_CQ,
    'cq_experimental': BuildEvent.CATEGORY_CQ_EXPERIMENTAL,
    'git_cl_try': BuildEvent.CATEGORY_GIT_CL_TRY,
  }
  if category:
    event.build_event.category = category_map.get(category.lower(),
BuildEvent.CATEGORY_UNKNOWN)

[Sergiy Byelozyorov, 2016/07/06 08:55:30]

Thanks. I've made it even shorter.

+    if category.lower() == 'cq':
+      event.build_event.category = BuildEvent.CATEGORY_CQ
+    elif category.lower() == 'cq_experimental':
+      event.build_event.category = BuildEvent.CATEGORY_CQ_EXPERIMENTAL
+    elif category.lower() == 'git_cl_try':
+      event.build_event.category = BuildEvent.CATEGORY_GIT_CL_TRY
+    else:
+      event.build_event.category = BuildEvent.CATEGORY_UNKNOWN
+
   if event.build_event.step_name:
     if event_type != 'STEP':
       logging.error('step_name should be provided only for type "STEP", '
                     'got %s', event_type)
     if not event.build_event.HasField('step_number'):
       logging.error('step_number was not provided, but got a value for '
                     'step_name (%s). Provide either both or none',
                     step_name)
     if (not event.build_event.HasField('build_number')
         and not event.build_event.HasField('build_scheduling_time_ms')):
@@ skipping 74 matching lines @@
                      step_text=None,
                      step_number=None,
                      result=None,
                      extra_result_code=None,
                      timestamp_kind=None,
                      event_timestamp=None,
                      goma_stats=None,
                      goma_error=None,
                      goma_crash_report_id=None,
                      patch_url=None,
-                     bbucket_id=None):
+                     bbucket_id=None,
+                     category=None):
   """Send a ChromeInfraEvent filled with a BuildEvent
 
   Args:
     event_type (string): any name of enum BuildEvent.BuildEventType.
       (listed in infra_libs.event_mon.monitoring.BUILD_EVENT_TYPES)
     hostname (string): fqdn of the machine that is running the build / step.
       aka the bot name.
     build_name (string): name of the builder.
 
   Keyword args:
     build_number (int): as the name says.
     build_scheduling_time (int): timestamp telling when the build was
       scheduled. This is required when build_number is provided to make it
       possibly to distinguish two builds with the same build number.
     step_name (str): name of the step.
     step_text (str): text of the step.
     step_number (int): rank of the step in the build. This is mandatory
       if step_name is provided, because step_name is not enough to tell the
       order.
     result (string): any name of enum BuildEvent.BuildResult.
       (listed in infra_libs.event_mon.monitoring.BUILD_RESULTS)
     extra_result_code (string or list of): arbitrary strings intended to provide
       more fine-grained information about the result.
     goma_stats (goma_stats_pb2.GomaStats): statistics output by the Goma proxy.
     goma_error (string): goma error type defined as GomaErrorType.
     goma_crash_report_id (string): id of goma crash report.
     patch_url (string): URL of the patch that triggered build
     bbucket_id (long): Buildbucket ID of the build.
+    category (string): Build category, e.g. cq or git_cl_try.
 
   Returns:
     success (bool): False if some error happened.
   """
   return get_build_event(event_type,
                          hostname,
                          build_name,
                          build_number=build_number,
                          build_scheduling_time=build_scheduling_time,
                          step_name=step_name,
                          step_text=step_text,
                          step_number=step_number,
                          result=result,
                          extra_result_code=extra_result_code,
                          timestamp_kind=timestamp_kind,
                          event_timestamp=event_timestamp,
                          goma_stats=goma_stats,
                          goma_error=goma_error,
                          goma_crash_report_id=goma_crash_report_id,
                          patch_url=patch_url,
-                         bbucket_id=bbucket_id).send()
+                         bbucket_id=bbucket_id,
+                         category=category).send()
 
 
 def send_events(events):
   """Send several events at once to the endpoint.
 
   Args:
     events (iterable of Event): events to send
 
   Return:
     success (bool): True if data was successfully received by the endpoint.
   """
   return config._router.push_event(tuple(e.log_event() for e in events))