Skip to content

Commit 07ede08

Browse files
committed
fix: rename new method to not conflict with trait method
1 parent 3bedfbe commit 07ede08

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/registry.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ impl Registry {
8585
///
8686
/// Note that this does not add the EOF marker to the output. Use [`encode_openmetrics_eof`]
8787
/// to do that.
88-
pub fn encode_openmetrics(&self, writer: &mut impl Write) -> fmt::Result {
88+
pub fn encode_openmetrics_to_writer(&self, writer: &mut impl Write) -> fmt::Result {
8989
for group in &self.metrics {
9090
group.encode_openmetrics(writer, self.prefix.as_deref(), &self.labels)?;
9191
}
9292

9393
for sub in self.sub_registries.iter() {
94-
sub.encode_openmetrics(writer)?;
94+
sub.encode_openmetrics_to_writer(writer)?;
9595
}
9696
Ok(())
9797
}
@@ -119,7 +119,7 @@ pub trait MetricsSource: Send + 'static {
119119

120120
impl MetricsSource for Registry {
121121
fn encode_openmetrics(&self, writer: &mut impl std::fmt::Write) -> Result<(), Error> {
122-
self.encode_openmetrics(writer)?;
122+
self.encode_openmetrics_to_writer(writer)?;
123123
write_eof(writer)?;
124124
Ok(())
125125
}

src/service.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
33
use std::{
44
net::SocketAddr,
5+
ops::Deref,
56
sync::{Arc, RwLock},
67
time::{Duration, Instant},
78
};
@@ -23,13 +24,13 @@ pub type RwLockRegistry = Arc<RwLock<Registry>>;
2324
impl MetricsSource for RwLockRegistry {
2425
fn encode_openmetrics(&self, writer: &mut impl std::fmt::Write) -> Result<(), Error> {
2526
let inner = self.read().expect("poisoned");
26-
<Registry as MetricsSource>::encode_openmetrics(&inner, writer)
27+
inner.encode_openmetrics(writer)
2728
}
2829
}
2930

3031
impl MetricsSource for Arc<Registry> {
3132
fn encode_openmetrics(&self, writer: &mut impl std::fmt::Write) -> Result<(), Error> {
32-
<Registry as MetricsSource>::encode_openmetrics(self, writer)
33+
Arc::deref(self).encode_openmetrics(writer)
3334
}
3435
}
3536

src/static_core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub struct GlobalRegistry;
4949
impl MetricsSource for GlobalRegistry {
5050
fn encode_openmetrics(&self, writer: &mut impl std::fmt::Write) -> Result<(), Error> {
5151
let core = crate::static_core::Core::get().ok_or(NoMetricsSnafu.build())?;
52-
<Registry as MetricsSource>::encode_openmetrics(&core.registry, writer)
52+
core.registry.encode_openmetrics(writer)
5353
}
5454
}
5555

0 commit comments

Comments
 (0)