Skip to content

Commit 54fa6f2

Browse files
committed
fix: formatting and clippy
1 parent a0a8c23 commit 54fa6f2

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

examples/tracing-http-propagator/src/server.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ impl SpanProcessor for RouteConcurrencyCounterSpanProcessor {
167167
}
168168

169169
fn obfuscate_http_auth_url(s: &str) -> Option<String> {
170-
let uri = hyper::http::Uri::from_maybe_shared(s.to_owned()).ok()?;
170+
#[allow(clippy::unnecessary_to_owned)]
171+
let uri = hyper::http::Uri::from_maybe_shared(s.to_string()).ok()?;
171172
let authority = uri.authority()?;
172173
let (_, url) = authority.as_str().split_once('@')?;
173174
let new_auth = format!("REDACTED_USERNAME:REDACTED_PASSWORD@{url}");

opentelemetry-sdk/src/trace/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub use id_generator::{IdGenerator, RandomIdGenerator};
3939
pub use links::SpanLinks;
4040
pub use provider::{SdkTracerProvider, TracerProviderBuilder};
4141
pub use sampler::{Sampler, ShouldSample};
42-
pub use span::{Span, ReadableSpan, FinishedSpan};
42+
pub use span::{FinishedSpan, ReadableSpan, Span};
4343
pub use span_limit::SpanLimits;
4444
pub use span_processor::{
4545
BatchConfig, BatchConfigBuilder, BatchSpanProcessor, BatchSpanProcessorBuilder,

opentelemetry-sdk/src/trace/span.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,12 @@ impl Span {
215215
if self.tracer.provider().is_shutdown() {
216216
return;
217217
}
218-
let provider = self.tracer.provider().clone();
219218

220219
#[cfg(feature = "experimental_span_processor_on_ending")]
221220
{
221+
let provider = self.tracer.provider().clone();
222222
for processor in provider.span_processors() {
223-
processor.on_ending( self);
223+
processor.on_ending(self);
224224
}
225225
}
226226

@@ -230,7 +230,7 @@ impl Span {
230230
span_context,
231231
..
232232
} = self;
233-
233+
234234
// skip if data has already been exported
235235
let data = match data.take() {
236236
Some(data) => data,
@@ -245,8 +245,9 @@ impl Span {
245245
is_consummed: false,
246246
};
247247

248-
for (i, processor) in provider.span_processors().iter().enumerate() {
249-
if i == provider.span_processors().len() - 1 {
248+
let span_processors = tracer.provider().span_processors();
249+
for (i, processor) in span_processors.iter().enumerate() {
250+
if i == span_processors.len() - 1 {
250251
finished_span.is_last_processor = true;
251252
}
252253
finished_span.is_consummed = false;

opentelemetry-sdk/src/trace/span_processor_with_async_runtime.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::runtime::{to_interval_stream, RuntimeChannel, TrySend};
44
use crate::trace::BatchConfig;
55
use crate::trace::Span;
66
use crate::trace::SpanProcessor;
7-
use crate::trace::{SpanData, FinishedSpan, SpanExporter, ReadableSpan};
7+
use crate::trace::{FinishedSpan, ReadableSpan, SpanData, SpanExporter};
88
use futures_channel::oneshot;
99
use futures_util::pin_mut;
1010
use futures_util::{

0 commit comments

Comments
 (0)