summaryrefslogtreecommitdiff
path: root/apex
diff options
context:
space:
mode:
author Sanath Kumar <sanathku@google.com> 2025-02-04 11:35:44 -0600
committer Sanath Kumar <sanathku@google.com> 2025-02-11 20:41:35 -0600
commit85f3d3f39f1527dc9e01aa76a253059893b91402 (patch)
tree171dd605fe911dcf0e5524003b660decdc267add /apex
parentc3fcccec063719c8ec8de08572adbff19d229642 (diff)
JobScheduler: Add Trace Tag to the job name
Job Name Creation Logic with #<TraceTag># * When both tag and namespace are present: #<TraceTag>#@<Namespace>@<Tag>:<PackageName> * When a tag is present but a namespace is not: #<TraceTag>#<Tag>:<PackageName> * When a tag is not present but a namespace is present: #<TraceTag>#@<Namespace>@<PackageName>/<Classname> * When both a tag and namespace are not present: #<TraceTag>#<PackageName>/<Classname> Bug: 354795473 Test: atest FrameworksMockingServicesTests:com.android.server.job Test: atest CtsJobSchedulerTestCases Flag: com.android.server.job.include_trace_tag_in_job_name Change-Id: I5dfec8aaf2a082ace0dd1e4857c02552cdfbda2f
Diffstat (limited to 'apex')
-rw-r--r--apex/jobscheduler/service/aconfig/job.aconfig12
-rw-r--r--apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java6
2 files changed, 17 insertions, 1 deletions
diff --git a/apex/jobscheduler/service/aconfig/job.aconfig b/apex/jobscheduler/service/aconfig/job.aconfig
index 86ed06bf4e3d..29df80fda33d 100644
--- a/apex/jobscheduler/service/aconfig/job.aconfig
+++ b/apex/jobscheduler/service/aconfig/job.aconfig
@@ -105,4 +105,14 @@ flag {
metadata {
purpose: PURPOSE_BUGFIX
}
-} \ No newline at end of file
+}
+
+flag {
+ name: "include_trace_tag_in_job_name"
+ namespace: "backstage_power"
+ description: "Add the trace tag to the job name"
+ bug: "354795473"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
diff --git a/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java b/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java
index aaf69864fe97..2d069f934d0d 100644
--- a/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java
+++ b/apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java
@@ -674,6 +674,12 @@ public final class JobStatus {
this.job = job;
StringBuilder batteryName = new StringBuilder();
+ if (com.android.server.job.Flags.includeTraceTagInJobName()) {
+ final String filteredTraceTag = this.getFilteredTraceTag();
+ if (filteredTraceTag != null) {
+ batteryName.append("#").append(filteredTraceTag).append("#");
+ }
+ }
if (namespace != null) {
batteryName.append("@").append(namespace).append("@");
}