linkerd
/
linkerd2-proxy
mirror of https://github.com/linkerd/linkerd2-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make `Metric::fmt_scopes` generic over an Iterator (#60) 

The `Scopes` type shouldn't be critical to metrics formatting.

This change makes the `Metric` type unaware of `Scopes` so that other
labeling mechanisms can be used if appropriate.
This commit is contained in:
Oliver Gould 2018-08-10 11:16:06 -07:00 committed by GitHub
parent f7a35442be
commit 005d4f19c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/telemetry/metrics/http.rs
View File

@ -41,7 +41,7 @@ impl fmt::Display for RequestScopes {
} }
Self::request_total.fmt_help(f)?; Self::request_total.fmt_help(f)?;
Self::request_total.fmt_scopes(f, &self, |s| &s.total)?; Self::request_total.fmt_scopes(f, self, |s| &s.total)?;
Ok(()) Ok(())
} }
@ -79,10 +79,10 @@ impl fmt::Display for ResponseScopes {
} }
Self::response_total.fmt_help(f)?; Self::response_total.fmt_help(f)?;
Self::response_total.fmt_scopes(f, &self, |s| &s.total)?; Self::response_total.fmt_scopes(f, self, |s| &s.total)?;
Self::response_latency_ms.fmt_help(f)?; Self::response_latency_ms.fmt_help(f)?;
Self::response_latency_ms.fmt_scopes(f, &self, |s| &s.latency)?; Self::response_latency_ms.fmt_scopes(f, self, |s| &s.latency)?;
Ok(()) Ok(())
} }

11
src/telemetry/metrics/mod.rs
View File

@ -135,12 +135,17 @@ impl<'a, M: FmtMetric> Metric<'a, M> {
} }
/// Formats a single metric across labeled scopes. /// Formats a single metric across labeled scopes.
pub fn fmt_scopes<L: Display + Hash + Eq, S, F: Fn(&S) -> &M>( pub fn fmt_scopes<'i, L: 'i, S: 'i, I, F>(
&self, &self,
f: &mut fmt::Formatter, f: &mut fmt::Formatter,
scopes: &Scopes<L, S>, scopes: I,
to_metric: F to_metric: F
)-> fmt::Result { ) -> fmt::Result
where
L: Display + Hash + Eq,
I: IntoIterator<Item = (&'i L, &'i S)>,
F: Fn(&S) -> &M
{
for (labels, scope) in scopes { for (labels, scope) in scopes {
to_metric(scope).fmt_metric_labeled(f, self.name, labels)?; to_metric(scope).fmt_metric_labeled(f, self.name, labels)?;
} }

12
src/telemetry/metrics/transport.rs
View File

@ -47,16 +47,16 @@ impl fmt::Display for OpenScopes {
} }
Self::tcp_open_total.fmt_help(f)?; Self::tcp_open_total.fmt_help(f)?;
Self::tcp_open_total.fmt_scopes(f, &self, |s| &s.open_total)?; Self::tcp_open_total.fmt_scopes(f, self, |s| &s.open_total)?;
Self::tcp_open_connections.fmt_help(f)?; Self::tcp_open_connections.fmt_help(f)?;
Self::tcp_open_connections.fmt_scopes(f, &self, |s| &s.open_connections)?; Self::tcp_open_connections.fmt_scopes(f, self, |s| &s.open_connections)?;
Self::tcp_read_bytes_total.fmt_help(f)?; Self::tcp_read_bytes_total.fmt_help(f)?;
Self::tcp_read_bytes_total.fmt_scopes(f, &self, |s| &s.read_bytes_total)?; Self::tcp_read_bytes_total.fmt_scopes(f, self, |s| &s.read_bytes_total)?;
Self::tcp_write_bytes_total.fmt_help(f)?; Self::tcp_write_bytes_total.fmt_help(f)?;
Self::tcp_write_bytes_total.fmt_scopes(f, &self, |s| &s.write_bytes_total)?; Self::tcp_write_bytes_total.fmt_scopes(f, self, |s| &s.write_bytes_total)?;
Ok(()) Ok(())
} }
@ -108,10 +108,10 @@ impl fmt::Display for CloseScopes {
} }
Self::tcp_close_total.fmt_help(f)?; Self::tcp_close_total.fmt_help(f)?;
Self::tcp_close_total.fmt_scopes(f, &self, |s| &s.close_total)?; Self::tcp_close_total.fmt_scopes(f, self, |s| &s.close_total)?;
Self::tcp_connection_duration_ms.fmt_help(f)?; Self::tcp_connection_duration_ms.fmt_help(f)?;
Self::tcp_connection_duration_ms.fmt_scopes(f, &self, |s| &s.connection_duration)?; Self::tcp_connection_duration_ms.fmt_scopes(f, self, |s| &s.connection_duration)?;
Ok(()) Ok(())
} }