tor-browser

commit c952b684db0efec9de9635c75e0dc4be55c4e048
parent b2de242893eb221c651576a5e000812cbdfaab00
Author: John M. Schanck <jschanck@mozilla.com>
Date:   Wed, 26 Nov 2025 23:20:48 +0000

Bug 1999869 - remove cert_storage.memory metric. r=keeler

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

Diffstat:
M
Cargo.lock
 | 
1
-
M
security/manager/ssl/cert_storage/Cargo.toml
 | 
1
-
M
security/manager/ssl/cert_storage/src/lib.rs
 | 
13
++-----------
M
security/manager/ssl/metrics.yaml
 | 
16
----------------

4 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -763,7 +763,6 @@ dependencies = [
  "clubcard-crlite",
  "crossbeam-utils",
  "cstr",
- "firefox-on-glean",
  "log",
  "moz_task",
  "nserror",
diff --git a/security/manager/ssl/cert_storage/Cargo.toml b/security/manager/ssl/cert_storage/Cargo.toml
@@ -12,7 +12,6 @@ clubcard = "0.3"
 clubcard-crlite = "0.3"
 crossbeam-utils = "0.8"
 cstr = "0.2"
-firefox-on-glean = { path = "../../../../toolkit/components/glean/api" }
 log = "0.4"
 moz_task = { path = "../../../../xpcom/rust/moz_task" }
 nserror = { path = "../../../../xpcom/rust/nserror" }
diff --git a/security/manager/ssl/cert_storage/src/lib.rs b/security/manager/ssl/cert_storage/src/lib.rs
@@ -9,7 +9,6 @@ extern crate clubcard_crlite;
 extern crate crossbeam_utils;
 #[macro_use]
 extern crate cstr;
-extern crate firefox_on_glean;
 #[macro_use]
 extern crate log;
 extern crate moz_task;
@@ -511,7 +510,6 @@ impl SecurityState {
 
         self.note_crlite_update_time()?;
         self.load_crlite_filter()?;
-        self.note_memory_usage();
         Ok(())
     }
 
@@ -542,7 +540,6 @@ impl SecurityState {
             self.crlite_filters.push(filter);
         }
         self.note_crlite_update_time()?;
-        self.note_memory_usage();
         Ok(())
     }
 
@@ -782,13 +779,6 @@ impl SecurityState {
         }
         Ok(true)
     }
-
-    fn note_memory_usage(&self) -> usize {
-        let mut ops = MallocSizeOfOps::new(cert_storage_malloc_size_of, None);
-        let size = self.size_of(&mut ops);
-        firefox_on_glean::metrics::cert_storage::memory.accumulate(size as u64);
-        size
-    }
 }
 
 impl MallocSizeOf for SecurityState {
@@ -1682,7 +1672,8 @@ impl MemoryReporter {
         _anonymize: bool,
     ) -> nserror::nsresult {
         let ss = try_ns!(self.security_state.read());
-        let size = ss.note_memory_usage();
+        let mut ops = MallocSizeOfOps::new(cert_storage_malloc_size_of, None);
+        let size = ss.size_of(&mut ops);
         let callback = match RefPtr::from_raw(callback) {
             Some(ptr) => ptr,
             None => return NS_ERROR_UNEXPECTED,
diff --git a/security/manager/ssl/metrics.yaml b/security/manager/ssl/metrics.yaml
@@ -9,22 +9,6 @@ $schema: moz://mozilla.org/schemas/glean/metrics/2-0-0
 $tags:
   - 'Core :: Security: PSM'
 
-cert_storage:
-  memory:
-    type: memory_distribution
-    memory_unit: byte
-    description: >
-      Heap memory used by cert_storage.
-    bugs:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1910500
-    data_reviews:
-      - https://bugzilla.mozilla.org/show_bug.cgi?id=1910500
-    data_sensitivity:
-      - technical
-    notification_emails:
-      - jschanck@mozilla.com
-    expires: 148
-
 data_storage:
   alternate_services:
     type: quantity