Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25af773a authored by Hector Dearman's avatar Hector Dearman Committed by Xin Li
Browse files

Reland Perfetto upload logging atoms DO NOT MERGE 

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.

Merged-In: Ia40303aa2a669c301fab912b0b0bdf5ec1259caf
Change-Id: I3c061fef4f103f0f83147d56ed8019dcb39a7711
parent 44113fe5

cmds/statsd/src/atoms.proto

+36 −0
Original line number Diff line number Diff line
@@ -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.
@@ -6858,3 +6860,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;

}