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

Commit 4bea53c6 authored by Adam Stone's avatar Adam Stone
Browse files

Update metric names for API consistency. 

The metric names need to be consistent with related APIs (e.g.
MediaCodec#getMetrics). Those APIs use dot separators rather than
slashes.

Bug 64001676

Test: Re-ran CTS, unit tests. Smoke with GPlay Movies.
Change-Id: I606e4c4bcbf630d584b9dea80471ad256764a42b
parent cea91ce6

drm/libmediadrm/DrmMetrics.cpp

+15 −15
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ void ExportCounterMetric(const android::CounterMetric<T>& counter, 
    ALOGE("item was unexpectedly null.");

    return;

  }

  std::string success_count_name = counter.metric_name() + "/ok/count";

  std::string error_count_name = counter.metric_name() + "/error/count";

  std::string success_count_name = counter.metric_name() + ".ok.count";

  std::string error_count_name = counter.metric_name() + ".error.count";

  counter.ExportValues(

      [&] (const android::status_t status, const int64_t value) {

          if (status == android::OK) {
@@ -81,7 +81,7 @@ void ExportCounterMetricWithAttributeNames( 
  counter.ExportValues(

      [&] (const T& attribute, const int64_t value) {

          std::string name = counter.metric_name()

              + "/" + GetAttributeName(attribute) + "/count";

              + "." + GetAttributeName(attribute) + ".count";

          item->setInt64(name.c_str(), value);

      });

}
@@ -93,9 +93,9 @@ void ExportEventMetric(const android::EventMetric<T>& event, 
    ALOGE("item was unexpectedly null.");

    return;

  }

  std::string success_count_name = event.metric_name() + "/ok/count";

  std::string error_count_name = event.metric_name() + "/error/count";

  std::string timing_name = event.metric_name() + "/ok/average_time_micros";

  std::string success_count_name = event.metric_name() + ".ok.count";

  std::string error_count_name = event.metric_name() + ".error.count";

  std::string timing_name = event.metric_name() + ".ok.average_time_micros";

  event.ExportValues(

      [&] (const android::status_t& status,

           const android::EventStatistics& value) {
@@ -118,19 +118,19 @@ void ExportEventMetric(const android::EventMetric<T>& event, 
namespace android {



MediaDrmMetrics::MediaDrmMetrics()

    : mOpenSessionCounter("/drm/mediadrm/open_session", "status"),

      mCloseSessionCounter("/drm/mediadrm/close_session", "status"),

      mGetKeyRequestTiming("/drm/mediadrm/get_key_request", "status"),

      mProvideKeyResponseTiming("/drm/mediadrm/provide_key_response", "status"),

    : mOpenSessionCounter("drm.mediadrm.open_session", "status"),

      mCloseSessionCounter("drm.mediadrm.close_session", "status"),

      mGetKeyRequestTiming("drm.mediadrm.get_key_request", "status"),

      mProvideKeyResponseTiming("drm.mediadrm.provide_key_response", "status"),

      mGetProvisionRequestCounter(

          "/drm/mediadrm/get_provision_request", "status"),

          "drm.mediadrm.get_provision_request", "status"),

      mProvideProvisionResponseCounter(

          "/drm/mediadrm/provide_provision_response", "status"),

          "drm.mediadrm.provide_provision_response", "status"),

      mKeyStatusChangeCounter(

          "/drm/mediadrm/key_status_change", "key_status_type"),

      mEventCounter("/drm/mediadrm/event", "event_type"),

          "drm.mediadrm.key_status_change", "key_status_type"),

      mEventCounter("drm.mediadrm.event", "event_type"),

      mGetDeviceUniqueIdCounter(

          "/drm/mediadrm/get_device_unique_id", "status") {

          "drm.mediadrm.get_device_unique_id", "status") {

}



void MediaDrmMetrics::Export(MediaAnalyticsItem* item) {

drm/libmediadrm/tests/DrmMetrics_test.cpp

+41 −43
Original line number Diff line number Diff line
@@ -65,15 +65,15 @@ TEST_F(MediaDrmMetricsTest, AllValuesSuccessCounts) { 


  // Verify the list of pairs of int64 metrics.

  std::vector<std::pair<std::string, int64_t>> expected_values = {

      { "/drm/mediadrm/open_session/ok/count", 1 },

      { "/drm/mediadrm/close_session/ok/count", 1 },

      { "/drm/mediadrm/get_key_request/ok/count", 1 },

      { "/drm/mediadrm/provide_key_response/ok/count", 1 },

      { "/drm/mediadrm/get_provision_request/ok/count", 1 },

      { "/drm/mediadrm/provide_provision_response/ok/count", 1 },

      { "/drm/mediadrm/key_status_change/USABLE/count", 1 },

      { "/drm/mediadrm/event/PROVISION_REQUIRED/count", 1 },

      { "/drm/mediadrm/get_device_unique_id/ok/count", 1 }};

      { "drm.mediadrm.open_session.ok.count", 1 },

      { "drm.mediadrm.close_session.ok.count", 1 },

      { "drm.mediadrm.get_key_request.ok.count", 1 },

      { "drm.mediadrm.provide_key_response.ok.count", 1 },

      { "drm.mediadrm.get_provision_request.ok.count", 1 },

      { "drm.mediadrm.provide_provision_response.ok.count", 1 },

      { "drm.mediadrm.key_status_change.USABLE.count", 1 },

      { "drm.mediadrm.event.PROVISION_REQUIRED.count", 1 },

      { "drm.mediadrm.get_device_unique_id.ok.count", 1 }};

  for (const auto& expected_pair : expected_values) {

    int64_t value = -1;

    EXPECT_TRUE(item.getInt64(expected_pair.first.c_str(), &value))
@@ -85,13 +85,13 @@ TEST_F(MediaDrmMetricsTest, AllValuesSuccessCounts) { 
  // Validate timing values exist.

  int64_t value = -1;

  EXPECT_TRUE(

      item.getInt64("/drm/mediadrm/get_key_request/ok/average_time_micros",

      item.getInt64("drm.mediadrm.get_key_request.ok.average_time_micros",

                    &value));

  EXPECT_GE(value, 0);



  value = -1;

  EXPECT_TRUE(

      item.getInt64("/drm/mediadrm/provide_key_response/ok/average_time_micros",

      item.getInt64("drm.mediadrm.provide_key_response.ok.average_time_micros",

                    &value));

  EXPECT_GE(value, 0);

}
@@ -140,30 +140,30 @@ TEST_F(MediaDrmMetricsTest, AllValuesFull) { 


  // Verify the list of pairs of int64 metrics.

  std::vector<std::pair<std::string, int64_t>> expected_values = {

      { "/drm/mediadrm/open_session/ok/count", 1 },

      { "/drm/mediadrm/close_session/ok/count", 1 },

      { "/drm/mediadrm/get_key_request/ok/count", 1 },

      { "/drm/mediadrm/provide_key_response/ok/count", 1 },

      { "/drm/mediadrm/get_provision_request/ok/count", 1 },

      { "/drm/mediadrm/provide_provision_response/ok/count", 1 },

      { "/drm/mediadrm/get_device_unique_id/ok/count", 1 },

      { "/drm/mediadrm/open_session/error/count", 1 },

      { "/drm/mediadrm/close_session/error/count", 1 },

      { "/drm/mediadrm/get_key_request/error/count", 1 },

      { "/drm/mediadrm/provide_key_response/error/count", 1 },

      { "/drm/mediadrm/get_provision_request/error/count", 1 },

      { "/drm/mediadrm/provide_provision_response/error/count", 1 },

      { "/drm/mediadrm/get_device_unique_id/error/count", 1 },

      { "/drm/mediadrm/key_status_change/USABLE/count", 1 },

      { "/drm/mediadrm/key_status_change/EXPIRED/count", 1 },

      { "/drm/mediadrm/key_status_change/OUTPUT_NOT_ALLOWED/count", 1 },

      { "/drm/mediadrm/key_status_change/STATUS_PENDING/count", 1 },

      { "/drm/mediadrm/key_status_change/INTERNAL_ERROR/count", 1 },

      { "/drm/mediadrm/event/PROVISION_REQUIRED/count", 1 },

      { "/drm/mediadrm/event/KEY_NEEDED/count", 1 },

      { "/drm/mediadrm/event/KEY_EXPIRED/count", 1 },

      { "/drm/mediadrm/event/VENDOR_DEFINED/count", 1 },

      { "/drm/mediadrm/event/SESSION_RECLAIMED/count", 1 }};

      { "drm.mediadrm.open_session.ok.count", 1 },

      { "drm.mediadrm.close_session.ok.count", 1 },

      { "drm.mediadrm.get_key_request.ok.count", 1 },

      { "drm.mediadrm.provide_key_response.ok.count", 1 },

      { "drm.mediadrm.get_provision_request.ok.count", 1 },

      { "drm.mediadrm.provide_provision_response.ok.count", 1 },

      { "drm.mediadrm.get_device_unique_id.ok.count", 1 },

      { "drm.mediadrm.open_session.error.count", 1 },

      { "drm.mediadrm.close_session.error.count", 1 },

      { "drm.mediadrm.get_key_request.error.count", 1 },

      { "drm.mediadrm.provide_key_response.error.count", 1 },

      { "drm.mediadrm.get_provision_request.error.count", 1 },

      { "drm.mediadrm.provide_provision_response.error.count", 1 },

      { "drm.mediadrm.get_device_unique_id.error.count", 1 },

      { "drm.mediadrm.key_status_change.USABLE.count", 1 },

      { "drm.mediadrm.key_status_change.EXPIRED.count", 1 },

      { "drm.mediadrm.key_status_change.OUTPUT_NOT_ALLOWED.count", 1 },

      { "drm.mediadrm.key_status_change.STATUS_PENDING.count", 1 },

      { "drm.mediadrm.key_status_change.INTERNAL_ERROR.count", 1 },

      { "drm.mediadrm.event.PROVISION_REQUIRED.count", 1 },

      { "drm.mediadrm.event.KEY_NEEDED.count", 1 },

      { "drm.mediadrm.event.KEY_EXPIRED.count", 1 },

      { "drm.mediadrm.event.VENDOR_DEFINED.count", 1 },

      { "drm.mediadrm.event.SESSION_RECLAIMED.count", 1 }};

  for (const auto& expected_pair : expected_values) {

    int64_t value = -1;

    EXPECT_TRUE(item.getInt64(expected_pair.first.c_str(), &value))
@@ -174,18 +174,16 @@ TEST_F(MediaDrmMetricsTest, AllValuesFull) { 


  // Validate timing values exist.

  int64_t value = -1;

  std::string name = metrics.mGetKeyRequestTiming.metric_name()

      + "/ok/average_time_micros";

  EXPECT_TRUE(item.getInt64(name.c_str(), &value));

  EXPECT_TRUE(

      item.getInt64("drm.mediadrm.get_key_request.ok.average_time_micros",

                    &value));

  EXPECT_GE(value, 0);



  value = -1;

  name = metrics.mProvideKeyResponseTiming.metric_name()

      + "/ok/average_time_micros";

  EXPECT_TRUE(item.getInt64(name.c_str(), &value));

  EXPECT_TRUE(

      item.getInt64("drm.mediadrm.provide_key_response.ok.average_time_micros",

                    &value));

  EXPECT_GE(value, 0);

}







}  // namespace android