commit dad9ae84d8d13b8a40049a9afeac20c04c000124
author Andy Hung <hunga@google.com> Thu May 06 10:56:41 2021 -0700
committer Andy Hung <hunga@google.com> Thu May 06 14:24:30 2021 -0700
tree 813a6645f10d8ae680a6a46d12b93575c0eec562
parent 3b169aab10404d7c3ac382a8ca6a71f9ea44a678

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

services/mediametrics/statsd_extractor.cpp

diff --git a/services/mediametrics/statsd_extractor.cpp b/services/mediametrics/statsd_extractor.cpp
index 281a4ce..2378f33 100644
--- a/services/mediametrics/statsd_extractor.cpp
+++ b/services/mediametrics/statsd_extractor.cpp
@@ -52,9 +52,6 @@
     //
     ::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 @@
       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

diff --git a/services/mediametrics/statsd_mediaparser.cpp b/services/mediametrics/statsd_mediaparser.cpp
index 6cceb06..af2946b 100644
--- a/services/mediametrics/statsd_mediaparser.cpp
+++ b/services/mediametrics/statsd_mediaparser.cpp
@@ -39,7 +39,6 @@
 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,28 +81,25 @@
     std::string logSessionId;
     item->getString("android.media.mediaparser.logSessionId", &logSessionId);
 
-    if (enabled_statsd) {
-        (void) android::util::stats_write(android::util::MEDIAMETRICS_MEDIAPARSER_REPORTED,
-                                   timestamp_nanos,
-                                   package_name.c_str(),
-                                   package_version_code,
-                                   parserName.c_str(),
-                                   createdByName,
-                                   parserPool.c_str(),
-                                   lastException.c_str(),
-                                   resourceByteCount,
-                                   durationMillis,
-                                   trackMimeTypes.c_str(),
-                                   trackCodecs.c_str(),
-                                   alteredParameters.c_str(),
-                                   videoWidth,
-                                   videoHeight,
-                                   logSessionId.c_str());
-    } else {
-        ALOGV("NOT sending MediaParser media metrics.");
-    }
+    int result = android::util::stats_write(android::util::MEDIAMETRICS_MEDIAPARSER_REPORTED,
+                               timestamp_nanos,
+                               package_name.c_str(),
+                               package_version_code,
+                               parserName.c_str(),
+                               createdByName,
+                               parserPool.c_str(),
+                               lastException.c_str(),
+                               resourceByteCount,
+                               durationMillis,
+                               trackMimeTypes.c_str(),
+                               trackCodecs.c_str(),
+                               alteredParameters.c_str(),
+                               videoWidth,
+                               videoHeight,
+                               logSessionId.c_str());
+
     std::stringstream log;
-    log << "result:" << "(result)" << " {"
+    log << "result:" << result << " {"
             << " mediametrics_mediaparser_reported:"
             << android::util::MEDIAMETRICS_MEDIAPARSER_REPORTED
             << " timestamp_nanos:" << timestamp_nanos