Bug 1973102 - Upgrade to Glean v64.5.1 r=TravisLong,supply-chain-reviewers,mach-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D254864

Author: chutten

Cargo.lock

@@ -70,7 +70,7 @@ uniffi_pipeline = "0.29.3"
 # Shared across multiple application-services consumers.
 rusqlite = "0.33.0"
 # Shared across multiple glean consumers.
-glean = "=64.4.0"
+glean = "=64.5.1"
 
 # Explicitly specify what our profiles use.  The opt-level setting here is
 # a total fiction; see the setup of MOZ_RUST_DEFAULT_FLAGS for what the

Cargo.toml

@@ -10,7 +10,7 @@ resolver = "2"
 
 [workspace.dependencies]
 gleam = "0.15.1"
-glean = "=64.4.0"
+glean = "=64.5.1"
 
 [profile.release]
 debug = true

gfx/wr/Cargo.lock

@@ -83,7 +83,7 @@ spotless = "7.0.2"
 
 # Mozilla versions
 apilint = "0.5.4"
-mozilla-glean = "64.4.0"
+mozilla-glean = "64.5.1"
 
 # Testing versions
 androidx-test = "1.6.1"

gfx/wr/Cargo.toml

@@ -57,7 +57,7 @@ pth:xpcom/geckoprocesstypes_generator
 pth:xpcom/idl-parser
 # glean-sdk may not be installable if a wheel isn't available
 # and it has to be built from source.
-pypi-optional:glean-sdk==64.4.0:telemetry will not be collected
+pypi-optional:glean-sdk==64.5.1:telemetry will not be collected
 pypi-optional:orjson>=3.10.15:json operations will be slower in various tools
 # Mach gracefully handles the case where `psutil` is unavailable.
 # We aren't (yet) able to pin packages in automation, so we have to

gradle/libs.versions.toml

@@ -272,15 +272,15 @@ user-login = "jrmuizel"
 user-name = "Jeff Muizelaar"
 
 [[publisher.glean]]
-version = "64.4.0"
-when = "2025-05-30"
+version = "64.5.1"
+when = "2025-06-23"
 user-id = 48
 user-login = "badboy"
 user-name = "Jan-Erik Rediger"
 
 [[publisher.glean-core]]
-version = "64.4.0"
-when = "2025-05-30"
+version = "64.5.1"
+when = "2025-06-23"
 user-id = 48
 user-login = "badboy"
 user-name = "Jan-Erik Rediger"

python/sites/mach.txt

@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.82"
 name = "glean-core"
-version = "64.4.0"
+version = "64.5.1"
 authors = [
     "Jan-Erik Rediger <jrediger@mozilla.com>",
     "The Glean Team <glean-team@mozilla.com>",
@@ -40,7 +40,7 @@ license = "MPL-2.0"
 repository = "https://github.com/mozilla/glean"
 
 [package.metadata.glean]
-glean-parser = "17.1.0"
+glean-parser = "17.2.0"
 
 [lib]
 name = "glean_core"
@@ -66,6 +66,10 @@ path = "tests/custom_distribution.rs"
 name = "datetime"
 path = "tests/datetime.rs"
 
+[[test]]
+name = "dual_labeled_counter"
+path = "tests/dual_labeled_counter.rs"
+
 [[test]]
 name = "event"
 path = "tests/event.rs"

supply-chain/imports.lock

@@ -2,11 +2,13 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+use std::ops::Deref;
 use std::sync::atomic::{AtomicU8, Ordering};
 
 use malloc_size_of_derive::MallocSizeOf;
 
 use crate::error::{Error, ErrorKind};
+use crate::metrics::dual_labeled_counter::validate_dynamic_key_and_or_category;
 use crate::metrics::labeled::validate_dynamic_label;
 use crate::Glean;
 use serde::{Deserialize, Serialize};
@@ -72,7 +74,40 @@ pub struct CommonMetricData {
     /// metric to be recorded to, dynamic labels are stored in the specific
     /// label so that we can validate them when the Glean singleton is
     /// available.
-    pub dynamic_label: Option<String>,
+    pub dynamic_label: Option<DynamicLabelType>,
+}
+
+/// The type of dynamic label applied to a base metric. Used to help identify
+/// the necessary validation to be performed.
+#[derive(Debug, Clone, Deserialize, Serialize, MallocSizeOf, uniffi::Enum)]
+pub enum DynamicLabelType {
+    /// A dynamic label applied from a `LabeledMetric`
+    Label(String),
+    /// A label applied by a `DualLabeledCounter` that contains a dynamic key
+    KeyOnly(String),
+    /// A label applied by a `DualLabeledCounter` that contains a dynamic category
+    CategoryOnly(String),
+    /// A label applied by a `DualLabeledCounter` that contains a dynamic key and category
+    KeyAndCategory(String),
+}
+
+impl Default for DynamicLabelType {
+    fn default() -> Self {
+        Self::Label(String::new())
+    }
+}
+
+impl Deref for DynamicLabelType {
+    type Target = str;
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            DynamicLabelType::Label(label) => label,
+            DynamicLabelType::KeyOnly(key) => key,
+            DynamicLabelType::CategoryOnly(category) => category,
+            DynamicLabelType::KeyAndCategory(key_and_category) => key_and_category,
+        }
+    }
 }
 
 #[derive(Default, Debug, MallocSizeOf)]
@@ -138,7 +173,17 @@ impl CommonMetricDataInternal {
         let base_identifier = self.base_identifier();
 
         if let Some(label) = &self.inner.dynamic_label {
-            validate_dynamic_label(glean, self, &base_identifier, label)
+            match label {
+                DynamicLabelType::Label(label) => {
+                    validate_dynamic_label(glean, self, &base_identifier, label)
+                }
+                _ => validate_dynamic_key_and_or_category(
+                    glean,
+                    self,
+                    &base_identifier,
+                    label.clone(),
+                ),
+            }
         } else {
             base_identifier
         }