Skip to content

Commit f79586b

Browse files
authored
Lint: fix issues with unnecessary wraps (#456)
1 parent 238e797 commit f79586b

File tree

4 files changed

+4
-11
lines changed
  • opentelemetry-datadog/src/exporter
  • opentelemetry-jaeger/src/exporter
  • opentelemetry-otlp/src/transform
  • opentelemetry-zipkin/src/exporter/model

4 files changed

+4
-11
lines changed

opentelemetry-datadog/src/exporter/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ mod tests {
192192
use crate::exporter::model::tests::get_span;
193193

194194
#[test]
195-
fn test_out_of_order_group() -> Result<(), Box<dyn std::error::Error>> {
195+
fn test_out_of_order_group() {
196196
let batch = vec![get_span(1, 1, 1), get_span(2, 2, 2), get_span(1, 1, 3)];
197197
let expected = vec![
198198
vec![get_span(1, 1, 1), get_span(1, 1, 3)],
@@ -204,7 +204,5 @@ mod tests {
204204
traces.sort_by_key(|t| t[0].span_context.trace_id().to_u128());
205205

206206
assert_eq!(traces, expected);
207-
208-
Ok(())
209207
}
210208
}

opentelemetry-jaeger/src/exporter/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ mod tests {
782782
}
783783

784784
#[test]
785-
fn test_set_status() -> Result<(), Box<dyn std::error::Error>> {
785+
fn test_set_status() {
786786
for (status_code, error_msg, status_tag_val, msg_tag_val) in get_error_tag_test_data() {
787787
let tags = build_span_tags(
788788
EvictedHashMap::new(20, 20),
@@ -803,6 +803,5 @@ mod tests {
803803
assert_tag_not_contains(tags.clone(), OTEL_STATUS_DESCRIPTION);
804804
}
805805
}
806-
Ok(())
807806
}
808807
}

opentelemetry-otlp/src/transform/metrics.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ mod tests {
731731
}
732732

733733
#[test]
734-
fn test_sink() -> Result<(), MetricsError> {
734+
fn test_sink() {
735735
let test_data: Vec<(ResourceWrapper, InstrumentationLibrary, Metric)> = vec![
736736
(
737737
vec![("runtime", "tokio")],
@@ -826,8 +826,6 @@ mod tests {
826826
for (expect, actual) in expect.into_iter().zip(actual.into_iter()) {
827827
assert_resource_metrics(expect, actual);
828828
}
829-
830-
Ok(())
831829
}
832830
}
833831
}

opentelemetry-zipkin/src/exporter/model/span.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ mod tests {
156156
}
157157

158158
#[test]
159-
fn test_set_status() -> Result<(), Box<dyn std::error::Error>> {
159+
fn test_set_status() {
160160
for (status_code, status_msg, status_tag_val, status_msg_tag_val) in
161161
get_set_status_test_data()
162162
{
@@ -188,7 +188,5 @@ mod tests {
188188
assert_tag_contains(tags, OTEL_ERROR_DESCRIPTION, status_msg_tag_val);
189189
};
190190
}
191-
192-
Ok(())
193191
}
194192
}

0 commit comments

Comments
 (0)