Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland Perfetto upload logging atoms DO NOT MERGE

Browse Source 
Initial state:
- I landed ag/9652310 (the original change) downstream
- I cherry-picked this change on upstream to aosp/1158971
- This cherry-pick had an incorrect Merged-In tag referring to ag/7911242
- This cl was present between mirror-aosp-master and master internally

Branch                      CL
aosp/master                 (aosp/1158971)
    \/
internal/mirror-aosp-master (aosp/1158971)
    \/
internal/[---]              Nothing since ag/7911242 was here
    ||                      already automerger skipped our change
    \/
internal/master             (ag/9652310)
    \/
[various children]          (ag/9652310)

See:
https://android-build.googleplex.com/builds/automerger/graph/project/googleplex-android/platform/frameworks/base

How this will fix the issue:
- The revert will go everywhere aosp/1158971 did
- The reland will go everywhere aosp/1158971 did plus to internal/master

This reverts commit 8ed72df3d8e21c06d8b1b848d6e58c15b251d25a.
This commit is contained in:
Hector Dearman
2019-11-19 16:28:59 +00:00
parent 38b8b858a7
commit 8d4a16cfc6
1 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
cmds/statsd/src/atoms.proto
View File

@@ -324,6 +324,8 @@ message Atom {
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 @@ message AppCompatibilityChangeReported {
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;
}