From a87fab667c44260fc159d8e2c4f386359be2ebb2 Mon Sep 17 00:00:00 2001 From: Marcin Oczeretko Date: Wed, 10 Feb 2021 14:26:26 +0000 Subject: [PATCH 1/2] Limit PerfettoTrigger to max 1 trigger per minute Test: manual Bug: 161781469 Change-Id: Ie35e1fe7e6a12ab75a60c21f442adcd73372050f --- .../android/internal/util/PerfettoTrigger.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/util/PerfettoTrigger.java b/core/java/com/android/internal/util/PerfettoTrigger.java index 9c87c697a7376..c7585046cf9c6 100644 --- a/core/java/com/android/internal/util/PerfettoTrigger.java +++ b/core/java/com/android/internal/util/PerfettoTrigger.java @@ -16,6 +16,7 @@ package com.android.internal.util; +import android.os.SystemClock; import android.util.Log; import java.io.IOException; @@ -27,16 +28,28 @@ import java.io.IOException; public class PerfettoTrigger { private static final String TAG = "PerfettoTrigger"; private static final String TRIGGER_COMMAND = "/system/bin/trigger_perfetto"; + private static final long THROTTLE_MILLIS = 60000; + private static volatile long sLastTriggerTime = -THROTTLE_MILLIS; /** * @param triggerName The name of the trigger. Must match the value defined in the AOT * Perfetto config. */ public static void trigger(String triggerName) { + // Trace triggering has a non-negligible cost (fork+exec). + // To mitigate potential excessive triggering by the API client we ignore calls that happen + // too quickl after the most recent trigger. + long sinceLastTrigger = SystemClock.elapsedRealtime() - sLastTriggerTime; + if (sinceLastTrigger < THROTTLE_MILLIS) { + Log.v(TAG, "Not triggering " + triggerName + " - not enough time since last trigger"); + return; + } + try { ProcessBuilder pb = new ProcessBuilder(TRIGGER_COMMAND, triggerName); Log.v(TAG, "Triggering " + String.join(" ", pb.command())); - Process process = pb.start(); + pb.start(); + sLastTriggerTime = SystemClock.elapsedRealtime(); } catch (IOException e) { Log.w(TAG, "Failed to trigger " + triggerName, e); } From 794e034d2fb2c53cfef2d1c48f65e5b596a36217 Mon Sep 17 00:00:00 2001 From: Marcin Oczeretko Date: Wed, 10 Feb 2021 15:53:28 +0000 Subject: [PATCH 2/2] Update AOT trigger names to match the new convention Adding com.android.telemetry namespace prefix to Perfetto trigger names Test: manual Bug: 161781469 Change-Id: I327b971fc6415431ba3b6d9aa069cd26d0627761 --- core/java/com/android/internal/jank/InteractionJankMonitor.java | 2 +- core/java/com/android/internal/util/LatencyTracker.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java index 6e9bc84156f14..cba6af98a9807 100644 --- a/core/java/com/android/internal/jank/InteractionJankMonitor.java +++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java @@ -499,7 +499,7 @@ public class InteractionJankMonitor { } public String getPerfettoTrigger() { - return String.format("interaction-jank-monitor-%d", mCujType); + return String.format("com.android.telemetry.interaction-jank-monitor-%d", mCujType); } public String getName() { diff --git a/core/java/com/android/internal/util/LatencyTracker.java b/core/java/com/android/internal/util/LatencyTracker.java index f42f468aefa08..dc6880e4f997d 100644 --- a/core/java/com/android/internal/util/LatencyTracker.java +++ b/core/java/com/android/internal/util/LatencyTracker.java @@ -219,7 +219,7 @@ public class LatencyTracker { } private static String getTraceTriggerNameForAction(@Action int action) { - return "latency-tracker-" + getNameOfAction(STATSD_ACTION[action]); + return "com.android.telemetry.latency-tracker-" + getNameOfAction(STATSD_ACTION[action]); } public static boolean isEnabled(Context ctx) {