Rename metrics.proto to wv_metrics.proto.

Merge from http://go/wvgerrit/105767

To avoid conflict with metrics.proto in
frameworks/av/drm/libmediadrm/proto.
This is in preparation of moving metrics_dump tool
to build under Android.

bug: 161783052
Test: unit test
Test: Play Movies & Tv and Netflix streaming
Change-Id: I2406b66db4d61cca7c6260ea8847a555d96c8d42

libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp

@@ -15,8 +15,8 @@
 #include "cdm_engine.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "metrics.pb.h"
 #include "wv_cdm_event_listener.h"
+#include "wv_metrics.pb.h"
 
 using ::testing::_;
 using ::testing::ByRef;

libwvdrmengine/cdm/core/test/cdm_engine_test.cpp

@@ -19,7 +19,6 @@
 #include "initialization_data.h"
 #include "license_request.h"
 #include "log.h"
-#include "metrics.pb.h"
 #include "properties.h"
 #include "string_conversions.h"
 #include "test_base.h"
@@ -27,6 +26,7 @@
 #include "url_request.h"
 #include "wv_cdm_constants.h"
 #include "wv_cdm_types.h"
+#include "wv_metrics.pb.h"
 
 namespace wvcdm {
 

libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp

@@ -9,7 +9,6 @@
 
 #include "cdm_session.h"
 #include "crypto_key.h"
-#include "metrics.pb.h"
 #include "properties.h"
 #include "service_certificate.h"
 #include "string_conversions.h"
@@ -17,6 +16,7 @@
 #include "test_printers.h"
 #include "usage_table_header.h"
 #include "wv_cdm_constants.h"
+#include "wv_metrics.pb.h"
 
 using ::testing::_;
 using ::testing::DoAll;

libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp

@@ -12,12 +12,12 @@
 #include "key_session.h"
 #include "license_protocol.pb.h"
 #include "log.h"
-#include "metrics.pb.h"
 #include "metrics_collections.h"
 #include "platform.h"
 #include "test_base.h"
 #include "test_printers.h"
 #include "wv_cdm_types.h"
+#include "wv_metrics.pb.h"
 
 namespace {
 

libwvdrmengine/cdm/include/wv_content_decryption_module.h

@@ -14,9 +14,9 @@
 #include "cdm_identifier.h"
 #include "disallow_copy_and_assign.h"
 #include "file_store.h"
-#include "metrics.pb.h"
 #include "timer.h"
 #include "wv_cdm_types.h"
+#include "wv_metrics.pb.h"
 
 namespace wvcdm {
 

libwvdrmengine/cdm/metrics/include/attribute_handler.h

@@ -8,10 +8,10 @@
 #include "OEMCryptoCENC.h"
 #include "field_tuples.h"
 #include "log.h"
-#include "metrics.pb.h"
 #include "pow2bucket.h"
 #include "value_metric.h"
 #include "wv_cdm_types.h"
+#include "wv_metrics.pb.h"
 
 namespace wvcdm {
 namespace metrics {

libwvdrmengine/cdm/metrics/include/event_metric.h

@@ -15,8 +15,8 @@
 #include "attribute_handler.h"
 #include "distribution.h"
 #include "log.h"
-#include "metrics.pb.h"
 #include "pow2bucket.h"
+#include "wv_metrics.pb.h"
 
 namespace wvcdm {
 namespace metrics {

libwvdrmengine/cdm/metrics/include/metrics_collections.h

@@ -14,10 +14,10 @@
 #include "OEMCryptoCENC.h"
 #include "counter_metric.h"
 #include "event_metric.h"
-#include "metrics.pb.h"
 #include "timer_metric.h"
 #include "value_metric.h"
 #include "wv_cdm_types.h"
+#include "wv_metrics.pb.h"
 
 // This definition indicates that a given metric does not need timing
 // stats. Example:

libwvdrmengine/cdm/metrics/include/value_metric.h

@@ -9,7 +9,7 @@
 #include <mutex>
 #include <string>
 
-#include "metrics.pb.h"
+#include "wv_metrics.pb.h"
 
 namespace wvcdm {
 namespace metrics {

libwvdrmengine/cdm/metrics/src/Android.bp

@@ -4,7 +4,7 @@ cc_library {
     vendor: true,
 
     srcs: [
-      "metrics.proto",
+      "wv_metrics.proto",
     ],
 
     cflags: [

libwvdrmengine/cdm/metrics/src/counter_metric.cpp

@@ -5,7 +5,7 @@
 
 #include "counter_metric.h"
 
-#include "metrics.pb.h"
+#include "wv_metrics.pb.h"
 
 namespace wvcdm {
 namespace metrics {

libwvdrmengine/cdm/metrics/src/metrics_collections.cpp

@@ -5,7 +5,7 @@
 #include <algorithm>
 
 #include "log.h"
-#include "metrics.pb.h"
+#include "wv_metrics.pb.h"
 
 using ::drm_metrics::Attributes;
 using ::drm_metrics::WvCdmMetrics;

libwvdrmengine/cdm/metrics/src/wv_metrics.proto

@@ -106,10 +106,12 @@ message WvCdmMetrics {
     repeated CounterMetric crypto_session_get_device_unique_id = 8;
     repeated CounterMetric crypto_session_get_token = 9;
     optional ValueMetric crypto_session_life_span = 10;
-    repeated DistributionMetric crypto_session_load_certificate_private_key_time_us = 11;
+    repeated DistributionMetric
+        crypto_session_load_certificate_private_key_time_us = 11;
     repeated DistributionMetric crypto_session_open_time_us = 12;
     optional ValueMetric crypto_session_system_id = 13;
-    repeated DistributionMetric crypto_session_update_usage_information_time_us = 14;
+    repeated DistributionMetric
+        crypto_session_update_usage_information_time_us = 14;
     optional ValueMetric crypto_session_usage_information_support = 15;
 
     // Usage Table Metrics
@@ -135,7 +137,8 @@ message WvCdmMetrics {
     repeated DistributionMetric oemcrypto_decrypt_cenc_time_us = 21;
     repeated CounterMetric oemcrypto_delete_usage_entry = 22;
     repeated CounterMetric oemcrypto_delete_usage_table = 23;
-    repeated DistributionMetric oemcrypto_derive_keys_from_session_key_time_us = 24;
+    repeated DistributionMetric oemcrypto_derive_keys_from_session_key_time_us =
+        24;
     repeated CounterMetric oemcrypto_force_delete_usage_entry = 25;
     repeated DistributionMetric oemcrypto_generate_derived_keys_time_us = 26;
     repeated CounterMetric oemcrypto_generate_nonce = 27;
@@ -229,10 +232,12 @@ message WvCdmMetrics {
     repeated DistributionMetric cdm_engine_decrypt_time_us = 11;
     repeated CounterMetric cdm_engine_find_session_for_key = 12;
     repeated DistributionMetric cdm_engine_generate_key_request_time_us = 13;
-    repeated DistributionMetric cdm_engine_get_provisioning_request_time_us = 14;
+    repeated DistributionMetric cdm_engine_get_provisioning_request_time_us =
+        14;
     repeated CounterMetric cdm_engine_get_secure_stop_ids = 15;
     repeated DistributionMetric cdm_engine_get_usage_info_time_us = 16;
-    repeated DistributionMetric cdm_engine_handle_provisioning_response_time_us = 17;
+    repeated DistributionMetric
+        cdm_engine_handle_provisioning_response_time_us = 17;
     optional ValueMetric cdm_engine_life_span_ms = 18;
     repeated CounterMetric cdm_engine_open_key_set_session = 19;
     repeated CounterMetric cdm_engine_open_session = 20;
@@ -259,7 +264,7 @@ message WvCdmMetricsGroup {
 }
 
 // Test message to support unit testing.
-message TestMetrics{
+message TestMetrics {
   optional ValueMetric test_value_metric = 1;
   repeated CounterMetric test_counters = 3;
   repeated DistributionMetric test_distributions = 2;

libwvdrmengine/cdm/metrics/test/metrics_collections_test.cpp

@@ -11,8 +11,8 @@
 #include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
 #include "log.h"
-#include "metrics.pb.h"
 #include "wv_cdm_types.h"
+#include "wv_metrics.pb.h"
 
 using drm_metrics::MetricsGroup;
 using google::protobuf::TextFormat;

libwvdrmengine/cdm/metrics/test/metrics_collections_unittest.cpp

@@ -12,9 +12,9 @@
 #include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
 #include "log.h"
-#include "metrics.pb.h"
 #include "string_conversions.h"
 #include "wv_cdm_types.h"
+#include "wv_metrics.pb.h"
 
 using drm_metrics::WvCdmMetrics;
 

libwvdrmengine/cdm/metrics/test/value_metric_unittest.cpp

@@ -9,7 +9,7 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "metrics.pb.h"
+#include "wv_metrics.pb.h"
 
 namespace wvcdm {
 namespace metrics {

libwvdrmengine/cdm/src/wv_content_decryption_module.cpp

@@ -13,12 +13,12 @@
 #include "initialization_data.h"
 #include "license.h"
 #include "log.h"
-#include "metrics.pb.h"
 #include "properties.h"
 #include "service_certificate.h"
 #include "string_conversions.h"
 #include "wv_cdm_constants.h"
 #include "wv_cdm_event_listener.h"
+#include "wv_metrics.pb.h"
 
 namespace {
 const int kCdmTimerDurationSeconds = 1;

libwvdrmengine/cdm/test/wv_cdm_metrics_test.cpp

@@ -8,12 +8,12 @@
 #include "cdm_identifier.h"
 #include "gmock/gmock.h"
 #include "log.h"
-#include "metrics.pb.h"
 #include "string_conversions.h"
 #include "test_base.h"
 #include "test_printers.h"
 #include "wv_cdm_types.h"
 #include "wv_content_decryption_module.h"
+#include "wv_metrics.pb.h"
 
 using ::testing::Eq;
 using ::testing::Ge;

libwvdrmengine/include_hidl/wv_metrics.h

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "metrics.pb.h"
+#include "wv_metrics.pb.h"
 
 namespace wv_metrics {
 void FormatWvCdmMetrics(const drm_metrics::WvCdmMetrics& metrics,

libwvdrmengine/mediadrm/include_hidl/hidl_metrics_adapter.h

@@ -11,7 +11,7 @@
 
 #include <android/hardware/drm/1.1/types.h>
 
-#include "metrics.pb.h"
+#include "wv_metrics.pb.h"
 
 namespace wvcdm {
 

libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp

@@ -22,9 +22,9 @@
 #include "hidl_metrics_adapter.h"
 #include "mapErrors-inl.h"
 #include "media/stagefright/MediaErrors.h"
-#include "metrics.pb.h"
 #include "openssl/sha.h"
 #include "wv_cdm_constants.h"
+#include "wv_metrics.pb.h"
 
 namespace {
 

libwvdrmengine/mediadrm/src_hidl/hidl_metrics_adapter.cpp

@@ -7,7 +7,7 @@
 #include "hidl_metrics_adapter.h"
 
 #include <android/hardware/drm/1.1/types.h>
-#include "metrics.pb.h"
+#include "wv_metrics.pb.h"
 
 using android::hardware::hidl_vec;
 using android::hardware::drm::V1_1::DrmMetricGroup;

libwvdrmengine/mediadrm/test/hidl_metrics_adapter_unittest.cpp

@@ -13,7 +13,7 @@
 #include <utils/Log.h>
 
 #include "gtest/gtest.h"
-#include "metrics.pb.h"
+#include "wv_metrics.pb.h"
 
 using android::hardware::hidl_vec;
 using android::hardware::drm::V1_1::DrmMetricGroup;

libwvdrmengine/tools/metrics_dump/include/wv_metrics.h

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "metrics.pb.h"
+#include "wv_metrics.pb.h"
 
 namespace wv_metrics {
 void FormatWvCdmMetrics(const drm_metrics::WvCdmMetrics& metrics,

libwvdrmengine/tools/metrics_dump/src/wv_metrics.cpp

@@ -11,9 +11,9 @@
 #include <string>
 
 #include "OEMCryptoCENC.h"
-#include "metrics.pb.h"
 #include "test_printers.h"
 #include "wv_cdm_types.h"
+#include "wv_metrics.pb.h"
 
 namespace wv_metrics {