0001-Disable-midnight-throttling-through-a-pref.patch

From b67bab4252dd0d3c707654721509764afc8e8b54 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Tue, 11 Dec 2018 00:41:36 +0100
Subject: [PATCH] Disable midnight throttling through a pref

---
 toolkit/components/telemetry/app/TelemetrySend.jsm          | 6 ++++++
 toolkit/components/telemetry/app/TelemetryUtils.jsm         | 1 +
 .../tests/marionette/harness/telemetry_harness/testcase.py  | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/telemetry/app/TelemetrySend.jsm b/toolkit/components/telemetry/app/TelemetrySend.jsm
index 4ab0ba7f8b1ee..b7cca50e5547d 100644
--- a/toolkit/components/telemetry/app/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/app/TelemetrySend.jsm
@@ -558,6 +558,12 @@ var SendScheduler = {
       return now.getTime();
     }
 
+    // Don't delay if configured so
+    let overrideFuzzingDelay = Services.prefs.getBoolPref(TelemetryUtils.Preferences.OverrideFuzzingDelay, false);
+    if (overrideFuzzingDelay) {
+      return now.getTime();
+    }
+
     // Delay ping send if we are within the midnight fuzzing range.
     // We spread those ping sends out between |midnight| and |midnight + midnightPingFuzzingDelay|.
     return midnight.getTime() + Policy.midnightPingFuzzingDelay();
diff --git a/toolkit/components/telemetry/app/TelemetryUtils.jsm b/toolkit/components/telemetry/app/TelemetryUtils.jsm
index 95272725f0b02..6c5d6afff9e06 100644
--- a/toolkit/components/telemetry/app/TelemetryUtils.jsm
+++ b/toolkit/components/telemetry/app/TelemetryUtils.jsm
@@ -39,6 +39,7 @@ var TelemetryUtils = {
     OverrideOfficialCheck: "toolkit.telemetry.send.overrideOfficialCheck",
     OverridePreRelease: "toolkit.telemetry.testing.overridePreRelease",
     OverrideUpdateChannel: "toolkit.telemetry.overrideUpdateChannel",
+    OverrideFuzzingDelay: "toolkit.telemetry.overrideFuzzingDelay",
     Server: "toolkit.telemetry.server",
     ShutdownPingSender: "toolkit.telemetry.shutdownPingSender.enabled",
     ShutdownPingSenderFirstSession: "toolkit.telemetry.shutdownPingSender.enabledFirstSession",
diff --git a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py
index 2269c77d38692..6ea5e6bda7004 100755
--- a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py
+++ b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py
@@ -80,7 +80,8 @@ class TelemetryTestCase(PuppeteerMixin, MarionetteTestCase):
             'datareporting.policy.dataSubmissionPolicyBypassNotification': True,
             'toolkit.telemetry.log.level': 'Trace',
             'toolkit.telemetry.log.dump': True,
-            'toolkit.telemetry.send.overrideOfficialCheck': True
+            'toolkit.telemetry.send.overrideOfficialCheck': True,
+            'toolkit.telemetry.overrideFuzzingDelay': True,
         }
 
         # Firefox will be forced to restart with the prefs enforced.
-- 
2.19.1