Stop building pingsender executable and stops pings

goastian · Dec 9, 2023 · 9a62c6a · 9a62c6a
1 parent 40fce3d
commit 9a62c6a
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 55 deletions.
diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in
@@ -17,7 +17,6 @@
 #if defined(MOZ_CRASHREPORTER)
 /minidump-analyzer
 #endif
-/pingsender
 /pk12util
 /ssltunnel
 /xpcshell

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
@@ -420,7 +420,7 @@ bin/libfreebl_64int_3.so
 
 ; [ Ping Sender ]
 ;
-@BINPATH@/pingsender@BIN_SUFFIX@
+; @BINPATH@/pingsender@BIN_SUFFIX@
 
 ; [ Notification COM Server ]
 ;

diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
@@ -87,7 +87,7 @@
 !define BETA_UPDATE_CHANNEL
 !endif
 
-!define BaseURLStubPing ""
+!define BaseURLStubPing "http://download-stats.mozilla.org/stub"
 
 # ARCH is used when it is necessary to differentiate the x64 registry keys from
 # the x86 registry keys (e.g. the uninstall registry key).
@@ -145,7 +145,7 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
 !define APPROXIMATE_REQUIRED_SPACE_MB "145"
 
 # Constants for parts of the telemetry submission URL
-!define TELEMETRY_BASE_URL
+!define TELEMETRY_BASE_URL https://incoming.telemetry.mozilla.org/submit
 !define TELEMETRY_NAMESPACE firefox-installer
 !define TELEMETRY_INSTALL_PING_VERSION 1
 !define TELEMETRY_INSTALL_PING_DOCTYPE install

diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
@@ -74,7 +74,7 @@ Var PostSigningData
 ; are a member of the Administrators group.
 !define NONADMIN_ELEVATE
 
-!define AbortSurveyURL ""
+!define AbortSurveyURL "http://www.kampyle.com/feedback_form/ff-feedback-form.php?site_code=8166124&form_id=12116&url="
 
 ; Other included files may depend upon these includes!
 ; The following includes are provided by NSIS.
@@ -918,7 +918,7 @@ Section "-InstallEndCleanup"
   ; When we're using the GUI, .onGUIEnd sends the ping, but of course that isn't
   ; invoked when we're running silently.
   ${If} ${Silent}
-    ;Call SendPing
+    Call SendPing
   ${EndIf}
 SectionEnd
 
@@ -2069,5 +2069,5 @@ FunctionEnd
 
 Function .onGUIEnd
   ${OnEndCommon}
-  ;Call SendPing
+  Call SendPing
 FunctionEnd
diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh
@@ -1489,7 +1489,6 @@ ${RemoveDefaultBrowserAgentShortcut}
   Push "crashreporter.exe"
   Push "default-browser-agent.exe"
   Push "minidump-analyzer.exe"
-  Push "pingsender.exe"
   Push "updater.exe"
   Push "mozwer.dll"
   Push "${FileMainEXE}"

diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py
@@ -554,7 +554,6 @@ class LinuxArtifactJob(ArtifactJob):
         "{product}/{product}",
         "{product}/{product}-bin",
         "{product}/minidump-analyzer",
-        "{product}/pingsender",
         "{product}/plugin-container",
         "{product}/updater",
         "{product}/glxtest",
@@ -651,7 +650,6 @@ class MacArtifactJob(ArtifactJob):
             "{product}-bin",
             "*.dylib",
             "minidump-analyzer",
-            "pingsender",
             "plugin-container.app/Contents/MacOS/plugin-container",
             "updater.app/Contents/MacOS/org.mozilla.updater",
             # 'xpcshell',

diff --git a/toolkit/components/telemetry/app/TelemetrySend.sys.mjs b/toolkit/components/telemetry/app/TelemetrySend.sys.mjs
@@ -1657,46 +1657,6 @@ export var TelemetrySendImpl = {
   },
 
   runPingSender(pings, observer) {
-    if (AppConstants.platform === "android") {
-      throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
-    }
-
-    let suppressPingsender = Services.prefs.getBoolPref(
-      "toolkit.telemetry.testing.suppressPingsender",
-      false
-    );
-    if (suppressPingsender) {
-      this._log.trace("Silently skipping pingsender call in automation");
-      return;
-    }
-
-    // By default, invoke `pingsender[.exe] URL path ...`.
-    let exeName =
-      AppConstants.platform === "win" ? "pingsender.exe" : "pingsender";
-    let params = [];
-
-    if (lazy.NimbusFeatures.pingsender.getVariable("backgroundTaskEnabled")) {
-      // If using pingsender background task, invoke `firefox[.exe] --backgroundtask pingsender URL path ...`.
-      exeName =
-        AppConstants.MOZ_APP_NAME +
-        (AppConstants.platform === "win" ? ".exe" : "");
-      params = ["--backgroundtask", "pingsender"];
-    }
-
-    this._log.info(
-      `Invoking '${exeName}${params.length ? " " + params.join(" ") : ""} ...'`
-    );
-
-    let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile);
-    exe.append(exeName);
-
-    params.push(...pings.flatMap(ping => [ping.url, ping.path]));
-    let process = Cc["@mozilla.org/process/util;1"].createInstance(
-      Ci.nsIProcess
-    );
-    process.init(exe);
-    process.startHidden = true;
-    process.noShell = true;
-    process.runAsync(params, params.length, observer);
+    throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
   },
 };
diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build
@@ -8,10 +8,6 @@ include("/ipc/chromium/chromium-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
 
-DIRS = [
-    "pingsender",
-]
-
 if CONFIG["COMPILE_ENVIRONMENT"]:
     EXPORTS.mozilla += ["!dap_ffi_generated.h"]