Skip to content

Commit 9fe943d

Browse files
authored
chore: fix rust 1.77 lints (#1641)
1 parent e0bb2b6 commit 9fe943d

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

examples/metrics-advanced/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use opentelemetry::global;
22
use opentelemetry::metrics::Unit;
33
use opentelemetry::Key;
4-
use opentelemetry::{metrics::MeterProvider as _, KeyValue};
4+
use opentelemetry::KeyValue;
55
use opentelemetry_sdk::metrics::{
66
Aggregation, Instrument, PeriodicReader, SdkMeterProvider, Stream,
77
};

examples/metrics-basic/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use opentelemetry::global;
22
use opentelemetry::metrics::Unit;
3-
use opentelemetry::{metrics::MeterProvider as _, KeyValue};
3+
use opentelemetry::KeyValue;
44
use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider};
55
use opentelemetry_sdk::{runtime, Resource};
66
use std::error::Error;

opentelemetry-sdk/src/metrics/internal/aggregate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl<T: Number<T>> AggregateBuilder<T> {
9393

9494
/// Wraps the passed in measure with an attribute filtering function.
9595
fn filter(&self, f: impl Measure<T>) -> impl Measure<T> {
96-
let filter = self.filter.as_ref().map(Arc::clone);
96+
let filter = self.filter.clone();
9797
move |n, mut attrs: AttributeSet| {
9898
if let Some(filter) = &filter {
9999
attrs.retain(filter.as_ref());

opentelemetry-sdk/src/metrics/pipeline.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,7 @@ where
386386
let cached = cache.entry(id).or_insert_with(|| {
387387
let filter = stream
388388
.allowed_attribute_keys
389-
.as_ref()
390-
.map(Arc::clone)
389+
.clone()
391390
.map(|allowed| Arc::new(move |kv: &KeyValue| allowed.contains(&kv.key)) as Arc<_>);
392391

393392
let b = AggregateBuilder::new(Some(self.pipeline.reader.temporality(kind)), filter);
@@ -409,10 +408,10 @@ where
409408
Ok(Some(m))
410409
});
411410

412-
cached
413-
.as_ref()
414-
.map(|o| o.as_ref().map(Arc::clone))
415-
.map_err(|e| MetricsError::Other(e.to_string()))
411+
match cached {
412+
Ok(opt) => Ok(opt.clone()),
413+
Err(err) => Err(MetricsError::Other(err.to_string())),
414+
}
416415
}
417416

418417
/// Validates if an instrument with the same name as id has already been created.

0 commit comments

Comments
 (0)