Skip to content

Commit

Permalink
Merge branch 'release-v63.0.0' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
badboy committed Nov 28, 2024
2 parents 505c497 + 9eab6a4 commit 2fe73c4
Show file tree
Hide file tree
Showing 118 changed files with 2,862 additions and 2,292 deletions.
2 changes: 1 addition & 1 deletion .buildconfig.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
libraryVersion: 62.0.0
libraryVersion: 63.0.0
groupId: org.mozilla.telemetry
projects:
glean:
Expand Down
11 changes: 6 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ commands:
- run:
name: Test
command: |
export GLEAN_TEST_COVERAGE=$(realpath glean_coverage.txt)
cargo test --workspace --verbose --jobs 6 -- --nocapture
- run:
name: Run Rust sample
Expand All @@ -95,11 +94,13 @@ commands:
command: |
glean-core/rlb/tests/test-ping-lifetime-flush.sh
- run:
name: Upload coverage report
name: Run Rust RLB enabled-pings test
command: |
pip3 install $(grep glean_parser pyproject.toml | tr -d ',"')
glean_parser coverage --allow-reserved -c glean_coverage.txt -f codecovio -o codecov.json glean-core/metrics.yaml
bin/codecov.sh -X yaml -f codecov.json
glean-core/rlb/tests/test-enabled-pings.sh
- run:
name: Run Rust RLB pending-gets-removed test
command: |
glean-core/rlb/tests/test-pending-gets-removed.sh
install-rustup:
steps:
Expand Down
4 changes: 3 additions & 1 deletion .dictionary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
personal_ws-1.1 en 292 utf-8
personal_ws-1.1 en 294 utf-8
AAR
AARs
ABI
Expand Down Expand Up @@ -97,6 +97,7 @@ UUIDs
Unbreak
Underflowing
UniFFI
UploadManager
Uploaders
VPN
Walkthrough
Expand Down Expand Up @@ -257,6 +258,7 @@ substring
swiftlint
tcsh
templating
th
timespan
timespan's
timespans
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cargo-vet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Vet Dependencies
runs-on: ubuntu-latest
env:
CARGO_VET_VERSION: 0.9.0
CARGO_VET_VERSION: 0.10.0
steps:
- uses: actions/checkout@master
- name: Install Rust
Expand Down
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ disabled_rules:
- force_cast
# We'll get to these when we get to them!
- todo
- function_body_length

identifier_name:
# Turn off it complaining about `id` or `let t = title`, etc, but keep
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
# Unreleased changes

[Full changelog](https://github.com/mozilla/glean/compare/v62.0.0...main)
[Full changelog](https://github.com/mozilla/glean/compare/v63.0.0...main)

# v63.0.0 (2024-11-28)

[Full changelog](https://github.com/mozilla/glean/compare/v62.0.0...v63.0.0)

* General
* Add methods to access current Glean debugging settings and the list of currently registered pings([Bug 1921976](https://bugzilla.mozilla.org/show_bug.cgi?id=1921976)).
* Require `glean_parser` v16.1.0 ([#3006](https://github.com/mozilla/glean/pull/3006))
* BREAKING CHANGE: Add new `collection-enabled` mode (and `follows_collection_enabled` setting for pings).
This allows to control a subset of pings independently from the Glean-wide `upload-enabled` flag.
This deprecates the `setUploadEnabled` API in favor of `setCollectionEnabled`. ([#3006](https://github.com/mozilla/glean/pull/3006))
* Rust
* Permit Glean shutdown to interrupt UploadManager Wait tasks ([bug 1928288](https://bugzilla.mozilla.org/show_bug.cgi?id=1928288))

# v62.0.0 (2024-11-05)

Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4735,8 +4735,9 @@ SOFTWARE.

The following text applies to code linked from these dependencies:

* [glean-build 15.2.0]( https://github.com/mozilla/glean )
* [glean 62.0.0]( https://github.com/mozilla/glean )
* [glean-core 63.0.0]( https://github.com/mozilla/glean )
* [glean-build 16.1.0]( https://github.com/mozilla/glean )
* [glean 63.0.0]( https://github.com/mozilla/glean )
* [zeitstempel 0.1.1]( https://github.com/badboy/zeitstempel )

```
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ test-rust-examples: glean-core/rlb/tests/*.sh ## Run Rust example tests
done

test-rust-with-logs: ## Run all Rust tests with debug logging and single-threaded
RUST_LOG=glean_core=debug cargo test --all -- --nocapture --test-threads=1 $(addprefix --target ,$(GLEAN_BUILD_TARGET))
RUST_LOG=glean,glean_core cargo test --all -- --nocapture --test-threads=1 $(addprefix --target ,$(GLEAN_BUILD_TARGET))

test-kotlin: ## Run all Kotlin tests
./gradlew :glean:testDebugUnitTest
Expand Down Expand Up @@ -157,7 +157,7 @@ docs-python: build-python ## Build the Python documentation
.PHONY: docs docs-rust docs-swift

docs-metrics: setup-python ## Build the internal metrics documentation
$(GLEAN_PYENV)/bin/pip install glean_parser~=15.2
$(GLEAN_PYENV)/bin/pip install glean_parser~=16.1
$(GLEAN_PYENV)/bin/glean_parser translate --allow-reserved \
-f markdown \
-o ./docs/user/user/collected-metrics \
Expand Down
Loading

0 comments on commit 2fe73c4

Please sign in to comment.