OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import argparse | 5 import argparse |
6 import glob | 6 import glob |
7 import json | 7 import json |
8 import logging | 8 import logging |
9 import os | 9 import os |
10 import sys | 10 import sys |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 'been provided or not.') | 104 'been provided or not.') |
105 | 105 |
106 build_group.add_argument('--build-event-extra-result-code', | 106 build_group.add_argument('--build-event-extra-result-code', |
107 help='Extra result code. String, comma-separated ' | 107 help='Extra result code. String, comma-separated ' |
108 'list of strings or json-encoded list of string. ' | 108 'list of strings or json-encoded list of string. ' |
109 'Each one must be less than 20 characters long.') | 109 'Each one must be less than 20 characters long.') |
110 build_group.add_argument('--build-event-patch-url', | 110 build_group.add_argument('--build-event-patch-url', |
111 help='URL of the patchset that triggered build') | 111 help='URL of the patchset that triggered build') |
112 build_group.add_argument('--build-event-bbucket-id', | 112 build_group.add_argument('--build-event-bbucket-id', |
113 help='Buildbucket ID for this build') | 113 help='Buildbucket ID for this build') |
| 114 build_group.add_argument('--build-event-category', |
| 115 help='Build category, e.g. cq or git_cl_try') |
| 116 |
114 build_group.add_argument('--build-event-goma-stats-path', | 117 build_group.add_argument('--build-event-goma-stats-path', |
115 metavar='FILENAME', | 118 metavar='FILENAME', |
116 help='File containing a serialized GomaStats ' | 119 help='File containing a serialized GomaStats ' |
117 'protobuf.') | 120 'protobuf.') |
118 build_group.add_argument('--build-event-goma-error', | 121 build_group.add_argument('--build-event-goma-error', |
119 choices=event_mon.GOMA_ERROR_TYPES, | 122 choices=event_mon.GOMA_ERROR_TYPES, |
120 help='Reason for no GomaStats protobuf.') | 123 help='Reason for no GomaStats protobuf.') |
121 build_group.add_argument('--build-event-goma-crash-report-id-path', | 124 build_group.add_argument('--build-event-goma-crash-report-id-path', |
122 metavar='FILENAME', | 125 metavar='FILENAME', |
123 help='File containing a crash report id.') | 126 help='File containing a crash report id.') |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 args.build_event_build_name, | 297 args.build_event_build_name, |
295 build_number=args.build_event_build_number, | 298 build_number=args.build_event_build_number, |
296 build_scheduling_time=args.build_event_build_scheduling_time, | 299 build_scheduling_time=args.build_event_build_scheduling_time, |
297 step_name=args.build_event_step_name, | 300 step_name=args.build_event_step_name, |
298 step_text=args.build_event_step_text, | 301 step_text=args.build_event_step_text, |
299 step_number=args.build_event_step_number, | 302 step_number=args.build_event_step_number, |
300 result=args.build_event_result, | 303 result=args.build_event_result, |
301 extra_result_code=args.build_event_extra_result_code, | 304 extra_result_code=args.build_event_extra_result_code, |
302 patch_url=args.build_event_patch_url, | 305 patch_url=args.build_event_patch_url, |
303 bbucket_id=args.build_event_bbucket_id, | 306 bbucket_id=args.build_event_bbucket_id, |
| 307 category=args.build_event_category, |
304 timestamp_kind=args.event_mon_timestamp_kind, | 308 timestamp_kind=args.event_mon_timestamp_kind, |
305 event_timestamp=args.event_mon_event_timestamp, | 309 event_timestamp=args.event_mon_event_timestamp, |
306 goma_stats=goma_stats, | 310 goma_stats=goma_stats, |
307 goma_error=args.build_event_goma_error, | 311 goma_error=args.build_event_goma_error, |
308 goma_crash_report_id=goma_crash_report_id)) | 312 goma_crash_report_id=goma_crash_report_id)) |
309 | 313 |
310 | 314 |
311 def send_events_from_file(args): | 315 def send_events_from_file(args): |
312 """Entry point when --events-from-file is passed.""" | 316 """Entry point when --events-from-file is passed.""" |
313 file_list = get_event_file_list(args.events_from_file) | 317 file_list = get_event_file_list(args.events_from_file) |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 build_scheduling_time=args.get('build-event-build-scheduling-time'), | 386 build_scheduling_time=args.get('build-event-build-scheduling-time'), |
383 step_name=args.get('build-event-step-name'), | 387 step_name=args.get('build-event-step-name'), |
384 step_text=args.get('build-event-step-text'), | 388 step_text=args.get('build-event-step-text'), |
385 step_number=args.get('build-event-step-number'), | 389 step_number=args.get('build-event-step-number'), |
386 result=args.get('build-event-result'), | 390 result=args.get('build-event-result'), |
387 extra_result_code=args.get('build-event-extra-result-code'), | 391 extra_result_code=args.get('build-event-extra-result-code'), |
388 timestamp_kind=args.get('event-mon-timestamp-kind'), | 392 timestamp_kind=args.get('event-mon-timestamp-kind'), |
389 event_timestamp=args.get('event-mon-event-timestamp'), | 393 event_timestamp=args.get('event-mon-event-timestamp'), |
390 service_name=args.get('event-mon-service-name'), | 394 service_name=args.get('event-mon-service-name'), |
391 patch_url=args.get('build-event-patch-url'), | 395 patch_url=args.get('build-event-patch-url'), |
392 bbucket_id=args.get('build-event-bbucket-id'))) | 396 bbucket_id=args.get('build-event-bbucket-id'), |
| 397 category=args.get('build-event-category'))) |
393 else: | 398 else: |
394 LOGGER.warning('build-event-type field not found, skipping line ' | 399 LOGGER.warning('build-event-type field not found, skipping line ' |
395 '%d in %s', lineno, filename) | 400 '%d in %s', lineno, filename) |
396 return events | 401 return events |
OLD | NEW |