Merge "Fixes reporting of dynamic adapter metrics." into oc-mr1-dev

libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp

@@ -434,7 +434,7 @@ class WatchDog {
   }
 
   // Check to see if the failure file was created before that last abort.
-  void CheckForPreviousFailure(wvcdm::metrics::CryptoMetrics* metrics) {
+  void CheckForPreviousFailure(wvcdm::metrics::OemCryptoDynamicAdapterMetrics* metrics) {
     wvcdm::FileSystem file_system;
     std::string filename = FailureFilename();
     if (!file_system.Exists(filename)) return;
@@ -448,7 +448,7 @@ class WatchDog {
       if (size == size_read && flag) {
         LOGE("Previous L3 Init failed.");
         if (metrics == nullptr) return;
-        metrics->oemcrypto_initialization_mode_.Record(
+        metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
             wvcdm::metrics::OEMCrypto_INITIALIZED_L3_INITIALIZATION_FAILED);
       }
     }
@@ -574,15 +574,12 @@ class Adapter {
   OEMCryptoResult Initialize() {
 
     /*
-     * To avoid changing the function signature and function contract - declare
-     * a one-off metrics group to collect detailed information about how
-     * oemcrypto was intialized.
-     *
-     * TODO(blueeyes): Refactor this to allow Initialize to provide the
-     * details to the caller or to use the metrics instance provided by
-     * the caller.
+     * To avoid changing the function signature and function contract, use a
+     * reference to a singleton object for the metrics collected from the
+     * dynamic adapter.
      */
-    wvcdm::metrics::CryptoMetrics metrics;
+    wvcdm::metrics::OemCryptoDynamicAdapterMetrics& metrics =
+        wvcdm::metrics::GetDynamicAdapterMetricsInstance();
 
     level1_ = FunctionPointers();  // start with all null pointers.
     level3_ = FunctionPointers();  // start with all null pointers.
@@ -592,20 +589,20 @@ class Adapter {
     watcher->StartThread();
     OEMCryptoResult result = watcher->WaitForStatusAndCleanUp();
     if (Level3_IsInApp()) {
-      metrics.oemcrypto_initialization_mode_
-          .Record(wvcdm::metrics::OEMCrypto_INITIALIZED_USING_IN_APP);
+      metrics.SetInitializationMode(
+          wvcdm::metrics::OEMCrypto_INITIALIZED_USING_IN_APP);
       return result;
     }
     if (force_level3()) {
       LOGW("Test code. User requested falling back to L3");
-      metrics.oemcrypto_initialization_mode_
-          .Record(wvcdm::metrics::OEMCrypto_INITIALIZED_FORCING_L3);
+      metrics.SetInitializationMode(
+          wvcdm::metrics::OEMCrypto_INITIALIZED_FORCING_L3);
       return result;
     }
     std::string library_name;
     if (!wvcdm::Properties::GetOEMCryptoPath(&library_name)) {
       LOGW("L1 library not specified. Falling back to L3");
-      metrics.oemcrypto_initialization_mode_.Record(
+      metrics.OemCryptoDynamicAdapterMetrics::SetInitializationMode(
           wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_NO_L1_LIBRARY_PATH);
       return result;
     }
@@ -613,7 +610,7 @@ class Adapter {
     if (level1_library_ == NULL) {
       LOGW("Could not load %s. Falling back to L3.  %s", library_name.c_str(),
            dlerror());
-      metrics.oemcrypto_initialization_mode_.Record(
+      metrics.OemCryptoDynamicAdapterMetrics::SetInitializationMode(
           wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_L1_OPEN_FAILED);
       return result;
     }
@@ -628,7 +625,7 @@ class Adapter {
     return result;
   }
 
-  bool LoadLevel1(wvcdm::metrics::CryptoMetrics* metrics) {
+  bool LoadLevel1(wvcdm::metrics::OemCryptoDynamicAdapterMetrics* metrics) {
     if (metrics == nullptr) {
       return false;
     }
@@ -640,25 +637,25 @@ class Adapter {
     LOOKUP_ALL(8, APIVersion, OEMCrypto_APIVersion);
     LOOKUP_ALL(8, Terminate,  OEMCrypto_Terminate);
     if (!level1_valid_) {
-      metrics->oemcrypto_initialization_mode_.Record(
+      metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
           wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_INVALID_L1);
       return false;
     }
     OEMCryptoResult st = level1_.Initialize();
     if (st != OEMCrypto_SUCCESS) {
       LOGW("Could not initialize L1. Falling Back to L3.");
-      metrics->oemcrypto_initialization_mode_.Record(
+      metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
           wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_COULD_NOT_INITIALIZE_L1);
       return false;
     }
     level1_.version = level1_.APIVersion();
-    metrics->oemcrypto_l1_api_version_.Record(level1_.version);
-    metrics->oemcrypto_l1_min_api_version_.Record(kMinimumVersion);
+    metrics->SetL1ApiVersion(level1_.version);
+    metrics->SetL1MinApiVersion(kMinimumVersion);
 
     if (level1_.version < kMinimumVersion) {
       LOGW("liboemcrypto.so is version %d, not %d. Falling Back to L3.",
            level1_.version, kMinimumVersion);
-      metrics->oemcrypto_initialization_mode_.Record(
+      metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
           wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_WRONG_L1_VERSION);
       level1_.Terminate();
       return false;
@@ -733,7 +730,7 @@ class Adapter {
 
     // If we have a valid keybox, initialization is done. We're good.
     if (OEMCrypto_SUCCESS == level1_.IsKeyboxValid()) {
-      metrics->oemcrypto_initialization_mode_.Record(
+      metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
           wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L1_WITH_KEYBOX);
       return true;
     }
@@ -742,7 +739,7 @@ class Adapter {
     // will have to be caught in the future when provisioning fails.
     if (level1_.version > 11 &&
         (level1_.GetProvisioningMethod() == OEMCrypto_OEMCertificate)) {
-      metrics->oemcrypto_initialization_mode_.Record(
+      metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
           wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L1_WITH_PROVISIONING_3_0);
       return true;
     }
@@ -759,10 +756,10 @@ class Adapter {
         // because we still want to test OEMCrypto in that configuration.
         LOGE("OEMCrypto uses cert as identification, but cdm does not!");
         LOGE("This will not work on a production device.");
-        metrics->oemcrypto_initialization_mode_.Record(
+        metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
             wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L1_CERTIFICATE_MIX);
       } else {
-        metrics->oemcrypto_initialization_mode_.Record(
+        metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
             wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L1_WITH_CERTIFICATE);
       }
       return true;
@@ -772,7 +769,7 @@ class Adapter {
     if (!wvcdm::Properties::GetFactoryKeyboxPath(&filename)) {
       LOGW("Bad Level 1 Keybox. Falling Back to L3.");
       level1_.Terminate();
-      metrics->oemcrypto_initialization_mode_.Record(
+      metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
           wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_BAD_KEYBOX);
       return false;
     }
@@ -781,7 +778,7 @@ class Adapter {
     if (size <= 0 || !file) {
       LOGW("Could not open %s. Falling Back to L3.", filename.c_str());
       level1_.Terminate();
-      metrics->oemcrypto_initialization_mode_.Record(
+      metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
           wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_COULD_NOT_OPEN_FACTORY_KEYBOX);
       return false;
     }
@@ -792,12 +789,12 @@ class Adapter {
       LOGE("Could NOT install keybox from %s. Falling Back to L3.",
            filename.c_str());
       level1_.Terminate();
-      metrics->oemcrypto_initialization_mode_.Record(
+      metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
           wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_COULD_NOT_INSTALL_KEYBOX);
       return false;
     }
     LOGI("Installed keybox from %s", filename.c_str());
-    metrics->oemcrypto_initialization_mode_.Record(
+    metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
         wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L1_INSTALLED_KEYBOX);
     return true;
   }