Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(591)

Unified Diff: infra/services/builder_alerts/__main__.py

Issue 2186673003: Remove logging and metrics from builder alerts code (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master
Patch Set: Also remove in chromium_try_flakes Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: infra/services/builder_alerts/__main__.py
diff --git a/infra/services/builder_alerts/__main__.py b/infra/services/builder_alerts/__main__.py
index ede241cada5c7b2980816f0318a77335ac935c47..dc74a85a497f5ce4b27f5a0be4a4cb1ca3e1d982 100755
--- a/infra/services/builder_alerts/__main__.py
+++ b/infra/services/builder_alerts/__main__.py
@@ -20,7 +20,6 @@ import requests
import requests_cache
from infra_libs import logs
-from infra_libs import ts_mon
from infra.libs.service_utils import outer_loop
from infra.services.builder_alerts import alert_builder
@@ -61,7 +60,6 @@ class SubProcess(object):
self._jobs = jobs
def __call__(self, master_url):
- logging.debug('Thread for master %s has started', master_url)
try:
master_json = buildbot.fetch_master_json(master_url)
if not master_json:
@@ -89,8 +87,6 @@ class SubProcess(object):
master_url,
)
raise Exception(msg)
- finally:
- logging.debug('Thread for master %s has finished', master_url)
def query_findit(findit_api_url, alerts):
@@ -193,7 +189,6 @@ def gzipped(data):
def inner_loop(args):
- logging.debug('Starting inner loop')
old_api_endpoint = string_helpers.slash_join(args.api_endpoint_prefix,
args.old_api_path) if args.old_api_path else None
if not old_api_endpoint:
@@ -254,14 +249,11 @@ def inner_loop(args):
alerts = []
suspected_cls = []
- logging.debug('Processing all masters via process pool')
pool = multiprocessing.Pool(processes=args.processes)
master_datas = pool.map(SubProcess(cache, old_alerts, args.builder_filter,
args.jobs), master_urls)
- logging.debug('Closing all threads in master process pool')
pool.close()
pool.join()
- logging.debug('Joined all threads in master process pool')
for data in master_datas:
# TODO(ojan): We should put an alert in the JSON for this master so
@@ -352,7 +344,6 @@ def inner_loop(args):
'--crbug-service-account was not specified, can not get crbug issues')
ret = False
- logging.debug('Returning from inner loop')
return ret
@@ -369,13 +360,6 @@ def main(args):
logs.add_argparse_options(parser)
outer_loop.add_argparse_options(parser)
- ts_mon.add_argparse_options(parser)
- parser.set_defaults(
- ts_mon_target_type='task',
- ts_mon_task_service_name='builder-alerts',
- ts_mon_task_job_name='builder-alerts',
- )
-
gatekeeper_json = os.path.join(build_scripts_dir, 'slave', 'gatekeeper.json')
parser.add_argument('--gatekeeper', action='store', default=gatekeeper_json)
gatekeeper_trees_json = os.path.join(build_scripts_dir, 'slave',
@@ -401,7 +385,6 @@ def main(args):
args = parser.parse_args(args)
logs.process_argparse_options(args)
loop_args = outer_loop.process_argparse_options(args)
- ts_mon.process_argparse_options(args)
# TODO(sergiyb): Remove support for data_url when builder_alerts recipes are
# updated and using new syntax to call this script.
@@ -437,25 +420,13 @@ def main(args):
def outer_loop_iteration():
return inner_loop(args)
- logging.debug('Starting outer loop')
loop_results = outer_loop.loop(
task=outer_loop_iteration,
sleep_timeout=lambda: 5,
**loop_args)
- logging.debug('Finished outer loop')
- logging.debug('Flushing ts_mon starting')
- ts_mon.flush()
- logging.debug('Flushing ts_mon completed')
return 0 if loop_results.success else 1
if __name__ == '__main__':
- logging.debug('Started main')
- retcode = main(sys.argv[1:])
- current_thread_descriptions = [t.name + (' (daemon)' if t.isDaemon() else '')
- for t in threading.enumerate()
- if t is not threading.current_thread()]
- logging.debug(
- 'Leaving main. Threads: %s', ', '.join(current_thread_descriptions))
- sys.exit(retcode)
+ sys.exit(main(sys.argv[1:]))
« no previous file with comments | « appengine/chromium_try_flakes/issue_tracker/issue_tracker_api.py ('k') | infra/services/builder_alerts/alert_builder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698