Skip to content

Commit d776d6c

Browse files
add default implementation for shutdown_with_timeout in logexporter trait
1 parent 45cfe3f commit d776d6c

File tree

13 files changed

+4
-85
lines changed

13 files changed

+4
-85
lines changed

opentelemetry-appender-log/Cargo.toml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,5 @@ spec_unstable_logs_enabled = ["opentelemetry/spec_unstable_logs_enabled"]
2929
with-serde = ["log/kv_serde", "serde"]
3030
experimental_metadata_attributes = ["dep:opentelemetry-semantic-conventions"]
3131

32-
[dev-dependencies]
33-
opentelemetry_sdk = { path = "../opentelemetry-sdk", features = [
34-
"testing",
35-
"spec_unstable_logs_enabled",
36-
] }
37-
opentelemetry-stdout = { workspace = true, features = ["logs"] }
38-
log = { workspace = true, features = ["kv_serde"] }
39-
tokio = { workspace = true }
40-
serde = { workspace = true, features = ["std", "derive"] }
41-
4232
[lints]
4333
workspace = true

opentelemetry-appender-tracing/Cargo.toml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,6 @@ tracing-log = { workspace = true, optional = true }
2020
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
2121
tracing-opentelemetry = { workspace = true, optional = true }
2222

23-
[dev-dependencies]
24-
log = { workspace = true }
25-
opentelemetry-stdout = { workspace = true, features = ["logs"] }
26-
opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["logs", "testing"] }
27-
tracing = { workspace = true, features = ["std"]}
28-
tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] }
29-
tracing-log = { workspace = true }
30-
criterion = { workspace = true }
31-
tokio = { workspace = true, features = ["full"]}
32-
33-
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
34-
pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
35-
3623
[features]
3724
default = []
3825
experimental_metadata_attributes = ["dep:tracing-log"]

opentelemetry-jaeger-propagator/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ opentelemetry = { version = "0.29", default-features = false, features = [
2525
"trace",
2626
], path = "../opentelemetry" }
2727

28-
[dev-dependencies]
29-
opentelemetry = { features = ["testing"], path = "../opentelemetry" }
30-
3128
[features]
3229
default = ["internal-logs"]
3330
internal-logs = ["opentelemetry/internal-logs"]

opentelemetry-otlp/Cargo.toml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,6 @@ serde = { workspace = true, features = ["derive"], optional = true }
4343
thiserror = { workspace = true }
4444
serde_json = { workspace = true, optional = true }
4545

46-
[dev-dependencies]
47-
tokio-stream = { workspace = true, features = ["net"] }
48-
# need tokio runtime to run smoke tests.
49-
opentelemetry_sdk = { features = ["trace", "rt-tokio", "testing"], path = "../opentelemetry-sdk" }
50-
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
51-
futures-util = { workspace = true }
52-
temp-env = { workspace = true }
53-
tonic = { workspace = true, features = ["router", "server"] }
54-
5546
[features]
5647
# telemetry pillars and functions
5748
trace = ["opentelemetry/trace", "opentelemetry_sdk/trace", "opentelemetry-proto/trace"]

opentelemetry-proto/Cargo.toml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,5 @@ serde = { workspace = true, optional = true, features = ["serde_derive"] }
6060
hex = { workspace = true, optional = true }
6161
base64 = { workspace = true, optional = true }
6262

63-
[dev-dependencies]
64-
opentelemetry = { features = ["testing"], path = "../opentelemetry" }
65-
tonic-build = { workspace = true }
66-
prost-build = { workspace = true }
67-
tempfile = { workspace = true }
68-
serde_json = { workspace = true }
69-
7063
[lints]
7164
workspace = true

opentelemetry-sdk/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ also modified to suppress telemetry before invoking exporters.
2525
- Fixed the overflow attribute to correctly use the boolean value `true`
2626
instead of the string `"true"`.
2727
[#2878](https://github.com/open-telemetry/opentelemetry-rust/issues/2878)
28-
- *Breaking* The `shutdown_with_timeout` method is added to LogExporter trait. This is breaking change for custom `LogExporter` authors.
28+
- The `shutdown_with_timeout` method is added to LogExporter trait.
2929
- *Breaking* `MetricError`, `MetricResult` no longer public (except when
3030
`spec_unstable_metrics_views` feature flag is enabled). `OTelSdkResult` should
3131
be used instead, wherever applicable. [#2906](https://github.com/open-telemetry/opentelemetry-rust/pull/2906)

opentelemetry-sdk/Cargo.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,6 @@ http = { workspace = true, optional = true }
3131
all-features = true
3232
rustdoc-args = ["--cfg", "docsrs"]
3333

34-
[dev-dependencies]
35-
criterion = { workspace = true, features = ["html_reports"] }
36-
rstest = { workspace = true }
37-
temp-env = { workspace = true }
38-
39-
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
40-
pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
41-
4234
[features]
4335
default = ["trace", "metrics", "logs", "internal-logs"]
4436
trace = ["opentelemetry/trace", "rand", "percent-encoding"]

opentelemetry-sdk/src/logs/export.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ pub trait LogExporter: Send + Sync + Debug {
136136
batch: LogBatch<'_>,
137137
) -> impl std::future::Future<Output = OTelSdkResult> + Send;
138138
/// Shuts down the exporter.
139-
fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult;
139+
fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult {
140+
Ok(())
141+
}
140142
/// Shuts down the exporter with a default timeout.
141143
fn shutdown(&self) -> OTelSdkResult {
142144
self.shutdown_with_timeout(time::Duration::from_secs(5))

opentelemetry-sdk/src/logs/in_memory_exporter.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,6 @@ impl LogExporter for InMemoryLogExporter {
215215
Ok(())
216216
}
217217

218-
fn shutdown(&self) -> OTelSdkResult {
219-
self.shutdown_with_timeout(time::Duration::from_secs(5))
220-
}
221-
222218
fn set_resource(&mut self, resource: &Resource) {
223219
let mut res_guard = self.resource.lock().expect("Resource lock poisoned");
224220
*res_guard = resource.clone();

opentelemetry-semantic-conventions/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ rustdoc-args = ["--cfg", "docsrs"]
2424
default = []
2525
semconv_experimental = []
2626

27-
[dev-dependencies]
28-
opentelemetry = { default-features = false, path = "../opentelemetry" } # for doctests
29-
opentelemetry_sdk = { features = ["trace"], path = "../opentelemetry-sdk" } # for doctests
30-
3127
[lints]
3228
workspace = true
3329

0 commit comments

Comments
 (0)