From 63a940c7a8f2c5d789798e39667f1bd38ded7532 Mon Sep 17 00:00:00 2001 From: Alex Gibson Date: Tue, 26 Mar 2024 09:18:21 +0000 Subject: [PATCH] Update to Glean 5.0.0 --- media/js/glean/init.es6.js | 4 +--- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/media/js/glean/init.es6.js b/media/js/glean/init.es6.js index c52e6dfcbcd..5d5287ad4e1 100644 --- a/media/js/glean/init.es6.js +++ b/media/js/glean/init.es6.js @@ -6,7 +6,6 @@ import Glean from '@mozilla/glean/web'; import GleanMetrics from '@mozilla/glean/metrics'; -import { BrowserSendBeaconUploader } from '@mozilla/glean/web'; import { recordCustomPageMetrics, pageEvent } from './page.es6'; import { clickEvent } from './elements.es6'; import Utils from './utils.es6'; @@ -26,8 +25,7 @@ function initGlean() { Glean.initialize('bedrock', Utils.isTelemetryEnabled(), { channel: channel, - serverEndpoint: endpoint, - httpClient: BrowserSendBeaconUploader // use sendBeacon since Firefox does not yet support keepalive using fetch() + serverEndpoint: endpoint }); /** diff --git a/package-lock.json b/package-lock.json index 2f21c5c83d1..e0b3722f5b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@babel/core": "^7.23.6", "@babel/preset-env": "^7.23.6", "@mozilla-protocol/core": "^19.0.0", - "@mozilla/glean": "^4.0.0-pre.3", + "@mozilla/glean": "^5.0.0", "@mozmeao/cookie-helper": "^1.1.0", "@mozmeao/dnt-helper": "^1.0.0", "@mozmeao/trafficcop": "^2.0.1", @@ -2143,9 +2143,9 @@ "integrity": "sha512-2kitmeSKbSixV41OUgYAp/nbhXd8ftY4FEG/QKsoinSg7njawQuNCM5NwPWiP9wdhGinxVJU5FBblif7FB5srA==" }, "node_modules/@mozilla/glean": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@mozilla/glean/-/glean-4.0.0.tgz", - "integrity": "sha512-sxSnyKMat2SS6V0U443Z6PoeDJ44aK6mSrQfpC8fTP7NK0Pm3KldPLylaKvskgrC+rGyMkme7Q+KLpTNLBOVUw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@mozilla/glean/-/glean-5.0.0.tgz", + "integrity": "sha512-DstT6PI8QTixlULf7Is277sEmpX61Dz+z/7rtxQBBFwGaPsvWJJsMsnNysNtSzSESIlcXoPbdPZ9RoXOcHuSlA==", "dependencies": { "fflate": "^0.8.0", "tslib": "^2.3.1", diff --git a/package.json b/package.json index 683c9163645..fc1465ed2cc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "@babel/core": "^7.23.6", "@babel/preset-env": "^7.23.6", "@mozilla-protocol/core": "^19.0.0", - "@mozilla/glean": "^4.0.0-pre.3", + "@mozilla/glean": "^5.0.0", "@mozmeao/cookie-helper": "^1.1.0", "@mozmeao/dnt-helper": "^1.0.0", "@mozmeao/trafficcop": "^2.0.1",