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

Commit 9369e6e0 authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Cherrypicker Worker
Browse files

Refactoring metrics in CrashRecovery module 

Separating out the new module log from framework.

Bug: b/289203818
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:6fd031f92d5cfdee9707199b9bdbdb47f692d673)
Merged-In: Ia8994b0ccc1b4c32000ef53bf53346719e4bd4e1
Change-Id: Ia8994b0ccc1b4c32000ef53bf53346719e4bd4e1
parent 1e5c0ca6

packages/CrashRecovery/services/Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -3,7 +3,15 @@ filegroup { 
    srcs: [

        "java/**/*.java",

        "java/**/*.aidl",

        ":statslog-crashrecovery-java-gen",

    ],

    path: "java",

    visibility: ["//frameworks/base:__subpackages__"],

}



genrule {

    name: "statslog-crashrecovery-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module crashrecovery " +

        "--javaPackage com.android.server.crashrecovery.proto --javaClass CrashRecoveryStatsLog --worksource",

    out: ["com/android/server/crashrecovery/proto/CrashRecoveryStatsLog.java"],

}

packages/CrashRecovery/services/java/com/android/server/RescueParty.java

+2 −2
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ import android.util.Slog; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.PackageWatchdog.FailureReasons;

import com.android.server.PackageWatchdog.PackageHealthObserver;

import com.android.server.PackageWatchdog.PackageHealthObserverImpact;

import com.android.server.am.SettingsToPropertiesMapper;

import com.android.server.crashrecovery.proto.CrashRecoveryStatsLog;



import java.io.File;

import java.util.ArrayList;
@@ -390,7 +390,7 @@ public class RescueParty { 
            return;

        }



        FrameworkStatsLog.write(FrameworkStatsLog.RESCUE_PARTY_RESET_REPORTED, level);

        CrashRecoveryStatsLog.write(CrashRecoveryStatsLog.RESCUE_PARTY_RESET_REPORTED, level);

        // Try our best to reset all settings possible, and once finished

        // rethrow any exception that we encountered

        Exception res = null;

packages/CrashRecovery/services/java/com/android/server/rollback/RollbackPackageHealthObserver.java

+5 −5
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ import android.util.Slog; 
import android.util.SparseArray;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.Preconditions;

import com.android.server.PackageWatchdog;

import com.android.server.PackageWatchdog.FailureReasons;

import com.android.server.PackageWatchdog.PackageHealthObserver;

import com.android.server.PackageWatchdog.PackageHealthObserverImpact;

import com.android.server.SystemConfig;

import com.android.server.crashrecovery.proto.CrashRecoveryStatsLog;

import com.android.server.pm.ApexManager;



import java.io.BufferedReader;
@@ -418,7 +418,7 @@ final class RollbackPackageHealthObserver implements PackageHealthObserver { 


        final VersionedPackage logPackage = logPackageTemp;

        WatchdogRollbackLogger.logEvent(logPackage,

                FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE,

                CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE,

                reasonToLog, failedPackageToLog);



        Consumer<Intent> onResult = result -> {
@@ -430,19 +430,19 @@ final class RollbackPackageHealthObserver implements PackageHealthObserver { 
                    int rollbackId = rollback.getRollbackId();

                    saveStagedRollbackId(rollbackId, logPackage);

                    WatchdogRollbackLogger.logEvent(logPackage,

                            FrameworkStatsLog

                            CrashRecoveryStatsLog

                            .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_BOOT_TRIGGERED,

                            reasonToLog, failedPackageToLog);



                } else {

                    WatchdogRollbackLogger.logEvent(logPackage,

                            FrameworkStatsLog

                            CrashRecoveryStatsLog

                                    .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS,

                            reasonToLog, failedPackageToLog);

                }

            } else {

                WatchdogRollbackLogger.logEvent(logPackage,

                        FrameworkStatsLog

                        CrashRecoveryStatsLog

                                .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE,

                        reasonToLog, failedPackageToLog);

            }

packages/CrashRecovery/services/java/com/android/server/rollback/WatchdogRollbackLogger.java

+15 −15
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 


package com.android.server.rollback;



import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_CRASH;

import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_NOT_RESPONDING;

import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_EXPLICIT_HEALTH_CHECK;

import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH;

import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH_DURING_BOOT;

import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN;

import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_BOOT_TRIGGERED;

import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE;

import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE;

import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS;

import static com.android.server.crashrecovery.proto.CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_CRASH;

import static com.android.server.crashrecovery.proto.CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_NOT_RESPONDING;

import static com.android.server.crashrecovery.proto.CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_EXPLICIT_HEALTH_CHECK;

import static com.android.server.crashrecovery.proto.CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH;

import static com.android.server.crashrecovery.proto.CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH_DURING_BOOT;

import static com.android.server.crashrecovery.proto.CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN;

import static com.android.server.crashrecovery.proto.CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_BOOT_TRIGGERED;

import static com.android.server.crashrecovery.proto.CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE;

import static com.android.server.crashrecovery.proto.CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE;

import static com.android.server.crashrecovery.proto.CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -42,8 +42,8 @@ import android.util.ArraySet; 
import android.util.Slog;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.PackageWatchdog;

import com.android.server.crashrecovery.proto.CrashRecoveryStatsLog;



import java.util.List;

import java.util.Set;
@@ -197,8 +197,8 @@ public final class WatchdogRollbackLogger { 
                + " rollbackReason: " + rollbackReasonToString(rollbackReason)

                + " failedPackageName: " + failingPackageName);

        if (logPackage != null) {

            FrameworkStatsLog.write(

                    FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED,

            CrashRecoveryStatsLog.write(

                    CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED,

                    type,

                    logPackage.getPackageName(),

                    logPackage.getVersionCode(),
@@ -208,8 +208,8 @@ public final class WatchdogRollbackLogger { 
        } else {

            // In the case that the log package is null, still log an empty string as an

            // indication that retrieving the logging parent failed.

            FrameworkStatsLog.write(

                    FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED,

            CrashRecoveryStatsLog.write(

                    CrashRecoveryStatsLog.WATCHDOG_ROLLBACK_OCCURRED,

                    type,

                    "",

                    0,