Skip to content

Commit 6f81a7d

Browse files
authored
Merge branch 'main' into 2726-clonebreaking
2 parents 9b1c9d7 + 86e842c commit 6f81a7d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

opentelemetry-sdk/src/metrics/instrument.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ impl Instrument {
130130

131131
/// empty returns if all fields of i are their default-value.
132132
pub(crate) fn is_empty(&self) -> bool {
133-
self.name == ""
134-
&& self.description == ""
133+
self.name.is_empty()
134+
&& self.description.is_empty()
135135
&& self.kind.is_none()
136-
&& self.unit == ""
136+
&& self.unit.is_empty()
137137
&& self.scope == InstrumentationScope::default()
138138
}
139139

opentelemetry-sdk/src/metrics/view.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ pub fn new_view(criteria: Instrument, mask: Stream) -> MetricResult<Box<dyn View
110110
let contains_wildcard = criteria.name.contains(['*', '?']);
111111

112112
let match_fn: Box<dyn Fn(&Instrument) -> bool + Send + Sync> = if contains_wildcard {
113-
if mask.name != "" {
113+
if !mask.name.is_empty() {
114114
// TODO - The error is getting lost here. Need to return or log.
115115
return Ok(Box::new(empty_view));
116116
}

0 commit comments

Comments
 (0)