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

Commit fd05a4ee authored by yro's avatar yro
Browse files

Remove dropbox dependency from StatsLogProcessor

Test: statsd, statsd_test

Change-Id: Ia9a3e9b2b3ffffaed81f6045ec43b7d908947fb6
parent 35c1a5d5
Loading
Loading
Loading
Loading
+1 −7
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ namespace statsd {

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 @@ StatsLogProcessor::~StatsLogProcessor() {

// 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);
+1 −5
Original line number Diff line number Diff line
@@ -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 @@ public:
    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 @@ private:
    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. */