Merge changes I095f893b,I14d40676

* changes:
  Adds a VersionInfo message to SignedMessage
  Add UsageTableHeader metrics

libwvdrmengine/cdm/core/src/cdm_session.cpp

@@ -267,6 +267,7 @@ CdmResponseType CdmSession::RestoreOfflineSession(
     } else {
       CdmResponseType sts = usage_table_header_->LoadEntry(
           crypto_session_.get(), usage_entry_, usage_entry_number_);
+      crypto_metrics_->usage_table_header_load_entry_.Increment(sts);
       if (sts != NO_ERROR) {
         LOGE(
             "CdmSession::RestoreOfflineSession: failed to load usage entry = "
@@ -298,8 +299,10 @@ CdmResponseType CdmSession::RestoreOfflineSession(
 
   if (usage_support_type_ == kUsageEntrySupport &&
       !provider_session_token.empty() && usage_table_header_ != NULL) {
-    CdmResponseType sts =
-        usage_table_header_->UpdateEntry(crypto_session_.get(), &usage_entry_);
+    CdmResponseType sts = NO_ERROR;
+    M_TIME(sts = usage_table_header_->UpdateEntry(crypto_session_.get(),
+                                                  &usage_entry_),
+           crypto_metrics_, usage_table_header_update_entry_, sts);
     if (sts != NO_ERROR) {
       LOGE(
           "CdmSession::RestoreOfflineSession failed to update usage entry = "
@@ -341,6 +344,7 @@ CdmResponseType CdmSession::RestoreUsageSession(
       usage_table_header_ != NULL) {
     sts = usage_table_header_->LoadEntry(
         crypto_session_.get(), usage_entry_, usage_entry_number_);
+    crypto_metrics_->usage_table_header_load_entry_.Increment(sts);
     if (sts != NO_ERROR) {
       LOGE("CdmSession::RestoreUsageSession: failed to load usage entry = %d",
            sts);
@@ -357,8 +361,9 @@ CdmResponseType CdmSession::RestoreUsageSession(
 
   if (usage_support_type_ == kUsageEntrySupport &&
       usage_table_header_ != NULL) {
-    sts =
-        usage_table_header_->UpdateEntry(crypto_session_.get(), &usage_entry_);
+    M_TIME(sts = usage_table_header_->UpdateEntry(crypto_session_.get(),
+                                                  &usage_entry_),
+           crypto_metrics_, usage_table_header_update_entry_, sts);
     if (sts != NO_ERROR) {
       LOGE("CdmSession::RestoreUsageSession: failed to update usage entry: %d",
            sts);
@@ -504,17 +509,24 @@ CdmResponseType CdmSession::AddKeyInternal(const CdmKeyResponse& key_response) {
         sts = usage_table_header_->AddEntry(
             crypto_session_.get(), is_offline_, key_set_id_,
             DeviceFiles::GetUsageInfoFileName(app_id), &usage_entry_number_);
+        crypto_metrics_->usage_table_header_add_entry_.Increment(sts);
         if (sts != NO_ERROR) return sts;
       }
     }
     sts = license_parser_->HandleKeyResponse(key_response);
 
+    // Update the license sdk and service versions.
+    const VersionInfo& version_info = license_parser_->GetServiceVersion();
+    metrics_->license_sdk_version_.Record(version_info.license_sdk_version());
+    metrics_->license_sdk_version_.Record(version_info.license_service_version());
+
     // Update or delete entry if usage table header+entries are supported
     if (usage_support_type_ == kUsageEntrySupport &&
         !provider_session_token.empty() && usage_table_header_ != NULL) {
       if (sts != KEY_ADDED) {
         CdmResponseType delete_sts = usage_table_header_->DeleteEntry(
             usage_entry_number_, file_handle_.get(), crypto_metrics_);
+        crypto_metrics_->usage_table_header_delete_entry_.Increment(delete_sts);
         if (delete_sts != NO_ERROR) {
           LOGW("CdmSession::AddKey: Delete usage entry failed = %d",
                delete_sts);
@@ -535,7 +547,9 @@ CdmResponseType CdmSession::AddKeyInternal(const CdmKeyResponse& key_response) {
       if (has_provider_session_token() &&
           usage_support_type_ == kUsageEntrySupport &&
           usage_table_header_ != NULL) {
-        usage_table_header_->UpdateEntry(crypto_session_.get(), &usage_entry_);
+        M_TIME(sts = usage_table_header_->UpdateEntry(crypto_session_.get(),
+                                                      &usage_entry_),
+               crypto_metrics_, usage_table_header_update_entry_, sts);
       }
 
       if (!is_offline_)
@@ -710,8 +724,9 @@ CdmResponseType CdmSession::GenerateReleaseRequest(CdmKeyRequest* key_request) {
 
   if (has_provider_session_token() &&
       usage_support_type_ == kUsageEntrySupport) {
-    status =
-        usage_table_header_->UpdateEntry(crypto_session_.get(), &usage_entry_);
+    M_TIME(status = usage_table_header_->UpdateEntry(crypto_session_.get(),
+                                                     &usage_entry_),
+           crypto_metrics_, usage_table_header_update_entry_, status);
     if (status != NO_ERROR) {
       LOGE(
           "CdmSession::GenerateReleaseRequest: Update usage entry failed = "
@@ -785,8 +800,10 @@ CdmResponseType CdmSession::DeleteUsageEntry(uint32_t usage_entry_number) {
     return INCORRECT_USAGE_SUPPORT_TYPE_1;
   }
 
-  return usage_table_header_->DeleteEntry(usage_entry_number,
-                                          file_handle_.get(), crypto_metrics_);
+  sts = usage_table_header_->DeleteEntry(usage_entry_number,
+                                         file_handle_.get(), crypto_metrics_);
+  crypto_metrics_->usage_table_header_delete_entry_.Increment(sts);
+  return sts;
 }
 
 bool CdmSession::IsKeyLoaded(const KeyId& key_id) {
@@ -1025,12 +1042,9 @@ CdmResponseType CdmSession::UpdateUsageEntryInformation() {
   }
 
   CdmResponseType sts = NO_ERROR;
-  M_TIME(
-    sts = usage_table_header_->UpdateEntry(crypto_session_.get(),
-                                           &usage_entry_),
-    crypto_metrics_,
-    crypto_session_update_usage_entry_,
-    sts);
+  M_TIME(sts = usage_table_header_->UpdateEntry(crypto_session_.get(),
+                                                &usage_entry_),
+         crypto_metrics_, usage_table_header_update_entry_, sts);
 
   if (sts != NO_ERROR) return sts;
 

libwvdrmengine/cdm/core/src/crypto_session.cpp

@@ -861,6 +861,7 @@ CdmResponseType CryptoSession::Open(SecurityLevel requested_security_level) {
             }
           }
           usage_table_header_ = *header;
+          metrics_->usage_table_header_initial_size_.Record((*header)->size());
         }
       }
     }

libwvdrmengine/cdm/core/src/license.cpp

@@ -514,6 +514,9 @@ CdmResponseType CdmLicense::HandleKeyResponse(
     LOGE("CdmLicense::HandleKeyResponse: not initialized");
     return LICENSE_PARSER_NOT_INITIALIZED_2;
   }
+  // Clear the latest service version when we receive a new response.
+  latest_service_version_.Clear();
+
   if (license_response.empty()) {
     LOGE("CdmLicense::HandleKeyResponse: empty license response");
     return EMPTY_LICENSE_RESPONSE_1;
@@ -527,6 +530,8 @@ CdmResponseType CdmLicense::HandleKeyResponse(
     return INVALID_LICENSE_RESPONSE;
   }
 
+  latest_service_version_ = signed_response.service_version_info();
+
   if (use_privacy_mode_ && Properties::allow_service_certificate_requests() &&
       signed_response.type() == SignedMessage::SERVICE_CERTIFICATE) {
     std::string signed_certificate;

libwvdrmengine/cdm/core/src/license_protocol.proto

@@ -390,6 +390,13 @@ message RemoteAttestation {
   optional bytes signature = 3;
 }
 
+message VersionInfo {
+  // License SDK version reported by the Widevine License SDK.
+  optional string license_sdk_version = 1;
+  // Version of the service hosting the license SDK.
+  optional string license_service_version = 2;
+}
+
 message SignedMessage {
   enum MessageType {
     LICENSE_REQUEST = 1;
@@ -412,6 +419,9 @@ message SignedMessage {
   optional RemoteAttestation remote_attestation = 5;
 
   repeated MetricData metric_data = 6;
+  // Version information from the SDK and license service. This information is
+  // provided in the license response.
+  optional VersionInfo service_version_info = 7;
 }
 message GroupKeys {
   enum GroupLicenseVersion {