Add an explicit way of making IDs local or global

base/trace_event/blame_context.cc

Index: base/trace_event/blame_context.cc
diff --git a/base/trace_event/blame_context.cc b/base/trace_event/blame_context.cc
index ae5c6790d6e12a1bc6cfa8a8f56a606070bc015c..b21ea41bccb7dac47d3aabaa524d5694c635e4b8 100644
--- a/base/trace_event/blame_context.cc
+++ b/base/trace_event/blame_context.cc
@@ -35,7 +35,8 @@ BlameContext::~BlameContext() {
   DCHECK(WasInitialized());
   TRACE_EVENT_API_ADD_TRACE_EVENT(
       TRACE_EVENT_PHASE_DELETE_OBJECT, category_group_enabled_, type_, scope_,
-      id_, 0, nullptr, nullptr, nullptr, nullptr, TRACE_EVENT_FLAG_HAS_ID);
+      id_, 0, nullptr, nullptr, nullptr, nullptr,
+      TRACE_EVENT_FLAG_HAS_LOCAL_ID);

[caseq, 2016/08/29 23:39:26]

Oh, so you're also fixing things! :-)

[chiniforooshan, 2016/08/30 17:40:46]

Reverted these "fixes" since, as you suggested, this will cause the id be logged
as "local_id" and will break trace_viewer until it understands local IDs.

   trace_event::TraceLog::GetInstance()->RemoveAsyncEnabledStateObserver(this);
 }
 
@@ -44,7 +45,7 @@ void BlameContext::Enter() {
   TRACE_EVENT_API_ADD_TRACE_EVENT(TRACE_EVENT_PHASE_ENTER_CONTEXT,
                                   category_group_enabled_, name_, scope_, id_,
                                   0 /* num_args */, nullptr, nullptr, nullptr,
-                                  nullptr, TRACE_EVENT_FLAG_HAS_ID);
+                                  nullptr, TRACE_EVENT_FLAG_HAS_LOCAL_ID);
 }
 
 void BlameContext::Leave() {
@@ -52,7 +53,7 @@ void BlameContext::Leave() {
   TRACE_EVENT_API_ADD_TRACE_EVENT(TRACE_EVENT_PHASE_LEAVE_CONTEXT,
                                   category_group_enabled_, name_, scope_, id_,
                                   0 /* num_args */, nullptr, nullptr, nullptr,
-                                  nullptr, TRACE_EVENT_FLAG_HAS_ID);
+                                  nullptr, TRACE_EVENT_FLAG_HAS_LOCAL_ID);
 }
 
 void BlameContext::TakeSnapshot() {
@@ -71,7 +72,7 @@ void BlameContext::TakeSnapshot() {
   TRACE_EVENT_API_ADD_TRACE_EVENT(TRACE_EVENT_PHASE_SNAPSHOT_OBJECT,
                                   category_group_enabled_, type_, scope_, id_,
                                   kNumArgs, &kArgName, arg_types, nullptr,
-                                  arg_values, TRACE_EVENT_FLAG_HAS_ID);
+                                  arg_values, TRACE_EVENT_FLAG_HAS_LOCAL_ID);
 }
 
 void BlameContext::OnTraceLogEnabled() {
@@ -97,7 +98,8 @@ void BlameContext::Initialize() {
       TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category_);
   TRACE_EVENT_API_ADD_TRACE_EVENT(
       TRACE_EVENT_PHASE_CREATE_OBJECT, category_group_enabled_, type_, scope_,
-      id_, 0, nullptr, nullptr, nullptr, nullptr, TRACE_EVENT_FLAG_HAS_ID);
+      id_, 0, nullptr, nullptr, nullptr, nullptr,
+      TRACE_EVENT_FLAG_HAS_LOCAL_ID);
   trace_event::TraceLog::GetInstance()->AddAsyncEnabledStateObserver(
       weak_factory_.GetWeakPtr());
   TakeSnapshot();