Merge "SystemServer: Migrate Boottime related metrics to StatsLog" (45990558) · Commits · e / os / android_frameworks_base

services/java/com/android/server/SystemServer.java

+17 −11

Original line number	Diff line number	Diff line
		@@ -71,11 +71,11 @@ import android.text.TextUtils;
		import android.util.DisplayMetrics;
		import android.util.EventLog;
		import android.util.Slog;
		import android.util.StatsLog;
		import android.view.WindowManager;
		import android.view.contentcapture.ContentCaptureManager;

		import com.android.internal.R;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.notification.SystemNotificationChannels;
		import com.android.internal.os.BinderInternal;
		import com.android.internal.util.ConcurrentUtils;
		@@ -443,10 +443,12 @@ public final class SystemServer {

		// Here we go!
		Slog.i(TAG, "Entered the Android system server!");
		int uptimeMillis = (int) SystemClock.elapsedRealtime();
		final long uptimeMillis = SystemClock.elapsedRealtime();
		EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_SYSTEM_RUN, uptimeMillis);
		if (!mRuntimeRestart) {
		MetricsLogger.histogram(null, "boot_system_server_init", uptimeMillis);
		StatsLog.write(StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED,
		StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__SYSTEM_SERVER_INIT_START,
		uptimeMillis);
		}

		// In case the runtime switched since last boot (such as when
		@@ -555,10 +557,12 @@ public final class SystemServer {
		StrictMode.initVmDefaults(null);

		if (!mRuntimeRestart && !isFirstBootOrUpgrade()) {
		int uptimeMillis = (int) SystemClock.elapsedRealtime();
		MetricsLogger.histogram(null, "boot_system_server_ready", uptimeMillis);
		final int MAX_UPTIME_MILLIS = 60 * 1000;
		if (uptimeMillis > MAX_UPTIME_MILLIS) {
		final long uptimeMillis = SystemClock.elapsedRealtime();
		StatsLog.write(StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED,
		StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__SYSTEM_SERVER_READY,
		uptimeMillis);
		final long maxUptimeMillis = 60 * 1000;
		if (uptimeMillis > maxUptimeMillis) {
		Slog.wtf(SYSTEM_SERVER_TIMING_TAG,
		"SystemServer init took too long. uptimeMillis=" + uptimeMillis);
		}
		@@ -791,8 +795,9 @@ public final class SystemServer {

		// Start the package manager.
		if (!mRuntimeRestart) {
		MetricsLogger.histogram(null, "boot_package_manager_init_start",
		(int) SystemClock.elapsedRealtime());
		StatsLog.write(StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED,
		StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__PACKAGE_MANAGER_INIT_START,
		SystemClock.elapsedRealtime());
		}

		t.traceBegin("StartPackageManagerService");
		@@ -808,8 +813,9 @@ public final class SystemServer {
		mPackageManager = mSystemContext.getPackageManager();
		t.traceEnd();
		if (!mRuntimeRestart && !isFirstBootOrUpgrade()) {
		MetricsLogger.histogram(null, "boot_package_manager_init_ready",
		(int) SystemClock.elapsedRealtime());
		StatsLog.write(StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED,
		StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__PACKAGE_MANAGER_INIT_READY,
		SystemClock.elapsedRealtime());
		}
		// Manages A/B OTA dexopting. This is a bootstrap service as we need it to rename
		// A/B artifacts after boot, before anything else might touch/need them.