From 5c127a69e4e7bb0aa6a48f703e4c1aff03dbcee4 Mon Sep 17 00:00:00 2001
From: Adam Gashlin <agashlin@mozilla.com>
Date: Mon, 27 Aug 2018 18:42:28 +0000
Subject: [PATCH] Bug 1486423: Remove expiring telemetry.os_shutting_down probe
 r=chutten

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

--HG--
extra : moz-landing-system : lando
---
 toolkit/components/telemetry/Scalars.yaml         | 15 ---------------
 toolkit/components/telemetry/TelemetrySend.jsm    |  1 -
 .../telemetry/tests/unit/test_TelemetrySession.js |  6 ------
 3 files changed, 22 deletions(-)

diff --git a/toolkit/components/telemetry/Scalars.yaml b/toolkit/components/telemetry/Scalars.yaml
index 1ef7817908c6..cf1aa0540f98 100644
--- a/toolkit/components/telemetry/Scalars.yaml
+++ b/toolkit/components/telemetry/Scalars.yaml
@@ -1564,21 +1564,6 @@ telemetry:
     record_in_processes:
       - 'main'
 
-  os_shutting_down:
-    bug_numbers:
-      - 1480826
-    description: >
-      Records true if there is a signal that Firefox was quitting because
-      the OS was shutting down. Only available on Windows.
-    expires: "64"
-    kind: boolean
-    notification_emails:
-      - telemetry-client-dev@mozilla.com
-      - agashlin@mozilla.com
-    release_channel_collection: opt-out
-    record_in_processes:
-      - 'main'
-
 telemetry.discarded:
   accumulations:
     bug_numbers:
diff --git a/toolkit/components/telemetry/TelemetrySend.jsm b/toolkit/components/telemetry/TelemetrySend.jsm
index da748002641a..dfa392035b11 100644
--- a/toolkit/components/telemetry/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/TelemetrySend.jsm
@@ -800,7 +800,6 @@ var TelemetrySendImpl = {
     let setOSShutdown = () => {
       this._log.trace("setOSShutdown - in OS shutdown");
       this._isOSShutdown = true;
-      Telemetry.scalarSet("telemetry.os_shutting_down", true);
     };
 
     switch (topic) {
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js b/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
index e9e45dee65fb..7ffac74976b5 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
@@ -1032,8 +1032,6 @@ add_task(async function test_sendShutdownPing() {
     return;
   }
 
-  const OSSHUTDOWN_SCALAR = "telemetry.os_shutting_down";
-
   let checkPendingShutdownPing = async function() {
     let pendingPings = await TelemetryStorage.loadPendingPingList();
     Assert.equal(pendingPings.length, 1,
@@ -1043,8 +1041,6 @@ add_task(async function test_sendShutdownPing() {
     Assert.ok(shutdownPing, "The 'shutdown' ping must be saved to disk.");
     Assert.equal("shutdown", shutdownPing.payload.info.reason,
                  "The 'shutdown' ping must be saved to disk.");
-    Assert.ok(shutdownPing.payload.processes.parent.scalars[OSSHUTDOWN_SCALAR],
-              "The OS shutdown scalar must be set to true.");
   };
 
   Preferences.set(TelemetryUtils.Preferences.ShutdownPingSender, true);
@@ -1063,8 +1059,6 @@ add_task(async function test_sendShutdownPing() {
   checkPingFormat(ping, ping.type, true, true);
   Assert.equal(ping.payload.info.reason, REASON_SHUTDOWN);
   Assert.equal(ping.clientId, gClientID);
-  Assert.ok(!(OSSHUTDOWN_SCALAR in ping.payload.processes.parent.scalars),
-            "The OS shutdown scalar must not be set.");
   // Try again, this time disable ping upload. The PingSender
   // should not be sending any ping!
   PingServer.registerPingHandler(() => Assert.ok(false, "Telemetry must not send pings if not allowed to."));