Skip to content

Commit

Permalink
chore: fix rust 1.77 lints (#1641)
Browse files Browse the repository at this point in the history
  • Loading branch information
TommyCpp authored Mar 25, 2024
1 parent e0bb2b6 commit 9fe943d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion examples/metrics-advanced/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use opentelemetry::global;
use opentelemetry::metrics::Unit;
use opentelemetry::Key;
use opentelemetry::{metrics::MeterProvider as _, KeyValue};
use opentelemetry::KeyValue;
use opentelemetry_sdk::metrics::{
Aggregation, Instrument, PeriodicReader, SdkMeterProvider, Stream,
};
Expand Down
2 changes: 1 addition & 1 deletion examples/metrics-basic/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use opentelemetry::global;
use opentelemetry::metrics::Unit;
use opentelemetry::{metrics::MeterProvider as _, KeyValue};
use opentelemetry::KeyValue;
use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider};
use opentelemetry_sdk::{runtime, Resource};
use std::error::Error;
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-sdk/src/metrics/internal/aggregate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ impl<T: Number<T>> AggregateBuilder<T> {

/// Wraps the passed in measure with an attribute filtering function.
fn filter(&self, f: impl Measure<T>) -> impl Measure<T> {
let filter = self.filter.as_ref().map(Arc::clone);
let filter = self.filter.clone();
move |n, mut attrs: AttributeSet| {
if let Some(filter) = &filter {
attrs.retain(filter.as_ref());
Expand Down
11 changes: 5 additions & 6 deletions opentelemetry-sdk/src/metrics/pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,7 @@ where
let cached = cache.entry(id).or_insert_with(|| {
let filter = stream
.allowed_attribute_keys
.as_ref()
.map(Arc::clone)
.clone()
.map(|allowed| Arc::new(move |kv: &KeyValue| allowed.contains(&kv.key)) as Arc<_>);

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

cached
.as_ref()
.map(|o| o.as_ref().map(Arc::clone))
.map_err(|e| MetricsError::Other(e.to_string()))
match cached {
Ok(opt) => Ok(opt.clone()),
Err(err) => Err(MetricsError::Other(err.to_string())),
}
}

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

0 comments on commit 9fe943d

Please sign in to comment.