widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I78f839fa,Ibd68db73

Browse Source 
* changes:
  Updated copyright notice and cleaned up includes.
  Ran clang-format on the metrics directory.
This commit is contained in:
Alex Dale
2021-11-05 23:44:25 +00:00
committed by Android (Google) Code Review
parent 281bc8322b 1b95db51f1
commit b6c93683db
23 changed files with 543 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libwvdrmengine/cdm/metrics/include/attribute_handler.h
View File

@@ -1,21 +1,18 @@
// Copyright 2018 Google Inc. All Rights Reserved. // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains the declarations for the EventMetric class and related // This file contains the declarations for the EventMetric class and related
// types. // types.
#ifndef WVCDM_METRICS_ATTRIBUTE_HANDLER_H_ #ifndef WVCDM_METRICS_ATTRIBUTE_HANDLER_H_
#define WVCDM_METRICS_ATTRIBUTE_HANDLER_H_ #define WVCDM_METRICS_ATTRIBUTE_HANDLER_H_
#include <string>
#include "OEMCryptoCENC.h"
#include "field_tuples.h"
#include "log.h" #include "log.h"
#include "pow2bucket.h"
#include "value_metric.h"
#include "wv_cdm_types.h"
#include "wv_metrics.pb.h" #include "wv_metrics.pb.h"
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
// This method is used to set the value of a single proto field. // This method is used to set the value of a single proto field.
// Specializations handle setting each value. // Specializations handle setting each value.
template <int I, typename F> template <int I, typename F>
@@ -47,7 +44,6 @@ class AttributeHandler {
return serialized_attributes; return serialized_attributes;
} }
}; };
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm
#endif // WVCDM_METRICS_ATTRIBUTE_HANDLER_H_ #endif // WVCDM_METRICS_ATTRIBUTE_HANDLER_H_

28
libwvdrmengine/cdm/metrics/include/counter_metric.h
View File

@@ -1,23 +1,23 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains the declarations for the Metric class and related // This file contains the declarations for the Metric class and related
// types. // types.
#ifndef WVCDM_METRICS_COUNTER_METRIC_H_ #ifndef WVCDM_METRICS_COUNTER_METRIC_H_
#define WVCDM_METRICS_COUNTER_METRIC_H_ #define WVCDM_METRICS_COUNTER_METRIC_H_
#include <cstdarg>
#include <map> #include <map>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <vector>
#include "attribute_handler.h" #include "attribute_handler.h"
#include "field_tuples.h" #include "field_tuples.h"
#include "wv_metrics.pb.h"
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
class CounterMetricTest; class CounterMetricTest;
// This base class provides the common defintion used by all templated // This base class provides the common defintion used by all templated
@@ -99,14 +99,13 @@ class CounterMetric : public BaseCounterMetric {
void Increment(int64_t value, F1 field1 = util::Unused(), void Increment(int64_t value, F1 field1 = util::Unused(),
F2 field2 = util::Unused(), F3 field3 = util::Unused(), F2 field2 = util::Unused(), F3 field3 = util::Unused(),
F4 field4 = util::Unused()) { F4 field4 = util::Unused()) {
std::string key = std::string key = attribute_handler_.GetSerializedAttributes(
attribute_handler_.GetSerializedAttributes(field1, field2, field1, field2, field3, field4);
field3, field4);
BaseCounterMetric::Increment(key, value); BaseCounterMetric::Increment(key, value);
} }
void ToProto(::google::protobuf::RepeatedPtrField<drm_metrics::CounterMetric> void ToProto(::google::protobuf::RepeatedPtrField<drm_metrics::CounterMetric>*
*counters) const; counters) const;
private: private:
friend class CounterMetricTest; friend class CounterMetricTest;
@@ -120,9 +119,8 @@ class CounterMetric : public BaseCounterMetric {
template <> template <>
inline void CounterMetric<0, util::Unused, 0, util::Unused, 0, util::Unused, 0, inline void CounterMetric<0, util::Unused, 0, util::Unused, 0, util::Unused, 0,
util::Unused>:: util::Unused>::
ToProto(::google::protobuf::RepeatedPtrField<drm_metrics::CounterMetric> ToProto(::google::protobuf::RepeatedPtrField<drm_metrics::CounterMetric>*
*counters) const { counters) const {
const std::map<std::string, int64_t>* values = GetValues(); const std::map<std::string, int64_t>* values = GetValues();
for (std::map<std::string, int64_t>::const_iterator it = values->begin(); for (std::map<std::string, int64_t>::const_iterator it = values->begin();
it != values->end(); it++) { it != values->end(); it++) {
@@ -134,8 +132,8 @@ inline void CounterMetric<0, util::Unused, 0, util::Unused, 0, util::Unused, 0,
template <int I1, typename F1, int I2, typename F2, int I3, typename F3, int I4, template <int I1, typename F1, int I2, typename F2, int I3, typename F3, int I4,
typename F4> typename F4>
inline void CounterMetric<I1, F1, I2, F2, I3, F3, I4, F4>::ToProto( inline void CounterMetric<I1, F1, I2, F2, I3, F3, I4, F4>::ToProto(
::google::protobuf::RepeatedPtrField<drm_metrics::CounterMetric> ::google::protobuf::RepeatedPtrField<drm_metrics::CounterMetric>* counters)
*counters) const { const {
const std::map<std::string, int64_t>* values = GetValues(); const std::map<std::string, int64_t>* values = GetValues();
for (std::map<std::string, int64_t>::const_iterator it = values->begin(); for (std::map<std::string, int64_t>::const_iterator it = values->begin();
it != values->end(); it++) { it != values->end(); it++) {
@@ -146,8 +144,6 @@ inline void CounterMetric<I1, F1, I2, F2, I3, F3, I4, F4>::ToProto(
new_counter->set_count(it->second); new_counter->set_count(it->second);
} }
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm
#endif // WVCDM_METRICS_COUNTER_METRIC_H_ #endif // WVCDM_METRICS_COUNTER_METRIC_H_

7
libwvdrmengine/cdm/metrics/include/distribution.h
View File

@@ -1,4 +1,6 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains the definition of a Distribution class which computes // This file contains the definition of a Distribution class which computes
// the distribution values of a series of samples. // the distribution values of a series of samples.
@@ -10,7 +12,6 @@
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
// The Distribution class holds statistics about a series of values that the // The Distribution class holds statistics about a series of values that the
// client provides via the Record method. A caller will call Record once for // client provides via the Record method. A caller will call Record once for
// each of the values in a series. The Distribution instance will calculate the // each of the values in a series. The Distribution instance will calculate the
@@ -46,8 +47,6 @@ class Distribution {
float mean_; float mean_;
double sum_squared_deviation_; double sum_squared_deviation_;
}; };
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm
#endif // WVCDM_METRICS_DISTRIBUTION_H_ #endif // WVCDM_METRICS_DISTRIBUTION_H_

43
libwvdrmengine/cdm/metrics/include/event_metric.h
View File

@@ -1,26 +1,24 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains the declarations for the EventMetric class and related // This file contains the declarations for the EventMetric class and related
// types. // types.
#ifndef WVCDM_METRICS_EVENT_METRIC_H_ #ifndef WVCDM_METRICS_EVENT_METRIC_H_
#define WVCDM_METRICS_EVENT_METRIC_H_ #define WVCDM_METRICS_EVENT_METRIC_H_
#include <cstdarg>
#include <map> #include <map>
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <vector>
#include "OEMCryptoCENC.h"
#include "attribute_handler.h" #include "attribute_handler.h"
#include "distribution.h" #include "distribution.h"
#include "field_tuples.h"
#include "log.h" #include "log.h"
#include "pow2bucket.h" #include "pow2bucket.h"
#include "wv_metrics.pb.h" #include "wv_metrics.pb.h"
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
class EventMetricTest; class EventMetricTest;
// This base class provides the common defintion used by all templated // This base class provides the common defintion used by all templated
@@ -97,9 +95,8 @@ class EventMetric : public BaseEventMetric {
void Record(double value, F1 field1 = util::Unused(), void Record(double value, F1 field1 = util::Unused(),
F2 field2 = util::Unused(), F3 field3 = util::Unused(), F2 field2 = util::Unused(), F3 field3 = util::Unused(),
F4 field4 = util::Unused()) { F4 field4 = util::Unused()) {
std::string key = std::string key = attribute_handler_.GetSerializedAttributes(
attribute_handler_.GetSerializedAttributes(field1, field2, field1, field2, field3, field4);
field3, field4);
BaseEventMetric::Record(key, value); BaseEventMetric::Record(key, value);
} }
@@ -108,8 +105,8 @@ class EventMetric : public BaseEventMetric {
}; };
void ToProto( void ToProto(
::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric> ::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric>*
*distributions_proto) const; distributions_proto) const;
private: private:
friend class EventMetricTest; friend class EventMetricTest;
@@ -138,12 +135,13 @@ template <>
inline void EventMetric<0, util::Unused, 0, util::Unused, 0, util::Unused, 0, inline void EventMetric<0, util::Unused, 0, util::Unused, 0, util::Unused, 0,
util::Unused>:: util::Unused>::
ToProto( ToProto(
::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric> ::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric>*
*distributions_proto) const { distributions_proto) const {
const std::map<std::string, Distribution *>* distributions const std::map<std::string, Distribution*>* distributions =
= GetDistributions(); GetDistributions();
for (std::map<std::string, Distribution*>::const_iterator it = for (std::map<std::string, Distribution*>::const_iterator it =
distributions->begin(); it != distributions->end(); it++) { distributions->begin();
it != distributions->end(); it++) {
drm_metrics::DistributionMetric* new_metric = distributions_proto->Add(); drm_metrics::DistributionMetric* new_metric = distributions_proto->Add();
SetDistributionValues(*it->second, new_metric); SetDistributionValues(*it->second, new_metric);
} }
@@ -152,12 +150,13 @@ inline void EventMetric<0, util::Unused, 0, util::Unused, 0, util::Unused, 0,
template <int I1, typename F1, int I2, typename F2, int I3, typename F3, int I4, template <int I1, typename F1, int I2, typename F2, int I3, typename F3, int I4,
typename F4> typename F4>
inline void EventMetric<I1, F1, I2, F2, I3, F3, I4, F4>::ToProto( inline void EventMetric<I1, F1, I2, F2, I3, F3, I4, F4>::ToProto(
::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric> ::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric>*
*distributions_proto) const { distributions_proto) const {
const std::map<std::string, Distribution *>* distributions const std::map<std::string, Distribution*>* distributions =
= GetDistributions(); GetDistributions();
for (std::map<std::string, Distribution*>::const_iterator it = for (std::map<std::string, Distribution*>::const_iterator it =
distributions->begin(); it != distributions->end(); it++) { distributions->begin();
it != distributions->end(); it++) {
drm_metrics::DistributionMetric* new_metric = distributions_proto->Add(); drm_metrics::DistributionMetric* new_metric = distributions_proto->Add();
if (!new_metric->mutable_attributes()->ParseFromString(it->first)) { if (!new_metric->mutable_attributes()->ParseFromString(it->first)) {
LOGE("Failed to parse the attributes from a string."); LOGE("Failed to parse the attributes from a string.");
@@ -165,8 +164,6 @@ inline void EventMetric<I1, F1, I2, F2, I3, F3, I4, F4>::ToProto(
SetDistributionValues(*it->second, new_metric); SetDistributionValues(*it->second, new_metric);
} }
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm
#endif // WVCDM_METRICS_EVENT_METRIC_H_ #endif // WVCDM_METRICS_EVENT_METRIC_H_

9
libwvdrmengine/cdm/metrics/include/field_tuples.h
View File

@@ -1,17 +1,16 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains the helper classes and methods for using field tuples // This file contains the helper classes and methods for using field tuples
// used by metrics classes to record variations of a single metric. // used by metrics classes to record variations of a single metric.
#ifndef WVCDM_METRICS_FIELD_TUPLES_H_ #ifndef WVCDM_METRICS_FIELD_TUPLES_H_
#define WVCDM_METRICS_FIELD_TUPLES_H_ #define WVCDM_METRICS_FIELD_TUPLES_H_
#include <ostream> #include <ostream>
#include <sstream>
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
namespace util { namespace util {
// TODO(blueeyes): Change to use C++ 11 support for variadic template args. // TODO(blueeyes): Change to use C++ 11 support for variadic template args.
// The C++ 03 pattern is no longer needed since we require C++11. b/68766426. // The C++ 03 pattern is no longer needed since we require C++11. b/68766426.
@@ -23,9 +22,7 @@ struct Unused {
return out; return out;
} }
}; };
} // namespace util } // namespace util
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm
#endif // WVCDM_METRICS_FIELD_TUPLES_H_ #endif // WVCDM_METRICS_FIELD_TUPLES_H_

66
libwvdrmengine/cdm/metrics/include/metrics_collections.h
View File

@@ -1,15 +1,18 @@
// Copyright 2016 Google Inc. All Rights Reserved. // Copyright 2016 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains definitions for metrics being collected throughout the // This file contains definitions for metrics being collected throughout the
// CDM. // CDM.
#ifndef WVCDM_METRICS_METRICS_COLLECTIONS_H_
#ifndef WVCDM_METRICS_METRICS_GROUP_H_ #define WVCDM_METRICS_METRICS_COLLECTIONS_H_
#define WVCDM_METRICS_METRICS_GROUP_H_
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <mutex> #include <mutex>
#include <ostream> #include <ostream>
#include <string>
#include <vector>
#include "OEMCryptoCENC.h" #include "OEMCryptoCENC.h"
#include "counter_metric.h" #include "counter_metric.h"
@@ -58,9 +61,7 @@
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
namespace { namespace {
// Short name definitions to ease AttributeHandler definitions. // Short name definitions to ease AttributeHandler definitions.
// Internal namespace to help simplify declarations. // Internal namespace to help simplify declarations.
const int kErrorCodeFieldNumber = const int kErrorCodeFieldNumber =
@@ -73,8 +74,7 @@ const int kCdmSecurityLevelFieldNumber =
::drm_metrics::Attributes::kCdmSecurityLevelFieldNumber; ::drm_metrics::Attributes::kCdmSecurityLevelFieldNumber;
const int kSecurityLevelFieldNumber = const int kSecurityLevelFieldNumber =
::drm_metrics::Attributes::kSecurityLevelFieldNumber; ::drm_metrics::Attributes::kSecurityLevelFieldNumber;
const int kLengthFieldNumber = const int kLengthFieldNumber = ::drm_metrics::Attributes::kLengthFieldNumber;
::drm_metrics::Attributes::kLengthFieldNumber;
const int kEncryptAlgorithmFieldNumber = const int kEncryptAlgorithmFieldNumber =
::drm_metrics::Attributes::kEncryptionAlgorithmFieldNumber; ::drm_metrics::Attributes::kEncryptionAlgorithmFieldNumber;
const int kSigningAlgorithmFieldNumber = const int kSigningAlgorithmFieldNumber =
@@ -89,8 +89,7 @@ const int kKeyRequestTypeFieldNumber =
::drm_metrics::Attributes::kKeyRequestTypeFieldNumber; ::drm_metrics::Attributes::kKeyRequestTypeFieldNumber;
const int kLicenseTypeFieldNumber = const int kLicenseTypeFieldNumber =
::drm_metrics::Attributes::kLicenseTypeFieldNumber; ::drm_metrics::Attributes::kLicenseTypeFieldNumber;
} // namespace
} // anonymous namespace
// The maximum number of completed sessions that can be stored. More than this // The maximum number of completed sessions that can be stored. More than this
// will cause some metrics to be discarded. // will cause some metrics to be discarded.
@@ -125,8 +124,8 @@ typedef enum OEMCryptoInitializationMode {
// This class contains metrics for Crypto Session and OEM Crypto. // This class contains metrics for Crypto Session and OEM Crypto.
class CryptoMetrics { class CryptoMetrics {
public: public:
void Serialize(drm_metrics::WvCdmMetrics::CryptoMetrics *crypto_metrics) void Serialize(
const; drm_metrics::WvCdmMetrics::CryptoMetrics* crypto_metrics) const;
/* CRYPTO SESSION */ /* CRYPTO SESSION */
// TODO(blueeyes): Convert this to crypto_session_default_security_level_. // TODO(blueeyes): Convert this to crypto_session_default_security_level_.
@@ -293,7 +292,7 @@ class CryptoMetrics {
oemcrypto_load_provisioning_; oemcrypto_load_provisioning_;
ValueMetric<uint32_t> oemcrypto_minor_api_version_; ValueMetric<uint32_t> oemcrypto_minor_api_version_;
ValueMetric<uint32_t> oemcrypto_maximum_usage_table_header_size_; ValueMetric<uint32_t> oemcrypto_maximum_usage_table_header_size_;
}; }; // class CryptoMetrics
// This class contains session-scoped metrics. All properties and // This class contains session-scoped metrics. All properties and
// statistics related to operations within a single session are // statistics related to operations within a single session are
@@ -325,11 +324,11 @@ class SessionMetrics {
// Metrics collected at the session level. // Metrics collected at the session level.
ValueMetric<double> cdm_session_life_span_; // Milliseconds. ValueMetric<double> cdm_session_life_span_; // Milliseconds.
EventMetric<kErrorCodeFieldNumber, CdmResponseType> cdm_session_renew_key_; EventMetric<kErrorCodeFieldNumber, CdmResponseType> cdm_session_renew_key_;
CounterMetric<kErrorCodeFieldNumber, CdmResponseType, CounterMetric<kErrorCodeFieldNumber, CdmResponseType, kErrorDetailFieldNumber,
kErrorDetailFieldNumber, int32_t> int32_t>
cdm_session_restore_offline_session_; cdm_session_restore_offline_session_;
CounterMetric<kErrorCodeFieldNumber, CdmResponseType, CounterMetric<kErrorCodeFieldNumber, CdmResponseType, kErrorDetailFieldNumber,
kErrorDetailFieldNumber, int32_t> int32_t>
cdm_session_restore_usage_session_; cdm_session_restore_usage_session_;
EventMetric<kKeyRequestTypeFieldNumber, CdmKeyRequestType> EventMetric<kKeyRequestTypeFieldNumber, CdmKeyRequestType>
@@ -342,8 +341,8 @@ class SessionMetrics {
// Serialize the session metrics to the provided |metric_group|. // Serialize the session metrics to the provided |metric_group|.
// |metric_group| is owned by the caller and must not be null. // |metric_group| is owned by the caller and must not be null.
void Serialize(drm_metrics::WvCdmMetrics::SessionMetrics *session_metrics) void Serialize(
const; drm_metrics::WvCdmMetrics::SessionMetrics* session_metrics) const;
private: private:
void SerializeSessionMetrics( void SerializeSessionMetrics(
@@ -351,7 +350,7 @@ class SessionMetrics {
CdmSessionId session_id_; CdmSessionId session_id_;
bool completed_; bool completed_;
CryptoMetrics crypto_metrics_; CryptoMetrics crypto_metrics_;
}; }; // class SessionMetrics
// This class contains metrics for the OEMCrypto Dynamic Adapter. They are // This class contains metrics for the OEMCrypto Dynamic Adapter. They are
// separated from other metrics because they need to be encapsulated in a // separated from other metrics because they need to be encapsulated in a
@@ -375,8 +374,8 @@ class OemCryptoDynamicAdapterMetrics {
// Serialize the session metrics to the provided |metric_group|. // Serialize the session metrics to the provided |metric_group|.
// |metric_group| is owned by the caller and must not be null. // |metric_group| is owned by the caller and must not be null.
void Serialize(drm_metrics::WvCdmMetrics::EngineMetrics *engine_metrics) void Serialize(
const; drm_metrics::WvCdmMetrics::EngineMetrics* engine_metrics) const;
// Clears the existing metric values. // Clears the existing metric values.
void Clear(); void Clear();
@@ -390,7 +389,7 @@ class OemCryptoDynamicAdapterMetrics {
previous_oemcrypto_initialization_failure_; previous_oemcrypto_initialization_failure_;
ValueMetric<uint32_t> oemcrypto_l1_api_version_; ValueMetric<uint32_t> oemcrypto_l1_api_version_;
ValueMetric<uint32_t> oemcrypto_l1_min_api_version_; ValueMetric<uint32_t> oemcrypto_l1_min_api_version_;
}; }; // class OemCryptoDynamicAdapterMetrics
// This will fetch the singleton instance for dynamic adapter metrics. // This will fetch the singleton instance for dynamic adapter metrics.
// This method is safe only if we use C++ 11. In C++ 11, static function-local // This method is safe only if we use C++ 11. In C++ 11, static function-local
@@ -438,8 +437,9 @@ class EngineMetrics {
void SetAppPackageName(const std::string& app_package_name); void SetAppPackageName(const std::string& app_package_name);
// Metrics recorded at the engine level. // Metrics recorded at the engine level.
EventMetric<kErrorCodeFieldNumber, CdmResponseType, EventMetric<kErrorCodeFieldNumber, CdmResponseType, kLicenseTypeFieldNumber,
kLicenseTypeFieldNumber, CdmLicenseType> cdm_engine_add_key_; CdmLicenseType>
cdm_engine_add_key_;
ValueMetric<std::string> cdm_engine_cdm_version_; ValueMetric<std::string> cdm_engine_cdm_version_;
CounterMetric<kErrorCodeFieldNumber, CdmResponseType> CounterMetric<kErrorCodeFieldNumber, CdmResponseType>
cdm_engine_close_session_; cdm_engine_close_session_;
@@ -449,15 +449,15 @@ class EngineMetrics {
cdm_engine_decrypt_; cdm_engine_decrypt_;
CounterMetric<kErrorCodeBoolFieldNumber, bool> CounterMetric<kErrorCodeBoolFieldNumber, bool>
cdm_engine_find_session_for_key_; cdm_engine_find_session_for_key_;
EventMetric<kErrorCodeFieldNumber, CdmResponseType, EventMetric<kErrorCodeFieldNumber, CdmResponseType, kLicenseTypeFieldNumber,
kLicenseTypeFieldNumber, CdmLicenseType> CdmLicenseType>
cdm_engine_generate_key_request_; cdm_engine_generate_key_request_;
EventMetric<kErrorCodeFieldNumber, CdmResponseType> EventMetric<kErrorCodeFieldNumber, CdmResponseType>
cdm_engine_get_provisioning_request_; cdm_engine_get_provisioning_request_;
CounterMetric<kErrorCodeFieldNumber, CdmResponseType> CounterMetric<kErrorCodeFieldNumber, CdmResponseType>
cdm_engine_get_secure_stop_ids_; cdm_engine_get_secure_stop_ids_;
EventMetric<kErrorCodeFieldNumber, CdmResponseType, EventMetric<kErrorCodeFieldNumber, CdmResponseType, kErrorDetailFieldNumber,
kErrorDetailFieldNumber, int32_t> int32_t>
cdm_engine_get_usage_info_; cdm_engine_get_usage_info_;
EventMetric<kErrorCodeFieldNumber, CdmResponseType> EventMetric<kErrorCodeFieldNumber, CdmResponseType>
cdm_engine_handle_provisioning_response_; cdm_engine_handle_provisioning_response_;
@@ -494,9 +494,7 @@ class EngineMetrics {
void SerializeEngineMetrics( void SerializeEngineMetrics(
drm_metrics::WvCdmMetrics::EngineMetrics* engine_metrics) const; drm_metrics::WvCdmMetrics::EngineMetrics* engine_metrics) const;
}; }; // class EngineMetrics
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm
#endif // WVCDM_METRICS_METRICS_COLLECTIONS_H_
#endif // WVCDM_METRICS_METRICS_GROUP_H_

8
libwvdrmengine/cdm/metrics/include/pow2bucket.h
View File

@@ -1,13 +1,13 @@
// Copyright 2018 Google Inc. All Rights Reserved. // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains the declaration of the Pow2Bucket class which // This file contains the declaration of the Pow2Bucket class which
// is a convenient way to bucketize sampled values into powers of 2. // is a convenient way to bucketize sampled values into powers of 2.
#ifndef WVCDM_METRICS_POW2BUCKET_H_ #ifndef WVCDM_METRICS_POW2BUCKET_H_
#define WVCDM_METRICS_POW2BUCKET_H_ #define WVCDM_METRICS_POW2BUCKET_H_
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
// This class converts the size_t value into the highest power of two // This class converts the size_t value into the highest power of two
// below the value. E.g. for 7, the value is 4. For 11, the value is 8. // below the value. E.g. for 7, the value is 4. For 11, the value is 8.
// This class is intended to simplify the use of EventMetric Fields that may // This class is intended to simplify the use of EventMetric Fields that may
@@ -43,8 +43,6 @@ class Pow2Bucket {
size_t value_; size_t value_;
}; };
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm
#endif // WVCDM_METRICS_POW2BUCKET_H_ #endif // WVCDM_METRICS_POW2BUCKET_H_

8
libwvdrmengine/cdm/metrics/include/timer_metric.h
View File

@@ -1,11 +1,12 @@
// Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
#ifndef WVCDM_METRICS_TIMER_METRIC_H_ #ifndef WVCDM_METRICS_TIMER_METRIC_H_
#define WVCDM_METRICS_TIMER_METRIC_H_ #define WVCDM_METRICS_TIMER_METRIC_H_
#include <chrono> #include <chrono>
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
class TimerMetric { class TimerMetric {
public: public:
// Constructs a new TimerMetric. // Constructs a new TimerMetric.
@@ -28,7 +29,6 @@ class TimerMetric {
std::chrono::time_point<std::chrono::steady_clock> start_; std::chrono::time_point<std::chrono::steady_clock> start_;
bool is_started_; bool is_started_;
}; };
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm
#endif #endif // WVCDM_METRICS_TIMER_METRIC_H_

13
libwvdrmengine/cdm/metrics/include/value_metric.h
View File

@@ -1,11 +1,13 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains the declarations for the Metric class and related // This file contains the declarations for the Metric class and related
// types. // types.
#ifndef WVCDM_METRICS_VALUE_METRIC_H_ #ifndef WVCDM_METRICS_VALUE_METRIC_H_
#define WVCDM_METRICS_VALUE_METRIC_H_ #define WVCDM_METRICS_VALUE_METRIC_H_
#include <stdint.h> #include <stdint.h>
#include <mutex> #include <mutex>
#include <string> #include <string>
@@ -13,14 +15,11 @@
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
// Internal namespace for helper methods. // Internal namespace for helper methods.
namespace impl { namespace impl {
// Helper function for setting a value in the proto. // Helper function for setting a value in the proto.
template <typename T> template <typename T>
void SetValue(drm_metrics::ValueMetric* value_proto, const T& value); void SetValue(drm_metrics::ValueMetric* value_proto, const T& value);
} // namespace impl } // namespace impl
// The ValueMetric class supports storing a single, overwritable value or an // The ValueMetric class supports storing a single, overwritable value or an
@@ -118,9 +117,7 @@ class ValueMetric {
* in const methods. * in const methods.
*/ */
mutable std::mutex internal_lock_; mutable std::mutex internal_lock_;
}; }; // class ValueMetric
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm
#endif // WVCDM_METRICS_VALUE_METRIC_H_ #endif // WVCDM_METRICS_VALUE_METRIC_H_

14
libwvdrmengine/cdm/metrics/src/attribute_handler.cpp
View File

@@ -1,15 +1,18 @@
// Copyright 2018 Google Inc. All Rights Reserved. // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains implementations for the AttributeHandler. // This file contains implementations for the AttributeHandler.
#include "attribute_handler.h" #include "attribute_handler.h"
#include "OEMCryptoCENC.h" #include "OEMCryptoCENC.h"
#include "field_tuples.h"
#include "pow2bucket.h" #include "pow2bucket.h"
#include "wv_cdm_types.h" #include "wv_cdm_types.h"
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
// //
// Specializations for setting attribute fields. // Specializations for setting attribute fields.
// //
@@ -82,16 +85,14 @@ void SetAttributeField<drm_metrics::Attributes::kKeyRequestTypeFieldNumber,
template <> template <>
void SetAttributeField<drm_metrics::Attributes::kLicenseTypeFieldNumber, void SetAttributeField<drm_metrics::Attributes::kLicenseTypeFieldNumber,
CdmLicenseType>( CdmLicenseType>(const CdmLicenseType& license_type,
const CdmLicenseType &license_type,
drm_metrics::Attributes* attributes) { drm_metrics::Attributes* attributes) {
attributes->set_license_type(license_type); attributes->set_license_type(license_type);
} }
template <> template <>
void SetAttributeField<drm_metrics::Attributes::kErrorDetailFieldNumber, void SetAttributeField<drm_metrics::Attributes::kErrorDetailFieldNumber,
int32_t>( int32_t>(const int32_t& error_detail,
const int32_t &error_detail,
drm_metrics::Attributes* attributes) { drm_metrics::Attributes* attributes) {
attributes->set_error_detail(error_detail); attributes->set_error_detail(error_detail);
} }
@@ -108,6 +109,5 @@ void SetAttributeField<drm_metrics::Attributes::kErrorCodeFieldNumber, int>(
const int& cdm_error, drm_metrics::Attributes* attributes) { const int& cdm_error, drm_metrics::Attributes* attributes) {
attributes->set_error_code(cdm_error); attributes->set_error_code(cdm_error);
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

8
libwvdrmengine/cdm/metrics/src/counter_metric.cpp
View File

@@ -1,15 +1,14 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains implementations for the BaseCounterMetric, the base class // This file contains implementations for the BaseCounterMetric, the base class
// for CounterMetric. // for CounterMetric.
#include "counter_metric.h" #include "counter_metric.h"
#include "wv_metrics.pb.h"
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
void BaseCounterMetric::Increment(const std::string& counter_key, void BaseCounterMetric::Increment(const std::string& counter_key,
int64_t value) { int64_t value) {
std::unique_lock<std::mutex> lock(internal_lock_); std::unique_lock<std::mutex> lock(internal_lock_);
@@ -20,6 +19,5 @@ void BaseCounterMetric::Increment(const std::string &counter_key,
value_map_[counter_key] = value_map_[counter_key] + value; value_map_[counter_key] = value_map_[counter_key] + value;
} }
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

6
libwvdrmengine/cdm/metrics/src/distribution.cpp
View File

@@ -1,4 +1,6 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains the definitions for the Distribution class members. // This file contains the definitions for the Distribution class members.
@@ -8,7 +10,6 @@
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
Distribution::Distribution() Distribution::Distribution()
: count_(0ULL), : count_(0ULL),
min_(FLT_MAX), min_(FLT_MAX),
@@ -26,6 +27,5 @@ void Distribution::Record(float value) {
min_ = min_ < value ? min_ : value; min_ = min_ < value ? min_ : value;
max_ = max_ > value ? max_ : value; max_ = max_ > value ? max_ : value;
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

12
libwvdrmengine/cdm/metrics/src/event_metric.cpp
View File

@@ -1,17 +1,14 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains implementations for the BaseEventMetric. // This file contains implementations for the BaseEventMetric.
#include "event_metric.h" #include "event_metric.h"
using ::google::protobuf::RepeatedPtrField;
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
BaseEventMetric::~BaseEventMetric() { BaseEventMetric::~BaseEventMetric() {
std::unique_lock<std::mutex> lock(internal_lock_); std::unique_lock<std::mutex> lock(internal_lock_);
for (std::map<std::string, Distribution*>::iterator it = value_map_.begin(); for (std::map<std::string, Distribution*>::iterator it = value_map_.begin();
it != value_map_.end(); it++) { it != value_map_.end(); it++) {
delete it->second; delete it->second;
@@ -20,9 +17,7 @@ BaseEventMetric::~BaseEventMetric() {
void BaseEventMetric::Record(const std::string& key, double value) { void BaseEventMetric::Record(const std::string& key, double value) {
std::unique_lock<std::mutex> lock(internal_lock_); std::unique_lock<std::mutex> lock(internal_lock_);
Distribution* distribution; Distribution* distribution;
if (value_map_.find(key) == value_map_.end()) { if (value_map_.find(key) == value_map_.end()) {
distribution = new Distribution(); distribution = new Distribution();
value_map_[key] = distribution; value_map_[key] = distribution;
@@ -32,6 +27,5 @@ void BaseEventMetric::Record(const std::string &key, double value) {
distribution->Record(value); distribution->Record(value);
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

53
libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
View File

@@ -1,5 +1,6 @@
// Copyright 2016 Google Inc. All Rights Reserved. // Copyright 2016 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
#include "metrics_collections.h" #include "metrics_collections.h"
#include <algorithm> #include <algorithm>
@@ -7,32 +8,28 @@
#include "log.h" #include "log.h"
#include "wv_metrics.pb.h" #include "wv_metrics.pb.h"
namespace wvcdm {
namespace metrics {
using ::drm_metrics::Attributes; using ::drm_metrics::Attributes;
using ::drm_metrics::WvCdmMetrics; using ::drm_metrics::WvCdmMetrics;
using ::google::protobuf::RepeatedPtrField; using ::google::protobuf::RepeatedPtrField;
using ::wvcdm::metrics::EventMetric; using ::wvcdm::metrics::EventMetric;
namespace { namespace {
// Helper struct for comparing session ids. // Helper struct for comparing session ids.
struct CompareSessionIds { struct CompareSessionIds {
const std::string& target_; const std::string& target_;
CompareSessionIds(const wvcdm::CdmSessionId& target) : target_(target){}; CompareSessionIds(const wvcdm::CdmSessionId& target) : target_(target){};
bool operator()(const std::shared_ptr<wvcdm::metrics::SessionMetrics> metrics) bool operator()(
const { const std::shared_ptr<wvcdm::metrics::SessionMetrics> metrics) const {
return metrics->GetSessionId() == target_; return metrics->GetSessionId() == target_;
} }
}; };
} // namespace
} // anonymous namespace void CryptoMetrics::Serialize(
WvCdmMetrics::CryptoMetrics* crypto_metrics) const {
namespace wvcdm {
namespace metrics {
void CryptoMetrics::Serialize(WvCdmMetrics::CryptoMetrics *crypto_metrics)
const {
/* CRYPTO SESSION */ /* CRYPTO SESSION */
crypto_metrics->set_allocated_crypto_session_security_level( crypto_metrics->set_allocated_crypto_session_security_level(
crypto_session_security_level_.ToProto()); crypto_session_security_level_.ToProto());
@@ -182,8 +179,7 @@ void CryptoMetrics::Serialize(WvCdmMetrics::CryptoMetrics *crypto_metrics)
crypto_metrics->mutable_oemcrypto_create_new_usage_entry()); crypto_metrics->mutable_oemcrypto_create_new_usage_entry());
oemcrypto_load_usage_entry_.ToProto( oemcrypto_load_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_load_usage_entry()); crypto_metrics->mutable_oemcrypto_load_usage_entry());
oemcrypto_move_entry_.ToProto( oemcrypto_move_entry_.ToProto(crypto_metrics->mutable_oemcrypto_move_entry());
crypto_metrics->mutable_oemcrypto_move_entry());
oemcrypto_create_old_usage_entry_.ToProto( oemcrypto_create_old_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_create_old_usage_entry()); crypto_metrics->mutable_oemcrypto_create_old_usage_entry());
oemcrypto_copy_old_usage_entry_.ToProto( oemcrypto_copy_old_usage_entry_.ToProto(
@@ -217,8 +213,8 @@ void CryptoMetrics::Serialize(WvCdmMetrics::CryptoMetrics *crypto_metrics)
SessionMetrics::SessionMetrics() : session_id_(""), completed_(false) {} SessionMetrics::SessionMetrics() : session_id_(""), completed_(false) {}
void SessionMetrics::Serialize(WvCdmMetrics::SessionMetrics *session_metrics) void SessionMetrics::Serialize(
const { WvCdmMetrics::SessionMetrics* session_metrics) const {
SerializeSessionMetrics(session_metrics); SerializeSessionMetrics(session_metrics);
crypto_metrics_.Serialize(session_metrics->mutable_crypto_metrics()); crypto_metrics_.Serialize(session_metrics->mutable_crypto_metrics());
} }
@@ -291,11 +287,11 @@ void OemCryptoDynamicAdapterMetrics::Serialize(
std::unique_lock<std::mutex> lock(adapter_lock_); std::unique_lock<std::mutex> lock(adapter_lock_);
engine_metrics->set_allocated_level3_oemcrypto_initialization_error( engine_metrics->set_allocated_level3_oemcrypto_initialization_error(
level3_oemcrypto_initialization_error_.ToProto()); oemcrypto_initialization_mode_.ToProto());
engine_metrics->set_allocated_oemcrypto_initialization_mode( engine_metrics->set_allocated_oemcrypto_initialization_mode(
oemcrypto_initialization_mode_.ToProto()); oemcrypto_initialization_mode_.ToProto());
engine_metrics->set_allocated_previous_oemcrypto_initialization_failure( engine_metrics->set_allocated_previous_oemcrypto_initialization_failure(
previous_oemcrypto_initialization_failure_.ToProto()); oemcrypto_initialization_mode_.ToProto());
engine_metrics->set_allocated_oemcrypto_l1_api_version( engine_metrics->set_allocated_oemcrypto_l1_api_version(
oemcrypto_l1_api_version_.ToProto()); oemcrypto_l1_api_version_.ToProto());
engine_metrics->set_allocated_oemcrypto_l1_min_api_version( engine_metrics->set_allocated_oemcrypto_l1_min_api_version(
@@ -322,14 +318,12 @@ OemCryptoDynamicAdapterMetrics &GetDynamicAdapterMetricsInstance() {
return *adapter_metrics; return *adapter_metrics;
} }
EngineMetrics::EngineMetrics() { EngineMetrics::EngineMetrics() { life_span_internal_.Start(); }
life_span_internal_.Start();
}
EngineMetrics::~EngineMetrics() { EngineMetrics::~EngineMetrics() {
std::unique_lock<std::mutex> lock(session_metrics_lock_); std::unique_lock<std::mutex> lock(session_metrics_lock_);
if (!active_session_metrics_list_.empty() if (!active_session_metrics_list_.empty() ||
|| !completed_session_metrics_list_.empty()) { !completed_session_metrics_list_.empty()) {
LOGV("Session counts: active = %zu, completed = %zu.", LOGV("Session counts: active = %zu, completed = %zu.",
active_session_metrics_list_.size(), active_session_metrics_list_.size(),
completed_session_metrics_list_.size()); completed_session_metrics_list_.size());
@@ -363,14 +357,12 @@ void EngineMetrics::ConsolidateSessions() {
}; };
std::unique_lock<std::mutex> lock(session_metrics_lock_); std::unique_lock<std::mutex> lock(session_metrics_lock_);
std::copy_if(active_session_metrics_list_.begin(), std::copy_if(
active_session_metrics_list_.end(), active_session_metrics_list_.begin(), active_session_metrics_list_.end(),
std::back_inserter(completed_session_metrics_list_), std::back_inserter(completed_session_metrics_list_), completed_filter);
completed_filter);
active_session_metrics_list_.erase( active_session_metrics_list_.erase(
std::remove_if(active_session_metrics_list_.begin(), std::remove_if(active_session_metrics_list_.begin(),
active_session_metrics_list_.end(), active_session_metrics_list_.end(), completed_filter),
completed_filter),
active_session_metrics_list_.end()); active_session_metrics_list_.end());
// TODO(b/118664842): Add support to merge older metrics into one // TODO(b/118664842): Add support to merge older metrics into one
@@ -463,6 +455,5 @@ void EngineMetrics::SerializeEngineMetrics(
crypto_metrics_.Serialize(engine_metrics->mutable_crypto_metrics()); crypto_metrics_.Serialize(engine_metrics->mutable_crypto_metrics());
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

9
libwvdrmengine/cdm/metrics/src/timer_metric.cpp
View File

@@ -1,16 +1,16 @@
// Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
#include "timer_metric.h" #include "timer_metric.h"
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
void TimerMetric::Start() { void TimerMetric::Start() {
start_ = clock_.now(); start_ = clock_.now();
is_started_ = true; is_started_ = true;
} }
void TimerMetric::Clear() { void TimerMetric::Clear() { is_started_ = false; }
is_started_ = false;
}
double TimerMetric::AsMs() const { double TimerMetric::AsMs() const {
return (clock_.now() - start_) / std::chrono::milliseconds(1); return (clock_.now() - start_) / std::chrono::milliseconds(1);
@@ -19,6 +19,5 @@ double TimerMetric::AsMs() const {
double TimerMetric::AsUs() const { double TimerMetric::AsUs() const {
return (clock_.now() - start_) / std::chrono::microseconds(1); return (clock_.now() - start_) / std::chrono::microseconds(1);
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

20
libwvdrmengine/cdm/metrics/src/value_metric.cpp
View File

@@ -1,11 +1,9 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains the specializations for helper methods for the // This file contains the specializations for helper methods for the
// ValueMetric class. // ValueMetric class.
#include <stdint.h>
#include <string>
#include "value_metric.h" #include "value_metric.h"
#include "OEMCryptoCENC.h" #include "OEMCryptoCENC.h"
@@ -14,18 +12,14 @@
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
namespace impl { namespace impl {
template <> template <>
void SetValue<int>(drm_metrics::ValueMetric *value_proto, void SetValue<int>(drm_metrics::ValueMetric* value_proto, const int& value) {
const int &value) {
value_proto->set_int_value(value); value_proto->set_int_value(value);
} }
template <> template <>
void SetValue<long>(drm_metrics::ValueMetric *value_proto, void SetValue<long>(drm_metrics::ValueMetric* value_proto, const long& value) {
const long &value) {
value_proto->set_int_value(value); value_proto->set_int_value(value);
} }
@@ -60,8 +54,7 @@ void SetValue<unsigned long long>(drm_metrics::ValueMetric *value_proto,
} }
template <> template <>
void SetValue<bool>(drm_metrics::ValueMetric *value_proto, void SetValue<bool>(drm_metrics::ValueMetric* value_proto, const bool& value) {
const bool &value) {
value_proto->set_int_value(value); value_proto->set_int_value(value);
} }
@@ -109,7 +102,6 @@ void SetValue<std::string>(drm_metrics::ValueMetric *value_proto,
const std::string& value) { const std::string& value) {
value_proto->set_string_value(value); value_proto->set_string_value(value);
} }
} // namespace impl } // namespace impl
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

9
libwvdrmengine/cdm/metrics/src/wv_metrics.proto
View File

@@ -1,4 +1,6 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// This file contains a proto definition for serialization of metrics data. // This file contains a proto definition for serialization of metrics data.
// //
@@ -15,10 +17,7 @@ option optimize_for = LITE_RUNTIME;
// want to count all of the operations with a give error code. // want to count all of the operations with a give error code.
message Attributes { message Attributes {
// Reserved for compatibility with logging proto. // Reserved for compatibility with logging proto.
// TODO(blueeyes): The reserved keyword is not supported in the older version reserved 8, 10 to 13;
// of protoc in the CE CDM third_party directory. Uncomment the reserved
// line when we upgrade. b/67016366.
// reserved 8, 10 to 13;
// The error code. See CdmResponseType in wv_cdm_types.h // The error code. See CdmResponseType in wv_cdm_types.h
optional int32 error_code = 1; optional int32 error_code = 1;

26
libwvdrmengine/cdm/metrics/test/counter_metric_unittest.cpp
View File

@@ -1,19 +1,19 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// Unit tests for CounterMetric // Unit tests for CounterMetric
#include "counter_metric.h" #include "counter_metric.h"
#include "gmock/gmock.h" #include <gtest/gtest.h>
#include "gtest/gtest.h"
#include "string_conversions.h"
using drm_metrics::TestMetrics; #include "pow2bucket.h"
using testing::IsNull; #include "string_conversions.h"
using testing::NotNull; #include "wv_cdm_types.h"
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
using drm_metrics::TestMetrics;
TEST(CounterMetricTest, NoFieldsEmpty) { TEST(CounterMetricTest, NoFieldsEmpty) {
wvcdm::metrics::CounterMetric<> metric; wvcdm::metrics::CounterMetric<> metric;
@@ -43,7 +43,8 @@ TEST(CounterMetricTest, NoFieldsSuccess) {
TEST(CounterMetricTest, OneFieldSuccess) { TEST(CounterMetricTest, OneFieldSuccess) {
wvcdm::metrics::CounterMetric<drm_metrics::Attributes::kErrorCodeFieldNumber, wvcdm::metrics::CounterMetric<drm_metrics::Attributes::kErrorCodeFieldNumber,
int> metric; int>
metric;
metric.Increment(7); metric.Increment(7);
metric.Increment(10, 7); metric.Increment(10, 7);
metric.Increment(13); metric.Increment(13);
@@ -61,7 +62,8 @@ TEST(CounterMetricTest, OneFieldSuccess) {
TEST(CounterMetricTest, TwoFieldsSuccess) { TEST(CounterMetricTest, TwoFieldsSuccess) {
CounterMetric<drm_metrics::Attributes::kErrorCodeFieldNumber, int, CounterMetric<drm_metrics::Attributes::kErrorCodeFieldNumber, int,
drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket> metric; drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket>
metric;
metric.Increment(7, Pow2Bucket(23)); // Increment by one. metric.Increment(7, Pow2Bucket(23)); // Increment by one.
metric.Increment(2, 7, Pow2Bucket(33)); metric.Increment(2, 7, Pow2Bucket(33));
@@ -110,7 +112,8 @@ TEST(CounterMetricTest, FourFieldsSuccess) {
drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket, drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket,
drm_metrics::Attributes::kErrorCodeBoolFieldNumber, bool, drm_metrics::Attributes::kErrorCodeBoolFieldNumber, bool,
drm_metrics::Attributes::kSecurityLevelFieldNumber, drm_metrics::Attributes::kSecurityLevelFieldNumber,
SecurityLevel> metric; SecurityLevel>
metric;
metric.Increment(10LL, 7, Pow2Bucket(13), true, kLevel3); metric.Increment(10LL, 7, Pow2Bucket(13), true, kLevel3);
TestMetrics metric_proto; TestMetrics metric_proto;
@@ -123,6 +126,5 @@ TEST(CounterMetricTest, FourFieldsSuccess) {
EXPECT_EQ(kLevel3, EXPECT_EQ(kLevel3,
metric_proto.test_counters(0).attributes().security_level()); metric_proto.test_counters(0).attributes().security_level());
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

13
libwvdrmengine/cdm/metrics/test/distribution_unittest.cpp
View File

@@ -1,16 +1,17 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// Unit tests for Distribution. // Unit tests for Distribution.
#include <float.h>
#include "distribution.h" #include "distribution.h"
#include "gtest/gtest.h" #include <float.h>
#include <gtest/gtest.h>
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
TEST(DistributionTest, NoValuesRecorded) { TEST(DistributionTest, NoValuesRecorded) {
Distribution distribution; Distribution distribution;
EXPECT_EQ(FLT_MAX, distribution.Min()); EXPECT_EQ(FLT_MAX, distribution.Min());
@@ -41,7 +42,5 @@ TEST(DistributionTest, MultipleValuesRecorded) {
EXPECT_EQ(3u, distribution.Count()); EXPECT_EQ(3u, distribution.Count());
EXPECT_NEAR(16.6667, distribution.Variance(), 0.0001); EXPECT_NEAR(16.6667, distribution.Variance(), 0.0001);
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

34
libwvdrmengine/cdm/metrics/test/event_metric_unittest.cpp
View File

@@ -1,19 +1,18 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// Unit tests for EventMetric // Unit tests for EventMetric
#include "event_metric.h" #include "event_metric.h"
#include "gmock/gmock.h" #include <gtest/gtest.h>
#include "gtest/gtest.h"
#include "string_conversions.h"
using drm_metrics::TestMetrics; #include "string_conversions.h"
using testing::IsNull; #include "wv_cdm_types.h"
using testing::NotNull;
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
using drm_metrics::TestMetrics;
class EventMetricTest : public ::testing::Test { class EventMetricTest : public ::testing::Test {
public: public:
@@ -71,7 +70,8 @@ TEST_F(EventMetricTest, OneFieldSuccess) {
TEST_F(EventMetricTest, TwoFieldsSuccess) { TEST_F(EventMetricTest, TwoFieldsSuccess) {
EventMetric<drm_metrics::Attributes::kErrorCodeFieldNumber, int, EventMetric<drm_metrics::Attributes::kErrorCodeFieldNumber, int,
drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket> metric; drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket>
metric;
metric.Record(1, 7, Pow2Bucket(23)); metric.Record(1, 7, Pow2Bucket(23));
metric.Record(2, 7, Pow2Bucket(33)); metric.Record(2, 7, Pow2Bucket(33));
@@ -114,7 +114,8 @@ TEST_F(EventMetricTest, TwoFieldsSuccess) {
TEST_F(EventMetricTest, ThreeFieldsSuccess) { TEST_F(EventMetricTest, ThreeFieldsSuccess) {
EventMetric<drm_metrics::Attributes::kErrorCodeFieldNumber, int, EventMetric<drm_metrics::Attributes::kErrorCodeFieldNumber, int,
drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket, drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket,
drm_metrics::Attributes::kErrorCodeBoolFieldNumber, bool> metric; drm_metrics::Attributes::kErrorCodeBoolFieldNumber, bool>
metric;
metric.Record(10LL, 7, Pow2Bucket(13), false); metric.Record(10LL, 7, Pow2Bucket(13), false);
metric.Record(11LL, 8, Pow2Bucket(17), true); metric.Record(11LL, 8, Pow2Bucket(17), true);
@@ -127,14 +128,16 @@ TEST_F(EventMetricTest, ThreeFieldsSuccess) {
EXPECT_FALSE(metric_proto.test_distributions(0).has_variance()); EXPECT_FALSE(metric_proto.test_distributions(0).has_variance());
EXPECT_EQ(7, metric_proto.test_distributions(0).attributes().error_code()); EXPECT_EQ(7, metric_proto.test_distributions(0).attributes().error_code());
EXPECT_EQ(8u, metric_proto.test_distributions(0).attributes().length()); EXPECT_EQ(8u, metric_proto.test_distributions(0).attributes().length());
EXPECT_FALSE(metric_proto.test_distributions(0).attributes().error_code_bool()); EXPECT_FALSE(
metric_proto.test_distributions(0).attributes().error_code_bool());
EXPECT_EQ(1u, metric_proto.test_distributions(1).operation_count()); EXPECT_EQ(1u, metric_proto.test_distributions(1).operation_count());
EXPECT_EQ(11LL, metric_proto.test_distributions(1).mean()); EXPECT_EQ(11LL, metric_proto.test_distributions(1).mean());
EXPECT_FALSE(metric_proto.test_distributions(1).has_variance()); EXPECT_FALSE(metric_proto.test_distributions(1).has_variance());
EXPECT_EQ(8, metric_proto.test_distributions(1).attributes().error_code()); EXPECT_EQ(8, metric_proto.test_distributions(1).attributes().error_code());
EXPECT_EQ(16u, metric_proto.test_distributions(1).attributes().length()); EXPECT_EQ(16u, metric_proto.test_distributions(1).attributes().length());
EXPECT_TRUE(metric_proto.test_distributions(1).attributes().error_code_bool()); EXPECT_TRUE(
metric_proto.test_distributions(1).attributes().error_code_bool());
} }
TEST_F(EventMetricTest, FourFieldsSuccess) { TEST_F(EventMetricTest, FourFieldsSuccess) {
@@ -142,7 +145,8 @@ TEST_F(EventMetricTest, FourFieldsSuccess) {
drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket, drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket,
drm_metrics::Attributes::kErrorCodeBoolFieldNumber, bool, drm_metrics::Attributes::kErrorCodeBoolFieldNumber, bool,
drm_metrics::Attributes::kCdmSecurityLevelFieldNumber, drm_metrics::Attributes::kCdmSecurityLevelFieldNumber,
CdmSecurityLevel> metric; CdmSecurityLevel>
metric;
metric.Record(10LL, 7, Pow2Bucket(13), true, kSecurityLevelL3); metric.Record(10LL, 7, Pow2Bucket(13), true, kSecurityLevelL3);
@@ -155,7 +159,8 @@ TEST_F(EventMetricTest, FourFieldsSuccess) {
EXPECT_FALSE(metric_proto.test_distributions(0).has_variance()); EXPECT_FALSE(metric_proto.test_distributions(0).has_variance());
EXPECT_EQ(7, metric_proto.test_distributions(0).attributes().error_code()); EXPECT_EQ(7, metric_proto.test_distributions(0).attributes().error_code());
EXPECT_EQ(8u, metric_proto.test_distributions(0).attributes().length()); EXPECT_EQ(8u, metric_proto.test_distributions(0).attributes().length());
EXPECT_TRUE(metric_proto.test_distributions(0).attributes().error_code_bool()); EXPECT_TRUE(
metric_proto.test_distributions(0).attributes().error_code_bool());
EXPECT_EQ( EXPECT_EQ(
3u, metric_proto.test_distributions(0).attributes().cdm_security_level()); 3u, metric_proto.test_distributions(0).attributes().cdm_security_level());
} }
@@ -185,6 +190,5 @@ TEST_F(EventMetricTest, Pow2BucketTest) {
value << Pow2Bucket(0x7FFFFFFF); value << Pow2Bucket(0x7FFFFFFF);
EXPECT_EQ("1073741824", value.str()); EXPECT_EQ("1073741824", value.str());
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

251
libwvdrmengine/cdm/metrics/test/metrics_collections_test.cpp
View File

@@ -1,29 +1,24 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// Unit tests for the metrics collections, // Unit tests for the metrics collections,
// EngineMetrics, SessionMetrics and CrytpoMetrics. // EngineMetrics, SessionMetrics and CrytpoMetrics.
#include "metrics_collections.h" #include "metrics_collections.h"
#include <sstream> #include <gtest/gtest.h>
#include "gmock/gmock.h"
#include "google/protobuf/text_format.h"
#include "gtest/gtest.h"
#include "log.h" #include "log.h"
#include "wv_cdm_types.h" #include "wv_cdm_types.h"
#include "wv_metrics.pb.h" #include "wv_metrics.pb.h"
using drm_metrics::MetricsGroup;
using google::protobuf::TextFormat;
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
using drm_metrics::MetricsGroup;
// TODO(blueeyes): Improve this implementation by supporting full message // TODO(blueeyes): Improve this implementation by supporting full message
// API In CDM. That allows us to use MessageDifferencer. // API In CDM. That allows us to use MessageDifferencer.
class EngineMetricsTest : public ::testing::Test { class EngineMetricsTest : public ::testing::Test {};
};
TEST_F(EngineMetricsTest, AllEngineMetrics) { TEST_F(EngineMetricsTest, AllEngineMetrics) {
EngineMetrics engine_metrics; EngineMetrics engine_metrics;
@@ -45,7 +40,8 @@ TEST_F(EngineMetricsTest, AllEngineMetrics) {
engine_metrics.cdm_engine_release_usage_info_.Record(1.0, NO_ERROR); engine_metrics.cdm_engine_release_usage_info_.Record(1.0, NO_ERROR);
engine_metrics.cdm_engine_remove_keys_.Record(1.0, NO_ERROR); engine_metrics.cdm_engine_remove_keys_.Record(1.0, NO_ERROR);
engine_metrics.cdm_engine_restore_key_.Record(1.0, NO_ERROR); engine_metrics.cdm_engine_restore_key_.Record(1.0, NO_ERROR);
engine_metrics.cdm_engine_unprovision_.Record(1.0, NO_ERROR, kSecurityLevelL1); engine_metrics.cdm_engine_unprovision_.Record(1.0, NO_ERROR,
kSecurityLevelL1);
drm_metrics::MetricsGroup actual_metrics; drm_metrics::MetricsGroup actual_metrics;
engine_metrics.Serialize(&actual_metrics, true, false); engine_metrics.Serialize(&actual_metrics, true, false);
@@ -73,10 +69,9 @@ TEST_F(EngineMetricsTest, EngineAndCryptoMetrics) {
engine_metrics.cdm_engine_close_session_.Record(1.0, NO_ERROR); engine_metrics.cdm_engine_close_session_.Record(1.0, NO_ERROR);
CryptoMetrics* crypto_metrics = engine_metrics.GetCryptoMetrics(); CryptoMetrics* crypto_metrics = engine_metrics.GetCryptoMetrics();
crypto_metrics->crypto_session_generic_decrypt_ crypto_metrics->crypto_session_generic_decrypt_.Record(
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128); 2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128);
crypto_metrics->crypto_session_get_device_unique_id_ crypto_metrics->crypto_session_get_device_unique_id_.Record(4.0, false);
.Record(4.0, false);
drm_metrics::MetricsGroup actual_metrics; drm_metrics::MetricsGroup actual_metrics;
engine_metrics.Serialize(&actual_metrics, true, false); engine_metrics.Serialize(&actual_metrics, true, false);
@@ -124,8 +119,8 @@ TEST_F(EngineMetricsTest, EngineMetricsWithCompletedSessions) {
SessionMetrics* session_metrics_2 = engine_metrics.AddSession(); SessionMetrics* session_metrics_2 = engine_metrics.AddSession();
session_metrics_2->SetSessionId("session_id_2"); session_metrics_2->SetSessionId("session_id_2");
// Record a CryptoMetrics metric in the session. // Record a CryptoMetrics metric in the session.
session_metrics_2->GetCryptoMetrics()->crypto_session_generic_decrypt_ session_metrics_2->GetCryptoMetrics()->crypto_session_generic_decrypt_.Record(
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128); 2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128);
session_metrics_2->SetSessionId("session_id_2"); session_metrics_2->SetSessionId("session_id_2");
// Mark only session 2 as completed. // Mark only session 2 as completed.
session_metrics_2->SetCompleted(); session_metrics_2->SetCompleted();
@@ -144,7 +139,8 @@ TEST_F(EngineMetricsTest, EngineMetricsWithCompletedSessions) {
// Spot check some metrics. // Spot check some metrics.
EXPECT_EQ("/drm/widevine/cdm_engine/add_key/time/count{error:2}", EXPECT_EQ("/drm/widevine/cdm_engine/add_key/time/count{error:2}",
actual_metrics.metric(0).name()); actual_metrics.metric(0).name());
EXPECT_EQ("/drm/widevine/crypto_session/load_certificate_private_key" EXPECT_EQ(
"/drm/widevine/crypto_session/load_certificate_private_key"
"/time/count{success:1}", "/time/count{success:1}",
actual_metrics.metric(2).name()); actual_metrics.metric(2).name());
EXPECT_EQ("/drm/widevine/cdm_session/session_id", EXPECT_EQ("/drm/widevine/cdm_session/session_id",
@@ -241,8 +237,7 @@ TEST_F(EngineMetricsTest, EngineMetricsRemoveSessions) {
ASSERT_EQ(0, actual_metrics.metric_sub_group_size()); ASSERT_EQ(0, actual_metrics.metric_sub_group_size());
} }
class SessionMetricsTest : public ::testing::Test { class SessionMetricsTest : public ::testing::Test {};
};
TEST_F(SessionMetricsTest, AllSessionMetrics) { TEST_F(SessionMetricsTest, AllSessionMetrics) {
SessionMetrics session_metrics; SessionMetrics session_metrics;
@@ -254,8 +249,8 @@ TEST_F(SessionMetricsTest, AllSessionMetrics) {
session_metrics.cdm_session_restore_usage_session_.Record(1.0, NO_ERROR); session_metrics.cdm_session_restore_usage_session_.Record(1.0, NO_ERROR);
// Record a CryptoMetrics metric in the session. // Record a CryptoMetrics metric in the session.
session_metrics.GetCryptoMetrics()->crypto_session_generic_decrypt_ session_metrics.GetCryptoMetrics()->crypto_session_generic_decrypt_.Record(
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128); 2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128);
MetricsGroup actual_metrics; MetricsGroup actual_metrics;
session_metrics.Serialize(&actual_metrics); session_metrics.Serialize(&actual_metrics);
@@ -271,7 +266,8 @@ TEST_F(SessionMetricsTest, AllSessionMetrics) {
EXPECT_EQ("/drm/widevine/cdm_session/renew_key/time/mean{error:0}", EXPECT_EQ("/drm/widevine/cdm_session/renew_key/time/mean{error:0}",
actual_metrics.metric(4).name()); actual_metrics.metric(4).name());
EXPECT_EQ(1.0, actual_metrics.metric(4).value().double_value()); EXPECT_EQ(1.0, actual_metrics.metric(4).value().double_value());
EXPECT_EQ("/drm/widevine/crypto_session/generic_decrypt/time/count" EXPECT_EQ(
"/drm/widevine/crypto_session/generic_decrypt/time/count"
"{error:0&length:1024&encryption_algorithm:1}", "{error:0&length:1024&encryption_algorithm:1}",
actual_metrics.metric(9).name()); actual_metrics.metric(9).name());
} }
@@ -290,134 +286,126 @@ TEST_F(SessionMetricsTest, EmptySessionMetrics) {
EXPECT_EQ(0, actual_metrics.metric_sub_group_size()); EXPECT_EQ(0, actual_metrics.metric_sub_group_size());
} }
class CryptoMetricsTest : public ::testing::Test { class CryptoMetricsTest : public ::testing::Test {};
};
TEST_F(CryptoMetricsTest, AllCryptoMetrics) { TEST_F(CryptoMetricsTest, AllCryptoMetrics) {
CryptoMetrics crypto_metrics; CryptoMetrics crypto_metrics;
// Crypto session metrics. // Crypto session metrics.
crypto_metrics.crypto_session_delete_all_usage_reports_ crypto_metrics.crypto_session_delete_all_usage_reports_.Record(1.0, NO_ERROR);
.Record(1.0, NO_ERROR); crypto_metrics.crypto_session_delete_multiple_usage_information_.Record(
crypto_metrics.crypto_session_delete_multiple_usage_information_ 1.0, NO_ERROR);
.Record(1.0, NO_ERROR); crypto_metrics.crypto_session_generic_decrypt_.Record(
crypto_metrics.crypto_session_generic_decrypt_ 2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128);
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128); crypto_metrics.crypto_session_generic_encrypt_.Record(
crypto_metrics.crypto_session_generic_encrypt_ 2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128);
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128); crypto_metrics.crypto_session_generic_sign_.Record(
crypto_metrics.crypto_session_generic_sign_ 2.0, NO_ERROR, Pow2Bucket(1025), kSigningAlgorithmHmacSha256);
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kSigningAlgorithmHmacSha256); crypto_metrics.crypto_session_generic_verify_.Record(
crypto_metrics.crypto_session_generic_verify_ 2.0, NO_ERROR, Pow2Bucket(1025), kSigningAlgorithmHmacSha256);
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kSigningAlgorithmHmacSha256);
crypto_metrics.crypto_session_get_device_unique_id_.Record(1.0, true); crypto_metrics.crypto_session_get_device_unique_id_.Record(1.0, true);
crypto_metrics.crypto_session_get_security_level_ crypto_metrics.crypto_session_get_security_level_.Record(1.0,
.Record(1.0, kSecurityLevelL1); kSecurityLevelL1);
crypto_metrics.crypto_session_get_system_id_.Record(1.0, true, 1234); crypto_metrics.crypto_session_get_system_id_.Record(1.0, true, 1234);
crypto_metrics.crypto_session_get_token_.Record(1.0, true); crypto_metrics.crypto_session_get_token_.Record(1.0, true);
crypto_metrics.crypto_session_life_span_.Record(1.0); crypto_metrics.crypto_session_life_span_.Record(1.0);
crypto_metrics.crypto_session_load_certificate_private_key_ crypto_metrics.crypto_session_load_certificate_private_key_.Record(1.0, true);
.Record(1.0, true);
crypto_metrics.crypto_session_open_.Record(1.0, NO_ERROR, kLevelDefault); crypto_metrics.crypto_session_open_.Record(1.0, NO_ERROR, kLevelDefault);
crypto_metrics.crypto_session_update_usage_information_ crypto_metrics.crypto_session_update_usage_information_.Record(1.0, NO_ERROR);
.Record(1.0, NO_ERROR);
crypto_metrics.crypto_session_usage_information_support_.Record(1.0, true); crypto_metrics.crypto_session_usage_information_support_.Record(1.0, true);
// Oem crypto metrics. // Oem crypto metrics.
crypto_metrics.oemcrypto_api_version_.Record(1.0, 123, kLevelDefault); crypto_metrics.oemcrypto_api_version_.Record(1.0, 123, kLevelDefault);
crypto_metrics.oemcrypto_close_session_ crypto_metrics.oemcrypto_close_session_.Record(1.0,
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_copy_buffer_ crypto_metrics.oemcrypto_copy_buffer_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED,
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED,
kLevelDefault, Pow2Bucket(1025)); kLevelDefault, Pow2Bucket(1025));
crypto_metrics.oemcrypto_deactivate_usage_entry_ crypto_metrics.oemcrypto_deactivate_usage_entry_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_decrypt_cenc_ crypto_metrics.oemcrypto_decrypt_cenc_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_delete_usage_entry_ crypto_metrics.oemcrypto_delete_usage_entry_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_delete_usage_table_ crypto_metrics.oemcrypto_delete_usage_table_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_derive_keys_from_session_key_ crypto_metrics.oemcrypto_derive_keys_from_session_key_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_force_delete_usage_entry_ crypto_metrics.oemcrypto_force_delete_usage_entry_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_generate_derived_keys_ crypto_metrics.oemcrypto_generate_derived_keys_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_generate_nonce_ crypto_metrics.oemcrypto_generate_nonce_.Record(1.0,
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_generate_rsa_signature_ crypto_metrics.oemcrypto_generate_rsa_signature_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_generate_signature_ crypto_metrics.oemcrypto_generate_signature_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_generic_decrypt_ crypto_metrics.oemcrypto_generic_decrypt_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_generic_encrypt_ crypto_metrics.oemcrypto_generic_encrypt_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_generic_sign_ crypto_metrics.oemcrypto_generic_sign_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_generic_verify_ crypto_metrics.oemcrypto_generic_verify_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_get_device_id_ crypto_metrics.oemcrypto_get_device_id_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault); 1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault);
crypto_metrics.oemcrypto_get_hdcp_capability_ crypto_metrics.oemcrypto_get_hdcp_capability_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault); 1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault);
crypto_metrics.oemcrypto_get_key_data_ crypto_metrics.oemcrypto_get_key_data_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025), kLevelDefault);
Pow2Bucket(1025), kLevelDefault); crypto_metrics.oemcrypto_get_max_number_of_sessions_.Record(
crypto_metrics.oemcrypto_get_max_number_of_sessions_ 1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault);
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault); crypto_metrics.oemcrypto_get_number_of_open_sessions_.Record(
crypto_metrics.oemcrypto_get_number_of_open_sessions_ 1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault);
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault); crypto_metrics.oemcrypto_get_oem_public_certificate_.Record(
crypto_metrics.oemcrypto_get_oem_public_certificate_ 1.0, OEMCrypto_ERROR_INIT_FAILED);
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_get_provisioning_method_ crypto_metrics.oemcrypto_get_provisioning_method_.Record(
.Record(1.0, OEMCrypto_Keybox, kLevelDefault); 1.0, OEMCrypto_Keybox, kLevelDefault);
crypto_metrics.oemcrypto_get_random_ crypto_metrics.oemcrypto_get_random_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED,
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); Pow2Bucket(1025));
crypto_metrics.oemcrypto_initialize_ crypto_metrics.oemcrypto_initialize_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED);
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_install_keybox_.Record(
crypto_metrics.oemcrypto_install_keybox_ 1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault);
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault); crypto_metrics.oemcrypto_is_anti_rollback_hw_present_.Record(1.0, true,
crypto_metrics.oemcrypto_is_anti_rollback_hw_present_ kLevelDefault);
.Record(1.0, true, kLevelDefault);
crypto_metrics.oemcrypto_is_keybox_valid_ crypto_metrics.oemcrypto_is_keybox_valid_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault); 1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault);
crypto_metrics.oemcrypto_load_device_rsa_key_ crypto_metrics.oemcrypto_load_device_rsa_key_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_load_keys_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_load_keys_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_load_test_keybox_ crypto_metrics.oemcrypto_load_test_keybox_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_load_test_rsa_key_ crypto_metrics.oemcrypto_load_test_rsa_key_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_open_session_ crypto_metrics.oemcrypto_open_session_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault); 1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault);
crypto_metrics.oemcrypto_refresh_keys_ crypto_metrics.oemcrypto_refresh_keys_.Record(1.0,
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_report_usage_ crypto_metrics.oemcrypto_report_usage_.Record(1.0,
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_rewrap_device_rsa_key_ crypto_metrics.oemcrypto_rewrap_device_rsa_key_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_rewrap_device_rsa_key_30_ crypto_metrics.oemcrypto_rewrap_device_rsa_key_30_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_security_level_ crypto_metrics.oemcrypto_security_level_.Record(1.0, kSecurityLevelL2,
.Record(1.0, kSecurityLevelL2, kLevelDefault); kLevelDefault);
crypto_metrics.oemcrypto_security_patch_level_ crypto_metrics.oemcrypto_security_patch_level_.Record(1.0, 123,
.Record(1.0, 123, kLevelDefault); kLevelDefault);
crypto_metrics.oemcrypto_select_key_ crypto_metrics.oemcrypto_select_key_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED);
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_supports_usage_table_.Record(
crypto_metrics.oemcrypto_supports_usage_table_ 1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault);
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, kLevelDefault); crypto_metrics.oemcrypto_update_usage_table_.Record(
crypto_metrics.oemcrypto_update_usage_table_ 1.0, OEMCrypto_ERROR_INIT_FAILED);
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_wrap_keybox_.Record(1.0,
crypto_metrics.oemcrypto_wrap_keybox_ OEMCrypto_ERROR_INIT_FAILED);
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED);
// Internal OEMCrypto Metrics // Internal OEMCrypto Metrics
crypto_metrics.oemcrypto_initialization_mode_ crypto_metrics.oemcrypto_initialization_mode_.Record(
.Record(1.0, OEMCrypto_INITIALIZED_FORCING_L3); 1.0, OEMCrypto_INITIALIZED_FORCING_L3);
crypto_metrics.oemcrypto_l1_api_version_.Record(1.0, 12, 123); crypto_metrics.oemcrypto_l1_api_version_.Record(1.0, 12, 123);
MetricsGroup actual_metrics; MetricsGroup actual_metrics;
@@ -440,6 +428,5 @@ TEST_F(CryptoMetricsTest, AllCryptoMetrics) {
// No subgroups should exist. // No subgroups should exist.
EXPECT_EQ(0, actual_metrics.metric_sub_group_size()); EXPECT_EQ(0, actual_metrics.metric_sub_group_size());
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

263
libwvdrmengine/cdm/metrics/test/metrics_collections_unittest.cpp
View File

@@ -1,35 +1,31 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// Unit tests for the metrics collections, // Unit tests for the metrics collections,
// EngineMetrics, SessionMetrics and CryptoMetrics. // EngineMetrics, SessionMetrics and CryptoMetrics.
#include "metrics_collections.h" #include "metrics_collections.h"
#include <sstream> #include <gtest/gtest.h>
#include "device_files.h" #include "device_files.h"
#include "gmock/gmock.h"
#include "google/protobuf/text_format.h"
#include "gtest/gtest.h"
#include "log.h" #include "log.h"
#include "string_conversions.h" #include "string_conversions.h"
#include "wv_cdm_types.h" #include "wv_cdm_types.h"
#include "wv_metrics.pb.h" #include "wv_metrics.pb.h"
namespace wvcdm {
namespace metrics {
using drm_metrics::WvCdmMetrics; using drm_metrics::WvCdmMetrics;
namespace { namespace {
const char kSessionId1[] = "session_id_1"; const char kSessionId1[] = "session_id_1";
const char kSessionId2[] = "session_id_2"; const char kSessionId2[] = "session_id_2";
} // anonymous namespace } // namespace
namespace wvcdm {
namespace metrics {
// TODO(blueeyes): Improve this implementation by supporting full message // TODO(blueeyes): Improve this implementation by supporting full message
// API In CDM. That allows us to use MessageDifferencer. // API In CDM. That allows us to use MessageDifferencer.
class EngineMetricsTest : public ::testing::Test { class EngineMetricsTest : public ::testing::Test {};
};
TEST_F(EngineMetricsTest, AllEngineMetrics) { TEST_F(EngineMetricsTest, AllEngineMetrics) {
EngineMetrics engine_metrics; EngineMetrics engine_metrics;
@@ -78,16 +74,16 @@ TEST_F(EngineMetricsTest, AllEngineMetrics) {
EXPECT_GT(actual.engine_metrics().cdm_engine_decrypt_time_us_size(), 0); EXPECT_GT(actual.engine_metrics().cdm_engine_decrypt_time_us_size(), 0);
EXPECT_GT(actual.engine_metrics().cdm_engine_find_session_for_key_size(), 0); EXPECT_GT(actual.engine_metrics().cdm_engine_find_session_for_key_size(), 0);
EXPECT_GT( EXPECT_GT(
actual.engine_metrics() actual.engine_metrics().cdm_engine_generate_key_request_time_us_size(),
.cdm_engine_generate_key_request_time_us_size(), 0); 0);
EXPECT_GT( EXPECT_GT(actual.engine_metrics()
actual.engine_metrics() .cdm_engine_get_provisioning_request_time_us_size(),
.cdm_engine_get_provisioning_request_time_us_size(), 0); 0);
EXPECT_GT(actual.engine_metrics().cdm_engine_get_usage_info_time_us_size(), EXPECT_GT(actual.engine_metrics().cdm_engine_get_usage_info_time_us_size(),
0); 0);
EXPECT_GT( EXPECT_GT(actual.engine_metrics()
actual.engine_metrics() .cdm_engine_handle_provisioning_response_time_us_size(),
.cdm_engine_handle_provisioning_response_time_us_size(), 0); 0);
EXPECT_GT(actual.engine_metrics().cdm_engine_open_key_set_session_size(), 0); EXPECT_GT(actual.engine_metrics().cdm_engine_open_key_set_session_size(), 0);
EXPECT_GT(actual.engine_metrics().cdm_engine_open_session_size(), 0); EXPECT_GT(actual.engine_metrics().cdm_engine_open_session_size(), 0);
EXPECT_GT(actual.engine_metrics().cdm_engine_query_key_status_time_us_size(), EXPECT_GT(actual.engine_metrics().cdm_engine_query_key_status_time_us_size(),
@@ -105,9 +101,9 @@ TEST_F(EngineMetricsTest, AllEngineMetrics) {
actual.engine_metrics().app_package_name().string_value()); actual.engine_metrics().app_package_name().string_value());
EXPECT_EQ("test cdm version", EXPECT_EQ("test cdm version",
actual.engine_metrics().cdm_engine_cdm_version().string_value()); actual.engine_metrics().cdm_engine_cdm_version().string_value());
EXPECT_EQ(100, EXPECT_EQ(
actual.engine_metrics() 100,
.cdm_engine_creation_time_millis().int_value()); actual.engine_metrics().cdm_engine_creation_time_millis().int_value());
} }
TEST_F(EngineMetricsTest, EngineAndCryptoMetrics) { TEST_F(EngineMetricsTest, EngineAndCryptoMetrics) {
@@ -120,8 +116,8 @@ TEST_F(EngineMetricsTest, EngineAndCryptoMetrics) {
CryptoMetrics* crypto_metrics = engine_metrics.GetCryptoMetrics(); CryptoMetrics* crypto_metrics = engine_metrics.GetCryptoMetrics();
crypto_metrics->crypto_session_get_device_unique_id_.Increment(NO_ERROR); crypto_metrics->crypto_session_get_device_unique_id_.Increment(NO_ERROR);
crypto_metrics->crypto_session_generic_decrypt_ crypto_metrics->crypto_session_generic_decrypt_.Record(
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128); 2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128);
WvCdmMetrics actual_metrics; WvCdmMetrics actual_metrics;
engine_metrics.Serialize(&actual_metrics); engine_metrics.Serialize(&actual_metrics);
@@ -134,28 +130,37 @@ TEST_F(EngineMetricsTest, EngineAndCryptoMetrics) {
actual_metrics.engine_metrics().cdm_engine_add_key_time_us_size()); actual_metrics.engine_metrics().cdm_engine_add_key_time_us_size());
EXPECT_EQ(2, actual_metrics.engine_metrics() EXPECT_EQ(2, actual_metrics.engine_metrics()
.cdm_engine_add_key_time_us(0) .cdm_engine_add_key_time_us(0)
.attributes().error_code()); .attributes()
ASSERT_EQ(1, .error_code());
actual_metrics.engine_metrics().cdm_engine_close_session_size()); ASSERT_EQ(1, actual_metrics.engine_metrics().cdm_engine_close_session_size());
EXPECT_EQ(UNKNOWN_ERROR, actual_metrics.engine_metrics() EXPECT_EQ(UNKNOWN_ERROR, actual_metrics.engine_metrics()
.cdm_engine_close_session(0) .cdm_engine_close_session(0)
.attributes().error_code()); .attributes()
ASSERT_EQ(1, actual_metrics.engine_metrics().crypto_metrics() .error_code());
ASSERT_EQ(1, actual_metrics.engine_metrics()
.crypto_metrics()
.crypto_session_get_device_unique_id_size()); .crypto_session_get_device_unique_id_size());
EXPECT_EQ(1, actual_metrics.engine_metrics().crypto_metrics() EXPECT_EQ(1, actual_metrics.engine_metrics()
.crypto_metrics()
.crypto_session_get_device_unique_id(0) .crypto_session_get_device_unique_id(0)
.count()); .count());
EXPECT_EQ(NO_ERROR, actual_metrics.engine_metrics().crypto_metrics() EXPECT_EQ(NO_ERROR, actual_metrics.engine_metrics()
.crypto_metrics()
.crypto_session_get_device_unique_id(0) .crypto_session_get_device_unique_id(0)
.attributes().error_code()); .attributes()
ASSERT_EQ(1, actual_metrics.engine_metrics().crypto_metrics() .error_code());
ASSERT_EQ(1, actual_metrics.engine_metrics()
.crypto_metrics()
.crypto_session_generic_decrypt_time_us_size()); .crypto_session_generic_decrypt_time_us_size());
EXPECT_EQ(2.0, actual_metrics.engine_metrics().crypto_metrics() EXPECT_EQ(2.0, actual_metrics.engine_metrics()
.crypto_metrics()
.crypto_session_generic_decrypt_time_us(0) .crypto_session_generic_decrypt_time_us(0)
.mean()); .mean());
EXPECT_EQ(NO_ERROR, actual_metrics.engine_metrics().crypto_metrics() EXPECT_EQ(NO_ERROR, actual_metrics.engine_metrics()
.crypto_metrics()
.crypto_session_generic_decrypt_time_us(0) .crypto_session_generic_decrypt_time_us(0)
.attributes().error_code()); .attributes()
.error_code());
} }
TEST_F(EngineMetricsTest, EmptyEngineMetrics) { TEST_F(EngineMetricsTest, EmptyEngineMetrics) {
@@ -186,8 +191,8 @@ TEST_F(EngineMetricsTest, EngineMetricsWithSessions) {
engine_metrics.AddSession(); engine_metrics.AddSession();
session_metrics_2->SetSessionId(kSessionId2); session_metrics_2->SetSessionId(kSessionId2);
// Record a CryptoMetrics metric in the session. // Record a CryptoMetrics metric in the session.
session_metrics_2->GetCryptoMetrics()->crypto_session_generic_decrypt_ session_metrics_2->GetCryptoMetrics()->crypto_session_generic_decrypt_.Record(
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128); 2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128);
WvCdmMetrics actual_metrics; WvCdmMetrics actual_metrics;
engine_metrics.Serialize(&actual_metrics); engine_metrics.Serialize(&actual_metrics);
@@ -201,7 +206,8 @@ TEST_F(EngineMetricsTest, EngineMetricsWithSessions) {
actual_metrics.session_metrics(0).session_id().string_value()); actual_metrics.session_metrics(0).session_id().string_value());
EXPECT_EQ(kSessionId2, EXPECT_EQ(kSessionId2,
actual_metrics.session_metrics(1).session_id().string_value()); actual_metrics.session_metrics(1).session_id().string_value());
EXPECT_EQ(1, actual_metrics.session_metrics(1).crypto_metrics() EXPECT_EQ(1, actual_metrics.session_metrics(1)
.crypto_metrics()
.crypto_session_generic_decrypt_time_us_size()); .crypto_session_generic_decrypt_time_us_size());
} }
@@ -259,8 +265,7 @@ TEST_F(EngineMetricsTest, EngineMetricsConsolidateSessionsNoSessions) {
ASSERT_EQ(0, actual_metrics.session_metrics_size()); ASSERT_EQ(0, actual_metrics.session_metrics_size());
} }
class SessionMetricsTest : public ::testing::Test { class SessionMetricsTest : public ::testing::Test {};
};
TEST_F(SessionMetricsTest, AllSessionMetrics) { TEST_F(SessionMetricsTest, AllSessionMetrics) {
SessionMetrics session_metrics; SessionMetrics session_metrics;
@@ -275,12 +280,13 @@ TEST_F(SessionMetricsTest, AllSessionMetrics) {
2.0, kKeyRequestTypeInitial); 2.0, kKeyRequestTypeInitial);
session_metrics.oemcrypto_build_info_.Record("test build info"); session_metrics.oemcrypto_build_info_.Record("test build info");
session_metrics.license_sdk_version_.Record("test license sdk version"); session_metrics.license_sdk_version_.Record("test license sdk version");
session_metrics.license_service_version_.Record("test license service version"); session_metrics.license_service_version_.Record(
"test license service version");
session_metrics.drm_certificate_key_type_.Record(1); session_metrics.drm_certificate_key_type_.Record(1);
// Record a CryptoMetrics metric in the session. // Record a CryptoMetrics metric in the session.
session_metrics.GetCryptoMetrics()->crypto_session_generic_decrypt_ session_metrics.GetCryptoMetrics()->crypto_session_generic_decrypt_.Record(
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128); 2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128);
WvCdmMetrics::SessionMetrics actual; WvCdmMetrics::SessionMetrics actual;
session_metrics.Serialize(&actual); session_metrics.Serialize(&actual);
@@ -315,32 +321,30 @@ TEST_F(SessionMetricsTest, EmptySessionMetrics) {
EXPECT_EQ(0, actual_metrics.cdm_session_restore_usage_session_size()); EXPECT_EQ(0, actual_metrics.cdm_session_restore_usage_session_size());
} }
class CryptoMetricsTest : public ::testing::Test { class CryptoMetricsTest : public ::testing::Test {};
};
TEST_F(CryptoMetricsTest, AllCryptoMetrics) { TEST_F(CryptoMetricsTest, AllCryptoMetrics) {
CryptoMetrics crypto_metrics; CryptoMetrics crypto_metrics;
// Crypto session metrics. // Crypto session metrics.
crypto_metrics.crypto_session_delete_all_usage_reports_.Increment(NO_ERROR); crypto_metrics.crypto_session_delete_all_usage_reports_.Increment(NO_ERROR);
crypto_metrics.crypto_session_delete_multiple_usage_information_ crypto_metrics.crypto_session_delete_multiple_usage_information_.Increment(
.Increment(NO_ERROR); NO_ERROR);
crypto_metrics.crypto_session_generic_decrypt_ crypto_metrics.crypto_session_generic_decrypt_.Record(
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128); 2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128);
crypto_metrics.crypto_session_generic_encrypt_ crypto_metrics.crypto_session_generic_encrypt_.Record(
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128); 2.0, NO_ERROR, Pow2Bucket(1025), kEncryptionAlgorithmAesCbc128);
crypto_metrics.crypto_session_generic_sign_ crypto_metrics.crypto_session_generic_sign_.Record(
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kSigningAlgorithmHmacSha256); 2.0, NO_ERROR, Pow2Bucket(1025), kSigningAlgorithmHmacSha256);
crypto_metrics.crypto_session_generic_verify_ crypto_metrics.crypto_session_generic_verify_.Record(
.Record(2.0, NO_ERROR, Pow2Bucket(1025), kSigningAlgorithmHmacSha256); 2.0, NO_ERROR, Pow2Bucket(1025), kSigningAlgorithmHmacSha256);
crypto_metrics.crypto_session_get_device_unique_id_.Increment(NO_ERROR); crypto_metrics.crypto_session_get_device_unique_id_.Increment(NO_ERROR);
crypto_metrics.crypto_session_get_token_.Increment(NO_ERROR); crypto_metrics.crypto_session_get_token_.Increment(NO_ERROR);
crypto_metrics.crypto_session_life_span_.Record(1.0); crypto_metrics.crypto_session_life_span_.Record(1.0);
crypto_metrics.crypto_session_load_certificate_private_key_ crypto_metrics.crypto_session_load_certificate_private_key_.Record(1.0,
.Record(1.0, NO_ERROR); NO_ERROR);
crypto_metrics.crypto_session_open_.Record(1.0, NO_ERROR, kLevelDefault); crypto_metrics.crypto_session_open_.Record(1.0, NO_ERROR, kLevelDefault);
crypto_metrics.crypto_session_update_usage_information_ crypto_metrics.crypto_session_update_usage_information_.Record(1.0, NO_ERROR);
.Record(1.0, NO_ERROR);
crypto_metrics.crypto_session_usage_information_support_.Record(true); crypto_metrics.crypto_session_usage_information_support_.Record(true);
crypto_metrics.crypto_session_security_level_.Record(kSecurityLevelL2); crypto_metrics.crypto_session_security_level_.Record(kSecurityLevelL2);
@@ -359,87 +363,83 @@ TEST_F(CryptoMetricsTest, AllCryptoMetrics) {
// Oem crypto metrics. // Oem crypto metrics.
crypto_metrics.oemcrypto_api_version_.Record(123); crypto_metrics.oemcrypto_api_version_.Record(123);
crypto_metrics.oemcrypto_close_session_ crypto_metrics.oemcrypto_close_session_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_copy_buffer_ crypto_metrics.oemcrypto_copy_buffer_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED,
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); Pow2Bucket(1025));
crypto_metrics.oemcrypto_deactivate_usage_entry_ crypto_metrics.oemcrypto_deactivate_usage_entry_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_decrypt_cenc_ crypto_metrics.oemcrypto_decrypt_cenc_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_delete_usage_entry_ crypto_metrics.oemcrypto_delete_usage_entry_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_delete_usage_table_ crypto_metrics.oemcrypto_delete_usage_table_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_derive_keys_from_session_key_ crypto_metrics.oemcrypto_derive_keys_from_session_key_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_force_delete_usage_entry_ crypto_metrics.oemcrypto_force_delete_usage_entry_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_generate_derived_keys_ crypto_metrics.oemcrypto_generate_derived_keys_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_generate_nonce_ crypto_metrics.oemcrypto_generate_nonce_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_generate_rsa_signature_ crypto_metrics.oemcrypto_generate_rsa_signature_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_generate_signature_ crypto_metrics.oemcrypto_generate_signature_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_generic_decrypt_ crypto_metrics.oemcrypto_generic_decrypt_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_generic_encrypt_ crypto_metrics.oemcrypto_generic_encrypt_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_generic_sign_ crypto_metrics.oemcrypto_generic_sign_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_generic_verify_ crypto_metrics.oemcrypto_generic_verify_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_get_device_id_ crypto_metrics.oemcrypto_get_device_id_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_get_key_data_ crypto_metrics.oemcrypto_get_key_data_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025)); 1.0, OEMCrypto_ERROR_INIT_FAILED, Pow2Bucket(1025));
crypto_metrics.oemcrypto_max_number_of_sessions_.Record(7); crypto_metrics.oemcrypto_max_number_of_sessions_.Record(7);
crypto_metrics.oemcrypto_number_of_open_sessions_.Record(5); crypto_metrics.oemcrypto_number_of_open_sessions_.Record(5);
crypto_metrics.oemcrypto_get_oem_public_certificate_ crypto_metrics.oemcrypto_get_oem_public_certificate_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_provisioning_method_.Record(OEMCrypto_Keybox); crypto_metrics.oemcrypto_provisioning_method_.Record(OEMCrypto_Keybox);
crypto_metrics.oemcrypto_get_random_ crypto_metrics.oemcrypto_get_random_.Increment(OEMCrypto_ERROR_INIT_FAILED);
.Increment(OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_initialize_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_initialize_
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_is_anti_rollback_hw_present_.Record(true); crypto_metrics.oemcrypto_is_anti_rollback_hw_present_.Record(true);
crypto_metrics.oemcrypto_is_keybox_valid_.Record(true); crypto_metrics.oemcrypto_is_keybox_valid_.Record(true);
crypto_metrics.oemcrypto_load_device_drm_key_.Record( crypto_metrics.oemcrypto_load_device_drm_key_.Record(
1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_load_keys_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_load_keys_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_refresh_keys_ crypto_metrics.oemcrypto_refresh_keys_.Record(1.0,
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_report_usage_.Increment(OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_report_usage_.Increment(OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_rewrap_device_rsa_key_ crypto_metrics.oemcrypto_rewrap_device_rsa_key_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_rewrap_device_rsa_key_30_ crypto_metrics.oemcrypto_rewrap_device_rsa_key_30_.Record(
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); 1.0, OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_security_patch_level_.Record(123); crypto_metrics.oemcrypto_security_patch_level_.Record(123);
crypto_metrics.oemcrypto_select_key_ crypto_metrics.oemcrypto_select_key_.Record(1.0, OEMCrypto_ERROR_INIT_FAILED);
.Record(1.0, OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_update_usage_table_.Increment(
crypto_metrics.oemcrypto_update_usage_table_ OEMCrypto_ERROR_INIT_FAILED);
.Increment(OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_create_usage_table_header_.Increment(
crypto_metrics.oemcrypto_create_usage_table_header_ OEMCrypto_ERROR_INIT_FAILED);
.Increment(OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_load_usage_table_header_.Increment(
crypto_metrics.oemcrypto_load_usage_table_header_ OEMCrypto_ERROR_INIT_FAILED);
.Increment(OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_shrink_usage_table_header_.Increment(
crypto_metrics.oemcrypto_shrink_usage_table_header_ OEMCrypto_ERROR_INIT_FAILED);
.Increment(OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_create_new_usage_entry_.Increment(
crypto_metrics.oemcrypto_create_new_usage_entry_ OEMCrypto_ERROR_INIT_FAILED);
.Increment(OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_load_usage_entry_.Increment(
crypto_metrics.oemcrypto_load_usage_entry_ OEMCrypto_ERROR_INIT_FAILED);
.Increment(OEMCrypto_ERROR_INIT_FAILED); crypto_metrics.oemcrypto_move_entry_.Increment(OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_move_entry_ crypto_metrics.oemcrypto_create_old_usage_entry_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_create_old_usage_entry_ crypto_metrics.oemcrypto_copy_old_usage_entry_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_copy_old_usage_entry_
.Increment(OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_set_sandbox_.Record("sandbox"); crypto_metrics.oemcrypto_set_sandbox_.Record("sandbox");
crypto_metrics.oemcrypto_set_decrypt_hash_ crypto_metrics.oemcrypto_set_decrypt_hash_.Increment(
.Increment(OEMCrypto_ERROR_INIT_FAILED); OEMCrypto_ERROR_INIT_FAILED);
crypto_metrics.oemcrypto_resource_rating_tier_.Record(123); crypto_metrics.oemcrypto_resource_rating_tier_.Record(123);
crypto_metrics.oemcrypto_minor_api_version_.Record(234); crypto_metrics.oemcrypto_minor_api_version_.Record(234);
crypto_metrics.oemcrypto_maximum_usage_table_header_size_.Record(321); crypto_metrics.oemcrypto_maximum_usage_table_header_size_.Record(321);
@@ -535,6 +535,5 @@ TEST_F(CryptoMetricsTest, AllCryptoMetrics) {
EXPECT_EQ(321, EXPECT_EQ(321,
actual.oemcrypto_maximum_usage_table_header_size().int_value()); actual.oemcrypto_maximum_usage_table_header_size().int_value());
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm

13
libwvdrmengine/cdm/metrics/test/value_metric_unittest.cpp
View File

@@ -1,19 +1,17 @@
// Copyright 2017 Google Inc. All Rights Reserved. // Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
// source code may only be used and distributed under the Widevine License
// Agreement.
// //
// Unit tests for ValueMetric. // Unit tests for ValueMetric.
#include "value_metric.h"
#include <memory> #include <memory>
#include <string> #include <string>
#include "value_metric.h" #include <gtest/gtest.h>
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "wv_metrics.pb.h"
namespace wvcdm { namespace wvcdm {
namespace metrics { namespace metrics {
TEST(ValueMetricTest, StringValue) { TEST(ValueMetricTest, StringValue) {
ValueMetric<std::string> metric; ValueMetric<std::string> metric;
metric.Record("foo"); metric.Record("foo");
@@ -59,6 +57,5 @@ TEST(ValueMetricTest, SetError) {
ASSERT_EQ(7, metric_proto->error_code()); ASSERT_EQ(7, metric_proto->error_code());
ASSERT_FALSE(metric_proto->has_int_value()); ASSERT_FALSE(metric_proto->has_int_value());
} }
} // namespace metrics } // namespace metrics
} // namespace wvcdm } // namespace wvcdm