commit bbe883649402d428d1996e1ef0d81e43c7a780a0
author Raman Tenneti <rtenneti@google.com> Mon Sep 27 15:15:47 2021 -0700
committer Raman Tenneti <rtenneti@google.com> Tue Sep 28 18:22:49 2021 +0000
tree 78692c87e78fc200054a8e9ba6c11c264e1b2a3d
parent 9d96f58f5fcec101c612e61c3e2526ca071d89ea

superproject: Log syncstate's parameter as data-json it it is an array.

All the values of syncstate are strings, check the first byte and last
byte to see if it is an array. For syncstate data, there were no false
positives.

Tested:
$ repo_dev sync

Verified event logged for argv is "data-json".

$./run_tests

Bug: [google internal] b/201102002
Change-Id: Id56adb532b80267f08d09147ac663cdd5987ce87
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/319075
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Raman Tenneti <rtenneti@google.com>

git_trace2_event_log.py

diff --git a/git_trace2_event_log.py b/git_trace2_event_log.py
index 0d4f23f..0e5e908 100644
--- a/git_trace2_event_log.py
+++ b/git_trace2_event_log.py
@@ -167,9 +167,9 @@
     repo_config = {k: v for k, v in config.items() if k.startswith('repo.')}
     self.LogConfigEvents(repo_config, 'def_param')
 
-  def GetDataEventName(self, key):
-    """Returns the 'data-json' if the key is argv else returns 'data'."""
-    return 'data-json' if key.endswith('sys.argv') else 'data'
+  def GetDataEventName(self, value):
+    """Returns 'data-json' if the value is an array else returns 'data'."""
+    return 'data-json' if value[0] == '[' and value[-1] == ']' else 'data'
 
   def LogDataConfigEvents(self, config, prefix):
     """Append a 'data' event for each config key/value in |config| to the current log.
@@ -182,7 +182,7 @@
       prefix: Prefix for each key that is logged.
     """
     for key, value in config.items():
-      event = self._CreateEventDict(self.GetDataEventName(key))
+      event = self._CreateEventDict(self.GetDataEventName(value))
       event['key'] = f'{prefix}/{key}'
       event['value'] = value
       self._log.append(event)

tests/test_git_trace2_event_log.py

diff --git a/tests/test_git_trace2_event_log.py b/tests/test_git_trace2_event_log.py
index 6131c7b..7bd21e2 100644
--- a/tests/test_git_trace2_event_log.py
+++ b/tests/test_git_trace2_event_log.py
@@ -267,7 +267,7 @@
       self.assertIn('value', event)
       key = event['key'].removeprefix(f'{prefix_value}/')
       value = event['value']
-      self.assertEqual(self._event_log_module.GetDataEventName(key), event['event'])
+      self.assertEqual(self._event_log_module.GetDataEventName(value), event['event'])
       self.assertTrue(key in config and value == config[key])
 
   def test_error_event(self):