Merge branch 'release-v66.1.1' into release

badboy · badboy · commit 137221b11328 · 2025-11-06T12:09:46.000+01:00
diff --git a/.buildconfig.yml b/.buildconfig.yml
@@ -1,4 +1,4 @@
-libraryVersion: 66.1.0
+libraryVersion: 66.1.1
 groupId: org.mozilla.telemetry
 projects:
   glean:
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -727,6 +727,7 @@ jobs:
       - image: cimg/python:3.9
     steps:
       - checkout
+      - skip-if-doc-only
       - test-python
 
   Python 3_9 on Alpine tests:
@@ -741,13 +742,15 @@ jobs:
           command: |
             apk add curl git gcc musl-dev libffi-dev openssh-client make openssl-dev
       - checkout
+      - skip-if-doc-only
       - test-python
 
   Python 3_10 tests:
     docker:
       - image: cimg/python:3.10
     steps:
       - checkout
+      - skip-if-doc-only
       - test-python
       - persist_to_workspace:
           root: .
@@ -758,13 +761,15 @@ jobs:
       - image: cimg/python:3.11
     steps:
       - checkout
+      - skip-if-doc-only
       - test-python
 
   Python 3_12 tests:
     docker:
       - image: cimg/python:3.12
     steps:
       - checkout
+      - skip-if-doc-only
       - test-python
 
   Python Windows x86_64 tests:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean/compare/v66.1.0...main)
+[Full changelog](https://github.com/mozilla/glean/compare/v66.1.1...main)
+
+# v66.1.1 (2025-11-06)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v66.1.0...v66.1.1)
+
+* Kotlin
+  * BUGFIX: For `lateinit` metrics, check that the metric was instantiated before recording on it ([#3309](https://github.com/mozilla/glean/pull/3309))
 
 # v66.1.0 (2025-11-03)
 
@@ -36,6 +43,14 @@
   * Updated Kotlin to 2.2.20 ([#3287](https://github.com/mozilla/glean/pull/3287))
   * Updated NDK to r29 ([#3290](https://github.com/mozilla/glean/pull/3290))
 
+# v65.2.3 (2025-11-06)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v65.2.2...v65.2.3)
+
+* Kotlin
+  * BUGFIX: For `lateinit` metrics, check that the metric was instantiated before recording on it ([#3309](https://github.com/mozilla/glean/pull/3309))
+    (Backported changes)
+
 # v65.2.2 (2025-10-02)
 
 [Full changelog](https://github.com/mozilla/glean/compare/v65.2.1...v65.2.2)
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -4606,9 +4606,9 @@ SOFTWARE.
 
 The following text applies to code linked from these dependencies:
 
-* [glean-core 66.1.0]( https://github.com/mozilla/glean )
+* [glean-core 66.1.1]( https://github.com/mozilla/glean )
 * [glean-build 18.0.6]( https://github.com/mozilla/glean )
-* [glean 66.1.0]( https://github.com/mozilla/glean )
+* [glean 66.1.1]( https://github.com/mozilla/glean )
 * [zeitstempel 0.2.0]( https://github.com/badboy/zeitstempel )
 
 ```
diff --git a/docs/dev/cut-a-new-release.md b/docs/dev/cut-a-new-release.md
@@ -91,7 +91,7 @@ When CI has finished and is green for your specific release branch, you are read
     * If this PR is "trivial" (no bugfixes or merge conflicts of note from earlier steps) you may land it without review.
     * There is a separate CircleCI task for the release branch, ensure that it also completes.
 7. Once the above pull request lands, delete the specific release branch.
-8. Pick a song and post a link in the team chat.
+8. Pick a song and post a link in the team chat. Add it to the [Release playlist](https://docs.google.com/document/d/17-7J8q4u1GGQ2dAR8jNXMydu2ptHFv6IgSYyMAAMRFg/edit).
 9. Post a message to [#glean:mozilla.org](https://chat.mozilla.org/#/room/#glean:mozilla.org) announcing the new release.
     * Include a copy of the release-specific changelog if you want to be fancy.
 
diff --git a/glean-core/Cargo.toml b/glean-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "glean-core"
-version = "66.1.0"
+version = "66.1.1"
 authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
 description = "A modern Telemetry library"
 repository = "https://github.com/mozilla/glean"
diff --git a/glean-core/android/src/main/java/mozilla/telemetry/glean/private/BooleanMetricType.kt b/glean-core/android/src/main/java/mozilla/telemetry/glean/private/BooleanMetricType.kt
@@ -37,7 +37,9 @@ class BooleanMetricType {
      */
     fun set(value: Boolean) {
         Dispatchers.Delayed.launch {
-            inner.set(value)
+            if (this::inner.isInitialized) {
+                inner.set(value)
+            }
         }
     }
 
diff --git a/glean-core/android/src/main/java/mozilla/telemetry/glean/private/CounterMetricType.kt b/glean-core/android/src/main/java/mozilla/telemetry/glean/private/CounterMetricType.kt
@@ -38,7 +38,9 @@ class CounterMetricType {
      */
     fun add(amount: Int = 1) {
         Dispatchers.Delayed.launch {
-            inner.add(amount)
+            if (this::inner.isInitialized) {
+                inner.add(amount)
+            }
         }
     }
 
diff --git a/glean-core/android/src/main/java/mozilla/telemetry/glean/private/QuantityMetricType.kt b/glean-core/android/src/main/java/mozilla/telemetry/glean/private/QuantityMetricType.kt
@@ -37,7 +37,9 @@ class QuantityMetricType {
      */
     fun set(value: Long) {
         Dispatchers.Delayed.launch {
-            inner.set(value)
+            if (this::inner.isInitialized) {
+                inner.set(value)
+            }
         }
     }
 
diff --git a/glean-core/android/src/main/java/mozilla/telemetry/glean/private/StringMetricType.kt b/glean-core/android/src/main/java/mozilla/telemetry/glean/private/StringMetricType.kt
@@ -38,7 +38,9 @@ class StringMetricType {
      */
     fun set(value: String) {
         Dispatchers.Delayed.launch {
-            inner.set(value)
+            if (this::inner.isInitialized) {
+                inner.set(value)
+            }
         }
     }
 
diff --git a/glean-core/rlb/Cargo.toml b/glean-core/rlb/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "glean"
-version = "66.1.0"
+version = "66.1.1"
 authors = ["Jan-Erik Rediger <jrediger@mozilla.com>", "The Glean Team <glean-team@mozilla.com>"]
 description = "Glean SDK Rust language bindings"
 repository = "https://github.com/mozilla/glean"
@@ -23,7 +23,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies.glean-core]
 path = ".."
-version = "66.1.0"
+version = "66.1.1"
 
 [dependencies]
 crossbeam-channel = "0.5"
diff --git a/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy b/gradle-plugin/src/main/groovy/mozilla/telemetry/glean-gradle-plugin/GleanGradlePlugin.groovy
@@ -548,7 +548,7 @@ except:
     void apply(Project project) {
         isOffline = project.gradle.startParameter.offline
 
-        project.ext.glean_version = "66.1.0"
+        project.ext.glean_version = "66.1.1"
         def parserVersion = gleanParserVersion(project)
 
         // Print the required glean_parser version to the console. This is
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "glean-sdk"
-version = "66.1.0"
+version = "66.1.1"
 requires-python = ">=3.9"
 classifiers = [
     "Intended Audience :: Developers",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-libraryVersion: 66.1.0`
	`1`	`+libraryVersion: 66.1.1`
`2`	`2`	`groupId: org.mozilla.telemetry`
`3`	`3`	`projects:`
`4`	`4`	`glean:`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ class BooleanMetricType {`
`37`	`37`	`*/`
`38`	`38`	`fun set(value: Boolean) {`
`39`	`39`	`Dispatchers.Delayed.launch {`
`40`		`- inner.set(value)`
	`40`	`+ if (this::inner.isInitialized) {`
	`41`	`+ inner.set(value)`
	`42`	`+ }`
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,9 @@ class CounterMetricType {`
`38`	`38`	`*/`
`39`	`39`	`fun add(amount: Int = 1) {`
`40`	`40`	`Dispatchers.Delayed.launch {`
`41`		`- inner.add(amount)`
	`41`	`+ if (this::inner.isInitialized) {`
	`42`	`+ inner.add(amount)`
	`43`	`+ }`
`42`	`44`	`}`
`43`	`45`	`}`
`44`	`46`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ class QuantityMetricType {`
`37`	`37`	`*/`
`38`	`38`	`fun set(value: Long) {`
`39`	`39`	`Dispatchers.Delayed.launch {`
`40`		`- inner.set(value)`
	`40`	`+ if (this::inner.isInitialized) {`
	`41`	`+ inner.set(value)`
	`42`	`+ }`
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`