Merge branch 'main' into ok_variants_within_error_enums

gagbo · web-flow · commit fccbe709ad39 · 2023-05-05T14:51:13.000+02:00
diff --git a/autometrics-macros/src/lib.rs b/autometrics-macros/src/lib.rs
@@ -319,8 +319,9 @@ fn latency_query(bucket_name: &str, label_key: &str, label_value: &str) -> Strin
         "sum by (le, function, module, commit, version) (rate({bucket_name}{{{label_key}=\"{label_value}\"}}[5m]) {ADD_BUILD_INFO_LABELS})"
     );
     format!(
-        "histogram_quantile(0.99, {latency}) or
-histogram_quantile(0.95, {latency})"
+        "label_replace(histogram_quantile(0.99, {latency}), \"percentile_latency\", \"99\", \"\", \"\")
+or
+label_replace(histogram_quantile(0.95, {latency}), \"percentile_latency\", \"95\", \"\", \"\")"
     )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -319,8 +319,9 @@ fn latency_query(bucket_name: &str, label_key: &str, label_value: &str) -> Strin`
`319`	`319`	`"sum by (le, function, module, commit, version) (rate({bucket_name}{{{label_key}=\"{label_value}\"}}[5m]) {ADD_BUILD_INFO_LABELS})"`
`320`	`320`	`);`
`321`	`321`	`format!(`
`322`		`- "histogram_quantile(0.99, {latency}) or`
`323`		`-histogram_quantile(0.95, {latency})"`
	`322`	`+ "label_replace(histogram_quantile(0.99, {latency}), \"percentile_latency\", \"99\", \"\", \"\")`
	`323`	`+or`
	`324`	`+label_replace(histogram_quantile(0.95, {latency}), \"percentile_latency\", \"95\", \"\", \"\")"`
`324`	`325`	`)`
`325`	`326`	`}`
`326`	`327`