Skip to content

Commit f2ac634

Browse files
committed
fmt
1 parent 64beac6 commit f2ac634

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

opentelemetry-otlp/src/exporter/http/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ use opentelemetry_proto::transform::common::tonic::ResourceAttributesWithSchema;
1313
use opentelemetry_proto::transform::logs::tonic::group_logs_by_resource_and_scope;
1414
#[cfg(feature = "trace")]
1515
use opentelemetry_proto::transform::trace::tonic::group_spans_by_resource_and_scope;
16-
#[cfg(feature = "trace")]
17-
use opentelemetry_sdk::trace::SpanData;
1816
#[cfg(feature = "logs")]
1917
use opentelemetry_sdk::logs::LogBatch;
18+
#[cfg(feature = "trace")]
19+
use opentelemetry_sdk::trace::SpanData;
2020
use prost::Message;
2121
use std::collections::HashMap;
2222
use std::env;

opentelemetry-proto/src/transform/trace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ mod tests {
198198
};
199199
use opentelemetry::InstrumentationScope;
200200
use opentelemetry::KeyValue;
201-
use opentelemetry_sdk::trace::SpanData;
202201
use opentelemetry_sdk::resource::Resource;
202+
use opentelemetry_sdk::trace::SpanData;
203203
use opentelemetry_sdk::trace::{SpanEvents, SpanLinks};
204204
use std::borrow::Cow;
205205
use std::time::{Duration, SystemTime};

opentelemetry-sdk/benches/batch_span_processor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
22
use opentelemetry::trace::{
33
SpanContext, SpanId, SpanKind, Status, TraceFlags, TraceId, TraceState,
44
};
5-
use opentelemetry_sdk::trace::SpanData;
65
use opentelemetry_sdk::testing::trace::NoopSpanExporter;
6+
use opentelemetry_sdk::trace::SpanData;
77
use opentelemetry_sdk::trace::{
88
BatchConfigBuilder, BatchSpanProcessor, SpanEvents, SpanLinks, SpanProcessor,
99
};

opentelemetry-sdk/src/trace/runtime_tests.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// need to run those tests one by one as the GlobalTracerProvider is a shared object between
33
// threads Use cargo test -- --ignored --test-threads=1 to run those tests.
44
#[cfg(any(feature = "rt-tokio", feature = "rt-tokio-current-thread"))]
5-
use crate::trace::{ExportResult, SpanExporter};
6-
#[cfg(any(feature = "rt-tokio", feature = "rt-tokio-current-thread"))]
75
use crate::runtime;
86
#[cfg(any(feature = "rt-tokio", feature = "rt-tokio-current-thread"))]
97
use crate::runtime::RuntimeChannel;
108
#[cfg(any(feature = "rt-tokio", feature = "rt-tokio-current-thread"))]
9+
use crate::trace::{ExportResult, SpanExporter};
10+
#[cfg(any(feature = "rt-tokio", feature = "rt-tokio-current-thread"))]
1111
use futures_util::future::BoxFuture;
1212
#[cfg(any(feature = "rt-tokio", feature = "rt-tokio-current-thread"))]
1313
use opentelemetry::global::*;
@@ -28,10 +28,7 @@ struct SpanCountExporter {
2828

2929
#[cfg(any(feature = "rt-tokio", feature = "rt-tokio-current-thread"))]
3030
impl SpanExporter for SpanCountExporter {
31-
fn export(
32-
&mut self,
33-
batch: Vec<crate::trace::SpanData>,
34-
) -> BoxFuture<'static, ExportResult> {
31+
fn export(&mut self, batch: Vec<crate::trace::SpanData>) -> BoxFuture<'static, ExportResult> {
3532
self.span_count.fetch_add(batch.len(), Ordering::SeqCst);
3633
Box::pin(async { Ok(()) })
3734
}

opentelemetry-sdk/src/trace/span_processor_with_async_runtime.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::trace::{ExportResult, SpanData, SpanExporter};
21
use crate::resource::Resource;
32
use crate::runtime::{RuntimeChannel, TrySend};
43
use crate::trace::BatchConfig;
54
use crate::trace::Span;
65
use crate::trace::SpanProcessor;
6+
use crate::trace::{ExportResult, SpanData, SpanExporter};
77
use futures_channel::oneshot;
88
use futures_util::{
99
future::{self, BoxFuture, Either},
@@ -420,7 +420,6 @@ where
420420
mod tests {
421421
// cargo test trace::span_processor::tests:: --features=testing
422422
use super::{BatchSpanProcessor, SpanProcessor};
423-
use crate::trace::{ExportResult, SpanData, SpanExporter};
424423
use crate::runtime;
425424
use crate::testing::trace::{
426425
new_test_export_span_data, new_tokio_test_exporter, InMemorySpanExporterBuilder,
@@ -430,6 +429,7 @@ mod tests {
430429
OTEL_BSP_MAX_QUEUE_SIZE_DEFAULT, OTEL_BSP_SCHEDULE_DELAY, OTEL_BSP_SCHEDULE_DELAY_DEFAULT,
431430
};
432431
use crate::trace::{BatchConfig, BatchConfigBuilder};
432+
use crate::trace::{ExportResult, SpanData, SpanExporter};
433433
use futures_util::Future;
434434
use std::fmt::Debug;
435435
use std::time::Duration;

0 commit comments

Comments
 (0)