summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Chang <jasonnc@google.com>2023-08-03 16:18:02 -0700
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-08-07 18:14:40 +0000
commitb8a7b4a629c3435d77a3266a4e6dce51dc342bd9 (patch)
treee1d54c983ad762f47f630439a1b99a4f7cbcaf8d
parent32b59565b7bd41ec1a121869823557f0b2b022d7 (diff)
downloadgit-repo-b8a7b4a629c3435d77a3266a4e6dce51dc342bd9.tar.gz
Prefix error events with RepoErrorEvent:
Prior to this change there is no way to distinguish between git sessions logs generated from repo source v.s. from git. Bug: b/294446468 Change-Id: I309f59e146c30cb08a0637e8d0b9c5d9efd5cada Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/381794 Commit-Queue: Jason Chang <jasonnc@google.com> Reviewed-by: Joanna Wang <jojwang@google.com> Tested-by: Jason Chang <jasonnc@google.com>
-rw-r--r--git_trace2_event_log.py4
-rw-r--r--tests/test_git_trace2_event_log.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/git_trace2_event_log.py b/git_trace2_event_log.py
index 46bd5e4b..5b99867b 100644
--- a/git_trace2_event_log.py
+++ b/git_trace2_event_log.py
@@ -203,8 +203,8 @@ class EventLog(object):
203 error_event = self._CreateEventDict("error") 203 error_event = self._CreateEventDict("error")
204 if fmt is None: 204 if fmt is None:
205 fmt = msg 205 fmt = msg
206 error_event["msg"] = msg 206 error_event["msg"] = f"RepoErrorEvent:{msg}"
207 error_event["fmt"] = fmt 207 error_event["fmt"] = f"RepoErrorEvent:{fmt}"
208 self._log.append(error_event) 208 self._log.append(error_event)
209 209
210 def _GetEventTargetPath(self): 210 def _GetEventTargetPath(self):
diff --git a/tests/test_git_trace2_event_log.py b/tests/test_git_trace2_event_log.py
index a6078d38..9d4f24c3 100644
--- a/tests/test_git_trace2_event_log.py
+++ b/tests/test_git_trace2_event_log.py
@@ -338,8 +338,8 @@ class EventLogTestCase(unittest.TestCase):
338 # Check for 'error' event specific fields. 338 # Check for 'error' event specific fields.
339 self.assertIn("msg", error_event) 339 self.assertIn("msg", error_event)
340 self.assertIn("fmt", error_event) 340 self.assertIn("fmt", error_event)
341 self.assertEqual(error_event["msg"], msg) 341 self.assertEqual(error_event["msg"], f"RepoErrorEvent:{msg}")
342 self.assertEqual(error_event["fmt"], fmt) 342 self.assertEqual(error_event["fmt"], f"RepoErrorEvent:{fmt}")
343 343
344 def test_write_with_filename(self): 344 def test_write_with_filename(self):
345 """Test Write() with a path to a file exits with None.""" 345 """Test Write() with a path to a file exits with None."""