[COST-4801] Add a tracing id to the delayed summary tasks. (#4998)

Author: myersCody

koku/api/settings/tags/mapping/view.py

@@ -150,6 +150,8 @@ def put(self, request: Request):
         parents_uuid = request.data.get("ids", [])
         if not TagMapping.objects.filter(parent__uuid__in=parents_uuid).exists():
             return Response({"detail": "Invalid parents UUIDs."}, status=status.HTTP_400_BAD_REQUEST)
+        # We should resummarize based on the child uuids since they were the ones replaced.
+        child_uuids = list(TagMapping.objects.filter(parent__in=parents_uuid).values_list("child", flat=True))
         TagMapping.objects.filter(parent__in=parents_uuid).delete()
-        resummarize_current_month_by_tag_keys(parents_uuid, request.user.customer.schema_name)
+        resummarize_current_month_by_tag_keys(child_uuids, request.user.customer.schema_name)
         return Response(status=status.HTTP_204_NO_CONTENT)

koku/reporting_common/models.py

@@ -4,6 +4,7 @@
 #
 """Models for shared reporting tables."""
 import logging
+from uuid import uuid4
 
 from django.conf import settings
 from django.db import models
@@ -190,6 +191,9 @@ def create_or_reset_timeout(
             existing_task.save()
             return existing_task
 
+        if not task_kwargs.get("tracing_id"):
+            task_kwargs["tracing_id"] = str(uuid4())
+
         new_task = cls(
             task_name=task_name,
             task_args=task_args,
@@ -205,14 +209,16 @@ def create_or_reset_timeout(
 @receiver(pre_delete, sender=DelayedCeleryTasks)
 def trigger_celery_task(sender, instance, **kwargs):
     """Triggers celery task prior to removing the rows from the table."""
+    tracing_id = instance.task_kwargs.get("tracing_id")
     result = celery_app.send_task(
         instance.task_name, args=instance.task_args, kwargs=instance.task_kwargs, queue=instance.queue_name
     )
-    log_msg = "Delay period ended, starting task."
+    log_msg = "delay period ended starting task"
     log_context = {
         "task_name": instance.task_name,
         "task_args": instance.task_args,
         "task_kwargs": instance.task_kwargs,
         "queue_name": instance.queue_name,
+        "result_id": result.id,
     }
-    LOG.info(log_json(tracing_id=result.id, msg=log_msg, context=log_context))
+    LOG.info(log_json(tracing_id=tracing_id, msg=log_msg, context=log_context))

koku/reporting_common/test_reporting_common.py

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 """Test Reporting Common."""
+from unittest.mock import MagicMock
 from unittest.mock import patch
 
 from django.utils import timezone
@@ -19,6 +20,7 @@
 from reporting_common.models import CostUsageReportManifest
 from reporting_common.models import CostUsageReportStatus
 from reporting_common.models import DelayedCeleryTasks
+from reporting_common.models import trigger_celery_task
 
 
 class TestCostUsageReportStatus(MasuTestCase):
@@ -156,3 +158,35 @@ def test_large_customer(self, mock_large_customer):
         with schema_context(self.schema):
             db_entry = DelayedCeleryTasks.objects.get(provider_uuid=self.aws_provider.uuid)
             self.assertEqual(db_entry.queue_name, UPDATE_SUMMARY_TABLES_QUEUE_XL)
+
+    @patch("reporting_common.models.celery_app")
+    def test_trigger_celery_task(self, mock_celery_app):
+        # Building Mocks
+        result = MagicMock()
+        result.id = "mocked_result_id"
+        mock_celery_app.send_task.return_value = result
+        # Building Test data
+        expected_task_name = "test_task"
+        expected_args = ["arg1", "arg2"]
+        expected_task_kwargs = {"tracing_id": "123"}
+        expected_queue = "test_queue"
+        task_instance = DelayedCeleryTasks.create_or_reset_timeout(
+            task_name=expected_task_name,
+            task_args=expected_args,
+            task_kwargs=expected_task_kwargs,
+            provider_uuid=self.aws_provider_uuid,
+            queue_name=expected_queue,
+        )
+
+        with self.assertLogs("reporting_common.models", level="INFO") as cm:
+            trigger_celery_task(sender=None, instance=task_instance)
+
+        log_message = "delay period ended starting task"
+        self.assertTrue(any(log_message in log for log in cm.output))
+
+        mock_celery_app.send_task.assert_called_once_with(
+            task_instance.task_name,
+            args=task_instance.task_args,
+            kwargs=task_instance.task_kwargs,
+            queue=task_instance.queue_name,
+        )