bug 1346297 - remove expired family safety telemetry probe r?fkiefer
MozReview-Commit-ID: BCc5Fa9jWJ2
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -694,39 +694,32 @@ nsNSSComponent::MaybeEnableFamilySafetyC
if (!(IsWin8Point1OrLater() && !IsWin10OrLater())) {
return;
}
// Detect but don't import by default.
uint32_t familySafetyMode = Preferences::GetUint(kFamilySafetyModePref, 1);
if (familySafetyMode > 2) {
familySafetyMode = 0;
}
- Telemetry::Accumulate(Telemetry::FAMILY_SAFETY, familySafetyMode);
if (familySafetyMode == 0) {
return;
}
bool familySafetyEnabled;
nsresult rv = AccountHasFamilySafetyEnabled(familySafetyEnabled);
if (NS_FAILED(rv)) {
- Telemetry::Accumulate(Telemetry::FAMILY_SAFETY, 3);
return;
}
if (!familySafetyEnabled) {
- Telemetry::Accumulate(Telemetry::FAMILY_SAFETY, 4);
return;
}
- Telemetry::Accumulate(Telemetry::FAMILY_SAFETY, 5);
if (familySafetyMode == 2) {
rv = LoadFamilySafetyRoot();
if (NS_FAILED(rv)) {
- Telemetry::Accumulate(Telemetry::FAMILY_SAFETY, 6);
MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
("failed to load Family Safety root"));
- } else {
- Telemetry::Accumulate(Telemetry::FAMILY_SAFETY, 7);
}
}
#endif // XP_WIN
}
#ifdef XP_WIN
// Helper function to determine if the OS considers the given certificate to be
// a trust anchor for TLS server auth certificates. This is to be used in the
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -484,25 +484,16 @@
},
"DEVICE_RESET_REASON": {
"record_in_processes": ["main", "content", "gpu"],
"expires_in_version": "never",
"kind": "enumerated",
"n_values": 10,
"description": "GPU Device Reset Reason (ok, hung, removed, reset, internal error, invalid call, out of memory)"
},
- "FAMILY_SAFETY": {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["seceng-telemetry@mozilla.com"],
- "expires_in_version": "60",
- "kind": "enumerated",
- "n_values": 16,
- "bug_numbers": [1239166],
- "description": "Status of Family Safety detection and remediation. See nsNSSComponent.cpp."
- },
"FETCH_IS_MAINTHREAD": {
"record_in_processes": ["main", "content"],
"expires_in_version": "50",
"kind": "boolean",
"description": "Was Fetch request initiated from the main thread?"
},
"FORCED_DEVICE_RESET_REASON": {
"record_in_processes": ["main", "content", "gpu"],