Bug 1857324 - Remove old pocket_button ping r=thecount

Depends on D191341

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

Author: chutten

browser/components/pocket/content/pktTelemetry.sys.mjs

@@ -4,35 +4,13 @@
 
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
-  PingCentre: "resource:///modules/PingCentre.sys.mjs",
   TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
   pktApi: "chrome://pocket/content/pktApi.sys.mjs",
 });
 
-// List of namespaces for the structured ingestion system.
-// They are defined in https://github.com/mozilla-services/mozilla-pipeline-schemas
-const STRUCTURED_INGESTION_NAMESPACE_AS = "activity-stream";
-const STRUCTURED_INGESTION_ENDPOINT_PREF =
-  "browser.newtabpage.activity-stream.telemetry.structuredIngestion.endpoint";
-// This is the topic for telemetry pings, used inside PingCentre.
-const POCKET_TELEMETRY_TOPIC = "pocket";
 const PREF_IMPRESSION_ID = "browser.newtabpage.activity-stream.impressionId";
 
-ChromeUtils.defineLazyGetter(lazy, "pingCentre", () => {
-  return new lazy.PingCentre({ topic: POCKET_TELEMETRY_TOPIC });
-});
-
 export var pktTelemetry = {
-  get structuredIngestionEndpointBase() {
-    if (!this._structuredIngestionEndpointBase) {
-      this._structuredIngestionEndpointBase = Services.prefs.getStringPref(
-        STRUCTURED_INGESTION_ENDPOINT_PREF,
-        ""
-      );
-    }
-    return this._structuredIngestionEndpointBase;
-  },
-
   get impressionId() {
     if (!this._impressionId) {
       this._impressionId = this.getOrCreateImpressionId();
@@ -53,62 +31,13 @@ export var pktTelemetry = {
     return impressionId;
   },
 
-  /**
-   * createPingPayload - Create a ping for an impression stats
-   *
-   * @param  {ob} data The data object to be included in the ping.
-   * @return {obj}    A telemetry ping
-   */
-  createPingPayload(data) {
-    // experiments, locale, version, and release_channel are provided by pingCentre.
-    // model and events is provided in the data param.
-    return {
-      ...data,
-      impression_id: this.impressionId,
-      pocket_logged_in_status: lazy.pktApi.isUserLoggedIn(),
-      profile_creation_date: this._profileCreationDate(),
-    };
-  },
-
   _profileCreationDate() {
     return (
       lazy.TelemetryEnvironment.currentEnvironment.profile.resetDate ||
       lazy.TelemetryEnvironment.currentEnvironment.profile.creationDate
     );
   },
 
-  _generateUUID() {
-    return String(Services.uuid.generateUUID());
-  },
-
-  /**
-   * Generates an endpoint for Structured Ingestion telemetry pipeline. Note that
-   * Structured Ingestion requires a different endpoint for each ping. See more
-   * details about endpoint schema at:
-   * https://github.com/mozilla/gcp-ingestion/blob/master/docs/edge.md#postput-request
-   */
-  _generateStructuredIngestionEndpoint() {
-    const uuid = this._generateUUID();
-    // Structured Ingestion does not support the UUID generated by gUUIDGenerator,
-    // because it contains leading and trailing braces. Need to trim them first.
-    const docID = uuid.slice(1, -1);
-    const extension = `${STRUCTURED_INGESTION_NAMESPACE_AS}/pocket-button/1/${docID}`;
-    return `${this.structuredIngestionEndpointBase}/${extension}`;
-  },
-
-  /**
-   * sendStructuredIngestionEvent - Sent a ping for an impression stats
-   *
-   * @param {ob} eventObject The data object to be included in the ping.
-   */
-  sendStructuredIngestionEvent(eventObject) {
-    lazy.pingCentre.sendStructuredIngestionPing(
-      eventObject,
-      this._generateStructuredIngestionEndpoint(),
-      STRUCTURED_INGESTION_NAMESPACE_AS
-    );
-  },
-
   /**
    * Records the provided data and common pocket-button data to Glean,
    * then submits it all in a pocket-button ping.

browser/components/pocket/content/pktUI.js

@@ -227,32 +227,10 @@ var pktUI = (function () {
     // Ensure opening the signup panel clears the icon state from any previous sessions.
     SaveToPocket.itemDeleted();
     pktTelemetry.submitPocketButtonPing("click", "save_button");
-    // A successful button click, for logged out users.
-    pktTelemetry.sendStructuredIngestionEvent(
-      pktTelemetry.createPingPayload({
-        events: [
-          {
-            action: "click",
-            source: "save_button",
-          },
-        ],
-      })
-    );
   }
 
   async function onShowHome() {
     pktTelemetry.submitPocketButtonPing("click", "home_button");
-    // A successful home button click.
-    pktTelemetry.sendStructuredIngestionEvent(
-      pktTelemetry.createPingPayload({
-        events: [
-          {
-            action: "click",
-            source: "home_button",
-          },
-        ],
-      })
-    );
 
     if (!NimbusFeatures.saveToPocket.getVariable("hideRecentSaves")) {
       let recentSaves = await pktApi.getRecentSavesCache();
@@ -303,17 +281,6 @@ var pktUI = (function () {
     }
 
     pktTelemetry.submitPocketButtonPing("click", "save_button");
-    // A successful button click, for logged in users.
-    pktTelemetry.sendStructuredIngestionEvent(
-      pktTelemetry.createPingPayload({
-        events: [
-          {
-            action: "click",
-            source: "save_button",
-          },
-        ],
-      })
-    );
 
     // Add url
     var options = {
@@ -455,19 +422,6 @@ var pktUI = (function () {
     if (data.source) {
       const { position, source, model } = data;
       pktTelemetry.submitPocketButtonPing("click", source, position, model);
-      const payload = pktTelemetry.createPingPayload({
-        ...(model ? { model } : {}),
-        events: [
-          {
-            action: "click",
-            source,
-            // Add in position if needed, for example, topic links have a position.
-            ...(position || position === 0 ? { position } : {}),
-          },
-        ],
-      });
-      // Send click event ping.
-      pktTelemetry.sendStructuredIngestionEvent(payload);
     }
 
     var url = data.url;
@@ -495,18 +449,6 @@ var pktUI = (function () {
         position,
         model
       );
-      const payload = pktTelemetry.createPingPayload({
-        model,
-        events: [
-          {
-            action: "click",
-            position,
-            source: "on_save_recs",
-          },
-        ],
-      });
-      // Send click event ping.
-      pktTelemetry.sendStructuredIngestionEvent(payload);
     }
 
     openTabWithUrl(url, contentPrincipal, csp);

browser/components/pocket/test/unit/browser_pocket_pktTelemetry.js

@@ -23,36 +23,6 @@ function test_runner(test) {
   add_task(testTask);
 }
 
-test_runner(async function test_createPingPayload({ sandbox }) {
-  const impressionId = "{7fd5a1ac-6089-4212-91a7-fcdec1d2f533}";
-  const creationDate = "18578";
-  await SpecialPowers.pushPrefEnv({
-    set: [["browser.newtabpage.activity-stream.impressionId", impressionId]],
-  });
-  sandbox.stub(pktTelemetry, "_profileCreationDate").returns(creationDate);
-  const result = pktTelemetry.createPingPayload({ test: "test" });
-
-  Assert.deepEqual(result, {
-    test: "test",
-    pocket_logged_in_status: false,
-    profile_creation_date: creationDate,
-    impression_id: impressionId,
-  });
-});
-
-test_runner(async function test_generateStructuredIngestionEndpoint({
-  sandbox,
-}) {
-  sandbox
-    .stub(pktTelemetry, "_generateUUID")
-    .returns("{7fd5a1ac-6089-4212-91a7-fcdec1d2f533}");
-  const endpoint = pktTelemetry._generateStructuredIngestionEndpoint();
-  Assert.equal(
-    endpoint,
-    "https://incoming.telemetry.mozilla.org/submit/activity-stream/pocket-button/1/7fd5a1ac-6089-4212-91a7-fcdec1d2f533"
-  );
-});
-
 test_runner(async function test_submitPocketButtonPing({ sandbox }) {
   const creationDate = "19640";
   const impressionId = "{422e3da9-c694-4fd2-b676-8ae070156128}";