Log task ID correctly. (#4389)

Author: jonathanmetzman

src/clusterfuzz/_internal/metrics/logs.py

@@ -199,7 +199,10 @@ def format_record(record: logging.LogRecord) -> str:
           os.getenv('TASK_PAYLOAD'),
       'name':
           record.name,
-      'pid': os.getpid(),
+      'pid':
+          os.getpid(),
+      'task_id':
+          os.getenv('CF_TASK_ID', 'null'),
   }
 
   initial_payload = os.getenv('INITIAL_TASK_PAYLOAD')
@@ -404,8 +407,6 @@ def cloud_label_filter(record):
             json.dumps(
                 getattr(record, 'location', {'Error': True}),
                 default=_handle_unserializable),
-        'task_id':
-            os.getenv('CF_TASK_ID', 'null'),
     })
     return True
 

src/clusterfuzz/_internal/tests/core/metrics/logs_test.py

@@ -136,11 +136,11 @@ class FormatRecordTest(unittest.TestCase):
   """Test format_record."""
 
   def setUp(self):
-    helpers.patch(self,
-                  ['clusterfuzz._internal.metrics.logs.update_entry_with_exc',
-                   'os.getpid'])
+    helpers.patch(self, [
+        'clusterfuzz._internal.metrics.logs.update_entry_with_exc', 'os.getpid'
+    ])
     helpers.patch_environ(self)
-
+    os.environ['CF_TASK_ID'] = 'job-1337'
     self.maxDiff = None
     self.mock.getpid.return_value = 1337
 
@@ -176,6 +176,7 @@ def test_format_record(self):
         'fuzz_target': 'fuzz_target1',
         'name': 'logger_name',
         'pid': 1337,
+        'task_id': 'job-1337',
         'extras': {
             'a': 1,
         },
@@ -200,6 +201,7 @@ def test_no_extras(self):
         'bot_name': 'linux-bot',
         'task_payload': 'fuzz fuzzer1 job1',
         'name': 'logger_name',
+        'task_id': 'job-1337',
         'pid': 1337,
         'location': {
             'path': 'path',
@@ -224,6 +226,7 @@ def test_worker_bot_name(self):
         'worker_bot_name': 'worker',
         'task_payload': 'fuzz fuzzer1 job1',
         'name': 'logger_name',
+        'task_id': 'job-1337',
         'pid': 1337,
         'location': {
             'path': 'path',