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

Commit e3d6bf3c authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "MediaMetrics: Report last statsd atoms pulled" into sc-dev am: 64f7aca0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14065163

Change-Id: I814f975acae2e785835fe5999f891a08056842c9
parents d9cb02d2 64f7aca0

services/mediametrics/MediaMetricsService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ AStatsManager_PullAtomCallbackReturn MediaMetricsService::pullItems( 
    std::lock_guard _l(mLock);

    for (auto &item : mPullableItems[key]) {

        if (const auto sitem = item.lock()) {

            dump2Statsd(sitem, data);

            dump2Statsd(sitem, data, mStatsdLog);

        }

    }

    mPullableItems[key].clear();

services/mediametrics/StringUtils.h

+21 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


#pragma once



#include <iomanip>

#include <sstream>

#include <string>

#include <vector>
@@ -146,4 +148,23 @@ inline std::string sanitizeLogSessionId(const std::string& string) { 
    return {}; // if not a logSessionId, return an empty string.

}



inline std::string bytesToString(const std::vector<uint8_t>& bytes, size_t maxSize = SIZE_MAX) {

    if (bytes.size() == 0) {

        return "{}";

    }

    std::stringstream ss;

    ss << "{";

    ss << std::hex << std::setfill('0');

    maxSize = std::min(maxSize, bytes.size());

    for (size_t i = 0; i < maxSize; ++i) {

        ss << " " << std::setw(2) << (int)bytes[i];

    }

    if (maxSize != bytes.size()) {

        ss << " ... }";

    } else {

        ss << " }";

    }

    return ss.str();

}



} // namespace android::mediametrics::stringutils

services/mediametrics/iface_statsd.cpp

+3 −2
Original line number Diff line number Diff line
@@ -93,12 +93,13 @@ bool dump2Statsd( 
    return dump2StatsdInternal(statsd_pushers, item, statsdLog);

}



bool dump2Statsd(const std::shared_ptr<const mediametrics::Item>& item, AStatsEventList* out) {

bool dump2Statsd(const std::shared_ptr<const mediametrics::Item>& item, AStatsEventList* out,

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

    static const std::map<std::string, statsd_puller*> statsd_pullers =

    {

        { "mediadrm", statsd_mediadrm_puller },

    };

    return dump2StatsdInternal(statsd_pullers, item, out);

    return dump2StatsdInternal(statsd_pullers, item, out, statsdLog);

}



} // namespace android

services/mediametrics/iface_statsd.h

+3 −3
Original line number Diff line number Diff line
@@ -39,12 +39,12 @@ extern statsd_pusher statsd_mediadrm; 
extern statsd_pusher statsd_drmmanager;



using statsd_puller = bool (const std::shared_ptr<const mediametrics::Item>& item,

        AStatsEventList *);

        AStatsEventList *, const std::shared_ptr<mediametrics::StatsdLog>& statsdLog);

// component specific pullers

extern statsd_puller statsd_mediadrm_puller;



bool dump2Statsd(const std::shared_ptr<const mediametrics::Item>& item,

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

bool dump2Statsd(const std::shared_ptr<const mediametrics::Item>& item, AStatsEventList* out);



bool dump2Statsd(const std::shared_ptr<const mediametrics::Item>& item, AStatsEventList* out,

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

} // namespace android

services/mediametrics/statsd_drm.cpp

+16 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <pwd.h>



#include "MediaMetricsService.h"

#include "StringUtils.h"

#include "iface_statsd.h"



#include <statslog.h>
@@ -172,7 +173,8 @@ std::vector<uint8_t> base64DecodeNoPad(std::string& str) { 


// |out| and its contents are memory-managed by statsd.

bool statsd_mediadrm_puller(

        const std::shared_ptr<const mediametrics::Item>& item, AStatsEventList* out)

        const std::shared_ptr<const mediametrics::Item>& item, AStatsEventList* out,

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

{

    if (item == nullptr) {

        return false;
@@ -201,6 +203,19 @@ bool statsd_mediadrm_puller( 
    AStatsEvent_writeByteArray(event, framework_raw.data(), framework_raw.size());

    AStatsEvent_writeByteArray(event, plugin_raw.data(), plugin_raw.size());

    AStatsEvent_build(event);



    std::stringstream log;

    log << "pulled:" << " {"

            << " media_drm_activity_info:"

            << android::util::MEDIA_DRM_ACTIVITY_INFO

            << " package_name:" << item->getPkgName()

            << " package_version_code:" << item->getPkgVersionCode()

            << " vendor:" << vendor

            << " description:" << description

            << " framework_metrics:" << mediametrics::stringutils::bytesToString(framework_raw, 8)

            << " vendor_metrics:" <<  mediametrics::stringutils::bytesToString(plugin_raw, 8)

            << " }";

    statsdLog->log(android::util::MEDIA_DRM_ACTIVITY_INFO, log.str());

    return true;

}