commit 4bea53c67527030fca3820dbe7d7711badf10cde
author Adam Stone <blueeyes@google.com> Wed Jan 24 21:44:58 2018 -0800
committer Adam Stone <blueeyes@google.com> Wed Jan 24 22:28:39 2018 -0800
tree 5ccf946190b2d436033899f03aa1fec9bbf203d1
parent cea91ce60260d7ebb94449ad7674150fdc227886

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

drm/libmediadrm/DrmMetrics.cpp

diff --git a/drm/libmediadrm/DrmMetrics.cpp b/drm/libmediadrm/DrmMetrics.cpp
index 68730b7..258c4b0 100644
--- a/drm/libmediadrm/DrmMetrics.cpp
+++ b/drm/libmediadrm/DrmMetrics.cpp
@@ -54,8 +54,8 @@
     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 @@
   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 @@
     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 @@
 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) {