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

Commit b603fb06 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add API to let metrics directly drop data without writing to an output."

parents 9055c1b6 06dba5d7

cmds/statsd/src/StatsLogProcessor.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -330,9 +330,7 @@ void StatsLogProcessor::flushIfNecessaryLocked( 
    mLastByteSizeTimes[key] = timestampNs;

    mLastByteSizeTimes[key] = timestampNs;

    if (totalBytes >

    if (totalBytes >

        StatsdStats::kMaxMetricsBytesPerConfig) {  // Too late. We need to start clearing data.

        StatsdStats::kMaxMetricsBytesPerConfig) {  // Too late. We need to start clearing data.

        // TODO(b/70571383): By 12/15/2017 add API to drop data directly

        metricsManager.dropData(timestampNs);

        ProtoOutputStream proto;

        metricsManager.onDumpReport(timestampNs, &proto);

        StatsdStats::getInstance().noteDataDropped(key);

        StatsdStats::getInstance().noteDataDropped(key);

        VLOG("StatsD had to toss out metrics for %s", key.ToString().c_str());

        VLOG("StatsD had to toss out metrics for %s", key.ToString().c_str());

    } else if (totalBytes > .9 * StatsdStats::kMaxMetricsBytesPerConfig) {

    } else if (totalBytes > .9 * StatsdStats::kMaxMetricsBytesPerConfig) {

cmds/statsd/src/StatsLogProcessor.h

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

    FRIEND_TEST(StatsLogProcessorTest, TestRateLimitByteSize);

    FRIEND_TEST(StatsLogProcessorTest, TestRateLimitBroadcast);

    FRIEND_TEST(StatsLogProcessorTest, TestRateLimitBroadcast);

    FRIEND_TEST(StatsLogProcessorTest, TestDropWhenByteSizeTooLarge);

    FRIEND_TEST(StatsLogProcessorTest, TestDropWhenByteSizeTooLarge);

    FRIEND_TEST(StatsLogProcessorTest, TestDropWhenByteSizeTooLarge);

    FRIEND_TEST(WakelockDurationE2eTest, TestAggregatedPredicateDimensionsForSumDuration1);

    FRIEND_TEST(WakelockDurationE2eTest, TestAggregatedPredicateDimensionsForSumDuration1);

    FRIEND_TEST(WakelockDurationE2eTest, TestAggregatedPredicateDimensionsForSumDuration2);

    FRIEND_TEST(WakelockDurationE2eTest, TestAggregatedPredicateDimensionsForSumDuration2);

    FRIEND_TEST(WakelockDurationE2eTest, TestAggregatedPredicateDimensionsForSumDuration3);

    FRIEND_TEST(WakelockDurationE2eTest, TestAggregatedPredicateDimensionsForSumDuration3);

cmds/statsd/src/metrics/CountMetricProducer.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -151,8 +151,11 @@ void CountMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, 
    protoOutput->end(protoToken);

    protoOutput->end(protoToken);





    mPastBuckets.clear();

    mPastBuckets.clear();

}





    // TODO: Clear mDimensionKeyMap once the report is dumped.

void CountMetricProducer::dropDataLocked(const uint64_t dropTimeNs) {

    flushIfNeededLocked(dropTimeNs);

    mPastBuckets.clear();

}

}





void CountMetricProducer::onConditionChangedLocked(const bool conditionMet,

void CountMetricProducer::onConditionChangedLocked(const bool conditionMet,

cmds/statsd/src/metrics/CountMetricProducer.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,8 @@ private: 




    void dumpStatesLocked(FILE* out, bool verbose) const override{};

    void dumpStatesLocked(FILE* out, bool verbose) const override{};





    void dropDataLocked(const uint64_t dropTimeNs) override;



    // Util function to flush the old packet.

    // Util function to flush the old packet.

    void flushIfNeededLocked(const uint64_t& newEventTime) override;

    void flushIfNeededLocked(const uint64_t& newEventTime) override;

cmds/statsd/src/metrics/DurationMetricProducer.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,11 @@ void DurationMetricProducer::onConditionChangedLocked(const bool conditionMet, 
    }

    }

}

}





void DurationMetricProducer::dropDataLocked(const uint64_t dropTimeNs) {

    flushIfNeededLocked(dropTimeNs);

    mPastBuckets.clear();

}



void DurationMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs,

void DurationMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs,

                                                ProtoOutputStream* protoOutput) {

                                                ProtoOutputStream* protoOutput) {

    flushIfNeededLocked(dumpTimeNs);

    flushIfNeededLocked(dumpTimeNs);