commit 4a2ebd6d3e54689c2c27bda7e12a72d7bb04440d
author Chris Ching <chingcodes@chromium.org> Wed Apr 26 16:30:05 2017 -0600
committer chrome-bot <chrome-bot@chromium.org> Wed May 03 10:38:26 2017 -0700
tree 15330ef8afbd8d0dd25b3efe4a8769c345e18f27
parent 5f07bc1974d639c37e1cefa7ffb6bae17224318c

parallel_emerge: events use single kind

All events use 'ParallelEmerge' for their kind. Previously used kinds
are now stored as 'task_name'

BUG=chromium:703431
TEST=none

Change-Id: I23141c270d157bea42a37f72b026b5cb33881ba3
Reviewed-on: https://chromium-review.googlesource.com/487911
Commit-Ready: Chris Ching <chingcodes@chromium.org>
Tested-by: Chris Ching <chingcodes@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>

scripts/parallel_emerge.py

diff --git a/scripts/parallel_emerge.py b/scripts/parallel_emerge.py
index fbf1e26..d109352 100644
--- a/scripts/parallel_emerge.py
+++ b/scripts/parallel_emerge.py
@@ -276,7 +276,9 @@
         self.unpack_only = True
       elif arg.startswith("--eventlogfile="):
         log_file_name = arg.replace("--eventlogfile=", "")
-        cros_event.setEventLogger(cros_event.getEventFileLogger(log_file_name))
+        event_logger = cros_event.getEventFileLogger(log_file_name)
+        event_logger.setKind('ParallelEmerge')
+        cros_event.setEventLogger(event_logger)
       else:
         # Not one of our options, so pass through to emerge.
         emerge_args.append(arg)
@@ -469,7 +471,7 @@
     if "--quiet" not in emerge.opts:
       print("Calculating deps...")
 
-    with cros_event.newEvent(kind="GenerateDepTree"):
+    with cros_event.newEvent(task_name="GenerateDepTree"):
       self.CreateDepgraph(emerge, packages)
       depgraph = emerge.depgraph
 
@@ -927,7 +929,8 @@
   Returns:
     The exit code returned by the subprocess.
   """
-  event = cros_event.newEvent(kind="EmergePackage", name=target)
+  event = cros_event.newEvent(task_name="EmergePackage",
+                              name=target)
   pid = os.fork()
   if pid == 0:
     try:
@@ -1005,7 +1008,7 @@
     cmd.append("--ignore-trailing-garbage=1")
   cmd.append(path)
 
-  with cros_event.newEvent(step="unpack package", **pkg_state) as event:
+  with cros_event.newEvent(task_name="UnpackPackage", **pkg_state) as event:
     result = cros_build_lib.RunCommand(cmd, cwd=root, stdout_to_pipe=True,
                                        print_cmd=False, error_code_ok=True)