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

Commit dad9ae84 authored by Andy Hung's avatar Andy Hung
Browse files

MediaMetrics: clean up logging of statsd atoms 

Now that sc-dev and master are in sync
clean up the code.

Test: adb shell dumpsys media.metrics
Test: atest mediametrics_tests
Bug: 184263266
Bug: 187446159
Change-Id: I649ee39d60c695b606fa51bc20b6d277b2658f1b
parent 3b169aab

services/mediametrics/statsd_extractor.cpp

+0 −4
Original line number Diff line number Diff line
@@ -52,9 +52,6 @@ bool statsd_extractor(const std::shared_ptr<const mediametrics::Item>& item, 
    //

    ::android::stats::mediametrics::ExtractorData metrics_proto;



    // flesh out the protobuf we'll hand off with our data

    //



    std::string format;

    if (item->getString("android.media.mediaextractor.fmt", &format)) {

        metrics_proto.set_format(format);
@@ -86,7 +83,6 @@ bool statsd_extractor(const std::shared_ptr<const mediametrics::Item>& item, 
      metrics_proto.set_entry_point(entry_point);

    }



    // android.media.mediaextractor.logSessionId        string

    std::string log_session_id;

    if (item->getString("android.media.mediaextractor.logSessionId", &log_session_id)) {

        metrics_proto.set_log_session_id(log_session_id);

services/mediametrics/statsd_mediaparser.cpp

+18 −22
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ namespace android { 
bool statsd_mediaparser(const std::shared_ptr<const mediametrics::Item>& item,

        const std::shared_ptr<mediametrics::StatsdLog>& statsdLog)

{

    static constexpr bool enabled_statsd = true; // TODO: Remove, dup with dump2StatsdInternal().

    if (item == nullptr) return false;



    const nsecs_t timestamp_nanos = MediaMetricsService::roundTime(item->getTimestamp());
@@ -82,8 +81,7 @@ bool statsd_mediaparser(const std::shared_ptr<const mediametrics::Item>& item, 
    std::string logSessionId;

    item->getString("android.media.mediaparser.logSessionId", &logSessionId);



    if (enabled_statsd) {

        (void) android::util::stats_write(android::util::MEDIAMETRICS_MEDIAPARSER_REPORTED,

    int result = android::util::stats_write(android::util::MEDIAMETRICS_MEDIAPARSER_REPORTED,

                               timestamp_nanos,

                               package_name.c_str(),

                               package_version_code,
@@ -99,11 +97,9 @@ bool statsd_mediaparser(const std::shared_ptr<const mediametrics::Item>& item, 
                               videoWidth,

                               videoHeight,

                               logSessionId.c_str());

    } else {

        ALOGV("NOT sending MediaParser media metrics.");

    }



    std::stringstream log;

    log << "result:" << "(result)" << " {"

    log << "result:" << result << " {"

            << " mediametrics_mediaparser_reported:"

            << android::util::MEDIAMETRICS_MEDIAPARSER_REPORTED

            << " timestamp_nanos:" << timestamp_nanos