From 6b232cc0583b264cb1194de2edb10c6883dd0915 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Tue, 2 Feb 2021 17:07:45 -0800 Subject: [PATCH] Fix the the proto definition for app startup and fully drawn events. ActivityMetricsLoggers build the proto with the compilation reason first and then the compilation filter. Instead of changing the logging code, we prefer to change the proto field order: this will facilitate the speed up the resolution without the need to purge data or wait for further release builds. It is ok, because both fields are in fact int32 proto values so the ABI does not change. Test: m Bug: 178108751 (cherry picked from commit cf676e8028c2611461dc3e009dd9fe771f44bdb2) Merged-In: I36ec354d273dceace5245d7634c68ac63dc5a8cd Change-Id: I03c701efe2181ae7796547267902f884007593eb --- cmds/statsd/src/atoms.proto | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 55e1186d86104..8416ff4d557e5 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -3612,11 +3612,11 @@ message AppStartOccurred { // Empty if not set. optional string launch_token = 13; - // The compiler filter used when when the package was optimized. - optional int32 package_optimization_compilation_filter = 14; - // The reason why the package was optimized. - optional int32 package_optimization_compilation_reason = 15; + optional int32 package_optimization_compilation_reason = 14; + + // The compiler filter used when when the package was optimized. + optional int32 package_optimization_compilation_filter = 15; } message AppStartCanceled { @@ -3662,11 +3662,11 @@ message AppStartFullyDrawn { // App startup time (until call to Activity#reportFullyDrawn()). optional int64 app_startup_time_millis = 6; - // The compiler filter used when when the package was optimized. - optional int32 package_optimization_compilation_filter = 7; - // The reason why the package was optimized. - optional int32 package_optimization_compilation_reason = 8; + optional int32 package_optimization_compilation_reason = 7; + + // The compiler filter used when when the package was optimized. + optional int32 package_optimization_compilation_filter = 8; } /**