Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Add shard ID to statsd atom for procstats collection" into rvc-dev am: b0f26f32d8 am: ddd439cf9e" into rvc-d1-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-06-24 21:39:18 +00:00
committed by Android (Google) Code Review
parent 7b15f8770b 9dc4cf2532
commit 0370e42b1f
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/statsd/src/atoms.proto
View File

@@ -6131,6 +6131,10 @@ message ProcessStatsAvailablePagesProto {
*/
message ProcStats {
optional ProcessStatsSectionProto proc_stats_section = 1;
// Data pulled from device into this is sometimes sharded across multiple atoms to work around
// a size limit. When this happens, this shard ID will contain an increasing 1-indexed integer
// with the number of this shard.
optional int32 shard_id = 2;
}
/**

12
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -2575,11 +2575,17 @@ public class StatsPullAtomService extends SystemService {
lastHighWaterMark, section, true, statsFiles, procStats);
procStats.dumpAggregatedProtoForStatsd(protoStreams, MAX_PROCSTATS_RAW_SHARD_SIZE);
for (ProtoOutputStream proto : protoStreams) {
if (proto.getBytes().length > 0) {
for (int i = 0; i < protoStreams.length; i++) {
byte[] bytes = protoStreams[i].getBytes(); // cache the value
if (bytes.length > 0) {
StatsEvent e = StatsEvent.newBuilder()
.setAtomId(atomTag)
.writeByteArray(proto.getBytes())
.writeByteArray(bytes)
// This is a shard ID, and is specified in the metric definition to be
// a dimension. This will result in statsd using RANDOM_ONE_SAMPLE to
// keep all the shards, as it thinks each shard is a different dimension
// of data.
.writeInt(i)
.build();
pulledData.add(e);
}