commit fd05a4ee56d72cf743c5186973fa6fd5100b2c04
author yro <yro@google.com> Thu Oct 26 14:08:26 2017 -0700
committer yro <yro@google.com> Thu Oct 26 14:18:25 2017 -0700
tree 550aa5335f43a83785ce2771d59f7db2c6526c87
parent 35c1a5d51b02a9a9853cf4abc0569591bdb71ecb

Remove dropbox dependency from StatsLogProcessor

Test: statsd, statsd_test

Change-Id: Ia9a3e9b2b3ffffaed81f6045ec43b7d908947fb6

cmds/statsd/src/StatsLogProcessor.cpp

diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp
index 68f48a4..56d4e4d 100644
--- a/cmds/statsd/src/StatsLogProcessor.cpp
+++ b/cmds/statsd/src/StatsLogProcessor.cpp
@@ -35,7 +35,7 @@
 
 StatsLogProcessor::StatsLogProcessor(const sp<UidMap>& uidMap,
                                      const std::function<void(const vector<uint8_t>&)>& pushLog)
-    : m_dropbox_writer("all-logs"), mUidMap(uidMap), mPushLog(pushLog) {
+    : mUidMap(uidMap), mPushLog(pushLog) {
 }
 
 StatsLogProcessor::~StatsLogProcessor() {
@@ -43,12 +43,6 @@
 
 // TODO: what if statsd service restarts? How do we know what logs are already processed before?
 void StatsLogProcessor::OnLogEvent(const LogEvent& msg) {
-    // TODO: Use EventMetric to filter the events we want to log.
-    /* TODO: Convert this when we have the generic protobuf writing library in.
-    EventMetricData eventMetricData = parse(msg);
-    m_dropbox_writer.addEventMetricData(eventMetricData);
-    */
-
     // pass the event to metrics managers.
     for (auto& pair : mMetricsManagers) {
         pair.second->onLogEvent(msg);

cmds/statsd/src/StatsLogProcessor.h

diff --git a/cmds/statsd/src/StatsLogProcessor.h b/cmds/statsd/src/StatsLogProcessor.h
index 08090c1..9cd74ca 100644
--- a/cmds/statsd/src/StatsLogProcessor.h
+++ b/cmds/statsd/src/StatsLogProcessor.h
@@ -20,7 +20,6 @@
 #include "logd/LogReader.h"
 #include "metrics/MetricsManager.h"
 #include "packages/UidMap.h"
-#include "storage/DropboxWriter.h"
 
 #include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
 
@@ -49,9 +48,6 @@
     void flush();
 
 private:
-    // TODO: use EventMetrics to log the events.
-    DropboxWriter m_dropbox_writer;
-
     std::unordered_map<ConfigKey, std::unique_ptr<MetricsManager>> mMetricsManagers;
 
     sp<UidMap> mUidMap;  // Reference to the UidMap to lookup app name and version for each uid.
@@ -75,7 +71,7 @@
     size_t mBufferSize = 0;
 
     /* Check if the buffer size exceeds the max buffer size when the new entry is added, and flush
-       the logs to dropbox if true. */
+       the logs to callback clients if true. */
     void flushIfNecessary(const EventMetricData& eventMetricData);
 
     /* Append event metric data to StatsLogReport. */