Skip to content

Commit 250fded

Browse files
chuttenchutten
committed
Merge branch 'hotfix-v65.2.2' into release
2 parents 7365639 + 02a076e commit 250fded

File tree

14 files changed

+326
-805
lines changed

14 files changed

+326
-805
lines changed

‎.buildconfig.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
libraryVersion: 65.2.1
1+
libraryVersion: 65.2.2
22
groupId: org.mozilla.telemetry
33
projects:
44
glean:

‎CHANGELOG.md‎

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

3-
[Full changelog](https://github.com/mozilla/glean/compare/v65.2.1...main)
3+
[Full changelog](https://github.com/mozilla/glean/compare/v65.2.2...main)
4+
5+
# v65.2.2 (2025-10-02)
6+
7+
[Full changelog](https://github.com/mozilla/glean/compare/v65.2.1...v65.2.2)
8+
9+
* General
10+
* Report db record counts during init phases ([bug 1992024](https://bugzilla.mozilla.org/show_bug.cgi?id=1992024))
411

512
# v65.2.1 (2025-09-26)
613

‎Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DEPENDENCIES.md‎

Lines changed: 142 additions & 688 deletions
Large diffs are not rendered by default.

‎glean-core/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "glean-core"
3-
version = "65.2.1"
3+
version = "65.2.2"
44
authors = ["Jan-Erik Rediger <[email protected]>", "The Glean Team <[email protected]>"]
55
description = "A modern Telemetry library"
66
repository = "https://github.com/mozilla/glean"

‎glean-core/android-native/dependency-licenses.xml‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ Binary distributions of this software incorporate code from a number of third-pa
44
These dependencies are available under a variety of free and open source licenses,
55
the details of which are reproduced below.
66
--> <license>
7-
<name>Apache License 2.0: miniz_oxide</name>
8-
<url>https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide</url>
9-
</license> <license>
107
<name>Apache License 2.0: rkv</name>
118
<url>https://github.com/mozilla/rkv</url>
129
</license> <license>
@@ -57,57 +54,6 @@ the details of which are reproduced below.
5754
</license> <license>
5855
<name>Apache License 2.0: android-tzdata</name>
5956
<url>https://github.com/RumovZ/android-tzdata</url>
60-
</license> <license>
61-
<name>Apache License 2.0: rustc-hash</name>
62-
<url>https://github.com/rust-lang/rustc-hash</url>
63-
</license> <license>
64-
<name>Apache License 2.0: anyhow</name>
65-
<url>https://github.com/dtolnay/anyhow</url>
66-
</license> <license>
67-
<name>Apache License 2.0: basic-toml</name>
68-
<url>https://github.com/dtolnay/basic-toml</url>
69-
</license> <license>
70-
<name>Apache License 2.0: inherent</name>
71-
<url>https://github.com/dtolnay/inherent</url>
72-
</license> <license>
73-
<name>Apache License 2.0: itoa</name>
74-
<url>https://github.com/dtolnay/itoa</url>
75-
</license> <license>
76-
<name>Apache License 2.0: libc</name>
77-
<url>https://github.com/rust-lang/libc</url>
78-
</license> <license>
79-
<name>Apache License 2.0: proc-macro2</name>
80-
<url>https://github.com/dtolnay/proc-macro2</url>
81-
</license> <license>
82-
<name>Apache License 2.0: quote</name>
83-
<url>https://github.com/dtolnay/quote</url>
84-
</license> <license>
85-
<name>Apache License 2.0: ryu</name>
86-
<url>https://github.com/dtolnay/ryu</url>
87-
</license> <license>
88-
<name>Apache License 2.0: semver</name>
89-
<url>https://github.com/dtolnay/semver</url>
90-
</license> <license>
91-
<name>Apache License 2.0: serde</name>
92-
<url>https://github.com/serde-rs/serde</url>
93-
</license> <license>
94-
<name>Apache License 2.0: serde_derive</name>
95-
<url>https://github.com/serde-rs/serde</url>
96-
</license> <license>
97-
<name>Apache License 2.0: serde_json</name>
98-
<url>https://github.com/serde-rs/json</url>
99-
</license> <license>
100-
<name>Apache License 2.0: syn</name>
101-
<url>https://github.com/dtolnay/syn</url>
102-
</license> <license>
103-
<name>Apache License 2.0: thiserror-impl</name>
104-
<url>https://github.com/dtolnay/thiserror</url>
105-
</license> <license>
106-
<name>Apache License 2.0: thiserror</name>
107-
<url>https://github.com/dtolnay/thiserror</url>
108-
</license> <license>
109-
<name>Apache License 2.0: unicode-ident</name>
110-
<url>https://github.com/dtolnay/unicode-ident</url>
11157
</license> <license>
11258
<name>Apache License 2.0: askama</name>
11359
<url>https://github.com/askama-rs/askama</url>
@@ -252,12 +198,66 @@ the details of which are reproduced below.
252198
</license> <license>
253199
<name>Apache License 2.0: android_system_properties</name>
254200
<url>https://github.com/nical/android_system_properties</url>
201+
</license> <license>
202+
<name>Apache License 2.0: anyhow</name>
203+
<url>https://github.com/dtolnay/anyhow</url>
204+
</license> <license>
205+
<name>Apache License 2.0: basic-toml</name>
206+
<url>https://github.com/dtolnay/basic-toml</url>
207+
</license> <license>
208+
<name>Apache License 2.0: inherent</name>
209+
<url>https://github.com/dtolnay/inherent</url>
210+
</license> <license>
211+
<name>Apache License 2.0: itoa</name>
212+
<url>https://github.com/dtolnay/itoa</url>
213+
</license> <license>
214+
<name>Apache License 2.0: libc</name>
215+
<url>https://github.com/rust-lang/libc</url>
216+
</license> <license>
217+
<name>Apache License 2.0: miniz_oxide</name>
218+
<url>https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide</url>
219+
</license> <license>
220+
<name>Apache License 2.0: proc-macro2</name>
221+
<url>https://github.com/dtolnay/proc-macro2</url>
222+
</license> <license>
223+
<name>Apache License 2.0: quote</name>
224+
<url>https://github.com/dtolnay/quote</url>
225+
</license> <license>
226+
<name>Apache License 2.0: rustc-hash</name>
227+
<url>https://github.com/rust-lang/rustc-hash</url>
228+
</license> <license>
229+
<name>Apache License 2.0: ryu</name>
230+
<url>https://github.com/dtolnay/ryu</url>
231+
</license> <license>
232+
<name>Apache License 2.0: semver</name>
233+
<url>https://github.com/dtolnay/semver</url>
234+
</license> <license>
235+
<name>Apache License 2.0: serde</name>
236+
<url>https://github.com/serde-rs/serde</url>
237+
</license> <license>
238+
<name>Apache License 2.0: serde_derive</name>
239+
<url>https://github.com/serde-rs/serde</url>
240+
</license> <license>
241+
<name>Apache License 2.0: serde_json</name>
242+
<url>https://github.com/serde-rs/json</url>
255243
</license> <license>
256244
<name>Apache License 2.0: siphasher</name>
257245
<url>https://github.com/jedisct1/rust-siphash</url>
246+
</license> <license>
247+
<name>Apache License 2.0: syn</name>
248+
<url>https://github.com/dtolnay/syn</url>
249+
</license> <license>
250+
<name>Apache License 2.0: thiserror-impl</name>
251+
<url>https://github.com/dtolnay/thiserror</url>
252+
</license> <license>
253+
<name>Apache License 2.0: thiserror</name>
254+
<url>https://github.com/dtolnay/thiserror</url>
258255
</license> <license>
259256
<name>Apache License 2.0: tinyvec_macros</name>
260257
<url>https://github.com/Soveu/tinyvec_macros</url>
258+
</license> <license>
259+
<name>Apache License 2.0: unicode-ident</name>
260+
<url>https://github.com/dtolnay/unicode-ident</url>
261261
</license> <license>
262262
<name>Apache License 2.0: winapi-x86_64-pc-windows-gnu</name>
263263
<url>https://github.com/retep998/winapi-rs</url>

‎glean-core/android/dependency-licenses.xml‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ Binary distributions of this software incorporate code from a number of third-pa
44
These dependencies are available under a variety of free and open source licenses,
55
the details of which are reproduced below.
66
--> <license>
7-
<name>Apache License 2.0: miniz_oxide</name>
8-
<url>https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide</url>
9-
</license> <license>
107
<name>Apache License 2.0: rkv</name>
118
<url>https://github.com/mozilla/rkv</url>
129
</license> <license>
@@ -57,57 +54,6 @@ the details of which are reproduced below.
5754
</license> <license>
5855
<name>Apache License 2.0: android-tzdata</name>
5956
<url>https://github.com/RumovZ/android-tzdata</url>
60-
</license> <license>
61-
<name>Apache License 2.0: rustc-hash</name>
62-
<url>https://github.com/rust-lang/rustc-hash</url>
63-
</license> <license>
64-
<name>Apache License 2.0: anyhow</name>
65-
<url>https://github.com/dtolnay/anyhow</url>
66-
</license> <license>
67-
<name>Apache License 2.0: basic-toml</name>
68-
<url>https://github.com/dtolnay/basic-toml</url>
69-
</license> <license>
70-
<name>Apache License 2.0: inherent</name>
71-
<url>https://github.com/dtolnay/inherent</url>
72-
</license> <license>
73-
<name>Apache License 2.0: itoa</name>
74-
<url>https://github.com/dtolnay/itoa</url>
75-
</license> <license>
76-
<name>Apache License 2.0: libc</name>
77-
<url>https://github.com/rust-lang/libc</url>
78-
</license> <license>
79-
<name>Apache License 2.0: proc-macro2</name>
80-
<url>https://github.com/dtolnay/proc-macro2</url>
81-
</license> <license>
82-
<name>Apache License 2.0: quote</name>
83-
<url>https://github.com/dtolnay/quote</url>
84-
</license> <license>
85-
<name>Apache License 2.0: ryu</name>
86-
<url>https://github.com/dtolnay/ryu</url>
87-
</license> <license>
88-
<name>Apache License 2.0: semver</name>
89-
<url>https://github.com/dtolnay/semver</url>
90-
</license> <license>
91-
<name>Apache License 2.0: serde</name>
92-
<url>https://github.com/serde-rs/serde</url>
93-
</license> <license>
94-
<name>Apache License 2.0: serde_derive</name>
95-
<url>https://github.com/serde-rs/serde</url>
96-
</license> <license>
97-
<name>Apache License 2.0: serde_json</name>
98-
<url>https://github.com/serde-rs/json</url>
99-
</license> <license>
100-
<name>Apache License 2.0: syn</name>
101-
<url>https://github.com/dtolnay/syn</url>
102-
</license> <license>
103-
<name>Apache License 2.0: thiserror-impl</name>
104-
<url>https://github.com/dtolnay/thiserror</url>
105-
</license> <license>
106-
<name>Apache License 2.0: thiserror</name>
107-
<url>https://github.com/dtolnay/thiserror</url>
108-
</license> <license>
109-
<name>Apache License 2.0: unicode-ident</name>
110-
<url>https://github.com/dtolnay/unicode-ident</url>
11157
</license> <license>
11258
<name>Apache License 2.0: askama</name>
11359
<url>https://github.com/askama-rs/askama</url>
@@ -252,12 +198,66 @@ the details of which are reproduced below.
252198
</license> <license>
253199
<name>Apache License 2.0: android_system_properties</name>
254200
<url>https://github.com/nical/android_system_properties</url>
201+
</license> <license>
202+
<name>Apache License 2.0: anyhow</name>
203+
<url>https://github.com/dtolnay/anyhow</url>
204+
</license> <license>
205+
<name>Apache License 2.0: basic-toml</name>
206+
<url>https://github.com/dtolnay/basic-toml</url>
207+
</license> <license>
208+
<name>Apache License 2.0: inherent</name>
209+
<url>https://github.com/dtolnay/inherent</url>
210+
</license> <license>
211+
<name>Apache License 2.0: itoa</name>
212+
<url>https://github.com/dtolnay/itoa</url>
213+
</license> <license>
214+
<name>Apache License 2.0: libc</name>
215+
<url>https://github.com/rust-lang/libc</url>
216+
</license> <license>
217+
<name>Apache License 2.0: miniz_oxide</name>
218+
<url>https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide</url>
219+
</license> <license>
220+
<name>Apache License 2.0: proc-macro2</name>
221+
<url>https://github.com/dtolnay/proc-macro2</url>
222+
</license> <license>
223+
<name>Apache License 2.0: quote</name>
224+
<url>https://github.com/dtolnay/quote</url>
225+
</license> <license>
226+
<name>Apache License 2.0: rustc-hash</name>
227+
<url>https://github.com/rust-lang/rustc-hash</url>
228+
</license> <license>
229+
<name>Apache License 2.0: ryu</name>
230+
<url>https://github.com/dtolnay/ryu</url>
231+
</license> <license>
232+
<name>Apache License 2.0: semver</name>
233+
<url>https://github.com/dtolnay/semver</url>
234+
</license> <license>
235+
<name>Apache License 2.0: serde</name>
236+
<url>https://github.com/serde-rs/serde</url>
237+
</license> <license>
238+
<name>Apache License 2.0: serde_derive</name>
239+
<url>https://github.com/serde-rs/serde</url>
240+
</license> <license>
241+
<name>Apache License 2.0: serde_json</name>
242+
<url>https://github.com/serde-rs/json</url>
255243
</license> <license>
256244
<name>Apache License 2.0: siphasher</name>
257245
<url>https://github.com/jedisct1/rust-siphash</url>
246+
</license> <license>
247+
<name>Apache License 2.0: syn</name>
248+
<url>https://github.com/dtolnay/syn</url>
249+
</license> <license>
250+
<name>Apache License 2.0: thiserror-impl</name>
251+
<url>https://github.com/dtolnay/thiserror</url>
252+
</license> <license>
253+
<name>Apache License 2.0: thiserror</name>
254+
<url>https://github.com/dtolnay/thiserror</url>
258255
</license> <license>
259256
<name>Apache License 2.0: tinyvec_macros</name>
260257
<url>https://github.com/Soveu/tinyvec_macros</url>
258+
</license> <license>
259+
<name>Apache License 2.0: unicode-ident</name>
260+
<url>https://github.com/dtolnay/unicode-ident</url>
261261
</license> <license>
262262
<name>Apache License 2.0: winapi-x86_64-pc-windows-gnu</name>
263263
<url>https://github.com/retep998/winapi-rs</url>

‎glean-core/metrics.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -920,6 +920,16 @@ glean.database:
920920
type: number
921921
post_load_ping_lifetime_data:
922922
type: number
923+
user_records:
924+
type: number
925+
ping_records:
926+
type: number
927+
application_records:
928+
type: number
929+
ping_memory_records:
930+
type: number
931+
error:
932+
type: string
923933

924934
glean.validation:
925935
foreground_count:

‎glean-core/rlb/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "glean"
3-
version = "65.2.1"
3+
version = "65.2.2"
44
authors = ["Jan-Erik Rediger <[email protected]>", "The Glean Team <[email protected]>"]
55
description = "Glean SDK Rust language bindings"
66
repository = "https://github.com/mozilla/glean"
@@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
2323

2424
[dependencies.glean-core]
2525
path = ".."
26-
version = "65.2.1"
26+
version = "65.2.2"
2727

2828
[dependencies]
2929
crossbeam-channel = "0.5"

‎glean-core/rlb/tests/health_ping.rs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,11 @@ fn test_pre_post_init_health_pings_exist() {
142142
assert_eq!(None, load_sizes.get("post_open"));
143143
assert_eq!(None, load_sizes.get("post_open_user"));
144144
assert_eq!(None, load_sizes.get("post_load_ping_lifetime_data"));
145+
assert_eq!(0, *load_sizes.get("user_records").unwrap());
146+
assert_eq!(0, *load_sizes.get("ping_records").unwrap());
147+
assert_eq!(0, *load_sizes.get("application_records").unwrap());
148+
assert_eq!(None, load_sizes.get("ping_memory_records"));
149+
assert_eq!(None, load_sizes.get("error"));
145150

146151
let cfg = ConfigurationBuilder::new(true, tmpname.clone(), "health-ping-test")
147152
.with_server_endpoint("invalid-test-host")
@@ -194,4 +199,15 @@ fn test_pre_post_init_health_pings_exist() {
194199
.unwrap()
195200
.as_i64()
196201
);
202+
assert!(0 < load_sizes.get("user_records").unwrap().as_i64().unwrap());
203+
assert!(0 < load_sizes.get("ping_records").unwrap().as_i64().unwrap());
204+
assert!(
205+
0 < load_sizes
206+
.get("application_records")
207+
.unwrap()
208+
.as_i64()
209+
.unwrap()
210+
);
211+
assert_eq!(None, load_sizes.get("ping_memory_records"));
212+
assert_eq!(None, load_sizes.get("error"));
197213
}

0 commit comments

Comments
 (0)