diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in index 2f420f773610..3551c6613d18 100644 --- a/browser/app/macbuild/Contents/MacOS-files.in +++ b/browser/app/macbuild/Contents/MacOS-files.in @@ -17,7 +17,6 @@ /crashhelper #endif /nmhproxy -/pingsender /pk12util /ssltunnel /xpcshell diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 5222087561a6..6dc8ccab77e5 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -402,7 +402,7 @@ bin/libfreebl_64int_3.so ; [ Ping Sender ] ; -@BINPATH@/pingsender@BIN_SUFFIX@ +; @BINPATH@/pingsender@BIN_SUFFIX@ ; [ Native Messaging Host Proxy ] ; diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index 210630833876..c75f2d3b60dd 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -1589,7 +1589,6 @@ ${RemoveDefaultBrowserAgentShortcut} Push "crashreporter.exe" Push "default-browser-agent.exe" Push "nmhproxy.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 index dbeef7b34ea8..c4bea82681fd 100644 --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -698,7 +698,6 @@ class MacArtifactJob(ArtifactJob): "{product}-bin", "*.dylib", "nmhproxy", - "pingsender", "plugin-container.app/Contents/MacOS/plugin-container", "updater.app/Contents/MacOS/net.waterfox.updater", # 'xpcshell', diff --git a/toolkit/components/telemetry/app/TelemetrySend.sys.mjs b/toolkit/components/telemetry/app/TelemetrySend.sys.mjs index 730f0571aafa..3e497d188758 100644 --- a/toolkit/components/telemetry/app/TelemetrySend.sys.mjs +++ b/toolkit/components/telemetry/app/TelemetrySend.sys.mjs @@ -1689,46 +1689,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 index a133831d2c26..9d1f25e6edfa 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -8,9 +8,9 @@ include("/ipc/chromium/chromium-config.mozbuild") FINAL_LIBRARY = "xul" -DIRS = [ - "pingsender", -] +# DIRS = [ +# "pingsender", +# ] if CONFIG["COMPILE_ENVIRONMENT"]: EXPORTS.mozilla += ["!dap_ffi_generated.h"]