From 6d7585cc1ee1bfb8cd033d5188eeefab480799dd Mon Sep 17 00:00:00 2001
From: Robin Steuber <bytesized@mozilla.com>
Date: Tue, 3 Oct 2023 23:40:24 +0000
Subject: [PATCH] Bug 1855604 - Back out calling of provenance data collection
 r=nalexander

Backs out Bug 1815023's patch: https://hg.mozilla.org/mozilla-central/rev/e9af7f1b2a01

Depends on D189591

Differential Revision: https://phabricator.services.mozilla.com/D189592
---
 browser/components/BrowserGlue.sys.mjs        |  9 --------
 browser/modules/BrowserUsageTelemetry.sys.mjs | 10 ---------
 .../app/TelemetryControllerParent.sys.mjs     | 21 -------------------
 3 files changed, 40 deletions(-)

diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
index ad297510d310..1d34fcc86e3c 100644
--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
@@ -61,7 +61,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   PluginManager: "resource:///actors/PluginParent.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.sys.mjs",
-  ProvenanceData: "resource:///modules/ProvenanceData.sys.mjs",
   PublicSuffixList:
     "resource://gre/modules/netwerk-dns/PublicSuffixList.sys.mjs",
   QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
@@ -2996,14 +2995,6 @@ BrowserGlue.prototype = {
         },
       },
 
-      {
-        name: "report-attribution-provenance-telemetry",
-        condition: lazy.TelemetryUtils.isTelemetryEnabled,
-        task: async () => {
-          await lazy.ProvenanceData.submitProvenanceTelemetry();
-        },
-      },
-
       {
         name: "SearchSERPDomainToCategoriesMap.init",
         task: () => {
diff --git a/browser/modules/BrowserUsageTelemetry.sys.mjs b/browser/modules/BrowserUsageTelemetry.sys.mjs
index be7d3571cf46..1c508945d691 100644
--- a/browser/modules/BrowserUsageTelemetry.sys.mjs
+++ b/browser/modules/BrowserUsageTelemetry.sys.mjs
@@ -14,7 +14,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
   PageActions: "resource:///modules/PageActions.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
-  ProvenanceData: "resource:///modules/ProvenanceData.sys.mjs",
   SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
   SearchSERPTelemetryUtils: "resource:///modules/SearchSERPTelemetry.sys.mjs",
 
@@ -1283,15 +1282,6 @@ export let BrowserUsageTelemetry = {
       return;
     }
 
-    try {
-      await lazy.ProvenanceData.submitProvenanceTelemetry();
-    } catch (ex) {
-      console.warn(
-        "reportInstallationTelemetry - submitProvenanceTelemetry failed",
-        ex
-      );
-    }
-
     const TIMESTAMP_PREF = "app.installation.timestamp";
     const lastInstallTime = Services.prefs.getStringPref(TIMESTAMP_PREF, null);
     const wpm = Cc["@mozilla.org/windows-package-manager;1"].createInstance(
diff --git a/toolkit/components/telemetry/app/TelemetryControllerParent.sys.mjs b/toolkit/components/telemetry/app/TelemetryControllerParent.sys.mjs
index 8008489242c1..7bb314c3c9f9 100644
--- a/toolkit/components/telemetry/app/TelemetryControllerParent.sys.mjs
+++ b/toolkit/components/telemetry/app/TelemetryControllerParent.sys.mjs
@@ -39,7 +39,6 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   ClientID: "resource://gre/modules/ClientID.sys.mjs",
   CoveragePing: "resource://gre/modules/CoveragePing.sys.mjs",
-  ProvenanceData: "resource:///modules/ProvenanceData.sys.mjs",
   TelemetryArchive: "resource://gre/modules/TelemetryArchive.sys.mjs",
   TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
   TelemetryEventPing: "resource://gre/modules/EventPing.sys.mjs",
@@ -1216,17 +1215,6 @@ var Impl = {
       NEWPROFILE_PING_DEFAULT_DELAY
     );
 
-    try {
-      // This is asynchronous, but we aren't going to await on it now. Just
-      // kick it off.
-      lazy.ProvenanceData.submitProvenanceTelemetry();
-    } catch (ex) {
-      this._log.warn(
-        "scheduleNewProfilePing - submitProvenanceTelemetry failed",
-        ex
-      );
-    }
-
     this._delayedNewPingTask = new DeferredTask(async () => {
       try {
         await this.sendNewProfilePing();
@@ -1246,15 +1234,6 @@ var Impl = {
       "sendNewProfilePing - shutting down: " + this._shuttingDown
     );
 
-    try {
-      await lazy.ProvenanceData.submitProvenanceTelemetry();
-    } catch (ex) {
-      this._log.warn(
-        "sendNewProfilePing - submitProvenanceTelemetry failed",
-        ex
-      );
-    }
-
     const scalars = Services.telemetry.getSnapshotForScalars(
       "new-profile",
       /* clear */ true