Add task group to metrics

tasks/base.py

@@ -1,5 +1,6 @@
 import logging
 from datetime import datetime
+from typing import Optional
 
 from celery.exceptions import SoftTimeLimitExceeded
 from celery.worker.request import Request
@@ -35,16 +36,22 @@
 )
 
 
+def _get_task_group_from_name(task_name: Optional[str]) -> Optional[str]:
+    if task_name is None or ("." not in task_name):
+        return None
+    # We checked that '.' is part of task_name
+    # So there will be at least 2 items in the array
+    return task_name.split(".")[-2]
+
+
 class BaseCodecovRequest(Request):
     @property
     def metrics_prefix(self):
         return f"worker.task.{self.name}"
 
     def on_timeout(self, soft: bool, timeout: int):
         res = super().on_timeout(soft, timeout)
-        task_group = (
-            self.name.split(".")[-2] if self.name is not None else "unknown_group"
-        )
+        task_group = _get_task_group_from_name(self.name)
         if not soft:
             REQUEST_HARD_TIMEOUT_COUNTER.labels(
                 task=self.name, task_group=task_group
@@ -126,7 +133,7 @@ class BaseCodecovTask(celery_app.Task):
     def __init_subclass__(cls, name="unknown_task"):
         cls.name = name
         # All task names follow the format `app.[cron|task].<task_group>.<task>`
-        task_group = name.split(".")[-2] if name != "unknown_task" else "unknown_group"
+        task_group = _get_task_group_from_name(name)
         cls.task_group = task_group
 
         cls.metrics_prefix = f"worker.task.{name}"

tasks/tests/unit/test_base.py

@@ -20,12 +20,27 @@
 )
 
 from database.tests.factories.core import OwnerFactory, RepositoryFactory
-from tasks.base import BaseCodecovRequest, BaseCodecovTask
+from tasks.base import BaseCodecovRequest, BaseCodecovTask, _get_task_group_from_name
 from tasks.base import celery_app as base_celery_app
 
 here = Path(__file__)
 
 
+@pytest.mark.parametrize(
+    "task_name,output",
+    [
+        (None, None),
+        ("task_not_following_expected_pattern", None),
+        ("task_group.task_name", "task_group"),
+        ("app.task.task_group.task_name", "task_group"),
+        ("app.cron.daily.task_name", "daily"),
+        (f"app.tasks.test_results.TestResultsProcessor", "test_results"),
+    ],
+)
+def test__get_task_group_from_name(task_name, output):
+    assert _get_task_group_from_name(task_name) == output
+
+
 class MockDateTime(datetime):
     """
     `@pytest.mark.freeze_time()` is convenient but will freeze time for
@@ -422,7 +437,6 @@ def test_sample_task_retry(self, celery_app, mocker):
 
 
 class TestBaseCodecovRequest(object):
-
     """
     All in all, this is a really weird class