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

Commit db7c52d2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6582636 from 5c716782 to rvc-release 

Change-Id: I58bbd14c18bdd555bf30da5fbe16d2d9df033454
parents 26968351 5c716782

cmds/statsd/src/StatsLogProcessor.cpp

+2 −0
Original line number Diff line number Diff line
@@ -529,7 +529,9 @@ void StatsLogProcessor::OnConfigUpdatedLocked( 
        VLOG("StatsdConfig valid");

    } else {

        // If there is any error in the config, don't use it.

        // Remove any existing config with the same key.

        ALOGE("StatsdConfig NOT valid");

        mMetricsManagers.erase(key);

    }

}

cmds/statsd/src/StatsLogProcessor.h

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ private: 
    FRIEND_TEST(StatsLogProcessorTest, TestRateLimitByteSize);

    FRIEND_TEST(StatsLogProcessorTest, TestRateLimitBroadcast);

    FRIEND_TEST(StatsLogProcessorTest, TestDropWhenByteSizeTooLarge);

    FRIEND_TEST(StatsLogProcessorTest, InvalidConfigRemoved);

    FRIEND_TEST(StatsLogProcessorTest, TestActiveConfigMetricDiskWriteRead);

    FRIEND_TEST(StatsLogProcessorTest, TestActivationOnBoot);

    FRIEND_TEST(StatsLogProcessorTest, TestActivationOnBootMultipleActivations);

cmds/statsd/src/guardrail/StatsdStats.h

+2 −0
Original line number Diff line number Diff line
@@ -660,6 +660,8 @@ private: 
    FRIEND_TEST(StatsdStatsTest, TestAtomMetricsStats);

    FRIEND_TEST(StatsdStatsTest, TestActivationBroadcastGuardrailHit);

    FRIEND_TEST(StatsdStatsTest, TestAtomErrorStats);



    FRIEND_TEST(StatsLogProcessorTest, InvalidConfigRemoved);

};



}  // namespace statsd

cmds/statsd/src/metrics/MetricsManager.cpp

+6 −2
Original line number Diff line number Diff line
@@ -361,8 +361,12 @@ void MetricsManager::onDumpReport(const int64_t dumpTimeStampNs, 
        protoOutput->end(token);

    }



    // Do not update the timestamps when data is not cleared to avoid timestamps from being

    // misaligned.

    if (erase_data) {

        mLastReportTimeNs = dumpTimeStampNs;

        mLastReportWallClockNs = getWallClockNs();

    }

    VLOG("=========================Metric Reports End==========================");

}

cmds/statsd/src/statsd_config.proto

+15 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ message EventMetric { 
  optional int64 condition = 3;



  repeated MetricConditionLink links = 4;



  reserved 100;

  reserved 101;

}



message CountMetric {
@@ -218,6 +221,9 @@ message CountMetric { 
  repeated MetricStateLink state_link = 9;



  optional FieldMatcher dimensions_in_condition = 7 [deprecated = true];



  reserved 100;

  reserved 101;

}



message DurationMetric {
@@ -245,6 +251,9 @@ message DurationMetric { 
  optional TimeUnit bucket = 7;



  optional FieldMatcher dimensions_in_condition = 8 [deprecated = true];



  reserved 100;

  reserved 101;

}



message GaugeMetric {
@@ -281,6 +290,9 @@ message GaugeMetric { 
  optional int32 max_pull_delay_sec = 13 [default = 30];



  optional bool split_bucket_for_app_upgrade = 14 [default = true];



  reserved 100;

  reserved 101;

}



message ValueMetric {
@@ -333,6 +345,9 @@ message ValueMetric { 
  optional bool split_bucket_for_app_upgrade = 17 [default = true];



  optional FieldMatcher dimensions_in_condition = 9 [deprecated = true];



  reserved 100;

  reserved 101;

}



message Alert {