Skip aggregation service histogram when ThreadTicks is not supported

Currently, if the platform doesn't support threadticks, base::TimeDelta() would be recorded. Instead, we want to skip the reporting entirely. Bug: 1368649 Change-Id: I4bc1177fa8bf450ac9afd93fc146be8ad48bb088 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3922556 Reviewed-by: John Delaney <johnidel@chromium.org> Commit-Queue: Anthony Garant <anthonygarant@google.com> Cr-Commit-Position: refs/heads/main@{#1052666}
marcosholgado · Sep 28, 2022 · 7f66748 · 7f66748
1 parent 8527201
commit 7f66748
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/content/browser/aggregation_service/aggregation_service_storage_sql.cc b/content/browser/aggregation_service/aggregation_service_storage_sql.cc
@@ -891,9 +891,11 @@ bool AggregationServiceStorageSql::CreateSchema() {
     return false;
   }
 
-  base::UmaHistogramMediumTimes(
-      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime",
-      timer.Elapsed());
+  if (timer.is_supported()) {
+    base::UmaHistogramMediumTimes(
+        "PrivacySandbox.AggregationService.Storage.Sql.CreationTime2",
+        timer.Elapsed());
+  }
 
   return transaction.Commit();
 }

diff --git a/content/browser/aggregation_service/aggregation_service_storage_sql_unittest.cc b/content/browser/aggregation_service/aggregation_service_storage_sql_unittest.cc
@@ -154,7 +154,7 @@ TEST_F(AggregationServiceStorageSqlTest,
 
   // DB creation UMA should not be recorded.
   histograms.ExpectTotalCount(
-      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime", 0);
+      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime2", 0);
 
   // Storing a public key should create and initialize the database.
   OpenDatabase();
@@ -163,9 +163,10 @@ TEST_F(AggregationServiceStorageSqlTest,
   storage_->SetPublicKeys(url, keyset);
   CloseDatabase();
 
-  // DB creation UMA should be recorded.
+  // DB creation UMA should be recorded if ThreadTicks is supported
   histograms.ExpectTotalCount(
-      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime", 1);
+      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime2",
+      base::ThreadTicks::IsSupported() ? 1 : 0);
 
   {
     sql::Database raw_db;
@@ -1155,7 +1156,8 @@ TEST_F(AggregationServiceStorageSqlMigrationsTest, MigrateEmptyToCurrent) {
   }
 
   histograms.ExpectTotalCount(
-      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime", 1);
+      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime2",
+      base::ThreadTicks::IsSupported() ? 1 : 0);
   histograms.ExpectUniqueSample(
       "PrivacySandbox.AggregationService.Storage.Sql.InitStatus",
       AggregationServiceStorageSql::InitStatus::kSuccess, 1);
@@ -1204,7 +1206,7 @@ TEST_F(AggregationServiceStorageSqlMigrationsTest, MigrateVersion1ToCurrent) {
   }
 
   histograms.ExpectTotalCount(
-      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime", 0);
+      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime2", 0);
   histograms.ExpectUniqueSample(
       "PrivacySandbox.AggregationService.Storage.Sql.InitStatus",
       AggregationServiceStorageSql::InitStatus::kSuccess, 1);
@@ -1253,7 +1255,7 @@ TEST_F(AggregationServiceStorageSqlMigrationsTest, MigrateVersion2ToCurrent) {
   }
 
   histograms.ExpectTotalCount(
-      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime", 0);
+      "PrivacySandbox.AggregationService.Storage.Sql.CreationTime2", 0);
   histograms.ExpectUniqueSample(
       "PrivacySandbox.AggregationService.Storage.Sql.InitStatus",
       AggregationServiceStorageSql::InitStatus::kSuccess, 1);

diff --git a/tools/metrics/histograms/metadata/privacy/histograms.xml b/tools/metrics/histograms/metadata/privacy/histograms.xml
@@ -380,6 +380,10 @@ reviewer.
 
 <histogram name="PrivacySandbox.AggregationService.Storage.Sql.CreationTime"
     units="ms" expires_after="2023-02-23">
+  <obsolete>
+    PrivacySandbox.AggregationService.Storage.Sql.CreationTime2 which only
+    records when Threadticks is supported, 10/2022.
+  </obsolete>
   <owner>alexmt@chromium.org</owner>
   <owner>linnan@chromium.org</owner>
   <summary>
@@ -389,6 +393,18 @@ reviewer.
   </summary>
 </histogram>
 
+<histogram name="PrivacySandbox.AggregationService.Storage.Sql.CreationTime2"
+    units="ms" expires_after="2023-02-23">
+  <owner>alexmt@chromium.org</owner>
+  <owner>linnan@chromium.org</owner>
+  <summary>
+    Records the time it took to initialize a new aggregation service database
+    from scratch. Recorded when the aggregation service database finishes
+    initialization. Note that no event is recorded if `ThreadTicks` is not
+    supported.
+  </summary>
+</histogram>
+
 <histogram name="PrivacySandbox.AggregationService.Storage.Sql.InitStatus"
     enum="PrivacySandboxAggregationServiceStorageSqlInitStatus"
     expires_after="2022-10-23">