diff --git a/src/telemetry/index.js b/src/telemetry/index.js index 6313bd155..881ac0bf6 100644 --- a/src/telemetry/index.js +++ b/src/telemetry/index.js @@ -8,10 +8,6 @@ import GleanMetrics from "@mozilla/glean/metrics"; import { googleAnalytics } from "./ga"; -// Glean generated metrics and pings files -import * as pageMetrics from "./generated/page"; -import { pageView as pageViewPing } from "./generated/pings"; - // detecting "do not track" via these instructions: // https://dev.to/corbindavenport/how-to-correctly-check-for-do-not-track-with-javascript-135d const isDNTEnabled = @@ -66,12 +62,6 @@ export function submitPageViewTelemetry(path) { }); } - // Use the standard events. + // Use the standard (built-in Glean) page load events. GleanMetrics.pageLoad({ url: path }); - - // Send telemetry to Glean. - pageMetrics.loaded.set(); - // Remove query params and trailing `/` characters. - pageMetrics.path.set(path.split("?")[0].replace(/\/$/, "")); - pageViewPing.submit(); } diff --git a/src/telemetry/metrics.yaml b/src/telemetry/metrics.yaml index aa1b4a437..0acb50159 100644 --- a/src/telemetry/metrics.yaml +++ b/src/telemetry/metrics.yaml @@ -4,41 +4,3 @@ --- $schema: moz://mozilla.org/schemas/glean/metrics/2-0-0 - -page: - loaded: - type: datetime - lifetime: ping - send_in_pings: - - page-view - description: | - The time the page was loaded. - bugs: - - https://bugzilla.mozilla.org/show_bug.cgi?id=1741582 - data_reviews: - - https://github.com/mozilla/glean-dictionary/pull/1015#issuecomment-996051009 - data_sensitivity: - - interaction - notification_emails: - - brizental@mozilla.com - - glean-team@mozilla.com - expires: never - path: - type: string - lifetime: ping - send_in_pings: - - page-view - description: | - The path of the page that was loaded. - - Query arguments will be stripped before recording. - bugs: - - https://bugzilla.mozilla.org/show_bug.cgi?id=1741582 - data_reviews: - - https://github.com/mozilla/glean-dictionary/pull/1015#issuecomment-996051009 - data_sensitivity: - - interaction - notification_emails: - - brizental@mozilla.com - - glean-team@mozilla.com - expires: never diff --git a/src/telemetry/pings.yaml b/src/telemetry/pings.yaml index 38d4ec9be..d99e19d66 100644 --- a/src/telemetry/pings.yaml +++ b/src/telemetry/pings.yaml @@ -4,16 +4,3 @@ --- $schema: moz://mozilla.org/schemas/glean/pings/2-0-0 - -page-view: - description: | - A ping that will be sent everytime a new page is visited. - include_client_id: true - send_if_empty: false - bugs: - - https://bugzilla.mozilla.org/show_bug.cgi?id=1741582 - data_reviews: - - https://github.com/mozilla/glean-dictionary/pull/1015#issuecomment-996051009 - notification_emails: - - brizental@mozilla.com - - glean-team@mozilla.com