Skip to content

Commit 8278288

Browse files
alessandrobolognaalessandrobologna
committed
chore: update from opentelemetry-sdk 0.28.0 to 0.29.0
1 parent 6179c15 commit 8278288

11 files changed

+59
-75
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# Unreleased
2+
3+
### Breaking Changes
4+
5+
- Upgrade from opentelemetry 0.28.0 to 0.29.0. Refer to the upstream
6+
[changelog](https://github.com/open-telemetry/opentelemetry-rust/blob/main/opentelemetry-sdk/CHANGELOG.md#0290)
7+
for more information.
8+
19
# 0.27.0 (October 9, 2024)
210

311
### Breaking Changes

‎Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ metrics = ["opentelemetry/metrics","opentelemetry_sdk/metrics", "smallvec"]
2323
metrics_gauge_unstable = []
2424

2525
[dependencies]
26-
opentelemetry = { version = "0.28.0", default-features = false, features = ["trace"] }
27-
opentelemetry_sdk = { version = "0.28.0", default-features = false, features = ["trace"] }
26+
opentelemetry = { version = "0.29.0", default-features = false, features = ["trace"] }
27+
opentelemetry_sdk = { version = "0.29.0", default-features = false, features = ["trace"] }
2828
tracing = { version = "0.1.35", default-features = false, features = ["std"] }
2929
tracing-core = "0.1.28"
3030
tracing-subscriber = { version = "0.3.0", default-features = false, features = ["registry", "std"] }
@@ -43,11 +43,11 @@ smallvec = { version = "1.0", optional = true }
4343
[dev-dependencies]
4444
async-trait = "0.1.56"
4545
criterion = { version = "0.5.1", default-features = false, features = ["html_reports"] }
46-
opentelemetry = { version = "0.28.0", features = ["trace", "metrics"] }
47-
opentelemetry_sdk = { version = "0.28.0", default-features = false, features = ["trace", "rt-tokio"] }
48-
opentelemetry-stdout = { version = "0.28.0", features = ["trace", "metrics"] }
49-
opentelemetry-otlp = { version = "0.28.0", features = ["metrics", "grpc-tonic"] }
50-
opentelemetry-semantic-conventions = { version = "0.28.0", features = ["semconv_experimental"] }
46+
opentelemetry = { version = "0.29.0", features = ["trace", "metrics"] }
47+
opentelemetry_sdk = { version = "0.29.0", default-features = false, features = ["trace", "rt-tokio"] }
48+
opentelemetry-stdout = { version = "0.29.0", features = ["trace", "metrics"] }
49+
opentelemetry-otlp = { version = "0.29.0", features = ["metrics", "grpc-tonic"] }
50+
opentelemetry-semantic-conventions = { version = "0.29.0", features = ["semconv_experimental"] }
5151
futures-util = { version = "0.3.17", default-features = false }
5252
tokio = { version = "1", features = ["full"] }
5353
tokio-stream = "0.1"

‎examples/opentelemetry-error.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,17 @@ fn main() -> Result<(), Box<dyn StdError + Send + Sync + 'static>> {
9292
struct WriterExporter;
9393

9494
impl SpanExporter for WriterExporter {
95-
fn export(
96-
&mut self,
95+
async fn export(
96+
&self,
9797
batch: Vec<sdk::trace::SpanData>,
98-
) -> futures_util::future::BoxFuture<'static, OTelSdkResult> {
98+
) -> OTelSdkResult {
9999
let mut writer = std::io::stdout();
100100
for span in batch {
101101
writeln!(writer, "{}", SpanData(span)).unwrap();
102102
}
103103
writeln!(writer).unwrap();
104104

105-
Box::pin(async move { OTelSdkResult::Ok(()) })
105+
OTelSdkResult::Ok(())
106106
}
107107
}
108108

‎tests/batch_global_subscriber.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use futures_util::future::BoxFuture;
21
use opentelemetry::{global as otel_global, trace::TracerProvider as _};
32
use opentelemetry_sdk::{
43
error::OTelSdkResult,
@@ -16,14 +15,12 @@ use std::sync::{Arc, Mutex};
1615
struct TestExporter(Arc<Mutex<Vec<SpanData>>>);
1716

1817
impl SpanExporter for TestExporter {
19-
fn export(&mut self, mut batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult> {
18+
async fn export(&self, mut batch: Vec<SpanData>) -> OTelSdkResult {
2019
let spans = self.0.clone();
21-
Box::pin(async move {
22-
if let Ok(mut inner) = spans.lock() {
23-
inner.append(&mut batch);
24-
}
25-
Ok(())
26-
})
20+
if let Ok(mut inner) = spans.lock() {
21+
inner.append(&mut batch);
22+
}
23+
Ok(())
2724
}
2825
}
2926

‎tests/errors.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use futures_util::future::BoxFuture;
21
use opentelemetry::trace::TracerProvider as _;
32
use opentelemetry_sdk::error::OTelSdkResult;
43
use opentelemetry_sdk::trace::{SdkTracerProvider, SpanData, SpanExporter, Tracer};
@@ -106,13 +105,11 @@ fn test_tracer(
106105
struct TestExporter(Arc<Mutex<Vec<SpanData>>>);
107106

108107
impl SpanExporter for TestExporter {
109-
fn export(&mut self, mut batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult> {
108+
async fn export(&self, mut batch: Vec<SpanData>) -> OTelSdkResult {
110109
let spans = self.0.clone();
111-
Box::pin(async move {
112-
if let Ok(mut inner) = spans.lock() {
113-
inner.append(&mut batch);
114-
}
115-
Ok(())
116-
})
110+
if let Ok(mut inner) = spans.lock() {
111+
inner.append(&mut batch);
112+
}
113+
Ok(())
117114
}
118115
}

‎tests/filtered.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use futures_util::future::BoxFuture;
21
use opentelemetry::trace::TracerProvider as _;
32
use opentelemetry_sdk::error::OTelSdkResult;
43
use opentelemetry_sdk::trace::{SdkTracerProvider, SpanData, SpanExporter, Tracer};
@@ -12,14 +11,12 @@ use tracing_subscriber::prelude::*;
1211
struct TestExporter(Arc<Mutex<Vec<SpanData>>>);
1312

1413
impl SpanExporter for TestExporter {
15-
fn export(&mut self, mut batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult> {
14+
async fn export(&self, mut batch: Vec<SpanData>) -> OTelSdkResult {
1615
let spans = self.0.clone();
17-
Box::pin(async move {
18-
if let Ok(mut inner) = spans.lock() {
19-
inner.append(&mut batch);
20-
}
21-
Ok(())
22-
})
16+
if let Ok(mut inner) = spans.lock() {
17+
inner.append(&mut batch);
18+
}
19+
Ok(())
2320
}
2421
}
2522

‎tests/follows_from.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use futures_util::future::BoxFuture;
21
use opentelemetry::trace::TracerProvider as _;
32
use opentelemetry_sdk::{
43
error::OTelSdkResult,
@@ -13,14 +12,12 @@ use tracing_subscriber::prelude::*;
1312
struct TestExporter(Arc<Mutex<Vec<SpanData>>>);
1413

1514
impl SpanExporter for TestExporter {
16-
fn export(&mut self, mut batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult> {
15+
async fn export(&self, mut batch: Vec<SpanData>) -> OTelSdkResult {
1716
let spans = self.0.clone();
18-
Box::pin(async move {
19-
if let Ok(mut inner) = spans.lock() {
20-
inner.append(&mut batch);
21-
}
22-
Ok(())
23-
})
17+
if let Ok(mut inner) = spans.lock() {
18+
inner.append(&mut batch);
19+
}
20+
Ok(())
2421
}
2522
}
2623

‎tests/parallel.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use futures_util::future::BoxFuture;
21
use opentelemetry::trace::TracerProvider as _;
32
use opentelemetry_sdk::error::OTelSdkResult;
43
use opentelemetry_sdk::trace::{SdkTracerProvider, SpanData, SpanExporter, SpanLimits, Tracer};
@@ -12,14 +11,12 @@ use tracing_subscriber::prelude::*;
1211
struct TestExporter(Arc<Mutex<Vec<SpanData>>>);
1312

1413
impl SpanExporter for TestExporter {
15-
fn export(&mut self, mut batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult> {
14+
async fn export(&self, mut batch: Vec<SpanData>) -> OTelSdkResult {
1615
let spans = self.0.clone();
17-
Box::pin(async move {
18-
if let Ok(mut inner) = spans.lock() {
19-
inner.append(&mut batch);
20-
}
21-
Ok(())
22-
})
16+
if let Ok(mut inner) = spans.lock() {
17+
inner.append(&mut batch);
18+
}
19+
Ok(())
2320
}
2421
}
2522

‎tests/parents.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use futures_util::future::BoxFuture;
21
use opentelemetry::trace::TracerProvider as _;
32
use opentelemetry_sdk::error::OTelSdkResult;
43
use opentelemetry_sdk::trace::{SdkTracerProvider, SpanData, SpanExporter, Tracer};
@@ -12,14 +11,12 @@ use tracing_subscriber::prelude::*;
1211
struct TestExporter(Arc<Mutex<Vec<SpanData>>>);
1312

1413
impl SpanExporter for TestExporter {
15-
fn export(&mut self, mut batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult> {
14+
async fn export(&self, mut batch: Vec<SpanData>) -> OTelSdkResult {
1615
let spans = self.0.clone();
17-
Box::pin(async move {
18-
if let Ok(mut inner) = spans.lock() {
19-
inner.append(&mut batch);
20-
}
21-
Ok(())
22-
})
16+
if let Ok(mut inner) = spans.lock() {
17+
inner.append(&mut batch);
18+
}
19+
Ok(())
2320
}
2421
}
2522

‎tests/span_ext.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use futures_util::future::BoxFuture;
21
use opentelemetry::trace::{Status, TracerProvider as _};
32
use opentelemetry_sdk::{
43
error::OTelSdkResult,
@@ -14,14 +13,12 @@ use tracing_subscriber::prelude::*;
1413
struct TestExporter(Arc<Mutex<Vec<SpanData>>>);
1514

1615
impl SpanExporter for TestExporter {
17-
fn export(&mut self, mut batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult> {
16+
async fn export(&self, mut batch: Vec<SpanData>) -> OTelSdkResult {
1817
let spans = self.0.clone();
19-
Box::pin(async move {
20-
if let Ok(mut inner) = spans.lock() {
21-
inner.append(&mut batch);
22-
}
23-
Ok(())
24-
})
18+
if let Ok(mut inner) = spans.lock() {
19+
inner.append(&mut batch);
20+
}
21+
Ok(())
2522
}
2623
}
2724

‎tests/trace_state_propagation.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use futures_util::future::BoxFuture;
21
use opentelemetry::{
32
propagation::{TextMapCompositePropagator, TextMapPropagator},
43
trace::{SpanContext, TraceContextExt, Tracer as _, TracerProvider as _},
@@ -218,13 +217,11 @@ fn build_sampled_context() -> (Context, impl Subscriber, TestExporter, SdkTracer
218217
struct TestExporter(Arc<Mutex<Vec<SpanData>>>);
219218

220219
impl SpanExporter for TestExporter {
221-
fn export(&mut self, mut batch: Vec<SpanData>) -> BoxFuture<'static, OTelSdkResult> {
220+
async fn export(&self, mut batch: Vec<SpanData>) -> OTelSdkResult {
222221
let spans = self.0.clone();
223-
Box::pin(async move {
224-
if let Ok(mut inner) = spans.lock() {
225-
inner.append(&mut batch);
226-
}
227-
Ok(())
228-
})
222+
if let Ok(mut inner) = spans.lock() {
223+
inner.append(&mut batch);
224+
}
225+
Ok(())
229226
}
230227
}

0 commit comments

Comments
 (0)