Skip to content

Commit

Permalink
removed From trait
Browse files Browse the repository at this point in the history
  • Loading branch information
Elias Ram committed May 27, 2024
1 parent 835f025 commit cab00f7
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
12 changes: 6 additions & 6 deletions sentry-core/src/metrics/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,11 +534,11 @@ impl Metric {
.as_secs();
let data = format!(
"{}@{}:{}|{}|#{}|T{}",
NormalizedName::from(self.name.as_ref()),
NormalizedUnit::from(self.unit.to_string().as_ref()),
NormalizedName::from_str(self.name.as_ref()),
NormalizedUnit::from_str(self.unit.to_string().as_ref()),
self.value,
self.value.ty(),
NormalizedTags::from(&self.tags),
NormalizedTags::from_tag_map(&self.tags),
timestamp
);
EnvelopeItem::Statsd(data.into_bytes()).into()
Expand Down Expand Up @@ -836,10 +836,10 @@ impl Worker {

for (timestamp, buckets) in buckets {
for (key, value) in buckets {
write!(&mut out, "{}", NormalizedName::from(key.name.as_ref()))?;
write!(&mut out, "{}", NormalizedName::from_str(key.name.as_ref()))?;
match key.unit {
MetricUnit::Custom(u) => {
write!(&mut out, "@{}", NormalizedUnit::from(u.as_ref()))?
write!(&mut out, "@{}", NormalizedUnit::from_str(u.as_ref()))?
}
_ => write!(&mut out, "@{}", key.unit)?,
}
Expand Down Expand Up @@ -868,7 +868,7 @@ impl Worker {

write!(&mut out, "|{}", key.ty.as_str())?;
let normalized_tags =
NormalizedTags::from(&key.tags).with_default_tags(&self.default_tags);
NormalizedTags::from_tag_map(&key.tags).with_default_tags(&self.default_tags);
write!(&mut out, "|#{}", normalized_tags)?;
writeln!(&mut out, "|T{}", timestamp)?;
}
Expand Down
8 changes: 4 additions & 4 deletions sentry-core/src/metrics/normalization/normalized_name.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ pub struct NormalizedName<'a> {
name: Cow<'a, str>,
}

impl<'a> From<&'a str> for NormalizedName<'a> {
fn from(name: &'a str) -> Self {
impl<'a> NormalizedName<'a> {
pub fn from_str(name: &'a str) -> Self {
static METRIC_NAME_RE: OnceLock<Regex> = OnceLock::new();
Self {
name: METRIC_NAME_RE
Expand All @@ -31,7 +31,7 @@ mod test {
fn test_from() {
let expected = "aA1_-.____________";

let actual = NormalizedName::from("aA1_-./+ö{😀\n\t\r\\| ,").to_string();
let actual = NormalizedName::from_str("aA1_-./+ö{😀\n\t\r\\| ,").to_string();

assert_eq!(expected, actual);
}
Expand All @@ -40,7 +40,7 @@ mod test {
fn test_length_restriction() {
let expected = "a".repeat(150);

let actual = NormalizedName::from("a".repeat(155).as_ref()).to_string();
let actual = NormalizedName::from_str("a".repeat(155).as_ref()).to_string();

assert_eq!(expected, actual);
}
Expand Down
16 changes: 8 additions & 8 deletions sentry-core/src/metrics/normalization/normalized_tags.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ pub struct NormalizedTags<'a> {
tags: HashMap<Cow<'a, str>, String>,
}

impl<'a> From<&'a TagMap> for NormalizedTags<'a> {
fn from(tags: &'a TagMap) -> Self {
impl<'a> NormalizedTags<'a> {
pub fn from_tag_map(tags: &'a TagMap) -> Self {
Self {
tags: tags
.iter()
Expand Down Expand Up @@ -95,7 +95,7 @@ mod test {
);
let expected = "aa:a\\na,bb:b\\rb,cc:c\\tc,dd:d\\\\d,ee:e\\u{7c}e,ff:f\\u{2c}f";

let actual = NormalizedTags::from(&tags).to_string();
let actual = NormalizedTags::from_tag_map(&tags).to_string();

assert_eq!(expected, actual);
}
Expand All @@ -109,7 +109,7 @@ mod test {
);
let expected = "";

let actual = NormalizedTags::from(&tags).to_string();
let actual = NormalizedTags::from_tag_map(&tags).to_string();

assert_eq!(expected, actual);
}
Expand All @@ -119,7 +119,7 @@ mod test {
let tags = TagMap::from([("aA1_-./+ö{ 😀".into(), "aA1_-./+ö{ 😀".into())]);
let expected = "aA1_-./:aA1_-./+ö{ 😀";

let actual = NormalizedTags::from(&tags).to_string();
let actual = NormalizedTags::from_tag_map(&tags).to_string();

assert_eq!(expected, actual);
}
Expand All @@ -132,7 +132,7 @@ mod test {
]);
let expected = "environment:production,release:default_release";

let actual = NormalizedTags::from(&TagMap::new())
let actual = NormalizedTags::from_tag_map(&TagMap::new())
.with_default_tags(&default_tags)
.to_string();

Expand All @@ -147,7 +147,7 @@ mod test {
]);
let expected = "environment:custom_env,release:custom_release";

let actual = NormalizedTags::from(&TagMap::from([
let actual = NormalizedTags::from_tag_map(&TagMap::from([
("release".into(), "custom_release".into()),
("environment".into(), "custom_env".into()),
]))
Expand All @@ -167,7 +167,7 @@ mod test {
+ ":"
+ "v".repeat(200).as_str();

let actual = NormalizedTags::from(&TagMap::from([(
let actual = NormalizedTags::from_tag_map(&TagMap::from([(
"k".repeat(35).into(),
"v".repeat(210).into(),
)]))
Expand Down
12 changes: 6 additions & 6 deletions sentry-core/src/metrics/normalization/normalized_unit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ pub struct NormalizedUnit<'a> {
unit: Cow<'a, str>,
}

impl<'a> From<&'a str> for NormalizedUnit<'a> {
fn from(unit: &'a str) -> Self {
impl<'a> NormalizedUnit<'a> {
pub fn from_str(unit: &'a str) -> Self {
static METRIC_UNIT_RE: OnceLock<Regex> = OnceLock::new();
let normalized_unit = METRIC_UNIT_RE
.get_or_init(|| Regex::new(r"[^a-zA-Z0-9_]").expect("Regex should compile"))
Expand Down Expand Up @@ -37,7 +37,7 @@ mod test {
fn test_from() {
let expected = "aA1_";

let actual = NormalizedUnit::from("aA1_-./+ö{😀\n\t\r\\| ,").to_string();
let actual = NormalizedUnit::from_str("aA1_-./+ö{😀\n\t\r\\| ,").to_string();

assert_eq!(expected, actual);
}
Expand All @@ -46,7 +46,7 @@ mod test {
fn test_from_empty() {
let expected = "none";

let actual = NormalizedUnit::from("").to_string();
let actual = NormalizedUnit::from_str("").to_string();

assert_eq!(expected, actual);
}
Expand All @@ -55,7 +55,7 @@ mod test {
fn test_from_empty_after_normalization() {
let expected = "none";

let actual = NormalizedUnit::from("+").to_string();
let actual = NormalizedUnit::from_str("+").to_string();

assert_eq!(expected, actual);
}
Expand All @@ -64,7 +64,7 @@ mod test {
fn test_length_restriction() {
let expected = "a".repeat(15);

let actual = NormalizedUnit::from("a".repeat(20).as_ref()).to_string();
let actual = NormalizedUnit::from_str("a".repeat(20).as_ref()).to_string();

assert_eq!(expected, actual);
}
Expand Down

0 comments on commit cab00f7

Please sign in to comment.