commit e0303396f235a7024e4fb492de21a39487b50af4
author Hector Dearman <hjd@google.com> Fri Nov 01 13:19:30 2019 +0000
committer Hector Dearman <hjd@google.com> Wed Nov 06 16:34:13 2019 +0000
tree 82769cccf1229c1b1d084ddf02ed526912f70099
parent 91ab4ed252af6d5ad5ceadb22c68de884e08acf9

Add Perfetto upload logging atoms

Assessment: https://eldar.corp.google.com/assessments/480866545
Doc: go/perfetto-monitoring-uploads
Bug: b/140984898
Bug: b/139351286
Test: Patch aosp/1156355 & aosp/1156886
  Run ./out/host/linux-x86/bin/statsd_testdrive 229
  adb shell perfetto -c :test --dropbox perfetto
Change-Id: I3e2dfa213b8fd3496aa0b09e02e0094be41711bc
Merged-In: I8f41d72c8f96a004911ef68491de8a214da4db24
(cherry picked from 69689f533b8061f246864e69bb1c0f41e22bebfc)

atoms.proto

diff --git a/atoms.proto b/atoms.proto
index 847c298..8a8df38 100644
--- a/atoms.proto
+++ b/atoms.proto
@@ -324,6 +324,8 @@
 
         AppCompatibilityChangeReported app_compatibility_change_reported =
             228 [(allow_from_any_uid) = true];
+        PerfettoUploaded perfetto_uploaded =
+            229 [(log_from_module) = "perfetto"];
     }
 
     // Pulled events will start at field 10000.
@@ -6857,3 +6859,37 @@
     optional Source source = 4;
 
 }
+
+/**
+ * Logged from
+ *     external/perfetto/src/perfetto_cmd/perfetto_cmd.cc
+ */
+message PerfettoUploaded {
+    enum Event {
+        PERFETTO_UNDEFINED = 0;
+        PERFETTO_TRACE_BEGIN = 1;
+        PERFETTO_BACKGROUND_TRACE_BEGIN = 2;
+        PERFETTO_ON_CONNECT = 3;
+        PERFETTO_ON_TRACING_DISABLED = 4;
+        PERFETTO_UPLOAD_DROPBOX_BEGIN = 5;
+        PERFETTO_UPLOAD_DROPBOX_SUCCESS = 6;
+        PERFETTO_UPLOAD_DROPBOX_FAILURE = 7;
+        PERFETTO_UPLOAD_INCIDENT_BEGIN = 8;
+        PERFETTO_UPLOAD_INCIDENT_SUCCESS = 9;
+        PERFETTO_UPLOAD_INCIDENT_FAILURE = 10;
+        PERFETTO_FINALIZE_TRACE_AND_EXIT = 11;
+        PERFETTO_TRIGGER_BEGIN = 12;
+        PERFETTO_TRIGGER_SUCCESS = 13;
+        PERFETTO_TRIGGER_FAILURE = 14;
+        PERFETTO_HIT_GUARDRAILS = 15;
+        PERFETTO_ON_TIMEOUT = 16;
+        PERFETTO_NOT_UPLOADING_EMPTY_TRACE = 17;
+    }
+
+    // Which stage of the pipeline we are reporting from.
+    optional Event event = 1;
+
+    // UUID matching the one set inside the SystemInfo trace packet.
+    optional int64 trace_uuid_lsb = 2;
+    optional int64 trace_uuid_msb = 3;
+}