Revert "Bug 1889444 - Record a Glean event for sites purged by Bounce Tracking Protection." r=bvandersloot,anti-tracking-reviewers

This reverts commit d13642ffba96ff2b73f1b442387fbea6f986fdab.

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

Author: Trikolon

toolkit/components/antitracking/bouncetrackingprotection/BounceTrackingProtection.cpp

@@ -13,7 +13,6 @@
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/ContentBlockingAllowList.h"
-#include "mozilla/glean/GleanMetrics.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_privacy.h"
@@ -587,8 +586,7 @@ nsresult BounceTrackingProtection::PurgeBounceTrackersForStateGlobal(
 
     RefPtr<ClearDataMozPromise::Private> clearPromise =
         new ClearDataMozPromise::Private(__func__);
-    RefPtr<ClearDataCallback> cb =
-        new ClearDataCallback(clearPromise, host, bounceTime);
+    RefPtr<ClearDataCallback> cb = new ClearDataCallback(clearPromise, host);
 
     MOZ_LOG(gBounceTrackingProtectionLog, LogLevel::Debug,
             ("%s: Purge state for host: %s", __FUNCTION__,
@@ -597,9 +595,7 @@ nsresult BounceTrackingProtection::PurgeBounceTrackersForStateGlobal(
     if (StaticPrefs::privacy_bounceTrackingProtection_enableDryRunMode()) {
       // In dry-run mode, we don't actually clear the data, but we still want to
       // resolve the promise to indicate that the data would have been cleared.
-      // Go through ClearDataCallback rather than directly resolving the promise
-      // to ensure telemetry is collected.
-      cb->OnDataDeleted(0);
+      clearPromise->Resolve(host, __func__);
     } else {
       // TODO: Bug 1842067: Clear by site + OA.
       rv = clearDataService->DeleteDataFromBaseDomain(host, false,
@@ -668,38 +664,13 @@ NS_IMPL_ISUPPORTS(BounceTrackingProtection::ClearDataCallback,
 NS_IMETHODIMP BounceTrackingProtection::ClearDataCallback::OnDataDeleted(
     uint32_t aFailedFlags) {
   if (aFailedFlags) {
-    MOZ_LOG(gBounceTrackingProtectionLog, LogLevel::Error,
-            ("%s: Failed to clear mHost: %s, mBounceTime: %" PRIu64
-             ", aFailedFlags: %d",
-             __FUNCTION__, mHost.get(), mBounceTime, aFailedFlags));
-    RecordClearDataTelemetry(false);
-
     mPromise->Reject(aFailedFlags, __func__);
   } else {
     MOZ_LOG(gBounceTrackingProtectionLog, LogLevel::Info,
-            ("%s: Cleared: mHost: %s, mBounceTime: %" PRIu64, __FUNCTION__,
-             mHost.get(), mBounceTime));
-    RecordClearDataTelemetry(true);
-
+            ("%s: Cleared %s", __FUNCTION__, mHost.get()));
     mPromise->Resolve(std::move(mHost), __func__);
   }
   return NS_OK;
 }
 
-void BounceTrackingProtection::ClearDataCallback::RecordClearDataTelemetry(
-    bool success) {
-// Record a glean event for the clear action. This is only recorded in
-// pre-release channels since we record the site host which is considered
-// category 3 data.
-// https://wiki.mozilla.org/Data_Collection#Data_Collection_Categories
-#if defined(EARLY_BETA_OR_EARLIER)
-  glean::bounce_tracking_protection::ActionPurgeExtra extra = {
-      .bounceTime = Some(mBounceTime / PR_USEC_PER_SEC),
-      .siteHost = Some(mHost),
-      .success = Some(success),
-  };
-  glean::bounce_tracking_protection::action_purge.Record(Some(extra));
-#endif  // defined(EARLY_BETA_OR_EARLIER)
-}
-
 }  // namespace mozilla

toolkit/components/antitracking/bouncetrackingprotection/BounceTrackingProtection.h

@@ -82,20 +82,13 @@ class BounceTrackingProtection final : public nsIBounceTrackingProtection {
     NS_DECL_NSICLEARDATACALLBACK
 
     explicit ClearDataCallback(ClearDataMozPromise::Private* aPromise,
-                               const nsACString& aHost,
-                               const PRTime aBounceTime)
-        : mHost(aHost), mBounceTime(aBounceTime), mPromise(aPromise) {
-      MOZ_ASSERT(!aHost.IsEmpty(), "Host must not be empty");
-      MOZ_ASSERT(aBounceTime > 0, "Bounce time must be a valid timestamp.");
-    };
+                               const nsACString& aHost)
+        : mHost(aHost), mPromise(aPromise){};
 
    private:
     virtual ~ClearDataCallback() { mPromise->Reject(0, __func__); }
 
-    void RecordClearDataTelemetry(bool success);
-
     nsCString mHost;
-    PRTime mBounceTime;
     RefPtr<ClearDataMozPromise::Private> mPromise;
   };
 };

toolkit/components/antitracking/bouncetrackingprotection/metrics.yaml

@@ -35,7 +35,6 @@
     "netwerk/protocol/http/metrics.yaml",
     "security/certverifier/metrics.yaml",
     "security/manager/ssl/metrics.yaml",
-    "toolkit/components/antitracking/bouncetrackingprotection/metrics.yaml",
     "toolkit/components/cookiebanners/metrics.yaml",
     "toolkit/components/extensions/metrics.yaml",
     "toolkit/components/formautofill/metrics.yaml",