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

Add extra OEMCrypto metrics

Browse Source 
[ Merge from http://go/wvgerrit/74924 ]

These were not previously being collected or were collected
insufficiently.

BUG: http://b/121090396 http://b/112919252
Test: Unit tests, Gplay, Nflix, GTS
Change-Id: I32b7206cbe6071519b4a483fbcd0920dc1a26961
This commit is contained in:
Adam Stone
2019-03-20 11:22:04 -07:00
parent a5bc8be7a0
commit 09c7473dea
5 changed files with 100 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/cdm/metrics/src/metrics.proto
View File

@@ -94,7 +94,7 @@ message WvCdmMetrics {
// This contains metrics that were captured at the CryptoSession level. These
// include CryptoSession metrics and most OEMCrypto metrics.
// next id: 62
// next id: 73
message CryptoMetrics {
// Crypto Session Metrics.
optional ValueMetric crypto_session_security_level = 1;
@@ -162,6 +162,17 @@ message WvCdmMetrics {
optional ValueMetric oemcrypto_usage_table_support = 54;
repeated CounterMetric oemcrypto_update_usage_table = 55;
repeated CounterMetric oemcrypto_update_usage_entry = 57;
repeated CounterMetric oemcrypto_create_usage_table_header = 62;
repeated CounterMetric oemcrypto_load_usage_table_header = 63;
repeated CounterMetric oemcrypto_shrink_usage_table_header = 64;
repeated CounterMetric oemcrypto_create_new_usage_entry = 65;
repeated CounterMetric oemcrypto_load_usage_entry = 66;
repeated CounterMetric oemcrypto_move_entry = 67;
repeated CounterMetric oemcrypto_create_old_usage_entry = 68;
repeated CounterMetric oemcrypto_copy_old_usage_entry = 69;
optional ValueMetric oemcrypto_set_sandbox = 70;
repeated CounterMetric oemcrypto_set_decrypt_hash = 71;
optional ValueMetric oemcrypto_resource_rating_tier = 72;
}
// This contains metrics that were captured within a CdmSession. This contains

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

@@ -161,7 +161,29 @@ void CryptoMetrics::Serialize(WvCdmMetrics::CryptoMetrics *crypto_metrics)
oemcrypto_update_usage_table_.ToProto(
crypto_metrics->mutable_oemcrypto_update_usage_table());
oemcrypto_update_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_update_usage_entry());
crypto_metrics->mutable_oemcrypto_update_usage_entry());
oemcrypto_create_usage_table_header_.ToProto(
crypto_metrics->mutable_oemcrypto_create_usage_table_header());
oemcrypto_load_usage_table_header_.ToProto(
crypto_metrics->mutable_oemcrypto_load_usage_table_header());
oemcrypto_shrink_usage_table_header_.ToProto(
crypto_metrics->mutable_oemcrypto_shrink_usage_table_header());
oemcrypto_create_new_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_create_new_usage_entry());
oemcrypto_load_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_load_usage_entry());
oemcrypto_move_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_move_entry());
oemcrypto_create_old_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_create_old_usage_entry());
oemcrypto_copy_old_usage_entry_.ToProto(
crypto_metrics->mutable_oemcrypto_copy_old_usage_entry());
crypto_metrics->set_allocated_oemcrypto_set_sandbox(
oemcrypto_set_sandbox_.ToProto());
oemcrypto_set_decrypt_hash_.ToProto(
crypto_metrics->mutable_oemcrypto_set_decrypt_hash());
crypto_metrics->set_allocated_oemcrypto_resource_rating_tier(
oemcrypto_resource_rating_tier_.ToProto());
}
SessionMetrics::SessionMetrics() : session_id_(""), completed_(false) {}