Bug 1648281 - Removed incoming telemetry for newFailed and reconciled for sync ping r=markh

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

services/sync/modules/telemetry.js

@@ -261,7 +261,8 @@ class EngineRecord {
     }
 
     let incomingData = {};
-    let properties = ["applied", "failed", "newFailed", "reconciled"];
+    // Counts has extra stuff used for logging, but we only care about a few
+    let properties = ["applied", "failed"];
     // Only record non-zero properties and only record incoming at all if
     // there's at least one property we care about.
     for (let property of properties) {

services/sync/tests/unit/sync_ping_schema.json

@@ -110,15 +110,11 @@
           "additionalProperties": false,
           "anyOf": [
             {"required": ["applied"]},
-            {"required": ["failed"]},
-            {"required": ["newFailed"]},
-            {"required": ["reconciled"]}
+            {"required": ["failed"]}
           ],
           "properties": {
             "applied": { "type": "integer", "minimum": 1 },
-            "failed": { "type": "integer", "minimum": 1 },
-            "newFailed": { "type": "integer", "minimum": 1 },
-            "reconciled": { "type": "integer", "minimum": 1 }
+            "failed": { "type": "integer", "minimum": 1 }
           }
         },
         "outgoing": {

services/sync/tests/unit/test_telemetry.js

@@ -300,7 +300,6 @@ add_task(async function test_upload_failed() {
     ping = await sync_engine_and_validate_telem(engine, true);
     ok(!!ping);
     equal(ping.engines.length, 1);
-    equal(ping.engines[0].incoming.reconciled, 1);
     deepEqual(ping.engines[0].outgoing, [{ sent: 2, failed: 2 }]);
   } finally {
     await cleanAndGo(engine, server);
@@ -392,8 +391,6 @@ add_task(async function test_sync_partialUpload() {
     equal(ping.engines[0].name, "rotary");
     deepEqual(ping.engines[0].incoming, {
       failed: 1,
-      newFailed: 1,
-      reconciled: 232,
     });
     ok(!ping.engines[0].outgoing);
     deepEqual(ping.engines[0].failureReason, uploadFailureError);

toolkit/components/telemetry/docs/data/sync-ping.rst

@@ -66,8 +66,6 @@ Structure:
                 applied: <integer>, // Number of records applied
                 succeeded: <integer>, // Number of records that applied without error
                 failed: <integer>, // Number of records that failed to apply
-                newFailed: <integer>, // Number of records that failed for the first time this sync
-                reconciled: <integer>, // Number of records that were reconciled
               },
 
               // Optional, excluded if it would be empty. Records that would be