Add args to LOG_RECEIVED (fixes celery#6885) (celery#6898)

* Add args and kwargs to LOG_RECEIVED and LOG_SUCCESS

* Add kwargs and args to test

celery/app/trace.py

@@ -527,6 +527,8 @@ def trace_task(uuid, args, kwargs, request=None):
                                 'name': get_task_name(task_request, name),
                                 'return_value': Rstr,
                                 'runtime': T,
+                                'args': safe_repr(args),
+                                'kwargs': safe_repr(kwargs),
                             })
 
                 # -* POST *-

celery/worker/strategy.py

@@ -2,6 +2,7 @@
 import logging
 
 from kombu.asynchronous.timer import to_timestamp
+from kombu.utils.encoding import safe_repr
 
 from celery import signals
 from celery.app import trace as _app_trace
@@ -151,7 +152,12 @@ def task_message_handler(message, body, ack, reject, callbacks,
         if _does_info:
             # Similar to `app.trace.info()`, we pass the formatting args as the
             # `extra` kwarg for custom log handlers
-            context = {'id': req.id, 'name': req.name}
+            context = {
+                'id': req.id,
+                'name': req.name,
+                'args': safe_repr(req.args),
+                'kwargs': safe_repr(req.kwargs),
+            }
             info(_app_trace.LOG_RECEIVED, context, extra={'data': context})
         if (req.expires or req.id in revoked_tasks) and req.revoked():
             return

t/unit/worker/test_strategy.py

@@ -191,7 +191,7 @@ def test_log_task_received_custom(self, caplog):
             C()
         for record in caplog.records:
             if record.msg == custom_fmt:
-                assert set(record.args) == {"id", "name"}
+                assert set(record.args) == {"id", "name", "kwargs", "args"}
                 break
         else:
             raise ValueError("Expected message not in captured log records")