Fixes missing or broken metrics in Widevine CDM

A few metrics were missing or not properly collected in the CDM metrics.
This CL addresses them.

Bug: 64570194
Bug: 72866232

Test: Unit tests and Google Play manual test.
Change-Id: I3a3aa4fb3eb8422c9c8c398016f02409307beb33

libwvdrmengine/cdm/metrics/include/metrics_collections.h

@@ -14,6 +14,7 @@
 #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"
 
@@ -144,6 +145,8 @@ class CryptoMetrics {
   ValueMetric<uint32_t> crypto_session_system_id_;
   EventMetric<kErrorCodeFieldNumber, CdmResponseType>
       crypto_session_update_usage_information_;
+  EventMetric<kErrorCodeFieldNumber, CdmResponseType>
+      crypto_session_update_usage_entry_;
   ValueMetric<bool> crypto_session_usage_information_support_;
   /* OEMCRYPTO */
   ValueMetric<uint32_t> oemcrypto_api_version_;
@@ -225,6 +228,8 @@ class CryptoMetrics {
   ValueMetric<CdmUsageSupportType> oemcrypto_usage_table_support_;
   CounterMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
       oemcrypto_update_usage_table_;
+  CounterMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
+      oemcrypto_update_usage_entry_;
 };
 
 // This class contains session-scoped metrics. All properties and
@@ -371,7 +376,6 @@ class EngineMetrics {
       cdm_engine_get_usage_info_;
   EventMetric<kErrorCodeFieldNumber, CdmResponseType>
       cdm_engine_handle_provisioning_response_;
-  ValueMetric<double> cdm_engine_life_span_;  // Milliseconds
   CounterMetric<kErrorCodeFieldNumber, CdmResponseType>
       cdm_engine_open_key_set_session_;
   CounterMetric<kErrorCodeFieldNumber, CdmResponseType>
@@ -395,6 +399,8 @@ class EngineMetrics {
  private:
   Lock session_metrics_lock_;
   std::vector<metrics::SessionMetrics *> session_metrics_list_;
+  // This is used to populate the engine lifespan metric
+  metrics::TimerMetric life_span_internal_;
   CryptoMetrics crypto_metrics_;
   std::string app_package_name_;