Merge branch 'release-v2.0.2' into release

Author: rosahbruno

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean.js/compare/v2.0.1...main)
+[Full changelog](https://github.com/mozilla/glean.js/compare/v2.0.2...main)
+
+# v2.0.2 (2023-09-14)
+
+[Full changelog](https://github.com/mozilla/glean.js/compare/v2.0.1...v2.0.2)
+
+* [#1768](https://github.com/mozilla/glean.js/pull/1768): Add support for `GLEAN_PYTHON` and `GLEAN_PIP` environment variables.
+* [#1755](https://github.com/mozilla/glean.js/pull/1755): Add sync check to `set` function for the URL metric.
+* [#1766](https://github.com/mozilla/glean.js/pull/1766): Update default `maxEvents` count to 1. This means an events ping will be sent after each recorded event unless the `maxEvents` count is explicitly set to a larger number.
 
 # v2.0.1 (2023-08-11)
 

automation/package-lock.json

@@ -21,7 +21,7 @@
   "devDependencies": {
     "@octokit/request": "^8.1.1",
     "browserstack-local": "^1.5.4",
-    "geckodriver": "^4.1.3",
+    "geckodriver": "^4.2.0",
     "selenium-webdriver": "^4.4.0",
     "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4",

automation/package.json

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+set -eo pipefail
+
+run() {
+    [ "${VERB:-0}" != 0 ] && echo "+ $*"
+    "$@"
+}
+
+# All sed commands below work with either
+# GNU sed (standard on Linux distrubtions) or BSD sed (standard on macOS)
+SED="sed"
+
+WORKSPACE_ROOT="$( cd "$(dirname "$0")/.." ; pwd -P )"
+
+# Set custom values for Python environment variables.
+if [ -x "$(command -v python)" ]; then
+  export GLEAN_PYTHON=python
+fi
+
+if [ -x "$(command -v pip)" ]; then
+  export GLEAN_PIP=pip
+fi
+
+# Delete the .venv so a new one gets created for testing.
+rm -rf .venv
+
+# Generate files using the Glean.js CLI tool (which just runs glean_parser)
+npm run cli -- \
+  translate tests/integration/schema/metrics.yaml tests/integration/schema/pings.yaml \
+  -f typescript \
+  -o tests/integration/schema/generated
+
+# Update metrics import path
+FILE=glean/tests/integration/schema/generated/forTesting.ts
+run $SED -i.bak -E \
+  -e 's#@mozilla/glean/private/metrics#../../../../src/core/metrics/types#g' \
+  "${WORKSPACE_ROOT}/${FILE}"
+run rm "${WORKSPACE_ROOT}/${FILE}.bak"
+
+# Update ping import path
+FILE=glean/tests/integration/schema/generated/pings.ts
+run $SED -i.bak -E \
+ -e 's#@mozilla/glean/private/ping#../../../../src/core/pings/ping_type.js#g' \
+ "${WORKSPACE_ROOT}/${FILE}"
+run rm "${WORKSPACE_ROOT}/${FILE}.bak"
+
+unset GLEAN_PYTHON
+unset GLEAN_PIP
+
+# Delete the custom .venv so next run uses the default Python binaries.
+rm -rf .venv

bin/python-env-vars-test.sh

@@ -3,9 +3,11 @@
 To update the version of glean_parser used by the Glean.js, run the `bin/update-glean-parser-version.sh` script, providing the version as a command line parameter:
 
 ```bash
-bin/update-glean-parser-version.sh 1.28.3
+bin/update-glean-parser-version.sh 1.28
 ```
 
+It's enough to specify `MINOR.MAJOR`.
+
 This will update the version in all the required places and create a commit with the changes. After that, you just need to create a pull request with the changes.
 
 No further action is required.

docs/guides/update_glean_parser.md

@@ -46,7 +46,7 @@ to external consumers.
 |timing_distribution|8.7 KB |8.7 KB |8.7 KB |
 |rate|2.5 KB |2.5 KB |2.5 KB |
 |uuid|1.0 KB |1.0 KB |1.0 KB |
-|url|2.2 KB |2.2 KB |2.2 KB |
+|url|2.3 KB |2.3 KB |2.3 KB |
 <!-- ! -->
 
 ## Plugins