Add ChromeHistogramSample typed event
Used to record UMA histogram samples within
Chrome.
Change-Id: If20de2d0d24f0e7d254aa427281d9b53595a08ea
diff --git a/Android.bp b/Android.bp
index f07e7e1..bee0d3c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3834,6 +3834,7 @@
name: "perfetto_protos_perfetto_trace_track_event_lite_gen",
srcs: [
"protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto",
+ "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_user_event.proto",
@@ -3852,6 +3853,7 @@
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --cpp_out=$(genDir)/external/perfetto/ $(in)",
out: [
"external/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.pb.cc",
+ "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_user_event.pb.cc",
@@ -3871,6 +3873,7 @@
name: "perfetto_protos_perfetto_trace_track_event_lite_gen_headers",
srcs: [
"protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto",
+ "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_user_event.proto",
@@ -3889,6 +3892,7 @@
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --cpp_out=$(genDir)/external/perfetto/ $(in)",
out: [
"external/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.pb.h",
+ "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_user_event.pb.h",
@@ -3912,6 +3916,7 @@
name: "perfetto_protos_perfetto_trace_track_event_zero_gen",
srcs: [
"protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto",
+ "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_user_event.proto",
@@ -3931,6 +3936,7 @@
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
out: [
"external/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.pbzero.cc",
+ "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_user_event.pbzero.cc",
@@ -3950,6 +3956,7 @@
name: "perfetto_protos_perfetto_trace_track_event_zero_gen_headers",
srcs: [
"protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto",
+ "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_user_event.proto",
@@ -3969,6 +3976,7 @@
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
out: [
"external/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.pbzero.h",
+ "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_user_event.pbzero.h",
diff --git a/BUILD b/BUILD
index 5f31283..87f5253 100644
--- a/BUILD
+++ b/BUILD
@@ -2283,6 +2283,7 @@
name = "protos_perfetto_trace_track_event_protos",
srcs = [
"protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto",
+ "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_user_event.proto",
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index 43840f0..55f3393 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -3986,6 +3986,19 @@
// End of protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto
+// Begin of protos/perfetto/trace/track_event/chrome_histogram_sample.proto
+
+// An individual histogram sample logged via Chrome's UMA metrics system.
+message ChromeHistogramSample {
+ // MD5 hash of the metric name. Either |name_hash| or |name| or both
+ // must be present.
+ optional uint64 name_hash = 1;
+ optional string name = 2;
+ optional int64 sample = 3;
+}
+
+// End of protos/perfetto/trace/track_event/chrome_histogram_sample.proto
+
// Begin of protos/perfetto/trace/track_event/chrome_keyed_service.proto
// Details about one of Chrome's keyed services associated with the event.
@@ -4359,7 +4372,7 @@
// their default track association) can be emitted as part of a
// TrackEventDefaults message.
//
-// Next reserved id: 12 (up to 15). Next id: 28.
+// Next reserved id: 12 (up to 15). Next id: 29.
message TrackEvent {
// Names of categories of the event. In the client library, categories are a
// way to turn groups of individual events on or off.
@@ -4458,6 +4471,7 @@
optional ChromeUserEvent chrome_user_event = 25;
optional ChromeKeyedService chrome_keyed_service = 26;
optional ChromeLegacyIpc chrome_legacy_ipc = 27;
+ optional ChromeHistogramSample chrome_histogram_sample = 28;
// New argument types go here :)
// ---------------------------------------------------------------------------
diff --git a/protos/perfetto/trace/track_event/BUILD.gn b/protos/perfetto/trace/track_event/BUILD.gn
index a897601..0db8974 100644
--- a/protos/perfetto/trace/track_event/BUILD.gn
+++ b/protos/perfetto/trace/track_event/BUILD.gn
@@ -17,6 +17,7 @@
perfetto_proto_library("@TYPE@") {
sources = [
"chrome_compositor_scheduler_state.proto",
+ "chrome_histogram_sample.proto",
"chrome_keyed_service.proto",
"chrome_legacy_ipc.proto",
"chrome_user_event.proto",
diff --git a/protos/perfetto/trace/track_event/chrome_histogram_sample.proto b/protos/perfetto/trace/track_event/chrome_histogram_sample.proto
new file mode 100644
index 0000000..902a9dc
--- /dev/null
+++ b/protos/perfetto/trace/track_event/chrome_histogram_sample.proto
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+option optimize_for = LITE_RUNTIME;
+
+package perfetto.protos;
+
+// An individual histogram sample logged via Chrome's UMA metrics system.
+message ChromeHistogramSample {
+ // MD5 hash of the metric name. Either |name_hash| or |name| or both
+ // must be present.
+ optional uint64 name_hash = 1;
+ optional string name = 2;
+ optional int64 sample = 3;
+}
diff --git a/protos/perfetto/trace/track_event/track_event.proto b/protos/perfetto/trace/track_event/track_event.proto
index 4d8b1fb..8b7195c 100644
--- a/protos/perfetto/trace/track_event/track_event.proto
+++ b/protos/perfetto/trace/track_event/track_event.proto
@@ -21,6 +21,7 @@
import "protos/perfetto/trace/track_event/log_message.proto";
import "protos/perfetto/trace/track_event/task_execution.proto";
import "protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto";
+import "protos/perfetto/trace/track_event/chrome_histogram_sample.proto";
import "protos/perfetto/trace/track_event/chrome_keyed_service.proto";
import "protos/perfetto/trace/track_event/chrome_legacy_ipc.proto";
import "protos/perfetto/trace/track_event/chrome_user_event.proto";
@@ -86,7 +87,7 @@
// their default track association) can be emitted as part of a
// TrackEventDefaults message.
//
-// Next reserved id: 12 (up to 15). Next id: 28.
+// Next reserved id: 12 (up to 15). Next id: 29.
message TrackEvent {
// Names of categories of the event. In the client library, categories are a
// way to turn groups of individual events on or off.
@@ -185,6 +186,7 @@
optional ChromeUserEvent chrome_user_event = 25;
optional ChromeKeyedService chrome_keyed_service = 26;
optional ChromeLegacyIpc chrome_legacy_ipc = 27;
+ optional ChromeHistogramSample chrome_histogram_sample = 28;
// New argument types go here :)
// ---------------------------------------------------------------------------
diff --git a/tools/gen_merged_protos b/tools/gen_merged_protos
index 52bcf76..1289e37 100755
--- a/tools/gen_merged_protos
+++ b/tools/gen_merged_protos
@@ -96,6 +96,7 @@
'protos/perfetto/trace/trace_packet.proto',
'protos/perfetto/trace/trace_packet_defaults.proto',
'protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto',
+ '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_user_event.proto',