Skip to content

Commit f2cfa1a

Browse files
committed
remove async_trait as dependency
1 parent 7b0eec5 commit f2cfa1a

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

opentelemetry-sdk/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ rust-version = "1.70"
1313
opentelemetry = { version = "0.27", path = "../opentelemetry/" }
1414
opentelemetry-http = { version = "0.27", path = "../opentelemetry-http", optional = true }
1515
async-std = { workspace = true, features = ["unstable"], optional = true }
16-
async-trait = { workspace = true }
16+
async-trait = { workspace = true, optional = true }
1717
futures-channel = "0.3"
1818
futures-executor = { workspace = true }
1919
futures-util = { workspace = true, features = ["std", "sink", "async-await-macro"] }
@@ -43,11 +43,11 @@ pprof = { version = "0.13", features = ["flamegraph", "criterion"] }
4343

4444
[features]
4545
default = ["trace", "metrics", "logs", "internal-logs"]
46-
trace = ["opentelemetry/trace", "rand", "percent-encoding"]
46+
trace = ["opentelemetry/trace", "rand", "percent-encoding"]
4747
jaeger_remote_sampler = ["trace", "opentelemetry-http", "http", "serde", "serde_json", "url"]
48-
logs = ["opentelemetry/logs", "serde_json"]
48+
logs = ["opentelemetry/logs", "async-trait", "serde_json"]
4949
spec_unstable_logs_enabled = ["logs", "opentelemetry/spec_unstable_logs_enabled"]
50-
metrics = ["opentelemetry/metrics", "glob"]
50+
metrics = ["opentelemetry/metrics", "glob", "async-trait"]
5151
testing = ["opentelemetry/testing", "trace", "metrics", "logs", "rt-async-std", "rt-tokio", "rt-tokio-current-thread", "tokio/macros", "tokio/rt-multi-thread"]
5252
rt-tokio = ["tokio", "tokio-stream"]
5353
rt-tokio-current-thread = ["tokio", "tokio-stream"]

opentelemetry-sdk/src/trace/span_processor.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,6 @@ mod tests {
727727
OTEL_BSP_MAX_CONCURRENT_EXPORTS_DEFAULT, OTEL_BSP_MAX_EXPORT_BATCH_SIZE_DEFAULT,
728728
};
729729
use crate::trace::{BatchConfig, BatchConfigBuilder, SpanEvents, SpanLinks};
730-
use async_trait::async_trait;
731730
use opentelemetry::trace::{SpanContext, SpanId, SpanKind, Status};
732731
use std::fmt::Debug;
733732
use std::future::Future;
@@ -963,7 +962,6 @@ mod tests {
963962
}
964963
}
965964

966-
#[async_trait]
967965
impl<D, DS> SpanExporter for BlockingExporter<D>
968966
where
969967
D: Fn(Duration) -> DS + 'static + Send + Sync,

0 commit comments

Comments
 (0)