Skip to content

Commit 1cfdb5a

Browse files
brizentalbrizental
committed
Merge branch 'release-v0.16.0' into release
2 parents 693a45c + 9ff1adf commit 1cfdb5a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+9406
-2287
lines changed

‎.circleci/config.yml‎

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
exit 1
2727
fi
2828
- run:
29-
name: Install Javascript dependencies
29+
name: Install JavaScript dependencies
3030
command: npm --prefix ./glean install
3131
- run:
3232
name: Run linter
@@ -47,7 +47,7 @@ jobs:
4747
sudo apt update
4848
sudo apt install firefox-trunk
4949
- run:
50-
name: Install Javascript dependencies
50+
name: Install JavaScript dependencies
5151
command: npm --prefix ./glean install
5252
- run:
5353
name: Run unit tests
@@ -62,20 +62,14 @@ jobs:
6262
steps:
6363
- checkout
6464
- run:
65-
name: Install Javascript dependencies for Glean
65+
name: Install JavaScript dependencies for Glean
6666
command: npm --prefix ./glean install
67-
- run:
68-
name: Build & link Glean.js to use it in the samples
69-
command: |
70-
npm --prefix ./glean run build:webext
71-
npm --prefix ./glean run build:cli
72-
npm --prefix ./glean link
7367
# JS sample related jobs
7468
- run:
75-
name: Install Javascript dependencies for the JS sample
69+
name: Install JavaScript dependencies for the JS sample
7670
command: |
77-
npm --prefix ./samples/web-extension/javascript install
78-
npm --prefix ./samples/web-extension/javascript link @mozilla/glean
71+
npm --prefix ./samples/web-extension/javascript install
72+
npm --prefix ./samples/web-extension/javascript run link:glean
7973
- run:
8074
name: Build the JS sample
8175
command: |
@@ -88,8 +82,8 @@ jobs:
8882
- run:
8983
name: Install Typescript dependencies for the TS sample
9084
command: |
91-
npm --prefix ./samples/web-extension/typescript install
92-
npm --prefix ./samples/web-extension/typescript link @mozilla/glean
85+
npm --prefix ./samples/web-extension/typescript install
86+
npm --prefix ./samples/web-extension/typescript run link:glean
9387
- run:
9488
name: Build the TS sample
9589
command: |
@@ -106,15 +100,17 @@ jobs:
106100
- checkout
107101
- run:
108102
name: Get and post build sizes to GitHub PR
109-
command: bin/build-size-check.sh
103+
command: |
104+
npm --prefix ./benchmarks install
105+
npm --prefix ./benchmarks run size:report
110106
111107
check-qt-js:
112108
docker:
113109
- image: cimg/python:3.9.4-node
114110
steps:
115111
- checkout
116112
- run:
117-
name: Install Javascript dependencies and build Glean.js for Qt
113+
name: Install JavaScript dependencies and build Glean.js for Qt
118114
command: |
119115
npm --prefix ./glean install
120116
npm --prefix ./glean run build:qt
@@ -136,7 +132,7 @@ jobs:
136132
source venv/bin/activate
137133
pip install -r requirements.txt
138134
glean_parser translate metrics.yaml pings.yaml -f javascript -o generated \
139-
--option platform=qt --option version="0.15";
135+
--option platform=qt --option version="0.16"
140136
141137
sudo apt-get install xvfb
142138
xvfb-run python main.py &> qml.log &
@@ -155,7 +151,7 @@ jobs:
155151
steps:
156152
- checkout
157153
- run:
158-
name: Install Javascript dependencies
154+
name: Install JavaScript dependencies
159155
command: npm --prefix ./glean install
160156
- run:
161157
name: Build documentation
@@ -166,27 +162,24 @@ jobs:
166162
- run:
167163
name: Show contents
168164
command: ls -R glean/dist/docs
169-
# Needed for write access to the GitHub repository;
170-
# see https://circleci.com/docs/2.0/gh-bb-integration/#deployment-keys-and-user-keys
171-
- add_ssh_keys:
172-
fingerprints:
173-
- "0c:0b:f8:f0:45:60:92:79:60:34:b2:12:9c:55:1d:fa"
174-
# The gh-pages npm package can be used to push a directory to a git branch;
175-
# see https://www.npmjs.com/package/gh-pages
176-
- run:
177-
name: Deploy docs to gh-pages branch
165+
- run:
166+
name: Setup SSH key and deploy docs to gh-pages branch
178167
command: |
179-
git config user.email "brizental@mozilla.com"
180-
git config user.name "brizental"
168+
eval "$(ssh-agent -s)"
169+
DECODED_SSH_DEPLOY_KEY=$(echo $SSH_DEPLOY_KEY | base64 -d)
170+
ssh-add - \<<< "${DECODED_SSH_DEPLOY_KEY}"
171+
git config user.email "brizental+moz-glean@mozilla.com"
172+
git config user.name "moz-glean"
181173
npm --prefix ./glean run publish:docs
182174
175+
183176
publish:
184177
docker:
185178
- image: cimg/node:16.1.0
186179
steps:
187180
- checkout
188181
- run:
189-
name: Install Javascript dependencies
182+
name: Install JavaScript dependencies
190183
command: npm --prefix ./glean install
191184
- run:
192185
name: NPM Authentication
@@ -213,27 +206,40 @@ jobs:
213206
./ghr -u mozilla -replace ${CIRCLE_TAG} glean/dist/glean_js-${CIRCLE_TAG}-qt.tar.gz
214207
215208
workflows:
216-
version: 2
217209
ci:
218210
jobs:
219211
- lint
220212
- test
221213
- check-qt-js
222214
- samples-tests
215+
- hold:
216+
type: approval
217+
requires:
218+
- lint
219+
- test
220+
- check-qt-js
221+
- samples-tests
222+
filters:
223+
branches:
224+
ignore:
225+
- main
226+
- release
227+
- /^release-*/
228+
- check-size:
229+
context: data-eng-gleanjs-gh
230+
requires:
231+
- hold
223232
- docs-deploy:
233+
context: data-eng-gleanjs-gh
224234
filters:
225235
branches:
226236
ignore: /.*/
227237
tags:
228238
only: /^v.*/
229239
- publish:
240+
context: data-eng-gleanjs-gh
230241
filters:
231242
branches:
232243
ignore: /.*/
233244
tags:
234245
only: /^v.*/
235-
# Comment this job away until Bug 1681899 is resolved.
236-
# - check-size:
237-
# filters:
238-
# branches:
239-
# ignore: main

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
### Pull Request checklist ###
2+
<!-- Before submitting the PR, please address each item -->
3+
- [ ] **Quality**: Make sure this PR builds and runs cleanly.
4+
- Inside the `glean/` folder, run:
5+
- `npm run test` Runs _all_ tests
6+
- `npm run lint && npm run lint:circular-deps` Runs _all_ linters
7+
- [ ] **Tests**: This PR includes thorough tests or an explanation of why it does not
8+
- [ ] **Changelog**: This PR includes a changelog entry to `CHANGELOG.md` or an explanation of why it does not need one
9+
- [ ] **Documentation**: This PR includes documentation changes, an explanation of why it does not need that or a follow-up bug has been filed to do that work
10+
- Documentation should be added to [The Glean Book](https://mozilla.github.io/glean/book/index.html) when making changes to Glean's user facing API
11+
- When changes to the Glean Book are necessary, link to the corresponding PR on the [`mozilla/glean`](https://github.com/mozilla/glean) repository
12+
- Documentation should be added to [the Glean.js developer documentation](https://github.com/mozilla/glean.js/tree/main/docs) when making internal code changes

‎CHANGELOG.md‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
# Unreleased changes
22

3-
[Full changelog](https://github.com/mozilla/glean.js/compare/v0.15.0...main)
3+
[Full changelog](https://github.com/mozilla/glean.js/compare/v0.16.0...main)
4+
5+
# v0.16.0 (2021-07-06)
6+
7+
[Full changelog](https://github.com/mozilla/glean.js/compare/v0.15.0...v0.16.0)
8+
9+
* [#346](https://github.com/mozilla/glean.js/pull/346): Provide default HTTP client for Qt/QML platform.
10+
* [#399](https://github.com/mozilla/glean.js/pull/399): Check if there are ping data before attempting to delete it.
11+
* This change lowers the amount of log messages related to attempting to delete inexistent data.
12+
* [#411](https://github.com/mozilla/glean.js/pull/411): Tag all messages logged by Glean with the component they are coming from.
13+
* [#415](https://github.com/mozilla/glean.js/pull/415), [#430](https://github.com/mozilla/glean.js/pull/430): Gzip ping paylod before upload
14+
* This changes the signature of `Uploader.post` to accept `string | Uint8Array` for the `body` parameter, instead of only `string`.
15+
* [#431](https://github.com/mozilla/glean.js/pull/431): BUGFIX: Record the timestamp for events before dispatching to the internal task queue.
16+
* [#462](https://github.com/mozilla/glean.js/pull/462): Implement persistent storage for Qt/QML platform.
17+
* [#466](https://github.com/mozilla/glean.js/pull/466): Expose `ErrorType` enum, for using with the `testGetNumRecordedErrors` API.
18+
* [#497](https://github.com/mozilla/glean.js/pull/497): Implement limit of 1MB for ping request payload. Limit is calculated after gzip compression.
419

520
# v0.15.0 (2021-06-03)
621

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![Glean logo](https://mozilla.github.io/glean/book/glean.jpeg)
44

5-
`Glean.js` is a modern approach for a Telemetry library aimed at Javascript environments. It is part of the [Glean project](https://docs.telemetry.mozilla.org/concepts/glean/glean.html).
5+
`Glean.js` is a modern approach for a Telemetry library aimed at JavaScript environments. It is part of the [Glean project](https://docs.telemetry.mozilla.org/concepts/glean/glean.html).
66

77
## Documentation
88

0 commit comments

Comments
 (0)