Source release 16.4.0

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 {

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 {

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:

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 {

metrics/src/Android.bp

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

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 {

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;
@@ -327,8 +327,8 @@ EngineMetrics::~EngineMetrics() {
   std::unique_lock<std::mutex> lock(session_metrics_lock_);
   if (!active_session_metrics_list_.empty()
       || !completed_session_metrics_list_.empty()) {
-    LOGV("EngineMetrics::~EngineMetrics. Session counts: "
-         "active %d. completed %d.", active_session_metrics_list_.size(),
+    LOGV("Session counts: active = %zu, completed = %zu.",
+         active_session_metrics_list_.size(),
          completed_session_metrics_list_.size());
   }
 }

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;

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;

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;
 

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 {