commit f91236e0fb4819ec6d2927327011de4fbee6a350
author Eric Seckler <eseckler@google.com> Mon Nov 04 10:25:45 2019 +0000
committer Eric Seckler <eseckler@google.com> Mon Nov 04 11:59:40 2019 +0000
tree 839e31b0a1e3b3ef2fe19f66d0b09285cbc66d9b
parent 5e1ef7e22ff06b9c2c359eac0d28d4d520162ead

processor: Retain original event ids during export + always export args

Chromium tests expect that event IDs for memory dumps correspond to the
original dump ID. So export the original source_id if available.

Turns out that the "args" argument for json events is expected to exist
by telemetry, so always write it.

Bug: 130786269
Change-Id: Ia96f21804ac78380808b89319a541512a28a38c3

src/trace_processor/export_json_unittest.cc

diff --git a/src/trace_processor/export_json_unittest.cc b/src/trace_processor/export_json_unittest.cc
index a65f894..679ef22 100644
--- a/src/trace_processor/export_json_unittest.cc
+++ b/src/trace_processor/export_json_unittest.cc
@@ -146,7 +146,8 @@
   EXPECT_EQ(event["tid"].asUInt(), kThreadID);
   EXPECT_EQ(event["cat"].asString(), kCategory);
   EXPECT_EQ(event["name"].asString(), kName);
-  EXPECT_FALSE(event.isMember("args"));
+  EXPECT_TRUE(event["args"].isObject());
+  EXPECT_EQ(event["args"].size(), 0u);
 }
 
 TEST_F(ExportJsonTest, StorageWithOneUnfinishedSlice) {
@@ -193,7 +194,8 @@
   EXPECT_EQ(event["tid"].asUInt(), kThreadID);
   EXPECT_EQ(event["cat"].asString(), kCategory);
   EXPECT_EQ(event["name"].asString(), kName);
-  EXPECT_FALSE(event.isMember("args"));
+  EXPECT_TRUE(event["args"].isObject());
+  EXPECT_EQ(event["args"].size(), 0u);
 }
 
 TEST_F(ExportJsonTest, StorageWithThreadName) {
@@ -819,7 +821,7 @@
   EXPECT_EQ(begin_event["ph"].asString(), "b");
   EXPECT_EQ(begin_event["ts"].asInt64(), kTimestamp / 1000);
   EXPECT_EQ(begin_event["pid"].asInt64(), kProcessID);
-  EXPECT_EQ(begin_event["id2"]["local"].asString(), "0x0");
+  EXPECT_EQ(begin_event["id2"]["local"].asString(), "0xeb");
   EXPECT_EQ(begin_event["cat"].asString(), kCategory);
   EXPECT_EQ(begin_event["name"].asString(), kName);
   EXPECT_EQ(begin_event["args"][kArgName].asInt(), kArgValue);
@@ -830,7 +832,7 @@
   EXPECT_EQ(end_event["ph"].asString(), "e");
   EXPECT_EQ(end_event["ts"].asInt64(), (kTimestamp + kDuration) / 1000);
   EXPECT_EQ(end_event["pid"].asInt64(), kProcessID);
-  EXPECT_EQ(end_event["id2"]["local"].asString(), "0x0");
+  EXPECT_EQ(end_event["id2"]["local"].asString(), "0xeb");
   EXPECT_EQ(end_event["cat"].asString(), kCategory);
   EXPECT_EQ(end_event["name"].asString(), kName);
   EXPECT_FALSE(end_event.isMember("args"));
@@ -878,7 +880,7 @@
   EXPECT_EQ(begin_event["tts"].asInt64(), kThreadTimestamp / 1000);
   EXPECT_EQ(begin_event["use_async_tts"].asInt(), 1);
   EXPECT_EQ(begin_event["pid"].asInt64(), kProcessID);
-  EXPECT_EQ(begin_event["id2"]["local"].asString(), "0x0");
+  EXPECT_EQ(begin_event["id2"]["local"].asString(), "0xeb");
   EXPECT_EQ(begin_event["cat"].asString(), kCategory);
   EXPECT_EQ(begin_event["name"].asString(), kName);
 
@@ -889,7 +891,7 @@
             (kThreadTimestamp + kThreadDuration) / 1000);
   EXPECT_EQ(end_event["use_async_tts"].asInt(), 1);
   EXPECT_EQ(end_event["pid"].asInt64(), kProcessID);
-  EXPECT_EQ(end_event["id2"]["local"].asString(), "0x0");
+  EXPECT_EQ(end_event["id2"]["local"].asString(), "0xeb");
   EXPECT_EQ(end_event["cat"].asString(), kCategory);
   EXPECT_EQ(end_event["name"].asString(), kName);
 }
@@ -934,7 +936,7 @@
   EXPECT_EQ(begin_event["tts"].asInt64(), kThreadTimestamp / 1000);
   EXPECT_EQ(begin_event["use_async_tts"].asInt(), 1);
   EXPECT_EQ(begin_event["pid"].asInt64(), kProcessID);
-  EXPECT_EQ(begin_event["id2"]["local"].asString(), "0x0");
+  EXPECT_EQ(begin_event["id2"]["local"].asString(), "0xeb");
   EXPECT_EQ(begin_event["cat"].asString(), kCategory);
   EXPECT_EQ(begin_event["name"].asString(), kName);
 }
@@ -982,7 +984,7 @@
   EXPECT_EQ(event["ph"].asString(), "n");
   EXPECT_EQ(event["ts"].asInt64(), kTimestamp / 1000);
   EXPECT_EQ(event["pid"].asInt64(), kProcessID);
-  EXPECT_EQ(event["id2"]["local"].asString(), "0x0");
+  EXPECT_EQ(event["id2"]["local"].asString(), "0xeb");
   EXPECT_EQ(event["cat"].asString(), kCategory);
   EXPECT_EQ(event["name"].asString(), kName);
   EXPECT_EQ(event["args"][kArgName].asInt(), kArgValue);