Move Sentry reporting logic to utils

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/run_tasks.py b/teuthology/run_tasks.py
index e40830ca64f75e316e3e9cbd3da6144369c00e1d..1af2c682079048b765f49fce8eb73935e3d5a609 100644 (file)
--- a/teuthology/run_tasks.py
+++ b/teuthology/run_tasks.py
@@ -7,9 +7,7 @@ import time
 import types
 import yaml
 
-from copy import deepcopy
 from humanfriendly import format_timespan
-import sentry_sdk
 
 import teuthology.exporter as exporter
 
@@ -18,6 +16,7 @@ from teuthology.exceptions import ConnectionLostError
 from teuthology.job_status import set_status, get_status
 from teuthology.misc import get_http_log_path, get_results_url
 from teuthology.timer import Timer
+from teuthology.util import sentry
 
 log = logging.getLogger(__name__)
 
@@ -94,6 +93,7 @@ def run_tasks(tasks, ctx):
     else:
         timer = Timer()
     stack = []
+    taskname = ""
     try:
         for taskdict in tasks:
             try:
@@ -119,45 +119,7 @@ def run_tasks(tasks, ctx):
             ctx.summary['failure_reason'] = str(e)
         log.exception('Saw exception from tasks.')
 
-        if teuth_config.sentry_dsn:
-            sentry_sdk.init(teuth_config.sentry_dsn)
-            config = deepcopy(ctx.config)
-
-            tags = {
-                'task': taskname,
-                'owner': ctx.owner,
-            }
-            optional_tags = ('teuthology_branch', 'branch', 'suite',
-                             'machine_type', 'os_type', 'os_version')
-            for tag in optional_tags:
-                if tag in config:
-                    tags[tag] = config[tag]
-
-            # Remove ssh keys from reported config
-            if 'targets' in config:
-                targets = config['targets']
-                for host in targets.keys():
-                    targets[host] = '<redacted>'
-
-            job_id = ctx.config.get('job_id')
-            archive_path = ctx.config.get('archive_path')
-            extras = dict(config=config,
-                         )
-            if job_id:
-                extras['logs'] = get_http_log_path(archive_path, job_id)
-
-            fingerprint = e.fingerprint() if hasattr(e, 'fingerprint') else None
-            exc_id = sentry_sdk.capture_exception(
-                error=e,
-                tags=tags,
-                extras=extras,
-                fingerprint=fingerprint,
-            )
-            event_url = "{server}/?query={id}".format(
-                server=teuth_config.sentry_server.strip('/'), id=exc_id)
-            log.exception(" Sentry event: %s" % event_url)
-            ctx.summary['sentry_event'] = event_url
-
+        ctx.summary['sentry_event'] = sentry.report_error(ctx.config, e, taskname)
         if ctx.config.get('interactive-on-error'):
             ctx.config['interactive-on-error'] = False
             from teuthology.task import interactive

diff --git a/teuthology/util/sentry.py b/teuthology/util/sentry.py
new file mode 100644 (file)
index 0000000..ed76774
--- /dev/null
+++ b/teuthology/util/sentry.py
@@ -0,0 +1,52 @@
+import logging
+import sentry_sdk
+
+from copy import deepcopy
+
+from teuthology.config import config as teuth_config
+from teuthology.misc import get_http_log_path
+
+log = logging.getLogger(__name__)
+
+
+def report_error(job_config, exception, task_name=None):
+    if not teuth_config.sentry_dsn:
+        return None
+    sentry_sdk.init(teuth_config.sentry_dsn)
+    job_config = deepcopy(job_config)
+
+    tags = {
+        'task': task_name,
+        'owner': job_config.get("owner"),
+    }
+    optional_tags = ('teuthology_branch', 'branch', 'suite',
+                     'machine_type', 'os_type', 'os_version')
+    for tag in optional_tags:
+        if tag in job_config:
+            tags[tag] = job_config[tag]
+
+    # Remove ssh keys from reported config
+    if 'targets' in job_config:
+        targets = job_config['targets']
+        for host in targets.keys():
+            targets[host] = '<redacted>'
+
+    job_id = job_config.get('job_id')
+    archive_path = job_config.get('archive_path')
+    extras = dict(config=job_config)
+    if job_id:
+        extras['logs'] = get_http_log_path(archive_path, job_id)
+
+    fingerprint = exception.fingerprint() if hasattr(exception, 'fingerprint') else None
+    exc_id = sentry_sdk.capture_exception(
+        error=exception,
+        tags=tags,
+        extras=extras,
+        fingerprint=fingerprint,
+    )
+    event_url = "{server}/?query={id}".format(
+        server=teuth_config.sentry_server.strip('/'), id=exc_id)
+    log.exception(" Sentry event: %s" % event_url)
+    return event_url
+
+