Bug 1908994 - Migrate NETWORK_CACHE_METADATA_* probes to Glean r=kershaw,acreskey,necko-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D217177

Author: Sean

netwerk/cache2/CacheFileMetadata.cpp

@@ -17,6 +17,7 @@
 #include "mozilla/Telemetry.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/IntegerPrintfMacros.h"
+#include "mozilla/glean/GleanMetrics.h"
 #include "prnetdb.h"
 
 namespace mozilla::net {
@@ -635,13 +636,16 @@ nsresult CacheFileMetadata::OnDataRead(CacheFileHandle* aHandle, char* aBuf,
     return NS_OK;
   }
 
+#ifndef ANDROID
+  mozilla::TimeStamp readEnd = mozilla::TimeStamp::Now();
   if (mFirstRead) {
-    Telemetry::AccumulateTimeDelta(
-        Telemetry::NETWORK_CACHE_METADATA_FIRST_READ_TIME_MS, mReadStart);
+    mozilla::glean::networking::cache_metadata_first_read_time
+        .AccumulateRawDuration(readEnd - mReadStart);
   } else {
-    Telemetry::AccumulateTimeDelta(
-        Telemetry::NETWORK_CACHE_METADATA_SECOND_READ_TIME_MS, mReadStart);
+    mozilla::glean::networking::cache_metadata_second_read_time
+        .AccumulateRawDuration(readEnd - mReadStart);
   }
+#endif
 
   // check whether we have read all necessary data
   uint32_t realOffset =
@@ -726,8 +730,9 @@ nsresult CacheFileMetadata::OnDataRead(CacheFileHandle* aHandle, char* aBuf,
     return NS_OK;
   }
 
-  Telemetry::Accumulate(Telemetry::NETWORK_CACHE_METADATA_SIZE_2,
-                        size - realOffset);
+#ifndef ANDROID
+  mozilla::glean::networking::cache_metadata_size.Accumulate(size - realOffset);
+#endif
 
   // We have all data according to offset information at the end of the entry.
   // Try to parse it.

netwerk/metrics.yaml

@@ -903,6 +903,43 @@ networking:
     expires: never
     telemetry_mirror: HTTP_UPLOAD_THROUGHPUT_MBPS_HTTP_3_100
 
+  cache_metadata_first_read_time: &cache_metadata_first_read_time
+    type: timing_distribution
+    time_unit: millisecond
+    description: >
+      Time spent to read the first part of the metadata from the cache entry file.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1908994
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1908994
+    notification_emails:
+      - [email protected]
+    expires: never
+    telemetry_mirror: NETWORK_CACHE_METADATA_FIRST_READ_TIME_MS
+
+  cache_metadata_second_read_time:
+    <<: *cache_metadata_first_read_time
+    description: >
+      Time spent to read the missing part of the metadata from the cache entry file.
+    telemetry_mirror: NETWORK_CACHE_METADATA_SECOND_READ_TIME_MS
+
+  cache_metadata_size:
+    type: memory_distribution
+    memory_unit: byte
+    description:
+      Size of the metadata in bytes parsed from the disk.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1133739
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1495336
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1908994
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1908994
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - [email protected]
+    expires: never
+
   residual_cache_folder_count:
     type: counter
     description: >

toolkit/components/telemetry/Histograms.json

@@ -12547,18 +12547,6 @@
     "n_buckets": 50,
     "description": "Time spent to read the missing part of the metadata from the cache entry file."
   },
-  "NETWORK_CACHE_METADATA_SIZE_2": {
-    "record_in_processes": ["main"],
-    "products": ["firefox", "fennec"],
-    "alert_emails": ["[email protected]", "[email protected]"],
-    "bug_numbers": [1133739, 1495336],
-    "expires_in_version": "never",
-    "kind": "linear",
-    "low": 1024,
-    "high": 66560,
-    "n_buckets": 66,
-    "description": "Size of the metadata in bytes parsed from the disk."
-  },
   "NETWORK_CACHE_SIZE": {
     "record_in_processes": ["main"],
     "products": ["firefox", "fennec"],