TrackEvent: Add parent uuid field and move track descriptor extension points
This patch adds the parent_uuid field to the track descriptor so that
tracks can be grouped in a hierarchy and moves the extension points
(e.g., Chrome-specific track descriptor fields) to their own top-level
messages to make it easier to add custom descriptor extensions in the
future.
Bug: 132678367
Change-Id: I448df34a7acff5809cd768b25f3d22d2ac27cf73
diff --git a/Android.bp b/Android.bp
index 3d8cdc7..d8b4f9a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4718,6 +4718,8 @@
"protos/perfetto/trace/track_event/chrome_histogram_sample.proto",
"protos/perfetto/trace/track_event/chrome_keyed_service.proto",
"protos/perfetto/trace/track_event/chrome_legacy_ipc.proto",
+ "protos/perfetto/trace/track_event/chrome_process_descriptor.proto",
+ "protos/perfetto/trace/track_event/chrome_thread_descriptor.proto",
"protos/perfetto/trace/track_event/chrome_user_event.proto",
"protos/perfetto/trace/track_event/debug_annotation.proto",
"protos/perfetto/trace/track_event/log_message.proto",
@@ -4738,6 +4740,8 @@
"external/perfetto/protos/perfetto/trace/track_event/chrome_histogram_sample.gen.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_keyed_service.gen.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_legacy_ipc.gen.cc",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_process_descriptor.gen.cc",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_thread_descriptor.gen.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_user_event.gen.cc",
"external/perfetto/protos/perfetto/trace/track_event/debug_annotation.gen.cc",
"external/perfetto/protos/perfetto/trace/track_event/log_message.gen.cc",
@@ -4758,6 +4762,8 @@
"protos/perfetto/trace/track_event/chrome_histogram_sample.proto",
"protos/perfetto/trace/track_event/chrome_keyed_service.proto",
"protos/perfetto/trace/track_event/chrome_legacy_ipc.proto",
+ "protos/perfetto/trace/track_event/chrome_process_descriptor.proto",
+ "protos/perfetto/trace/track_event/chrome_thread_descriptor.proto",
"protos/perfetto/trace/track_event/chrome_user_event.proto",
"protos/perfetto/trace/track_event/debug_annotation.proto",
"protos/perfetto/trace/track_event/log_message.proto",
@@ -4778,6 +4784,8 @@
"external/perfetto/protos/perfetto/trace/track_event/chrome_histogram_sample.gen.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_keyed_service.gen.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_legacy_ipc.gen.h",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_process_descriptor.gen.h",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_thread_descriptor.gen.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_user_event.gen.h",
"external/perfetto/protos/perfetto/trace/track_event/debug_annotation.gen.h",
"external/perfetto/protos/perfetto/trace/track_event/log_message.gen.h",
@@ -4802,6 +4810,8 @@
"protos/perfetto/trace/track_event/chrome_histogram_sample.proto",
"protos/perfetto/trace/track_event/chrome_keyed_service.proto",
"protos/perfetto/trace/track_event/chrome_legacy_ipc.proto",
+ "protos/perfetto/trace/track_event/chrome_process_descriptor.proto",
+ "protos/perfetto/trace/track_event/chrome_thread_descriptor.proto",
"protos/perfetto/trace/track_event/chrome_user_event.proto",
"protos/perfetto/trace/track_event/debug_annotation.proto",
"protos/perfetto/trace/track_event/log_message.proto",
@@ -4821,6 +4831,8 @@
"external/perfetto/protos/perfetto/trace/track_event/chrome_histogram_sample.pb.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_keyed_service.pb.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_legacy_ipc.pb.cc",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_process_descriptor.pb.cc",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_thread_descriptor.pb.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_user_event.pb.cc",
"external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pb.cc",
"external/perfetto/protos/perfetto/trace/track_event/log_message.pb.cc",
@@ -4841,6 +4853,8 @@
"protos/perfetto/trace/track_event/chrome_histogram_sample.proto",
"protos/perfetto/trace/track_event/chrome_keyed_service.proto",
"protos/perfetto/trace/track_event/chrome_legacy_ipc.proto",
+ "protos/perfetto/trace/track_event/chrome_process_descriptor.proto",
+ "protos/perfetto/trace/track_event/chrome_thread_descriptor.proto",
"protos/perfetto/trace/track_event/chrome_user_event.proto",
"protos/perfetto/trace/track_event/debug_annotation.proto",
"protos/perfetto/trace/track_event/log_message.proto",
@@ -4860,6 +4874,8 @@
"external/perfetto/protos/perfetto/trace/track_event/chrome_histogram_sample.pb.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_keyed_service.pb.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_legacy_ipc.pb.h",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_process_descriptor.pb.h",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_thread_descriptor.pb.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_user_event.pb.h",
"external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pb.h",
"external/perfetto/protos/perfetto/trace/track_event/log_message.pb.h",
@@ -4884,6 +4900,8 @@
"protos/perfetto/trace/track_event/chrome_histogram_sample.proto",
"protos/perfetto/trace/track_event/chrome_keyed_service.proto",
"protos/perfetto/trace/track_event/chrome_legacy_ipc.proto",
+ "protos/perfetto/trace/track_event/chrome_process_descriptor.proto",
+ "protos/perfetto/trace/track_event/chrome_thread_descriptor.proto",
"protos/perfetto/trace/track_event/chrome_user_event.proto",
"protos/perfetto/trace/track_event/debug_annotation.proto",
"protos/perfetto/trace/track_event/log_message.proto",
@@ -4904,6 +4922,8 @@
"external/perfetto/protos/perfetto/trace/track_event/chrome_histogram_sample.pbzero.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_keyed_service.pbzero.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_legacy_ipc.pbzero.cc",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_process_descriptor.pbzero.cc",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_thread_descriptor.pbzero.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_user_event.pbzero.cc",
"external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pbzero.cc",
"external/perfetto/protos/perfetto/trace/track_event/log_message.pbzero.cc",
@@ -4924,6 +4944,8 @@
"protos/perfetto/trace/track_event/chrome_histogram_sample.proto",
"protos/perfetto/trace/track_event/chrome_keyed_service.proto",
"protos/perfetto/trace/track_event/chrome_legacy_ipc.proto",
+ "protos/perfetto/trace/track_event/chrome_process_descriptor.proto",
+ "protos/perfetto/trace/track_event/chrome_thread_descriptor.proto",
"protos/perfetto/trace/track_event/chrome_user_event.proto",
"protos/perfetto/trace/track_event/debug_annotation.proto",
"protos/perfetto/trace/track_event/log_message.proto",
@@ -4944,6 +4966,8 @@
"external/perfetto/protos/perfetto/trace/track_event/chrome_histogram_sample.pbzero.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_keyed_service.pbzero.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_legacy_ipc.pbzero.h",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_process_descriptor.pbzero.h",
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_thread_descriptor.pbzero.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_user_event.pbzero.h",
"external/perfetto/protos/perfetto/trace/track_event/debug_annotation.pbzero.h",
"external/perfetto/protos/perfetto/trace/track_event/log_message.pbzero.h",