Source release 18.1.0

metrics/include/metrics_collections.h

@@ -61,7 +61,6 @@
 
 namespace wvcdm {
 namespace metrics {
-namespace {
 // Short name definitions to ease AttributeHandler definitions.
 // Internal namespace to help simplify declarations.
 const int kErrorCodeFieldNumber =
@@ -89,7 +88,8 @@ const int kKeyRequestTypeFieldNumber =
     ::drm_metrics::Attributes::kKeyRequestTypeFieldNumber;
 const int kLicenseTypeFieldNumber =
     ::drm_metrics::Attributes::kLicenseTypeFieldNumber;
-}  // namespace
+const int kOemCryptoSignatureHashAlgorithmFieldNumber =
+    ::drm_metrics::Attributes::kOemCryptoSignatureHashAlgorithmFieldNumber;
 
 // The maximum number of completed sessions that can be stored. More than this
 // will cause some metrics to be discarded.
@@ -252,8 +252,6 @@ class CryptoMetrics {
   EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
       oemcrypto_rewrap_device_rsa_key_30_;
   ValueMetric<uint16_t> oemcrypto_security_patch_level_;
-  EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
-      oemcrypto_select_key_;
   ValueMetric<CdmUsageSupportType> oemcrypto_usage_table_support_;
   CounterMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
       oemcrypto_update_usage_table_;
@@ -299,6 +297,12 @@ class CryptoMetrics {
       oemcrypto_install_oem_private_key_;
   ValueMetric<int> oemcrypto_watermarking_support_;
   ValueMetric<int> oemcrypto_production_readiness_;
+  EventMetric<kOemCryptoResultFieldNumber, OEMCryptoResult>
+      oemcrypto_get_key_handle_;
+  CounterMetric<kOemCryptoResultFieldNumber, OEMCryptoResult,
+                kOemCryptoSignatureHashAlgorithmFieldNumber,
+                OEMCrypto_SignatureHashAlgorithm>
+      oemcrypto_get_signature_hash_algorithm_;
 };  // class CryptoMetrics
 
 // This class contains session-scoped metrics. All properties and

metrics/include/value_metric.h

@@ -39,8 +39,6 @@ void SetValue(drm_metrics::ValueMetric* value_proto, const T& value);
 template <typename T>
 class ValueMetric {
  public:
-  ValueMetric() {}
-
   // Record the value of the metric.
   void Record(const T& value) {
     std::unique_lock<std::mutex> lock(mutex_);
@@ -103,7 +101,7 @@ class ValueMetric {
  private:
   enum ValueState { kNone, kHasValue, kHasError };
 
-  T value_;
+  T value_ = T();
   int error_code_ = 0;
   ValueState state_ = kNone;