diff options
| author | Tej Singh <singhtejinder@google.com> | 2019-05-09 18:17:59 -0700 |
|---|---|---|
| committer | Tej Singh <singhtejinder@google.com> | 2019-05-13 15:37:19 -0700 |
| commit | f53d445cef3b2c115a359dec6e888c2ad4dd1694 (patch) | |
| tree | 3063c89419d4f43dc8f2a1e147a1da36cef2c77d /cmds/statsd/src/metrics/MetricsManager.cpp | |
| parent | 0d3acf62ecf5b0e8ec1f6af0321e0831ced2372e (diff) | |
Persist active metric status across system server
Previously, all metrics/configs would deactivate on system server death.
Now, active status is restored.
Bug: 129717537
Test: bit statsd_test:*
Test: libprotoutil_test:ProtoOutputStream*
Change-Id: Idf372457f60a931a2d00176a5eab58c534a25e41
Diffstat (limited to 'cmds/statsd/src/metrics/MetricsManager.cpp')
| -rw-r--r-- | cmds/statsd/src/metrics/MetricsManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/statsd/src/metrics/MetricsManager.cpp b/cmds/statsd/src/metrics/MetricsManager.cpp index 947f37782fcc..207a7dd87215 100644 --- a/cmds/statsd/src/metrics/MetricsManager.cpp +++ b/cmds/statsd/src/metrics/MetricsManager.cpp @@ -528,14 +528,14 @@ void MetricsManager::loadActiveConfig(const ActiveConfig& config, int64_t curren } void MetricsManager::writeActiveConfigToProtoOutputStream( - int64_t currentTimeNs, ProtoOutputStream* proto) { + int64_t currentTimeNs, const DumpReportReason reason, ProtoOutputStream* proto) { proto->write(FIELD_TYPE_INT64 | FIELD_ID_ACTIVE_CONFIG_ID, (long long)mConfigKey.GetId()); proto->write(FIELD_TYPE_INT32 | FIELD_ID_ACTIVE_CONFIG_UID, mConfigKey.GetUid()); for (int metricIndex : mMetricIndexesWithActivation) { const auto& metric = mAllMetricProducers[metricIndex]; const uint64_t metricToken = proto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_ACTIVE_CONFIG_METRIC); - metric->writeActiveMetricToProtoOutputStream(currentTimeNs, proto); + metric->writeActiveMetricToProtoOutputStream(currentTimeNs, reason, proto); proto->end(metricToken); } } |