ref(metric-meta): Add support for metric metadata

Author: Dav1dde

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+
+## Unreleased
+
+- Add support for metric metadata. ([#2751](https://github.com/getsentry/relay/pull/2751))
+
 ## 23.11.1
 
 **Features**:

Cargo.lock

@@ -15,14 +15,16 @@ debug = true
 
 [workspace.dependencies]
 anyhow = "1.0.66"
-chrono = { version = "0.4.29", default-features = false, features = [
+chrono = { version = "0.4.31", default-features = false, features = [
     "std",
     "serde",
 ] }
 clap = { version = "4.4.6" }
 criterion = "0.5"
 futures = { version = "0.3", default-features = false, features = ["std"] }
 insta = { version = "1.31.0", features = ["json", "redactions", "ron"] }
+hash32 = "0.3.1"
+hashbrown = "0.13.2"
 itertools = "0.10.5"
 once_cell = "1.13.1"
 rand = "0.8.5"

Cargo.toml

@@ -33,6 +33,9 @@ pub enum Feature {
     /// Enable processing profiles
     #[serde(rename = "organizations:profiling")]
     Profiling,
+    /// Enable metric metadata.
+    #[serde(rename = "organizations:metric-meta")]
+    MetricMeta,
 
     /// Deprecated, still forwarded for older downstream Relays.
     #[serde(rename = "organizations:transaction-name-mark-scrubbed-as-sanitized")]

relay-dynamic-config/src/feature.rs

@@ -9,21 +9,27 @@ edition = "2021"
 license-file = "../LICENSE.md"
 publish = false
 
+[features]
+redis = ["relay-redis/impl"]
+
 [dependencies]
 bytecount = "0.6.0"
 fnv = "1.0.7"
-hash32 = "0.3.1"
+hash32 = { workspace = true }
+hashbrown = { workspace = true }
 itertools = { workspace = true }
 relay-base-schema = { path = "../relay-base-schema" }
 relay-common = { path = "../relay-common" }
 relay-log = { path = "../relay-log" }
+relay-redis = { path = "../relay-redis", optional = true }
 relay-statsd = { path = "../relay-statsd" }
 relay-system = { path = "../relay-system" }
 serde = { workspace = true }
 serde_json = { workspace = true }
 smallvec = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["time"] }
+chrono = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true }

relay-metrics/Cargo.toml

@@ -399,29 +399,6 @@ fn parse_gauge(string: &str) -> Option<GaugeValue> {
     })
 }
 
-/// Parses an MRI from a string and a separate type.
-///
-/// The given string must be a part of the MRI, including the following components:
-///  - (optional) The namespace. If missing, it is defaulted to `"custom"`
-///  - (required) The metric name.
-///  - (optional) The unit. If missing, it is defaulted to "none".
-///
-/// The metric type is never part of this string and must be supplied separately.
-fn parse_mri(string: &str, ty: MetricType) -> Option<MetricResourceIdentifier> {
-    let (name_and_namespace, unit) = protocol::parse_name_unit(string)?;
-
-    let (raw_namespace, name) = name_and_namespace
-        .split_once('/')
-        .unwrap_or(("custom", name_and_namespace));
-
-    Some(MetricResourceIdentifier {
-        ty,
-        name,
-        namespace: raw_namespace.parse().ok()?,
-        unit,
-    })
-}
-
 /// Parses tags in the format `tag1,tag2:value`.
 ///
 /// Tag values are optional. For tags with missing values, an empty `""` value is assumed.
@@ -640,7 +617,7 @@ impl Bucket {
         let (mri_str, values_str) = components.next()?.split_once(':')?;
         let ty = components.next().and_then(|s| s.parse().ok())?;
 
-        let mri = parse_mri(mri_str, ty)?;
+        let mri = MetricResourceIdentifier::parse_with_type(mri_str, ty).ok()?;
         let value = match ty {
             MetricType::Counter => BucketValue::Counter(parse_counter(values_str)?),
             MetricType::Distribution => BucketValue::Distribution(parse_distribution(values_str)?),

relay-metrics/src/bucket.rs

@@ -72,11 +72,17 @@ pub mod aggregator;
 
 mod aggregatorservice;
 mod bucket;
+mod meta;
 mod protocol;
+#[cfg(feature = "redis")]
+mod redis_meta;
 mod router;
 mod statsd;
 
 pub use aggregatorservice::*;
 pub use bucket::*;
+pub use meta::*;
 pub use protocol::*;
+#[cfg(feature = "redis")]
+pub use redis_meta::*;
 pub use router::*;