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

Commit ff5ab067 authored by Adam Stone's avatar Adam Stone Committed by Android (Google) Code Review
Browse files

Merge "Fixes the transformation of metrics." into pi-dev

parents ec2c0359 342f5ff6

drm/libmediadrm/DrmMetrics.cpp

+23 −5
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
using ::android::String16;

using ::android::String8;

using ::android::drm_metrics::DrmFrameworkMetrics;

using ::android::hardware::hidl_string;

using ::android::hardware::hidl_vec;

using ::android::hardware::drm::V1_0::EventType;

using ::android::hardware::drm::V1_0::KeyStatusType;
@@ -192,6 +193,13 @@ void SetValue(const String16 &name, DrmMetricGroup::ValueType type, 
    }

}



inline String16 MakeIndexString(unsigned int index) {

  std::string str("[");

  str.append(std::to_string(index));

  str.append("]");

  return String16(str.c_str());

}



} // namespace



namespace android {
@@ -370,9 +378,11 @@ status_t MediaDrmMetrics::HidlMetricsToBundle( 
    }



    int groupIndex = 0;

    std::map<String16, int> indexMap;

    for (const auto &hidlMetricGroup : hidlMetricGroups) {

        PersistableBundle bundleMetricGroup;

        for (const auto &hidlMetric : hidlMetricGroup.metrics) {

            String16 metricName(hidlMetric.name.c_str());

            PersistableBundle bundleMetric;

            // Add metric component values.

            for (const auto &value : hidlMetric.values) {
@@ -388,14 +398,22 @@ status_t MediaDrmMetrics::HidlMetricsToBundle( 
            // Add attributes to the bundle metric.

            bundleMetric.putPersistableBundle(String16("attributes"),

                                              bundleMetricAttributes);

            // Add one layer of indirection, allowing for repeated metric names.

            PersistableBundle repeatedMetrics;

            bundleMetricGroup.getPersistableBundle(metricName,

                                                   &repeatedMetrics);

            int index = indexMap[metricName];

            repeatedMetrics.putPersistableBundle(MakeIndexString(index),

                                                 bundleMetric);

            indexMap[metricName] = ++index;



            // Add the bundle metric to the group of metrics.

            bundleMetricGroup.putPersistableBundle(

                String16(hidlMetric.name.c_str()), bundleMetric);

            bundleMetricGroup.putPersistableBundle(metricName,

                                                   repeatedMetrics);

        }

        // Add the bundle metric group to the collection of groups.

        bundleMetricGroups->putPersistableBundle(

            String16(std::to_string(groupIndex).c_str()), bundleMetricGroup);

        groupIndex++;

        bundleMetricGroups->putPersistableBundle(MakeIndexString(groupIndex++),

                                                 bundleMetricGroup);

    }



    return OK;

drm/libmediadrm/tests/DrmMetrics_test.cpp

+10 −6
Original line number Diff line number Diff line
@@ -429,7 +429,8 @@ TEST_F(MediaDrmMetricsTest, HidlToBundleMetricsMultiple) { 
  DrmMetricGroup hidlMetricGroup =

      { { {

              "open_session_ok",

              { { "status", DrmMetricGroup::ValueType::INT64_TYPE, (int64_t) Status::OK, 0.0, "" } },

              { { "status", DrmMetricGroup::ValueType::INT64_TYPE,

                  (int64_t) Status::OK, 0.0, "" } },

              { { "count", DrmMetricGroup::ValueType::INT64_TYPE, 3, 0.0, "" } }

          },

          {
@@ -444,25 +445,28 @@ TEST_F(MediaDrmMetricsTest, HidlToBundleMetricsMultiple) { 
                                                     &bundleMetricGroups));

  ASSERT_EQ(1U, bundleMetricGroups.size());

  PersistableBundle bundleMetricGroup;

  ASSERT_TRUE(bundleMetricGroups.getPersistableBundle(String16("0"), &bundleMetricGroup));

  ASSERT_TRUE(bundleMetricGroups.getPersistableBundle(String16("[0]"), &bundleMetricGroup));

  ASSERT_EQ(2U, bundleMetricGroup.size());



  // Verify each metric.

  PersistableBundle metric;

  ASSERT_TRUE(bundleMetricGroup.getPersistableBundle(String16("open_session_ok"), &metric));

  PersistableBundle metricInstance;

  ASSERT_TRUE(metric.getPersistableBundle(String16("[0]"), &metricInstance));

  int64_t value = 0;

  ASSERT_TRUE(metric.getLong(String16("count"), &value));

  ASSERT_TRUE(metricInstance.getLong(String16("count"), &value));

  ASSERT_EQ(3, value);

  PersistableBundle attributeBundle;

  ASSERT_TRUE(metric.getPersistableBundle(String16("attributes"), &attributeBundle));

  ASSERT_TRUE(metricInstance.getPersistableBundle(String16("attributes"), &attributeBundle));

  ASSERT_TRUE(attributeBundle.getLong(String16("status"), &value));

  ASSERT_EQ((int64_t) Status::OK, value);



  ASSERT_TRUE(bundleMetricGroup.getPersistableBundle(String16("close_session_not_opened"),

                                                     &metric));

  ASSERT_TRUE(metric.getLong(String16("count"), &value));

  ASSERT_TRUE(metric.getPersistableBundle(String16("[0]"), &metricInstance));

  ASSERT_TRUE(metricInstance.getLong(String16("count"), &value));

  ASSERT_EQ(7, value);

  ASSERT_TRUE(metric.getPersistableBundle(String16("attributes"), &attributeBundle));

  ASSERT_TRUE(metricInstance.getPersistableBundle(String16("attributes"), &attributeBundle));

  value = 0;

  ASSERT_TRUE(attributeBundle.getLong(String16("status"), &value));

  ASSERT_EQ((int64_t) Status::ERROR_DRM_SESSION_NOT_OPENED, value);